small optimizations

mojolicious · Aug 18, 2012 · e12093c · e12093c
1 parent e774ea0
commit e12093c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/Changes b/Changes
@@ -6,6 +6,7 @@
   - Added squish method to Mojo::ByteStream.
   - Added squish function to Mojo::Util.
   - Improved documentation.
+  - Improved tests.
   - Fixed json_has method in Test::Mojo.
 
 3.31  2012-08-15

diff --git a/lib/Mojolicious/Controller.pm b/lib/Mojolicious/Controller.pm
@@ -372,8 +372,7 @@ sub session {
   my $self = shift;
 
   # Hash
-  my $stash = $self->stash;
-  my $session = $stash->{'mojo.session'} ||= {};
+  my $session = $self->stash->{'mojo.session'} ||= {};
   return $session unless @_;
 
   # Get
@@ -509,20 +508,18 @@ sub _fallbacks {
   my ($self, $options, $template, $inline) = @_;
 
   # Mode specific template
-  unless ($self->render($options)) {
-
-    # Template
-    $options->{template} = $template;
-    unless ($self->render($options)) {
-
-      # Inline template
-      my $stash = $self->stash;
-      return unless $stash->{format} eq 'html';
-      delete $stash->{$_} for qw(extends layout);
-      delete $options->{template};
-      return $self->render(%$options, inline => $inline, handler => 'ep');
-    }
-  }
+  return 1 if $self->render($options);
+
+  # Template
+  $options->{template} = $template;
+  return 1 if $self->render($options);
+
+  # Inline template
+  my $stash = $self->stash;
+  return unless $stash->{format} eq 'html';
+  delete $stash->{$_} for qw(extends layout);
+  delete $options->{template};
+  return $self->render(%$options, inline => $inline, handler => 'ep');
 }
 
 1;

diff --git a/t/mojo/websocket.t b/t/mojo/websocket.t
@@ -76,8 +76,7 @@ websocket '/early_start' => sub {
   $self->on(
     message => sub {
       my ($self, $message) = @_;
-      $self->send("${message}test2");
-      $self->finish;
+      $self->send("${message}test2")->finish;
     }
   );
 };