small documentation tweaks

mojolicious · Mar 23, 2012 · 6c2cf63 · 6c2cf63
1 parent 71f299a
commit 6c2cf63
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 16 deletions.
diff --git a/lib/Mojo/Content/MultiPart.pm b/lib/Mojo/Content/MultiPart.pm
@@ -142,7 +142,7 @@ sub _parse_multipart {
   # Parse
   $self->{multi_state} ||= 'multipart_preamble';
   my $boundary = $self->boundary;
-  while (!$self->is_finished) {
+  until ($self->is_finished) {
 
     # Preamble
     if (($self->{multi_state} || '') eq 'multipart_preamble') {

diff --git a/lib/Mojo/Reactor.pm b/lib/Mojo/Reactor.pm
@@ -170,7 +170,7 @@ Create a new timer, invoking the callback after a given amount of time in
 seconds.
 
   # Invoke as soon as possible
-  $reactor->timer(0 => sub { say 'First tick.' });
+  $reactor->timer(0 => sub { say 'Next tick.' });
 
 =head2 C<watch>
 

diff --git a/lib/Mojo/Reactor/EV.pm b/lib/Mojo/Reactor/EV.pm
@@ -60,10 +60,7 @@ sub _timer {
   my $id = $self->SUPER::_timer(0, 0, $cb);
   weaken $self;
   $self->{timers}->{$id}->{watcher} = EV::timer(
-    $after,
-    $recurring ? $after : 0,
-    sub {
-      my $w = shift;
+    $after => ($recurring ? $after : 0) => sub {
       $self->_sandbox("Timer $id", $self->{timers}->{$id}->{cb});
       delete $self->{timers}->{$id} unless $recurring;
     }

diff --git a/lib/Mojo/Reactor/Poll.pm b/lib/Mojo/Reactor/Poll.pm
@@ -27,8 +27,9 @@ sub one_tick {
   $self->{running} = 1;
 
   # Wait for one event
-  my $i = 0;
-  while (!$i) {
+  my $i    = 0;
+  my $poll = $self->_poll;
+  until ($i) {
 
     # Stop automatically if there is nothing to watch
     return $self->stop unless keys %{$self->{timers}} || keys %{$self->{io}};
@@ -40,15 +41,14 @@ sub one_tick {
 
     # I/O
     if (keys %{$self->{io}}) {
-      my $poll = $self->_poll;
       $poll->poll($timeout);
       ++$i and $self->_sandbox('Read', $self->{io}->{fileno $_}->{cb}, 0)
         for $poll->handles(POLLIN | POLLHUP | POLLERR);
       ++$i and $self->_sandbox('Write', $self->{io}->{fileno $_}->{cb}, 1)
         for $poll->handles(POLLOUT);
     }
 
-    # Wait for timeout
+    # Wait for timeout if poll can't be used
     elsif ($timeout) { usleep $timeout * 1000000 }
 
     # Timers

diff --git a/lib/Mojo/Server/CGI.pm b/lib/Mojo/Server/CGI.pm
@@ -22,7 +22,7 @@ sub run {
 
   # Request body
   binmode STDIN;
-  while (!$req->is_finished) {
+  until ($req->is_finished) {
     my $read = STDIN->read(my $buffer, CHUNK_SIZE, 0);
     last unless $read;
     $req->parse($buffer);

diff --git a/lib/Mojo/Server/PSGI.pm b/lib/Mojo/Server/PSGI.pm
@@ -21,7 +21,7 @@ sub run {
 
   # Request body
   my $len = $env->{CONTENT_LENGTH};
-  while (!$req->is_finished) {
+  until ($req->is_finished) {
     my $chunk = ($len && $len < CHUNK_SIZE) ? $len : CHUNK_SIZE;
     my $read = $env->{'psgi.input'}->read(my $buffer, $chunk, 0);
     last unless $read;

diff --git a/lib/Mojolicious/Guides/Rendering.pod b/lib/Mojolicious/Guides/Rendering.pod
@@ -714,7 +714,7 @@ Less commonly used and more powerful features.
 
 =head2 Internationalization
 
-Thanks to L<Locale::Maketext>, all you need for basic internationalization
+Thanks to L<Locale::Maketext> all you need for basic internationalization
 support in your application is the plugin L<Mojolicious::Plugin::I18N> and a
 few lexicon classes.
 
@@ -740,7 +740,7 @@ Preferred languages will be automatically detected from the
 C<Accept-Language> header or can be manually changed with the helper
 L<Mojolicious::Plugin::I18N/"languages">.
 
-  $ ./myapp.pl get / -H 'Accept-Language: de'
+  $ ./myapp.pl get -H 'Accept-Language: de' /
 
 =head2 Chunked transfer encoding
 

diff --git a/lib/Mojolicious/Plugin/PoweredBy.pm b/lib/Mojolicious/Plugin/PoweredBy.pm
@@ -8,8 +8,8 @@ use Mojo::Base 'Mojolicious::Plugin';
 #  and the octopus ate all his acorns.
 #  And also he got a racecar. Is any of this getting through to you?"
 sub register {
-  my ($self, $app, $args) = @_;
-  my $name = $args->{name} || 'Mojolicious (Perl)';
+  my ($self, $app, $conf) = @_;
+  my $name = $conf->{name} || 'Mojolicious (Perl)';
   $app->hook(before_dispatch =>
       sub { shift->res->headers->header('X-Powered-By' => $name) });
 }