v1.46

- Mojolicious 4.0 compatability

.travis.yml

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

Changes

@@ -2,6 +2,36 @@ Revision history for Mojolicious::Plugin::TtRenderer
 
 {{$NEXT}}
 
+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
 

dist.ini

@@ -5,6 +5,8 @@ license = Perl_5
 copyright_holder = Ask Bjørn Hansen
 # copyright_year   = 2009
 
+version = 1.46
+
 [Prereqs]
 Mojolicious  = 3.33
 Template     = 2.18
@@ -25,15 +27,15 @@ 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/(.*)
+;[BumpVersionFromGit]
+;version_regexp = ^release/(.*)
 
 [PkgVersion]
 

lib/Mojolicious/Plugin/TtRenderer/Engine.pm

@@ -34,7 +34,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 +47,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 +54,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 +81,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 +181,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 {

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