Update Changes for v1.21

Closes #17

.travis.yml

@@ -0,0 +1,8 @@
+language: perl
+install:
+  - cpanm Mojolicious Template
+script: HARNESS_IS_VERBOSE=1 prove -v -Ilib t
+perl:
+  - "5.14"
+  - "5.12"
+  - "5.10"

Changes

@@ -1,8 +1,14 @@
-Revision history for MojoX-Renderer-TT
+Revision history for Mojolicious::Plugin::TtRenderer
 
 {{$NEXT}}
+        - Fixed double TT rendering on error (Matthias Bethke (GH#21))
+        - Cache templates in tmpdir by default (Marcus Ramberg)
+        - Require Mojolicious 2.51 to avoid memory leaks (GH#19)
+        - Document the 'c' stash variable (RT#70866, Matthias Bethke)
+        - Fix memory leaks, add tests for them (GH#18, Magnus Holm)
+        - Use app->renderer->paths to find template directories (GH#17)
 
-1.14    August 1, 2011
+1.20    August 1, 2011
         - Drop use of MojoX namespace for Mojolicious::Plugin::TtRenderer::
           (GH#12, Cosimo Streppone)
 

MANIFEST.SKIP

@@ -9,6 +9,7 @@
 
 # Avoid Makemaker generated and utility files.
 \bMANIFEST\.bak
+\bMYMETA.*
 \bMakefile$
 \bblib/
 \bMakeMaker-\d
@@ -41,6 +42,3 @@ t/tmp/ctpl
 \.t\.log$
 
 \.prove$
-
-# XS shit
-\.(?:bs|c|o)$

dist.ini

@@ -6,7 +6,7 @@ copyright_holder = Ask Bjørn Hansen
 # copyright_year   = 2009
 
 [Prereqs]
-Mojolicious  = 1.3
+Mojolicious  = 2.51
 Template     = 2.18
 
 [Prereqs / TestRequires ]
@@ -35,8 +35,7 @@ version_regexp = ^release/(.*)
 [PkgVersion]
 
 [CheckChangeLog]
-[CompileTests]
-[DistManifestTests]
+[Test::Compile]
 [HasVersionTests]
 [MetaTests]
 [ReadmeFromPod]

lib/Mojolicious/Plugin/TtRenderer.pm

@@ -3,8 +3,6 @@ package Mojolicious::Plugin::TtRenderer;
 use strict;
 use warnings;
 
-our $VERSION = '0.01';
-
 use base 'Mojolicious::Plugin';
 
 use Mojolicious::Plugin::TtRenderer::Engine;
@@ -20,6 +18,8 @@ sub register {
     $app->renderer->add_handler(tt => $tt);
 }
 
+local ($Mojolicious::Plugin::TtRenderer::VERSION) = ('devel') unless defined $Mojolicious::Plugin::TtRenderer::VERSION;
+
 1;
 __END__
 
@@ -52,6 +52,12 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
 Register renderer in L<Mojolicious> application.
 
+=head1 EXTRA STASH VARIABLES
+
+The current controller instance can be accessed as C<c>.
+
+   [% c.req.headers.host %]
+
 =head1 SEE ALSO
 
 L<Mojolicious::Plugin::TtRenderer::Engine>, L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicious.org>.

lib/Mojolicious/Plugin/TtRenderer/Engine.pm

@@ -10,11 +10,13 @@ use File::Spec ();
 use Mojo::ByteStream 'b';
 use Template ();
 use Cwd qw/abs_path/;
+use Scalar::Util 'weaken';
 
 __PACKAGE__->attr('tt');
 
 sub build {
     my $self = shift->SUPER::new(@_);
+    weaken($self->{app});
     $self->_init(@_);
     return sub { $self->_render(@_) }
 }
@@ -25,15 +27,23 @@ sub _init {
 
     #$Template::Parser::DEBUG = 1;
 
+    my $dir;
     my $app = delete $args{mojo} || delete $args{app};
-
-    my $dir = $app && $app->home->rel_dir('tmp/ctpl');
+    if($dir=$args{cache_dir}) {
+      
+      if($app && substr($dir,0,1) ne '/') {
+        $dir=$app->home->rel_dir('tmp/ctpl');
+      }
+    }
 
     # TODO
     #   take and process options :-)
 
     my %config = (
-        ($app ? (INCLUDE_PATH => abs_path($app->home->rel_dir('templates'))) : ()),
+        (   $app
+            ? (INCLUDE_PATH => (join ":", map { abs_path($_) } @{$app->renderer->paths}))
+            : ()
+        ),
         COMPILE_EXT => '.ttc',
         COMPILE_DIR => ($dir || abs_path(File::Spec->tmpdir)),
         UNICODE     => 1,
@@ -78,9 +88,7 @@ sub _render {
     # Error
     unless ($ok) {
 
-        my $e = Mojo::Exception->new(
-            $self->tt->error.'',
-            $self->tt->service->process(defined $inline ? \$inline : $t));
+        my $e = Mojo::Exception->new($self->tt->error.'');
         $$output = '';
         $c->app->log->error(qq/Template error in "$t": $e/);
         $c->render_exception($e);
@@ -130,6 +138,7 @@ use strict;
 use warnings;
 
 use base 'Template::Provider';
+use Scalar::Util 'weaken';
 
 sub new {
     my $class = shift;
@@ -139,6 +148,7 @@ sub new {
 
     my $self = $class->SUPER::new(%params);
     $self->renderer($renderer);
+    weaken($self->{renderer});
     return $self;
 }
 
@@ -247,6 +257,11 @@ object. When used the INCLUDE_PATH will be set to
 
 A hash reference of options that are passed to Template->new().
 
+=item cache_dir
+
+Absolute or relative dir to your app home, to cache processed versions of your
+templates. Will default to a temp-dir if not set.
+
 =back
 
 =head1 AUTHOR
@@ -256,7 +271,6 @@ Ask Bjørn Hansen, C<< <ask at develooper.com> >>
 =head1 TODO
 
    * Better support non-Mojolicious frameworks
-   * Move the default template cache directory?
    * Better way to pass parameters to the templates? (stash)
    * More sophisticated default search path?
 

t/templates/conditional-exception.html.tt

@@ -0,0 +1,4 @@
+foo
+[% PROCESS doesnotexist.tt IF do_process %]
+bar
+

t/tt_plugin_lite_app.t

@@ -15,7 +15,7 @@ BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
   unless Mojo::IOLoop->new->generate_port;
-plan tests => 3;
+plan tests => 6;
 
 # Leela: OK, this has gotta stop. I'm going to remind Fry of his humanity the way only a woman can.
 # Farnsworth: You're going to do his laundry?
@@ -30,10 +30,23 @@ plugin 'tt_renderer';
 app->log->level('error');
 
 # GET /
-get '/' => 'index';
+get '/'     => 'index';
+get '/blow' => sub {
+    shift->render(template => 'conditional-exception', do_process => 1);
+};
+
 
 my $t = Test::Mojo->new;
 
 # Simple TT template
 $t->get_ok('/')->status_is(200)
-  ->content_like(qr/test123456/);
+  ->content_like(qr/test123456/);
+$t->get_ok('/blow')->status_is(500)->content_like(qr/file error - doesnotexist.tt: No such file or directory/);
+
+eval "
+  use Devel::Cycle 'find_cycle';
+  find_cycle(app, sub {
+    ok(0, 'Cycle found');
+  });
+";
+