Update Changes for v1.21

Closes #17

.gitignore

@@ -6,6 +6,7 @@ _build*
 pm_to_blib*
 *.tar.gz
 .lwpcookies
+Mojolicious-Plugin-TtRenderer-*
 MojoX-Renderer-TT-*
 cover_db
 *~

.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,6 +1,29 @@
-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.20    August 1, 2011
+        - Drop use of MojoX namespace for Mojolicious::Plugin::TtRenderer::
+          (GH#12, Cosimo Streppone)
+
+1.13    June 7, 2011
+        - Compatibility with Mojolicious 1.3+
+
+1.12    February 28, 2011
+        - Inline wrappers and includes now work on Windows
+          (GH#13, Christiaan Kras)
+
+1.11    February 6, 2011
+        - Change to use relative paths (Marcus Ramberg)
+        - Add exception template for tests
+
+1.10    February 5, 2011
         - Support Mojolicious 'layout'/'extends' (Maxim Vuets, Marcus
           Ramberg)
         - Fix Strawberry Perl tests (RT#65282, Christiaan Kras, Ask)

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

@@ -1,4 +1,4 @@
-name    = MojoX-Renderer-TT
+name    = Mojolicious-Plugin-TtRenderer
 author  = Ask Bjørn Hansen <ask@develooper.com>
 license = Perl_5
 
@@ -6,7 +6,7 @@ copyright_holder = Ask Bjørn Hansen
 # copyright_year   = 2009
 
 [Prereqs]
-Mojolicious  = 1.01
+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,23 +3,23 @@ package Mojolicious::Plugin::TtRenderer;
 use strict;
 use warnings;
 
-our $VERSION = '0.01';
-
 use base 'Mojolicious::Plugin';
 
-use MojoX::Renderer::TT;
+use Mojolicious::Plugin::TtRenderer::Engine;
 
 sub register {
     my ($self, $app, $args) = @_;
 
     $args ||= {};
 
-    my $tt = MojoX::Renderer::TT->build(%$args, app => $app);
+    my $tt = Mojolicious::Plugin::TtRenderer::Engine->build(%$args, app => $app);
 
     # Add "tt" handler
     $app->renderer->add_handler(tt => $tt);
 }
 
+local ($Mojolicious::Plugin::TtRenderer::VERSION) = ('devel') unless defined $Mojolicious::Plugin::TtRenderer::VERSION;
+
 1;
 __END__
 
@@ -52,8 +52,14 @@ 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<MojoX::Renderer::TT>, L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicious.org>.
+L<Mojolicious::Plugin::TtRenderer::Engine>, L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicious.org>.
 
 =cut

lib/Mojolicious/Plugin/TtRenderer/Engine.pm

@@ -1,18 +1,22 @@
-package MojoX::Renderer::TT;
+package Mojolicious::Plugin::TtRenderer::Engine;
 
 use warnings;
 use strict;
 
 use base 'Mojo::Base';
 
+use Carp ();
 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(@_) }
 }
@@ -23,27 +27,34 @@ 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 => $app->home->rel_dir('templates')) : ()),
+        (   $app
+            ? (INCLUDE_PATH => (join ":", map { abs_path($_) } @{$app->renderer->paths}))
+            : ()
+        ),
         COMPILE_EXT => '.ttc',
-        COMPILE_DIR => ($dir || File::Spec->tmpdir),
+        COMPILE_DIR => ($dir || abs_path(File::Spec->tmpdir)),
         UNICODE     => 1,
         ENCODING    => 'utf-8',
         CACHE_SIZE  => 128,
         RELATIVE    => 1,
-        ABSOLUTE    => 1,
         %{$args{template_options} || {}},
     );
 
     $config{LOAD_TEMPLATES} =
-      [MojoX::Renderer::TT::Provider->new(%config, renderer => $app->renderer)]
+      [Mojolicious::Plugin::TtRenderer::Provider->new(%config, renderer => $app->renderer)]
       unless $config{LOAD_TEMPLATES};
 
     $self->tt(Template->new(\%config))
@@ -52,7 +63,6 @@ sub _init {
     return $self;
 }
 
-use Data::Dumper;
 sub _render {
     my ($self, $renderer, $c, $output, $options) = @_;
 
@@ -64,12 +74,8 @@ sub _render {
     $t = 'inline' if defined $inline;
     return unless $t;
 
-    # Path
-    my $path = $renderer->template_path($options);
-    $path = b($inline)->md5_sum->to_string if defined $inline;
-    return unless $path;
 
-    my $helper = MojoX::Renderer::TT::Helper->new(ctx => $c);
+    my $helper = Mojolicious::Plugin::TtRenderer::Helper->new(ctx => $c);
 
     # Purge previous result
     $$output = '';
@@ -77,14 +83,12 @@ sub _render {
     my @params = ({%{$c->stash}, c => $c, h => $helper}, $output, {binmode => ':utf8'});
     $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0]->ctx($c);
 
-    my $ok = $self->tt->process(defined $inline ? \$inline : $path, @params);
+    my $ok = $self->tt->process(defined $inline ? \$inline : $t, @params);
 
     # Error
     unless ($ok) {
 
-        my $e = Mojo::Exception->new(
-            $self->tt->error.'',
-            $self->tt->service->process(defined $inline ? \$inline : $path));
+        my $e = Mojo::Exception->new($self->tt->error.'');
         $$output = '';
         $c->app->log->error(qq/Template error in "$t": $e/);
         $c->render_exception($e);
@@ -95,10 +99,10 @@ sub _render {
     return 1;
 }
 
-1;    # End of MojoX::Renderer::TT
+1;    # End of Mojolicious::Plugin::TtRenderer::Engine
 
 package
-  MojoX::Renderer::TT::Helper;
+  Mojolicious::Plugin::TtRenderer::Helper;
 
 use strict;
 use warnings;
@@ -128,12 +132,13 @@ sub AUTOLOAD {
 1;
 
 package
-  MojoX::Renderer::TT::Provider;
+  Mojolicious::Plugin::TtRenderer::Provider;
 
 use strict;
 use warnings;
 
 use base 'Template::Provider';
+use Scalar::Util 'weaken';
 
 sub new {
     my $class = shift;
@@ -143,6 +148,7 @@ sub new {
 
     my $self = $class->SUPER::new(%params);
     $self->renderer($renderer);
+    weaken($self->{renderer});
     return $self;
 }
 
@@ -155,14 +161,16 @@ sub _template_content {
     my $self = shift;
     my ($path) = @_;
 
-    my ($t) = ($path =~ m{templates[\/|\\](.*)$});
+    # Convert backslashes to forward slashes to make inline templates work on Windows
+    $path =~ s/\\/\//g;
+    my ($t) = ($path =~ m{templates\/(.*)$});
 
     if (-r $path) {
         return $self->SUPER::_template_content(@_);
     }
 
     # Try DATA section
-    elsif (my $d = $self->renderer->get_inline_template($self->ctx, $t)) {
+    elsif (my $d = $self->renderer->get_data_template($self->ctx, $t)) {
         return wantarray ? ($d, '', time) : $d;
     }
 
@@ -180,7 +188,7 @@ __END__
 
 =head1 NAME
 
-MojoX::Renderer::TT - Template Toolkit renderer for Mojo
+Mojolicious::Plugin::TtRenderer::Engine - Template Toolkit renderer for Mojo
 
 =head1 SYNOPSIS
 
@@ -193,9 +201,9 @@ Add the handler:
         $self->plugin(tt_renderer => {template_options => {FILTERS => [ ... ]}});
 
         # Or manually
-        use MojoX::Renderer::TT;
+        use Mojolicious::Plugin::TtRenderer::Engine;
 
-        my $tt = MojoX::Renderer::TT->build(
+        my $tt = Mojolicious::Plugin::TtRenderer::Engine->build(
             mojo => $self,
             template_options => {
                 PROCESS  => 'tpl/wrapper',
@@ -243,12 +251,17 @@ Supported parameters are
 
 =item mojo
 C<build> currently uses a C<mojo> parameter pointing to the base class (Mojo).
-object. When used the INCLUDE_PATH will be set to 
+object. When used the INCLUDE_PATH will be set to
 
 =item template_options
 
 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
@@ -258,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?
 
@@ -274,7 +286,7 @@ make changes.
 
 You can find documentation for this module with the perldoc command.
 
-    perldoc MojoX::Renderer::TT
+    perldoc Mojolicious::Plugin::TtRenderer::Engine
 
 You can also look for information at:
 

t/00-load.t

@@ -3,7 +3,7 @@
 use Test::More tests => 1;
 
 BEGIN {
-	use_ok( 'MojoX::Renderer::TT' );
+	use_ok( 'Mojolicious::Plugin::TtRenderer::Engine' );
 }
 
-diag( "Testing MojoX::Renderer::TT $MojoX::Renderer::TT::VERSION, Perl $], $^X" );
+diag( "Testing Mojolicious::Plugin::TtRenderer::Engine $Mojolicious::Plugin::TtRenderer::Engine::VERSION, Perl $], $^X" );

t/lite_app.t

@@ -3,6 +3,8 @@
 use strict;
 use warnings;
 
+BEGIN { $ENV{MOJO_MODE}='testing'; };
+
 use utf8;
 
 use Test::More tests => 31;
@@ -14,7 +16,7 @@ use Test::Mojo;
 # Silence
 app->log->level('fatal');
 
-use_ok('MojoX::Renderer::TT');
+use_ok('Mojolicious::Plugin::TtRenderer::Engine');
 
 plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1}};
 
@@ -45,7 +47,7 @@ get '/inline' => sub { shift->render(inline => '[% 1 + 1 %]', handler => 'tt') }
 my $t = Test::Mojo->new;
 
 # Exception
-$t->get_ok('/exception')->status_is(500)->content_like(qr/error/i);
+$t->get_ok('/exception')->status_is(500)->content_like(qr/Exception/i);
 
 # Normal rendering
 $t->get_ok('/bar/hello')->content_is("hello");
@@ -92,13 +94,13 @@ __DATA__
 @@ include.inc
 Hello
 
-@@ includes/include.inc
+@@ includes/sub/include.inc
 Hallo
 
 @@ include.html.tt
 [%- INCLUDE 'include.inc' -%]
 Include!
-[% INCLUDE 'includes/include.inc' -%]
+[% INCLUDE 'includes/sub/include.inc' -%]
 
 @@ layouts/layout.html.tt
 w[%- content -%]d

t/templates/conditional-exception.html.tt

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

t/templates/exception.testing.html.ep

@@ -0,0 +1,8 @@
+% my $s = $self->stash;
+% my $e = $self->stash('exception');
+% delete $s->{inner_template};
+% delete $s->{exception};
+% my $dump = dumper $s;
+% $s->{exception} = $e;
+An Exception has occured: <%= $e->message %>
+at <%= $e->line->[0] %> in <%= $e->line->[1] %>

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');
+  });
+";
+