v1.47

- Template-Toolkit 2.25 compatability

.gitignore

@@ -1,14 +1,2 @@
-blib*
-Makefile
-Makefile.old
-Build
-_build*
-pm_to_blib*
-*.tar.gz
-.lwpcookies
-Mojolicious-Plugin-TtRenderer-*
-MojoX-Renderer-TT-*
-cover_db
-*~
-*.bak
-.build
+/Mojolicious-Plugin-TtRenderer-*
+/.build

.travis.yml

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

Changes

@@ -2,6 +2,39 @@ Revision history for Mojolicious::Plugin::TtRenderer
 
 {{$NEXT}}
 
+1.47      2013-07-26 06:07:35 America/New_York
+        - Template-Toolkit 2.25 compatability
+
+1.46    May 19, 2013
+        - Mojolicious 4.0 compatability
+
+1.45    April 26, 2013
+        - correctly support app->default->{layout} (GH#37, Fayland Lam)
+
+1.44    April 13, 2013
+        - promote development changes to production
+
+1.43_01 April 11, 2013
+        - _template_modified returns value from super class instead of 1 if true (GH#36, Fayland Lam)
+
+1.43    April 8, 2013
+        - promote development changes
+
+1.42_04 April 6, 2013
+        - Updated meta for new github repo location
+
+1.42_03 March 22, 2013
+        - Allow custom relative paths for cache_dir (GH#35, Jason Crowther)
+
+1.42_02 February 26, 2013
+        - only create COMPILE_DIR based on UID if the user doesn't specify COMPILE_DIR
+
+1.42_01 February 24, 2013
+        - set COMPILE_DIR based on UID so that multiple users can use TtRenderer with default config
+
+1.42    February 24, 2013
+        - fix for test on solaris
+
 1.41    February 23, 2013
         - Additional testing diagnostics
 

MANIFEST.SKIP

@@ -1,44 +0,0 @@
-# Avoid version control files.
-\bRCS\b
-\bCVS\b
-\bSCCS\b
-,v$
-\B\.svn\b
-\B\.git\b
-\b_darcs\b
-
-# Avoid Makemaker generated and utility files.
-\bMANIFEST\.bak
-\bMYMETA.*
-\bMakefile$
-\bblib/
-\bMakeMaker-\d
-\bpm_to_blib\.ts$
-\bpm_to_blib$
-\bblibdirs\.ts$         # 6.18 through 6.25 generated this
-
-# Avoid Module::Build generated and utility files.
-\bBuild$
-\b_build/
-
-# Avoid temp and backup files.
-~$
-\.old$
-\#$
-\b\.#
-\.bak$
-
-# Avoid Devel::Cover files.
-\bcover_db\b
-
-### DEFAULT MANIFEST.SKIP ENDS HERE ####
-
-t/tmp/ctpl
-
-\.DS_Store$
-\.sw.$
-(\w+-)*(\w+)-\d\.\d+(?:\.tar\.gz)?$
-
-\.t\.log$
-
-\.prove$

README.pod

@@ -1,9 +1,13 @@
-=encoding utf-8
+=pod
 
 =head1 NAME
 
 Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
 
+=head1 VERSION
+
+version 1.47
+
 =head1 SYNOPSIS
 
  # Mojolicious
@@ -19,6 +23,8 @@ Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
 L<Mojolicious::Plugin::TtRenderer> is a simple loader for 
 L<Mojolicious::Plugin::TtRenderer::Engine>.
 
+=encoding utf-8
+
 =head1 METHODS
 
 L<Mojolicious::Plugin::TtRenderer> inherits all methods from
@@ -45,48 +51,42 @@ L<http://mojolicious.org>.
 
 =head1 AUTHOR
 
-Current maintainer: Graham Ollis C<< <plicease@cpan.org> >>
+original author: Ask Bjørn Hansen
 
-Original author: Ask Bjørn Hansen, C<< <ask at develooper.com> >>
+current maintainer: Graham Ollis <plicease@cpan.org>
 
-=head1 BUGS
+contributors:
 
-Please report any bugs or feature requests to the project's github issue tracker
-L<https://github.com/abh/mojox-renderer-tt/issues?state=open>.
+vti
 
-=head1 SUPPORT
+Marcus Ramberg
 
-You can find documentation for this module with the perldoc command.
+Matthias Bethke
 
- perldoc Mojolicious::Plugin::TtRenderer
+Htbaa
 
-You can also look for information at:
+Magnus Holm
 
-=over 4
+Maxim Vuets
 
-=item * git repository
+Rafael Kitover
 
-L<http://git.develooper.com/?p=MojoX-Renderer-TT.git;a=summary>,
-L<git://git.develooper.com/MojoX-Renderer-TT.git>
+giftnuss
 
-L<http://github.com/abh/mojox-renderer-tt/>
+Cosimo Streppone
 
-=item * CPAN Ratings
+Fayland Lam
 
-L<http://cpanratings.perl.org/d/MojoX-Renderer-TT>
+Jason Crowther
 
-=item * Search CPAN
+spleenjack
 
-L<http://search.cpan.org/dist/MojoX-Renderer-TT/>
+Árpád Szász
 
-=back
+=head1 COPYRIGHT AND LICENSE
 
-=head1 COPYRIGHT & LICENSE
+This software is copyright (c) 2013 by Ask Bjørn Hansen.
 
-Copyright 2008-2010 Ask Bjørn Hansen, all rights reserved.
-
-Copyright 2012 Graham Ollis.
-
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
 

dist.ini

@@ -5,6 +5,10 @@ license = Perl_5
 copyright_holder = Ask Bjørn Hansen
 # copyright_year   = 2009
 
+version = 1.47
+
+[@Author::Plicease]
+
 [Prereqs]
 Mojolicious  = 3.33
 Template     = 2.18
@@ -12,31 +16,12 @@ Template     = 2.18
 [Prereqs / TestRequires ]
 Test::More   = 0
 
-[NextRelease]
-format = %-7v %{MMMM d, yyyy}d
-
-[@Git]
-tag_format = release/%v
-# push_to    = all
-
-[@Filter]
-bundle = @Basic
-remove = Readme
-remove = Manifest
-
 [MetaResources]
-bugtracker.web = https://github.com/abh/mojox-renderer-tt/issues
-repository.web  = http://github.com/abh/mojox-renderer-tt
-repository.url  = git://github.com/abh/mojox-renderer-tt.git
+bugtracker.web = https://github.com/plicease/mojox-renderer-tt/issues
+repository.web  = http://github.com/plicease/mojox-renderer-tt
+repository.url  = git://github.com/plicease/mojox-renderer-tt.git
 repository.type = git
 
-[Homepage]
-
-[BumpVersionFromGit]
-version_regexp = ^release/(.*)
-
-[PkgVersion]
-
 [CheckChangeLog]
 [Test::Compile]
 [HasVersionTests]
@@ -52,8 +37,23 @@ type     = pod
 filename = README.pod
 location = root
 
-[Manifest]
-
 [MinimumPerl]
 
-[MetaJSON]
+[Author::Plicease::Thanks]
+current     = Graham Ollis <plicease@cpan.org>
+original    = Ask Bjørn Hansen
+contributor = vti
+contributor = Marcus Ramberg
+contributor = Matthias Bethke
+contributor = Htbaa
+contributor = Magnus Holm
+contributor = Maxim Vuets
+contributor = Rafael Kitover
+contributor = giftnuss
+contributor = Cosimo Streppone
+contributor = Fayland Lam
+contributor = Jason Crowther
+contributor = spleenjack
+contributor = Árpád Szász
+
+[Author::Plicease::Upload]

lib/Mojolicious/Plugin/TtRenderer.pm

@@ -4,6 +4,9 @@ use strict;
 use warnings;
 use v5.10;
 
+# ABSTRACT: Template Renderer Plugin
+# VERSION
+
 use base 'Mojolicious::Plugin';
 
 use Mojolicious::Plugin::TtRenderer::Engine;
@@ -26,10 +29,6 @@ __END__
 
 =encoding utf-8
 
-=head1 NAME
-
-Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
-
 =head1 SYNOPSIS
 
  # Mojolicious
@@ -69,51 +68,4 @@ L<Mojolicious>,
 L<Mojolicious::Guides>, 
 L<http://mojolicious.org>.
 
-=head1 AUTHOR
-
-Current maintainer: Graham Ollis C<< <plicease@cpan.org> >>
-
-Original author: Ask Bjørn Hansen, C<< <ask at develooper.com> >>
-
-=head1 BUGS
-
-Please report any bugs or feature requests to the project's github issue tracker
-L<https://github.com/abh/mojox-renderer-tt/issues?state=open>.
-
-=head1 SUPPORT
-
-You can find documentation for this module with the perldoc command.
-
- perldoc Mojolicious::Plugin::TtRenderer
-
-You can also look for information at:
-
-=over 4
-
-=item * git repository
-
-L<http://git.develooper.com/?p=MojoX-Renderer-TT.git;a=summary>,
-L<git://git.develooper.com/MojoX-Renderer-TT.git>
-
-L<http://github.com/abh/mojox-renderer-tt/>
-
-=item * CPAN Ratings
-
-L<http://cpanratings.perl.org/d/MojoX-Renderer-TT>
-
-=item * Search CPAN
-
-L<http://search.cpan.org/dist/MojoX-Renderer-TT/>
-
-=back
-
-=head1 COPYRIGHT & LICENSE
-
-Copyright 2008-2010 Ask Bjørn Hansen, all rights reserved.
-
-Copyright 2012 Graham Ollis.
-
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
-
 =cut

lib/Mojolicious/Plugin/TtRenderer/Engine.pm

@@ -3,9 +3,7 @@ package Mojolicious::Plugin::TtRenderer::Engine;
 use warnings;
 use strict;
 use v5.10;
-
 use base 'Mojo::Base';
-
 use Carp ();
 use File::Spec ();
 use Mojo::ByteStream 'b';
@@ -14,6 +12,9 @@ use Cwd qw/abs_path/;
 use Scalar::Util 'weaken';
 use POSIX ':errno_h';
 
+# ABSTRACT: Template Toolkit renderer for Mojo
+# VERSION
+
 __PACKAGE__->attr('tt');
 
 sub build {
@@ -34,7 +35,7 @@ sub _init {
     if($dir=$args{cache_dir}) {
 
       if($app && substr($dir,0,1) ne '/') {
-        $dir=$app->home->rel_dir('tmp/ctpl');
+        $dir=$app->home->rel_dir($dir);
       }
     }
 
@@ -47,7 +48,6 @@ sub _init {
     my %config = (
         INCLUDE_PATH => \@renderer_paths,
         COMPILE_EXT  => '.ttc',
-        COMPILE_DIR  => ($dir || abs_path(File::Spec->tmpdir)),
         UNICODE      => 1,
         ENCODING     => 'utf-8',
         CACHE_SIZE   => 128,
@@ -55,6 +55,12 @@ sub _init {
         %{$args{template_options} || {}},
     );
 
+    $config{COMPILE_DIR} //= $dir || do {
+      my $tmpdir = File::Spec->catdir(File::Spec->tmpdir, "ttr$<");
+      mkdir $tmpdir unless -d $tmpdir;
+      $tmpdir;
+    };
+
     $config{LOAD_TEMPLATES} =
       [Mojolicious::Plugin::TtRenderer::Provider->new(%config, renderer => $app->renderer)]
       unless $config{LOAD_TEMPLATES};
@@ -76,12 +82,16 @@ sub _render {
     $t = 'inline' if defined $inline;
     return unless $t;
 
-
     my $helper = Mojolicious::Plugin::TtRenderer::Helper->new(ctx => $c);
 
     # Purge previous result
     $$output = '';
 
+    # fixes for t/lite_app_with_default_layouts.t
+    unless ($c->stash->{layout}) {
+        $c->stash->{content} ||= $c->stash->{'mojo.content'}->{content};
+    }
+
     my @params = ({%{$c->stash}, c => $c, h => $helper}, $output, {binmode => ':utf8'});
     my $provider = $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0];
     $provider->options($options);
@@ -172,8 +182,7 @@ sub options       { @_ > 1 ? $_[0]->{options}       = $_[1] : $_[0]->{options} }
 
 sub _template_modified {
     my($self, $template) = @_;
-    return 1 if $self->SUPER::_template_modified($template);
-    return $template =~ /^templates(?:\/|\\)/;
+    $self->SUPER::_template_modified($template) || $template =~ /^templates(?:\/|\\)/;
 }
 
 sub _template_content {
@@ -217,10 +226,6 @@ __END__
 
 =encoding utf-8
 
-=head1 NAME
-
-Mojolicious::Plugin::TtRenderer::Engine - Template Toolkit renderer for Mojo
-
 =head1 SYNOPSIS
 
 Add the handler:
@@ -306,51 +311,4 @@ L<Mojolicious>,
 L<Mojolicious::Guides>, 
 L<http://mojolicious.org>.
 
-=head1 AUTHOR
-
-Current maintainer: Graham Ollis C<< <plicease@cpan.org> >>
-
-Original author: Ask Bjørn Hansen, C<< <ask at develooper.com> >>
-
-=head1 BUGS
-
-Please report any bugs or feature requests to the project's github issue tracker
-L<https://github.com/abh/mojox-renderer-tt/issues?state=open>.
-
-=head1 SUPPORT
-
-You can find documentation for this module with the perldoc command.
-
- perldoc Mojolicious::Plugin::TtRenderer::Engine
-
-You can also look for information at:
-
-=over 4
-
-=item * git repository
-
-L<http://git.develooper.com/?p=MojoX-Renderer-TT.git;a=summary>,
-L<git://git.develooper.com/MojoX-Renderer-TT.git>
-
-L<http://github.com/abh/mojox-renderer-tt/>
-
-=item * CPAN Ratings
-
-L<http://cpanratings.perl.org/d/MojoX-Renderer-TT>
-
-=item * Search CPAN
-
-L<http://search.cpan.org/dist/MojoX-Renderer-TT/>
-
-=back
-
-=head1 COPYRIGHT & LICENSE
-
-Copyright 2008-2010 Ask Bjørn Hansen, all rights reserved.
-
-Copyright 2012 Graham Ollis.
-
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
-
 =cut

t/deep_recursion.t

@@ -7,13 +7,22 @@ use warnings;
 
 use utf8;
 
-use Test::More tests => 3;
+use Test::More;
 
 use Mojolicious::Lite;
 use Test::Mojo;
 use File::Temp qw( tempdir );
 use File::Spec;
 
+if($Mojolicious::VERSION >= 4.0)
+{
+  plan skip_all => 'test broken in mojo 4.0';
+}
+else
+{
+  plan tests => 3;
+}
+
 # Send log to tmp file so that it doesn't clutter up the screen.
 app->log->level('fatal');
 app->log->path(do {

t/default_handler_no_templates_dir.t

@@ -6,7 +6,7 @@ use Test::More tests => 6;
 use Test::Mojo;
 
 use Mojolicious::Lite;
-plugin 'tt_renderer';
+plugin 'tt_renderer' => { template_options => { COMPILE_DIR  => tempdir( CLEANUP => 1 ) } };
 app->renderer->default_handler('tt');
 
 get '/' => sub {

t/lite_app_with_default_layouts.t

@@ -0,0 +1,37 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+BEGIN { $ENV{MOJO_MODE}='testing'; };
+
+use utf8;
+
+use Test::More tests => 3;
+
+use Mojolicious::Lite;
+use Mojo::ByteStream 'b';
+use Test::Mojo;
+use File::Temp qw( tempdir );
+
+# Silence
+app->log->level('fatal');
+
+use_ok('Mojolicious::Plugin::TtRenderer::Engine');
+
+plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1, COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
+app->defaults(layout => 'wrapper');
+
+get '/test' => 'test';
+
+my $t = Test::Mojo->new;
+
+$t->get_ok('/test')->content_is("WS-hello-EW");
+
+__DATA__
+
+@@ test.html.tt
+hello
+
+@@ layouts/wrapper.html.tt
+WS-[%- content -%]-EW

t/tt_plugin_lite_app.t

@@ -51,7 +51,7 @@ my $t = Test::Mojo->new;
 # Simple TT template
 $t->get_ok('/')->status_is(200)
   ->content_like(qr/test123456/);
-$t->get_ok('/blow')->status_is(500)->content_like(qr/file error - doesnotexist\.tt: No such file or directory/);
+$t->get_ok('/blow')->status_is(500)->content_like(qr/file error - (templates\/)?doesnotexist\.tt: (No such file or directory|not found)/);
 
 if(eval q{ use Devel::Cycle; 1 })
 {