v1.41

- Additional testing diagnostics

Changes

@@ -1,6 +1,26 @@
 Revision history for Mojolicious::Plugin::TtRenderer
 
 {{$NEXT}}
+
+1.41    February 23, 2013
+        - Additional testing diagnostics
+
+1.40    February 20, 2013
+        - Added diagnostic for IO loop implementation in testing
+
+1.39    January 28, 2013
+        - Documentation updates.
+
+1.38    January 27, 2013
+        - fixed but where DATA templates were not being rendered with empty renderer path
+
+1.37    January 12, 2013
+        - fix default_template2.t to use temp directory for COMPILE_DIR
+
+1.36    January 9, 2013
+        - Use $provider->fetch to find templates (GH#34)
+
+1.35    December 30, 2012
         - Documentation fix
 
 1.34    December 29, 2012

README.pod

@@ -38,7 +38,10 @@ The current controller instance can be accessed as C<c>.
 
 =head1 SEE ALSO
 
-L<Mojolicious::Plugin::TtRenderer::Engine>, L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicious.org>.
+L<Mojolicious::Plugin::TtRenderer::Engine>, 
+L<Mojolicious>, 
+L<Mojolicious::Guides>, 
+L<http://mojolicious.org>.
 
 =head1 AUTHOR
 

dist.ini

@@ -12,6 +12,9 @@ Template     = 2.18
 [Prereqs / TestRequires ]
 Test::More   = 0
 
+[NextRelease]
+format = %-7v %{MMMM d, yyyy}d
+
 [@Git]
 tag_format = release/%v
 # push_to    = all
@@ -51,9 +54,6 @@ location = root
 
 [Manifest]
 
-[NextRelease]
-format = %-7v %{MMMM d, yyyy}d
-
 [MinimumPerl]
 
 [MetaJSON]

lib/Mojolicious/Plugin/TtRenderer.pm

@@ -64,7 +64,10 @@ The current controller instance can be accessed as C<c>.
 
 =head1 SEE ALSO
 
-L<Mojolicious::Plugin::TtRenderer::Engine>, L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicious.org>.
+L<Mojolicious::Plugin::TtRenderer::Engine>, 
+L<Mojolicious>, 
+L<Mojolicious::Guides>, 
+L<http://mojolicious.org>.
 
 =head1 AUTHOR
 

lib/Mojolicious/Plugin/TtRenderer/Engine.pm

@@ -12,6 +12,7 @@ use Mojo::ByteStream 'b';
 use Template ();
 use Cwd qw/abs_path/;
 use Scalar::Util 'weaken';
+use POSIX ':errno_h';
 
 __PACKAGE__->attr('tt');
 
@@ -41,12 +42,10 @@ sub _init {
     #   take and process options :-)
 
     my @renderer_paths = $app ? map { abs_path($_) } grep { -d $_ } @{ $app->renderer->paths } : ();
+    push @renderer_paths, 'templates';
 
     my %config = (
-        (   @renderer_paths > 0
+        INCLUDE_PATH => \@renderer_paths,
-            ? (INCLUDE_PATH => [@renderer_paths, 'templates'])
-            : ()
-        ),
         COMPILE_EXT  => '.ttc',
         COMPILE_DIR  => ($dir || abs_path(File::Spec->tmpdir)),
         UNICODE      => 1,
@@ -87,11 +86,26 @@ sub _render {
     my $provider = $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0];
     $provider->options($options);
     $provider->ctx($c);
-    $provider->not_found(0);
 
-    my $ok = $self->tt->process(defined $inline ? \$inline : $t, @params);
+    my $ok = do {
+        if (defined $inline) {
+            $self->tt->process(\$inline, @params);
+        }
+        else {
+            my @ret = $provider->fetch($t);
 
-    return 0 if $provider->not_found;
+            if (not defined $ret[1]) {
+                $self->tt->process($ret[0], @params);
+            }
+            elsif (not defined $ret[0]) { # not found
+                return 0;
+            }
+            else { # error
+                return 0 if $! == ENOENT && (not ref $ret[0]); # not found when not blessed exception
+                die $ret[0];
+            }
+        }
+    };
 
     # Error
     die $self->tt->error unless $ok;
@@ -155,7 +169,6 @@ sub new {
 sub renderer      { @_ > 1 ? $_[0]->{renderer}      = $_[1] : $_[0]->{renderer} }
 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 {
     my($self, $template) = @_;
@@ -183,7 +196,6 @@ sub _template_content {
     # Try DATA section
     if(defined $options) {
         $data = $self->renderer->get_data_template($options);
-        $self->not_found(1) unless defined $data;
     } else {
         my $loader = Mojo::Loader->new;
         foreach my $class (@{ $self->renderer->classes }) {
@@ -274,7 +286,11 @@ object. When used the INCLUDE_PATH will be set to
 
 =item template_options
 
-A hash reference of options that are passed to Template->new().
+A hash reference of options that are passed to Template->new().  Note that if you
+specify an C<INCLUDE_PATH> through this option it will remove the DATA section
+templates from your path.  A better way to specify an C<INCLUDE_PATH> if you also
+want to use DATA section templates it by manipulting the L<Mojolicious::Renderer>
+path.
 
 =item cache_dir
 
@@ -283,18 +299,19 @@ templates. Will default to a temp-dir if not set.
 
 =back
 
+=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 TODO
-
-   * Better support non-Mojolicious frameworks
-   * Better way to pass parameters to the templates? (stash)
-   * More sophisticated default search path?
-
 =head1 BUGS
 
 Please report any bugs or feature requests to the project's github issue tracker

t/01-ioloop.t

@@ -0,0 +1,11 @@
+use strict;
+use warnings;
+use Test::More tests => 1;
+use Mojo::IOLoop;
+
+my $loop = eval { Mojo::IOLoop->singleton };
+diag $@ if $@;
+ok $loop;
+diag ref eval { $loop->reactor };
+diag $@ if $@;
+

t/default_handler_as_engine.t

@@ -0,0 +1,52 @@
+use strict;
+use warnings;
+use Test::More tests => 9;
+use Test::Mojo;
+use File::Temp qw( tempdir );
+use FindBin '$Bin';
+
+use Mojolicious::Lite;
+use Mojolicious::Plugin::TtRenderer::Engine ();
+
+my $tt = Mojolicious::Plugin::TtRenderer::Engine->build(
+    mojo => app,
+    template_options => {
+        UNICODE  => 1,
+        ENCODING => 'UTF-8',
+        #INCLUDE_PATH => "$Bin/templates",
+        COMPILE_DIR  => tempdir( CLEANUP => 1 ),
+    }
+);
+
+app->renderer->add_handler(tt => $tt);
+app->renderer->default_handler('tt');
+
+get '/' => sub {
+    die 'foo';
+};
+
+get '/bar' => 'bar';
+
+get '/grimlock' => 'grimlock';
+
+my $t = Test::Mojo->new;
+
+$t->get_ok('/')
+    ->status_is(500)
+    ->content_like(qr{foo});
+
+$t->get_ok('/bar')
+    ->status_is(200)
+    ->content_like(qr{bar});
+
+$t->get_ok('/grimlock')
+    ->status_is(200)
+    ->content_like(qr{King});
+
+__DATA__
+
+@@ index.html.tt
+anything
+
+@@ bar.html.tt
+sometimes, the bar, he eats you...

t/default_handler_as_plugin.t

@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More tests => 3;
+use Test::More tests => 9;
 use Test::Mojo;
 use File::Temp qw( tempdir );
 
@@ -11,7 +11,7 @@ app->plugin(
     tt_renderer => {
         template_options => {
             # These options are specific to TT
-            INCLUDE_PATH => 'templates',
+            #INCLUDE_PATH => 'templates',
             COMPILE_DIR  => tempdir( CLEANUP => 1 ),
             COMPILE_EXT  => '.ttc',
             # ... anything else to be passed on to TT should go here
@@ -25,13 +25,29 @@ get '/' => sub {
     die 'foo';
 };
 
+get '/bar' => 'bar';
+
+get '/grimlock' => 'grimlock';
+
 my $t = Test::Mojo->new;
 
 $t->get_ok('/')
     ->status_is(500)
     ->content_like(qr{foo});
 
+$t->get_ok('/bar')
+    ->status_is(200)
+    ->content_like(qr{bar});
+
+$t->get_ok('/grimlock')
+    ->status_is(200)
+    ->content_like(qr{King});
+
 __DATA__
 
 @@ index.html.tt
 anything
+
+@@ bar.html.tt
+sometimes, the bar, he eats you...
+

t/default_handler_no_templates_dir.t

@@ -0,0 +1,40 @@
+use strict;
+use warnings;
+use File::Temp qw( tempdir );
+BEGIN { $ENV{MOJO_HOME} = tempdir( CLEANUP => 1) }
+use Test::More tests => 6;
+use Test::Mojo;
+
+use Mojolicious::Lite;
+plugin 'tt_renderer';
+app->renderer->default_handler('tt');
+
+get '/' => sub {
+    die 'foo';
+};
+
+get '/bar' => 'bar';
+
+my $t = Test::Mojo->new;
+
+$t->get_ok('/')
+    ->status_is(500)
+    ->content_like(qr{foo});
+
+$t->app->log->on(message => sub {
+  my($log, $level, @lines) = @_;
+  diag @lines if $level eq 'error';
+});
+
+$t->get_ok('/bar')
+    ->status_is(200)
+    ->content_like(qr{sometimes, the bar,});
+
+__DATA__
+
+@@ index.html.tt
+anything
+
+@@ bar.html.tt
+sometimes, the bar, he eats you...
+

t/templates/grimlock.html.tt

@@ -0,0 +1 @@
+Me Grimlock King!