better template tests

mojolicious · May 11, 2012 · d7bd288 · d7bd288
1 parent 96b605e
commit d7bd288
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,9 @@
 This file documents the revision history for Perl extension Mojolicious.
 
+2.96  2012-05-11
+  - Improved documentation.
+  - Improved tests.
+
 2.95  2012-05-10
   - Improved documentation.
   - Fixed bug that caused inactivity timeouts to be logged too often.

diff --git a/lib/Mojo/Template.pm b/lib/Mojo/Template.pm
@@ -286,9 +286,8 @@ sub parse {
 }
 
 sub render {
-  my $self = shift;
-  my $e    = $self->parse(shift)->build->compile;
-  return $e ? $e : $self->interpret(@_);
+  my $self = shift->parse(shift)->build;
+  return $self->compile || $self->interpret(@_);
 }
 
 sub render_file {
@@ -674,6 +673,11 @@ Compile template.
 
 Interpret template.
 
+  # Reuse template
+  say $mt->render('Result <%= $_[0] + $_[1] %>', 1, 1);
+  say $mt->interpret(2, 2);
+  say $mt->interpret(3, 3);
+
 =head2 C<parse>
 
   $mt = $mt->parse($template);

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -34,7 +34,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Leaf Fluttering In Wind';
-our $VERSION  = '2.95';
+our $VERSION  = '2.96';
 
 # "These old doomsday devices are dangerously unstable.
 #  I'll rest easier not knowing where they are."

diff --git a/t/mojo/template.t b/t/mojo/template.t
@@ -17,7 +17,7 @@ use Mojo::Base -strict;
 
 use utf8;
 
-use Test::More tests => 202;
+use Test::More tests => 204;
 
 # "When I held that gun in my hand, I felt a surge of power...
 #  like God must feel when he's holding a gun."
@@ -789,6 +789,10 @@ $output = $mt->render(<<'EOF', 'test', {foo => 'bar'});
 </html>
 EOF
 is $output, "<html>\ntest bar\n</html>\n", 'arguments';
+is $mt->interpret('tset', {foo => 'baz'}), "<html>\ntset baz\n</html>\n",
+  'arguments again';
+is $mt->interpret('tset', {foo => 'yada'}), "<html>\ntset yada\n</html>\n",
+  'arguments again';
 
 # Ugly multiline loop
 $mt     = Mojo::Template->new;