Merge branch 'master' of github.com:abh/mojox-renderer-tt

where the default COMPILE_DIR already exists and is owned
by another user or not writable for some other reason by
the testing user.

Changes

@@ -1,6 +1,26 @@
 Revision history for Mojolicious::Plugin::TtRenderer
 
 {{$NEXT}}
+        - silenced a few annoying warnings during test
+        - use temp directory for COMPILE_DIR in tests to avoid failures if the
+          default compile directory already exists and is owned by someone else.
+
+1.31    December 26, 2012
+        - Set locale "C" in tests that rely on it
+
+1.30    December 22, 2012
+        - Don't rely on English locale in the test t/tt_plugin_lite_app.t
+
+1.29    December 18, 2012
+        - support multiple renderer paths
+
+1.28    October 11, 2012
+        - specify minimum perl version
+
+1.27    October 2, 2012
+        - documentation fixes and updates.
+
+1.26    August 31, 2012
         - Windows compatability with Cwd::abs_path
 
 1.25    August 25, 2012

README.pod

@@ -0,0 +1,89 @@
+=encoding utf-8
+
+=head1 NAME
+
+Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
+
+=head1 SYNOPSIS
+
+    # Mojolicious
+    $self->plugin('tt_renderer');
+    $self->plugin(tt_renderer => {template_options => {FILTERS => [ ... ]}});
+
+    # Mojolicious::Lite
+    plugin 'tt_renderer';
+    plugin tt_renderer => {template_options => {FILTERS => [ ... ]}};
+
+=head1 DESCRIPTION
+
+L<Mojolicous::Plugin::TtRenderer> is a simple loader for 
+L<Mojolicious::Plugin::TtRenderer::Engine>.
+
+=head1 METHODS
+
+L<Mojolicious::Plugin::TtRenderer> inherits all methods from
+L<Mojolicious::Plugin> and implements the following new ones.
+
+=head2 C<register>
+
+    $plugin->register;
+
+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>.
+
+=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.
+

dist.ini

@@ -38,9 +38,20 @@ version_regexp = ^release/(.*)
 [Test::Compile]
 [HasVersionTests]
 [MetaTests]
-[ReadmeFromPod]
+
+[ReadmeAnyFromPod]
+type     = text
+filename = README
+location = build
+
+[ReadmeAnyFromPod / ReadMePodInRoot]
+type     = pod
+filename = README.pod
+location = root
+
 [Manifest]
 
 [NextRelease]
 format = %-7v %{MMMM d, yyyy}d
 
+[MinimumPerl]

lib/Mojolicious/Plugin/TtRenderer.pm

@@ -2,6 +2,7 @@ package Mojolicious::Plugin::TtRenderer;
 
 use strict;
 use warnings;
+use v5.10;
 
 use base 'Mojolicious::Plugin';
 
@@ -18,11 +19,13 @@ sub register {
     $app->renderer->add_handler(tt => $tt);
 }
 
-local ($Mojolicious::Plugin::TtRenderer::VERSION) = ('devel') unless defined $Mojolicious::Plugin::TtRenderer::VERSION;
+$Mojolicious::Plugin::TtRenderer::VERSION //= ('devel');
 
 1;
 __END__
 
+=encoding utf-8
+
 =head1 NAME
 
 Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
@@ -39,7 +42,8 @@ Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
 
 =head1 DESCRIPTION
 
-L<Mojolicous::Plugin::TtRenderer> is a simple loader for L<MojoX::Renderer::TT>.
+L<Mojolicous::Plugin::TtRenderer> is a simple loader for 
+L<Mojolicious::Plugin::TtRenderer::Engine>.
 
 =head1 METHODS
 
@@ -62,4 +66,51 @@ The current controller instance can be accessed as C<c>.
 
 L<Mojolicious::Plugin::TtRenderer::Engine>, 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

@@ -44,7 +44,7 @@ sub _init {
 
     my %config = (
         (   @renderer_paths > 0
-            ? (INCLUDE_PATH => join(":", @renderer_paths))
+            ? (INCLUDE_PATH => [@renderer_paths, 'templates'])
             : ()
         ),
         COMPILE_EXT => '.ttc',
@@ -157,7 +157,11 @@ sub ctx           { @_ > 1 ? $_[0]->{ctx}           = $_[1] : $_[0]->{ctx} }
 sub options       { @_ > 1 ? $_[0]->{options}       = $_[1] : $_[0]->{options} }
 sub not_found     { @_ > 1 ? $_[0]->{not_found}     = $_[1] : $_[0]->{not_found} }
 
-sub _template_modified {1}
+sub _template_modified {
+    my($self, $template) = @_;
+    return 1 if $self->SUPER::_template_modified($template);
+    return $template =~ /^templates(?:\/|\\)/;
+}
 
 sub _template_content {
     my $self = shift;
@@ -281,7 +285,9 @@ templates. Will default to a temp-dir if not set.
 
 =head1 AUTHOR
 
-Ask Bjørn Hansen, C<< <ask at develooper.com> >>
+Current maintainer: Graham Ollis C<< <plicease@cpan.org> >>
+
+Original author: Ask Bjørn Hansen, C<< <ask at develooper.com> >>
 
 =head1 TODO
 
@@ -291,11 +297,8 @@ Ask Bjørn Hansen, C<< <ask at develooper.com> >>
 
 =head1 BUGS
 
-Please report any bugs or feature requests to C<bug-mojox-renderer-tt at rt.cpan.org>,
-or through the web interface at
-L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=MojoX-Renderer-TT>.  I will be
-notified, and then you'll automatically be notified of progress on your bug as I
-make changes.
+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
 
@@ -314,10 +317,6 @@ L<git://git.develooper.com/MojoX-Renderer-TT.git>
 
 L<http://github.com/abh/mojox-renderer-tt/>
 
-=item * RT: CPAN's request tracker
-
-L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=MojoX-Renderer-TT>
-
 =item * CPAN Ratings
 
 L<http://cpanratings.perl.org/d/MojoX-Renderer-TT>
@@ -328,13 +327,12 @@ L<http://search.cpan.org/dist/MojoX-Renderer-TT/>
 
 =back
 
-=head1 ACKNOWLEDGEMENTS
-
-
 =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.
 

t/00-load.t

@@ -1,9 +1,9 @@
 #!perl
 
-use Test::More tests => 1;
+use Test::More tests => 2;
 
 BEGIN {
+	use_ok( 'Mojolicious::Plugin::TtRenderer' );
 	use_ok( 'Mojolicious::Plugin::TtRenderer::Engine' );
 }
 
-diag( "Testing Mojolicious::Plugin::TtRenderer::Engine $Mojolicious::Plugin::TtRenderer::Engine::VERSION, Perl $], $^X" );

t/deep_recursion.t

@@ -11,11 +11,14 @@ use Test::More tests => 3;
 
 use Mojolicious::Lite;
 use Test::Mojo;
+use File::Temp qw( tempdir tempfile );
 
+my($fh_log,$filename_log) = tempfile('fooXXXXX', TMPDIR => 1, UNLINK => 1);
 # Silence
 app->log->level('fatal');
+app->log->path($filename_log);
 
-plugin 'tt_renderer';
+plugin 'tt_renderer' => {template_options => { COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
 
 get '/exception' => sub { die };
 

t/default_template.t

@@ -2,6 +2,7 @@ use strict;
 use warnings;
 use Test::More tests => 3;
 use Test::Mojo;
+use File::Temp qw( tempdir );
 
 use Mojolicious::Lite;
 
@@ -11,7 +12,7 @@ app->plugin(
         template_options => {
             # These options are specific to TT
             INCLUDE_PATH => 'templates',
-            COMPILE_DIR  => 'templates_c',
+            COMPILE_DIR  => tempdir( CLEANUP => 1 ),
             COMPILE_EXT  => '.ttc',
             # ... anything else to be passed on to TT should go here
         },

t/lite_app.t

@@ -12,13 +12,14 @@ use Test::More tests => 39;
 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}};
+plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1, COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
 
 get '/exception' => 'error';
 

t/multiple_paths.t

@@ -0,0 +1,31 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+BEGIN { $ENV{MOJO_MODE}='testing'; };
+
+use utf8;
+
+use Test::More tests => 6;
+
+use Mojolicious::Lite;
+use Test::Mojo;
+use File::Temp qw( tempdir );
+
+# Silence
+app->log->level('fatal');
+
+my @paths = map { app->home->rel_dir($_) } "templates/multiple_first", "templates/multiple_second";
+app->renderer->paths([@paths]);
+
+plugin 'TtRenderer' => {template_options => { COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
+
+get '/first' => 'first';
+get '/second' => 'second';
+
+my $t = Test::Mojo->new;
+
+$t->get_ok('/first')->status_is(200)->content_like(qr/First/);
+$t->get_ok('/second')->status_is(200)->content_like(qr/Second/);
+

t/templates/multiple_first/first.html.tt

@@ -0,0 +1 @@
+First

t/templates/multiple_second/first.html.tt

@@ -0,0 +1 @@
+Second

t/templates/multiple_second/second.html.tt

@@ -0,0 +1 @@
+Second

t/tt_plugin_lite_app.t

@@ -5,12 +5,22 @@
 use strict;
 use warnings;
 
-use File::Temp;
+BEGIN {
+  unless($^O eq 'MSWin32') {
+    eval '# line '. __LINE__ . ' "' . __FILE__ . qq("\n). q{
+      use POSIX qw( setlocale LC_ALL );
+      setlocale(LC_ALL, 'C');
+    };
+    warn $@ if $@;
+  }
+}
+
+use File::Temp qw( tempdir );
 use Mojo::IOLoop;
 use Test::More;
 
 # Use a clean temporary directory
-BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
+BEGIN { $ENV{MOJO_TMPDIR} ||= tempdir( CLEANUP => 1) }
 
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
@@ -24,7 +34,7 @@ use Mojolicious::Lite;
 use Test::Mojo;
 
 # POD renderer plugin
-plugin 'tt_renderer';
+plugin 'tt_renderer' => {template_options => { COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
 
 # Silence
 app->log->level('error');
@@ -41,10 +51,12 @@ 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 - doesnotexist\.tt: No such file or directory/);
 
 if(eval q{ use Devel::Cycle; 1 })
 {
+  # ignore warnings coming from Devel::Cycle
+  local $SIG{__WARN__} = sub { };
   Devel::Cycle::find_cycle(app, sub {
     my $arg = shift;
     # Template::Provider (from which M::P::T::Provider inherits) has some cycles which are freed manaully by
@@ -56,4 +68,4 @@ if(eval q{ use Devel::Cycle; 1 })
       fail('Cycle found')
     }
   });
-};
+};

t/two_data.t

@@ -20,7 +20,7 @@ use_ok 'Foo';
 
 push @{app->renderer->classes}, 'Foo';
 
-plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1}};
+plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1, COMPILE_DIR => tempdir( CLEANUP => 1 )}};
 
 app->log->level('fatal');