v1.48

- documentation

.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

@@ -0,0 +1,11 @@
+language: perl
+install:
+  - 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

@@ -1,8 +1,116 @@
-Revision history for MojoX-Renderer-TT
+Revision history for Mojolicious::Plugin::TtRenderer
 
 {{$NEXT}}
 
-1.14    August 1, 2011
+1.48      2013-08-08 09:13:19 America/New_York
+        - documentation
+
+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
+
+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
+        - Include META.json in distribution.
+
+1.33    December 27, 2012
+        - Fix hang in t/deep_recursion.t on *BSD
+
+1.32    December 27, 2012
+        - 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
+        - Return 0 on not found, die on error (GH#30)
+
+1.24    August 23, 2012
+        - Compatibility with Mojolicious 3.33+
+
+1.23    August 23, 2012
+        - Use die instead of render_exception (GH#29)
+
+1.22    August 21, 2012
+        - Compatibility with Mojolicious 3.05+ (GH#24)
+        - Avoid deep recursion when exception template dies (GH#25,GH26)
+        - Fixed test failures (GH#27,GH#28)
+
+1.21    June 5, 2012
+        - 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)
 

MANIFEST.SKIP

@@ -1,46 +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
-\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$
-
-# XS shit
-\.(?:bs|c|o)$

README.pod

@@ -0,0 +1,240 @@
+=pod
+
+=head1 NAME
+
+Mojolicious::Plugin::TtRenderer - Template Renderer Plugin for Mojolicious
+
+=head1 VERSION
+
+version 1.48
+
+=head1 SYNOPSIS
+
+L<Mojolicious::Lite>:
+
+ plugin 'tt_renderer';
+
+L<Mojolicious>
+
+ $self->plugin('tt_renderer');
+
+=head1 DESCRIPTION
+
+This plugin is a simple Template Toolkit renderer for L<Mojolicious>. 
+Its defaults are usually reasonable, although for finer grain detail in 
+configuration you may want to use 
+L<Mojolicious::Plugin::TtRenderer::Engine> directly.
+
+=encoding utf-8
+
+=head1 OPTIONS
+
+These are the options that can be passed in as arguments to this plugin.
+
+=head2 template_options
+
+Configuration hash passed into L<Template>'s constructor, see 
+L<Template Toolkit's configuration summary|Template#CONFIGURATION-SUMMARY>
+for details.  Here is an example using the L<Mojolicious::Lite> form:
+
+ plugin 'tt_renderer' => {
+   template_options => {
+     PRE_CHOMP => 1,
+     POST_CHOMP => 1,
+     TRIM => 1,
+   },
+ };
+
+Here is the same example using the full L<Mojolicious> app form:
+
+ package MyApp;
+ 
+ use Mojo::Base qw( Mojolicious );
+ 
+ sub startup {
+   my($self) = @_;
+   
+   $self->plugin('tt_renderer' => {
+     template_options => {
+       PRE_CHOMP => 1,
+       POST_CHOMP => 1,
+       TRIM => 1,
+     },
+   }
+   
+   ...
+ }
+
+These options will be used if you do not override them:
+
+=over 4
+
+=item INCLUDE_PATH
+
+Generated based on your application's renderer's configuration.  It
+will include all renderer paths, in addition to search files located
+in the C<__DATA__> section by the usual logic used by L<Mojolicious>.
+
+=item COMPILE_EXT
+
+C<.ttc>
+
+=item UNICODE
+
+C<1> (true)
+
+=item ENCODING
+
+C<utf-87>
+
+=item CACHE_SIZE
+
+C<128>
+
+=item RELATIZE
+
+C<1> (true)
+
+=back
+
+=head2 cache_dir
+
+Specifies the directory in which compiled template files are
+written.  This:
+
+ plugin 'tt_renderer', { cache_dir => 'some/path' };
+
+is equivalent to
+
+ plugin 'tt_renderer', { template_options { COMPILE_DIR => 'some/path' } };
+
+except in the first example relative paths are relative to the L<Mojolicious>
+app's home directory (C<$app->home>).
+
+=head1 STASH
+
+=head2 h
+
+Helpers are available via the C<h> entry in the stash.
+
+ <a href="[% h.url_for('index') %]">go back to index</a>
+
+=head2 c
+
+The current controller instance can be accessed as C<c>.
+
+ I see you are requesting a document from [% c.req.headers.host %].
+
+=head1 EXAMPLES
+
+L<Mojolicious::Lite> example:
+
+ use Mojolicious::Lite;
+ 
+ plugin 'tt_renderer';
+ 
+ get '/' => sub {
+   my $self = shift;
+   $self->render('index');
+ };
+ 
+ app->start;
+ 
+ __DATA__
+ 
+ @@ index.html.tt
+ [% 
+    WRAPPER 'layouts/default.html.tt' 
+    title = 'Welcome'
+ %]
+ <p>Welcome to the Mojolicious real-time web framework!</p>
+ <p>Welcome to the TtRenderer plugin!</p>
+ [% END %]
+ 
+ @@ layouts/default.html.tt
+ <!DOCTYPE html>
+ <html>
+   <head><title>[% title %]</title></head>
+   <body>[% content %]</body>
+ </html>
+
+L<Mojolicious> example:
+
+ package MyApp;
+ use Mojo::Base 'Mojolicious';
+ 
+ sub startup {
+   my $self = shift;
+   $self->plugin('tt_renderer');
+   my $r = $self->routes;
+   $r->get('/')->to('example#welcome');
+ }
+ 
+ 1;
+
+ package MyApp::Example;
+ use Mojo::Base 'Mojolicious::Controller';
+ 
+ # This action will render a template
+ sub welcome {
+   my $self = shift;
+ 
+   # Render template "example/welcome.html.tt" with message
+   $self->render(
+     message => 'Looks like your TtRenderer is working!');
+ }
+ 
+ 1;
+
+These are also included with the C<Mojolicious::Plugin::TtRenderer>
+distribution, including the support files required for the full 
+L<Mojolicious> app example.
+
+=head1 SEE ALSO
+
+L<Mojolicious::Plugin::TtRenderer::Engine>, 
+L<Mojolicious>, 
+L<Mojolicious::Guides>, 
+L<http://mojolicious.org>.
+
+=head1 AUTHOR
+
+original author: Ask Bjørn Hansen
+
+current maintainer: Graham Ollis <plicease@cpan.org>
+
+contributors:
+
+vti
+
+Marcus Ramberg
+
+Matthias Bethke
+
+Htbaa
+
+Magnus Holm
+
+Maxim Vuets
+
+Rafael Kitover
+
+giftnuss
+
+Cosimo Streppone
+
+Fayland Lam
+
+Jason Crowther
+
+spleenjack
+
+Árpád Szász
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2013 by Ask Bjørn Hansen.
+
+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

@@ -1,48 +1,64 @@
 name    = Mojolicious-Plugin-TtRenderer
-author  = Ask Bjørn Hansen <ask@develooper.com>
+author  = Graham Ollis <plicease@cpan.org>
 license = Perl_5
 
 copyright_holder = Ask Bjørn Hansen
 # copyright_year   = 2009
 
+version = 1.48
+
+[@Author::Plicease]
+
 [Prereqs]
-Mojolicious  = 1.3
+Mojolicious  = 3.33
 Template     = 2.18
 
 [Prereqs / TestRequires ]
 Test::More   = 0
 
-[@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]
-[CompileTests]
-[DistManifestTests]
+[Test::Compile]
 [HasVersionTests]
 [MetaTests]
-[ReadmeFromPod]
-[PodCoverageTests]
-[Manifest]
 
-[NextRelease]
-format = %-7v %{MMMM d, yyyy}d
+[ReadmeAnyFromPod]
+type     = text
+filename = README
+location = build
 
+[ReadmeAnyFromPod / ReadMePodInRoot]
+type     = pod
+filename = README.pod
+location = root
+
+[MinimumPerl]
+
+[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]
+
+[InsertExample]
+
+[MetaNoIndex]
+directory = example

example/README

@@ -0,0 +1,8 @@
+Included in this directory are two examples of how to use the Template Toolkit
+Renderer.
+
+myapp.pl - Mojolicious::Lite example
+myapp/   - full Mojolicious application example
+
+They were created as minor modifications of the applications generated
+using the 'mojo generate' command.

example/myapp.pl

@@ -0,0 +1,28 @@
+use Mojolicious::Lite;
+
+plugin 'tt_renderer';
+
+get '/' => sub {
+  my $self = shift;
+  $self->render('index');
+};
+
+app->start;
+
+__DATA__
+
+@@ index.html.tt
+[% 
+   WRAPPER 'layouts/default.html.tt' 
+   title = 'Welcome'
+%]
+<p>Welcome to the Mojolicious real-time web framework!</p>
+<p>Welcome to the TtRenderer plugin!</p>
+[% END %]
+
+@@ layouts/default.html.tt
+<!DOCTYPE html>
+<html>
+  <head><title>[% title %]</title></head>
+  <body>[% content %]</body>
+</html>

example/myapp/lib/MyApp.pm

@@ -0,0 +1,11 @@
+package MyApp;
+use Mojo::Base 'Mojolicious';
+
+sub startup {
+  my $self = shift;
+  $self->plugin('tt_renderer');
+  my $r = $self->routes;
+  $r->get('/')->to('example#welcome');
+}
+
+1;

example/myapp/lib/MyApp/Example.pm

@@ -0,0 +1,13 @@
+package MyApp::Example;
+use Mojo::Base 'Mojolicious::Controller';
+
+# This action will render a template
+sub welcome {
+  my $self = shift;
+
+  # Render template "example/welcome.html.tt" with message
+  $self->render(
+    message => 'Looks like your TtRenderer is working!');
+}
+
+1;

example/myapp/log/development.log

@@ -0,0 +1,21 @@
+[Thu Aug  8 09:00:16 2013] [info] Listening at "http://*:3000".
+[Thu Aug  8 09:00:20 2013] [debug] Your secret passphrase needs to be changed!!!
+[Thu Aug  8 09:00:20 2013] [debug] GET "/".
+[Thu Aug  8 09:00:20 2013] [debug] Routing to controller "MyApp::Example" and action "welcome".
+[Thu Aug  8 09:00:20 2013] [error] parse error - example/welcome.html.tt line 8: unexpected end of input
+[Thu Aug  8 09:00:20 2013] [debug] Template "exception.development.html.ep" not found.
+[Thu Aug  8 09:00:20 2013] [debug] Template "exception.html.ep" not found.
+[Thu Aug  8 09:00:20 2013] [debug] Rendering inline template.
+[Thu Aug  8 09:00:20 2013] [debug] Rendering inline template.
+[Thu Aug  8 09:00:20 2013] [debug] 500 Internal Server Error (0.061556s, 16.245/s).
+[Thu Aug  8 09:00:41 2013] [info] Listening at "http://*:3000".
+[Thu Aug  8 09:00:44 2013] [debug] Your secret passphrase needs to be changed!!!
+[Thu Aug  8 09:00:44 2013] [debug] GET "/".
+[Thu Aug  8 09:00:44 2013] [debug] Routing to controller "MyApp::Example" and action "welcome".
+[Thu Aug  8 09:00:44 2013] [debug] 200 OK (0.032461s, 30.806/s).
+[Thu Aug  8 09:00:47 2013] [debug] GET "/".
+[Thu Aug  8 09:00:47 2013] [debug] Routing to controller "MyApp::Example" and action "welcome".
+[Thu Aug  8 09:00:47 2013] [debug] 200 OK (0.001260s, 793.651/s).
+[Thu Aug  8 09:00:52 2013] [debug] GET "/".
+[Thu Aug  8 09:00:52 2013] [debug] Routing to controller "MyApp::Example" and action "welcome".
+[Thu Aug  8 09:00:52 2013] [debug] 200 OK (0.001683s, 594.177/s).

example/myapp/public/index.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Welcome to the Mojolicious real-time web framework!</title>
+  </head>
+  <body>
+    <h2>Welcome to the Mojolicious real-time web framework!</h2>
+    This is the static document "public/index.html",
+    <a href="/">click here</a> to get back to the start.
+  </body>
+</html>

example/myapp/script/my_app

@@ -0,0 +1,11 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use FindBin;
+BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
+
+# Start command line interface for application
+require Mojolicious::Commands;
+Mojolicious::Commands->start_app('MyApp');

example/myapp/t/basic.t

@@ -0,0 +1,9 @@
+use Mojo::Base -strict;
+
+use Test::More;
+use Test::Mojo;
+
+my $t = Test::Mojo->new('MyApp');
+$t->get_ok('/')->status_is(200)->content_like(qr/Mojolicious/i);
+
+done_testing();

example/myapp/templates/example/welcome.html.tt

@@ -0,0 +1,10 @@
+[%
+  WRAPPER 'layouts/default.html.tt'
+  title = 'Welcome'
+%]
+<h2>[% $message %]</h2>
+This page was generated from the template "templates/example/welcome.html.ep"
+and the layout "templates/layouts/default.html.ep",
+<a href="[% url_for %]">click here</a> to reload the page or
+<a href="/index.html">here</a> to move forward to a static page.
+[% END %]

example/myapp/templates/layouts/default.html.tt

@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<html>
+  <head><title>[% title %]</title></head>
+  <body>[% content %]</body>
+</html>

lib/Mojolicious/Plugin/TtRenderer.pm

@@ -2,8 +2,10 @@ package Mojolicious::Plugin::TtRenderer;
 
 use strict;
 use warnings;
+use v5.10;
 
-our $VERSION = '0.01';
+# ABSTRACT: Template Renderer Plugin for Mojolicious
+# VERSION
 
 use base 'Mojolicious::Plugin';
 
@@ -20,40 +22,149 @@ sub register {
     $app->renderer->add_handler(tt => $tt);
 }
 
+$Mojolicious::Plugin::TtRenderer::VERSION //= ('devel');
+
 1;
 __END__
 
-=head1 NAME
-
-Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
+=encoding utf-8
 
 =head1 SYNOPSIS
 
-    # Mojolicious
-    $self->plugin('tt_renderer');
-    $self->plugin(tt_renderer => {template_options => {FILTERS => [ ... ]}});
+L<Mojolicious::Lite>:
 
-    # Mojolicious::Lite
-    plugin 'tt_renderer';
-    plugin tt_renderer => {template_options => {FILTERS => [ ... ]}};
+ plugin 'tt_renderer';
+
+L<Mojolicious>
+
+ $self->plugin('tt_renderer');
 
 =head1 DESCRIPTION
 
-L<Mojolicous::Plugin::TtRenderer> is a simple loader for L<MojoX::Renderer::TT>.
+This plugin is a simple Template Toolkit renderer for L<Mojolicious>. 
+Its defaults are usually reasonable, although for finer grain detail in 
+configuration you may want to use 
+L<Mojolicious::Plugin::TtRenderer::Engine> directly.
 
-=head1 METHODS
+=head1 OPTIONS
 
-L<Mojolicious::Plugin::TtRenderer> inherits all methods from
-L<Mojolicious::Plugin> and implements the following new ones.
+These are the options that can be passed in as arguments to this plugin.
 
-=head2 C<register>
+=head2 template_options
 
-    $plugin->register;
+Configuration hash passed into L<Template>'s constructor, see 
+L<Template Toolkit's configuration summary|Template#CONFIGURATION-SUMMARY>
+for details.  Here is an example using the L<Mojolicious::Lite> form:
 
-Register renderer in L<Mojolicious> application.
+ plugin 'tt_renderer' => {
+   template_options => {
+     PRE_CHOMP => 1,
+     POST_CHOMP => 1,
+     TRIM => 1,
+   },
+ };
+
+Here is the same example using the full L<Mojolicious> app form:
+
+ package MyApp;
+ 
+ use Mojo::Base qw( Mojolicious );
+ 
+ sub startup {
+   my($self) = @_;
+   
+   $self->plugin('tt_renderer' => {
+     template_options => {
+       PRE_CHOMP => 1,
+       POST_CHOMP => 1,
+       TRIM => 1,
+     },
+   }
+   
+   ...
+ }
+
+These options will be used if you do not override them:
+
+=over 4
+
+=item INCLUDE_PATH
+
+Generated based on your application's renderer's configuration.  It
+will include all renderer paths, in addition to search files located
+in the C<__DATA__> section by the usual logic used by L<Mojolicious>.
+
+=item COMPILE_EXT
+
+C<.ttc>
+
+=item UNICODE
+
+C<1> (true)
+
+=item ENCODING
+
+C<utf-87>
+
+=item CACHE_SIZE
+
+C<128>
+
+=item RELATIZE
+
+C<1> (true)
+
+=back
+
+=head2 cache_dir
+
+Specifies the directory in which compiled template files are
+written.  This:
+
+ plugin 'tt_renderer', { cache_dir => 'some/path' };
+
+is equivalent to
+
+ plugin 'tt_renderer', { template_options { COMPILE_DIR => 'some/path' } };
+
+except in the first example relative paths are relative to the L<Mojolicious>
+app's home directory (C<$app->home>).
+
+=head1 STASH
+
+=head2 h
+
+Helpers are available via the C<h> entry in the stash.
+
+ <a href="[% h.url_for('index') %]">go back to index</a>
+
+=head2 c
+
+The current controller instance can be accessed as C<c>.
+
+ I see you are requesting a document from [% c.req.headers.host %].
+
+=head1 EXAMPLES
+
+L<Mojolicious::Lite> example:
+
+# EXAMPLE: example/myapp.pl
+
+L<Mojolicious> example:
+
+# EXAMPLE: example/myapp/lib/MyApp.pm
+
+# EXAMPLE: example/myapp/lib/MyApp/Example.pm
+
+These are also included with the C<Mojolicious::Plugin::TtRenderer>
+distribution, including the support files required for the full 
+L<Mojolicious> app example.
 
 =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>.
 
 =cut

lib/Mojolicious/Plugin/TtRenderer/Engine.pm

@@ -2,19 +2,24 @@ 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';
 use Template ();
 use Cwd qw/abs_path/;
+use Scalar::Util 'weaken';
+use POSIX ':errno_h';
+
+# ABSTRACT: Template Toolkit renderer for Mojolicious
+# VERSION
 
 __PACKAGE__->attr('tt');
 
 sub build {
     my $self = shift->SUPER::new(@_);
+    weaken($self->{app});
     $self->_init(@_);
     return sub { $self->_render(@_) }
 }
@@ -25,24 +30,37 @@ sub _init {
 
     #$Template::Parser::DEBUG = 1;
 
+    my $dir;
     my $app = delete $args{mojo} || delete $args{app};
+    if($dir=$args{cache_dir}) {
 
-    my $dir = $app && $app->home->rel_dir('tmp/ctpl');
+      if($app && substr($dir,0,1) ne '/') {
+        $dir=$app->home->rel_dir($dir);
+      }
+    }
 
     # TODO
     #   take and process options :-)
 
+    my @renderer_paths = $app ? map { abs_path($_) } grep { -d $_ } @{ $app->renderer->paths } : ();
+    push @renderer_paths, 'templates';
+
     my %config = (
-        ($app ? (INCLUDE_PATH => abs_path($app->home->rel_dir('templates'))) : ()),
-        COMPILE_EXT => '.ttc',
-        COMPILE_DIR => ($dir || abs_path(File::Spec->tmpdir)),
-        UNICODE     => 1,
-        ENCODING    => 'utf-8',
-        CACHE_SIZE  => 128,
-        RELATIVE    => 1,
+        INCLUDE_PATH => \@renderer_paths,
+        COMPILE_EXT  => '.ttc',
+        UNICODE      => 1,
+        ENCODING     => 'utf-8',
+        CACHE_SIZE   => 128,
+        RELATIVE     => 1,
         %{$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};
@@ -64,29 +82,43 @@ sub _render {
     $t = 'inline' if defined $inline;
     return unless $t;
 
-
     my $helper = Mojolicious::Plugin::TtRenderer::Helper->new(ctx => $c);
 
     # Purge previous result
     $$output = '';
 
-    my @params = ({%{$c->stash}, c => $c, h => $helper}, $output, {binmode => ':utf8'});
-    $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0]->ctx($c);
+    # fixes for t/lite_app_with_default_layouts.t
+    unless ($c->stash->{layout}) {
+        $c->stash->{content} ||= $c->stash->{'mojo.content'}->{content};
+    }
 
-    my $ok = $self->tt->process(defined $inline ? \$inline : $t, @params);
+    my @params = ({%{$c->stash}, c => $c, h => $helper}, $output, {binmode => ':utf8'});
+    my $provider = $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0];
+    $provider->options($options);
+    $provider->ctx($c);
+
+    my $ok = do {
+        if (defined $inline) {
+            $self->tt->process(\$inline, @params);
+        }
+        else {
+            my @ret = $provider->fetch($t);
+
+            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
-    unless ($ok) {
-
-        my $e = Mojo::Exception->new(
-            $self->tt->error.'',
-            $self->tt->service->process(defined $inline ? \$inline : $t));
-        $$output = '';
-        $c->app->log->error(qq/Template error in "$t": $e/);
-        $c->render_exception($e);
-        $self->tt->error('');
-        return 0;
-    }
+    die $self->tt->error unless $ok;
 
     return 1;
 }
@@ -130,6 +162,7 @@ use strict;
 use warnings;
 
 use base 'Template::Provider';
+use Scalar::Util 'weaken';
 
 sub new {
     my $class = shift;
@@ -139,35 +172,52 @@ sub new {
 
     my $self = $class->SUPER::new(%params);
     $self->renderer($renderer);
+    weaken($self->{renderer});
     return $self;
 }
 
 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 _template_modified {1}
+sub _template_modified {
+    my($self, $template) = @_;
+    $self->SUPER::_template_modified($template) || $template =~ /^templates(?:\/|\\)/;
+}
 
 sub _template_content {
     my $self = shift;
     my ($path) = @_;
 
+    my $options = delete $self->{options};
+    
     # 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(@_);
     }
 
+    my $data;
+    my $error = '';
+
     # Try DATA section
-    elsif (my $d = $self->renderer->get_data_template($self->ctx, $t)) {
-        return wantarray ? ($d, '', time) : $d;
+    if(defined $options) {
+        $data = $self->renderer->get_data_template($options);
+    } else {
+        my $loader = Mojo::Loader->new;
+        foreach my $class (@{ $self->renderer->classes }) {
+            $data = $loader->data($class, $t);
+            last if $data;
+        }
     }
 
-    my $data = '';
-    my $error = "$path: not found";
-    my $mod_date = time;
-    return wantarray ? ($data, $error, $mod_date) : $data;
+    unless($data) {
+        $data = '';
+        $error = "$path: not found";
+    }
+    return wantarray ? ($data, $error, time) : $data;
 }
 
 1;
@@ -176,35 +226,31 @@ __END__
 
 =encoding utf-8
 
-=head1 NAME
-
-Mojolicious::Plugin::TtRenderer::Engine - Template Toolkit renderer for Mojo
-
 =head1 SYNOPSIS
 
 Add the handler:
 
-    sub startup {
-        ...
+ sub startup {
+     ...
+ 
+     # Via mojolicious plugin
+     $self->plugin(tt_renderer => {template_options => {FILTERS => [ ... ]}});
+ 
+     # Or manually
+     use Mojolicious::Plugin::TtRenderer::Engine;
+ 
+     my $tt = Mojolicious::Plugin::TtRenderer::Engine->build(
+         mojo => $self,
+         template_options => {
+             PROCESS  => 'tpl/wrapper',
+             FILTERS  => [ ... ],
+             UNICODE  => 1,
+             ENCODING => 'UTF-8',
+         }
+     );
 
-        # Via mojolicious plugin
-        $self->plugin(tt_renderer => {template_options => {FILTERS => [ ... ]}});
-
-        # Or manually
-        use Mojolicious::Plugin::TtRenderer::Engine;
-
-        my $tt = Mojolicious::Plugin::TtRenderer::Engine->build(
-            mojo => $self,
-            template_options => {
-                PROCESS  => 'tpl/wrapper',
-                FILTERS  => [ ... ],
-                UNICODE  => 1,
-                ENCODING => 'UTF-8',
-            }
-        );
-
-        $self->renderer->add_handler( tt => $tt );
-    }
+     $self->renderer->add_handler( tt => $tt );
+ }
 
 Template parameter are taken from C< $c->stash >.
 
@@ -214,20 +260,20 @@ The template file for C<"example/welcome"> would be C<"templates/welcome.html.tt
 
 When template file is not available rendering from C<__DATA__> is attempted.
 
-    __DATA__
+ __DATA__
 
-    @@ welcome.html.tt
-    Welcome, [% user.name %]!
+ @@ welcome.html.tt
+ Welcome, [% user.name %]!
 
 Inline template is also supported:
 
-    $self->render(inline => '[% 1 + 1 %]', handler => 'tt');
+ $self->render(inline => '[% 1 + 1 %]', handler => 'tt');
 
 =head1 HELPERS
 
 Helpers are exported automatically under C<h> namespace.
 
-    [% h.url_for('index') %]
+ [% h.url_for('index') %]
 
 =head1 METHODS
 
@@ -245,68 +291,24 @@ 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
+
+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
+=head1 SEE ALSO
 
-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?
-
-=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.
-
-=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 * 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>
-
-=item * Search CPAN
-
-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.
-
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
+L<Mojolicious::Plugin::TtRenderer::Engine>, 
+L<Mojolicious>, 
+L<Mojolicious::Guides>, 
+L<http://mojolicious.org>.
 
 =cut

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/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/deep_recursion.t

@@ -0,0 +1,69 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+#BEGIN { $ENV{MOJO_MODE}='testing'; };
+
+use utf8;
+
+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 {
+  File::Spec->catfile(tempdir(CLEANUP => 1), 'mojo.log');
+});
+
+plugin 'tt_renderer' => {template_options => { COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
+
+get '/exception' => sub { die };
+
+#say app->mode;
+#app->start;
+#exit;
+
+my $t = Test::Mojo->new;
+
+$t->app->renderer->default_handler('tt');
+
+my $deep_recursion = 0;
+
+do {
+  local $SIG{__WARN__} = sub {
+    my $warning = shift;
+    if($warning =~ /Deep recursion/) {
+      $deep_recursion = 1;
+      die $warning;
+    }
+  };
+  $t->get_ok('/exception')
+    ->status_is(500);
+};
+
+ok !$deep_recursion, 'no deep recursion';
+
+__DATA__
+
+@@ exception.development.html.tt
+[% 1 + % %]
+
+@@ exception.html.tt
+[% 1 + % %]
+
+@@ exception.testing.html.tt
+[% 1 + % %]

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

@@ -0,0 +1,53 @@
+use strict;
+use warnings;
+use Test::More tests => 9;
+use Test::Mojo;
+use File::Temp qw( tempdir );
+
+use Mojolicious::Lite;
+
+# Tell Mojolicious we want to load the TT renderer plugin
+app->plugin(
+    tt_renderer => {
+        template_options => {
+            # These options are specific to TT
+            #INCLUDE_PATH => 'templates',
+            COMPILE_DIR  => tempdir( CLEANUP => 1 ),
+            COMPILE_EXT  => '.ttc',
+            # ... anything else to be passed on to TT should go here
+        },
+    }
+);
+
+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_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' => { template_options => { COMPILE_DIR  => tempdir( CLEANUP => 1 ) } };
+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/lite_app.t

@@ -7,18 +7,19 @@ BEGIN { $ENV{MOJO_MODE}='testing'; };
 
 use utf8;
 
-use Test::More tests => 31;
+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';
 
@@ -26,6 +27,10 @@ get '/with_include' => 'include';
 
 get '/with_wrapper' => 'wrapper';
 
+get '/badinclude' => 'badinclude';
+
+get '/badwrapper' => 'badwrapper';
+
 get '/with_auto_wrapper' => 'auto_wrapper';
 
 get '/inheritance_base' => 'inheritance_base';
@@ -55,6 +60,12 @@ $t->get_ok('/bar/hello')->content_is("hello");
 # With include
 $t->get_ok('/with_include')->content_is("HelloInclude!Hallo");
 
+# Bad inclde
+$t->get_ok('/badinclude')->status_is(500)->content_like(qr/Exception/i)->content_like(qr/bogus\.inc/);
+
+# Bad wrapper
+$t->get_ok('/badwrapper')->status_is(500)->content_like(qr/Exception/i)->content_like(qr/layouts\/bogus\.html\.tt/);
+
 # With wrapper
 $t->get_ok('/with_wrapper')->content_is("wrapped");
 
@@ -102,6 +113,10 @@ Hallo
 Include!
 [% INCLUDE 'includes/sub/include.inc' -%]
 
+@@ badinclude.html.tt
+[%- INCLUDE 'bogus.inc' -%]
+not here
+
 @@ layouts/layout.html.tt
 w[%- content -%]d
 
@@ -110,6 +125,11 @@ w[%- content -%]d
 rappe
 [%- END -%]
 
+@@ badwrapper.html.tt
+[%- WRAPPER 'layouts/bogus.html.tt' %-]
+not here
+[%- END -%]
+
 @@ layouts/auto_layout.html.tt
 w[%- h.content -%]d
 

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/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/pod-coverage.t

@@ -1,18 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-# Ensure a recent version of Test::Pod::Coverage
-my $min_tpc = 1.08;
-eval "use Test::Pod::Coverage $min_tpc";
-plan skip_all => "Test::Pod::Coverage $min_tpc required for testing POD coverage"
-    if $@;
-
-# Test::Pod::Coverage doesn't require a minimum Pod::Coverage version,
-# but older versions don't recognize some common documentation styles
-my $min_pc = 0.18;
-eval "use Pod::Coverage $min_pc";
-plan skip_all => "Pod::Coverage $min_pc required for testing POD coverage"
-    if $@;
-
-all_pod_coverage_ok();

t/templates/Foo.pm

@@ -0,0 +1,13 @@
+package
+  Foo; 
+1;
+__DATA__ 
+
+@@ include.inc
+Hello
+@@ includes/sub/include.inc
+Hallo
+
+@@ 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/grimlock.html.tt

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

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,17 +5,27 @@
 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!'
   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?
@@ -24,16 +34,38 @@ 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');
 
 # 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 - (templates\/)?doesnotexist\.tt: (No such file or directory|not found)/);
+
+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
+    # its DESTROY method, so we skip reporting those cycles.
+    unless(scalar(scalar(grep { ref($_->[2]) eq 'Mojolicious::Plugin::TtRenderer::Provider' && $_->[1] =~ /^(HEAD|TAIL|LOOKUP)$/ } @$arg)) > 0)
+    {
+      #use YAML ();
+      #diag YAML::Dump([ map { [ $_->[0], $_->[1], ref($_->[2]), ref($_->[3]) ] } @$arg ]);
+      fail('Cycle found')
+    }
+  });
+};

t/two_data.t

@@ -0,0 +1,48 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+BEGIN { $ENV{MOJO_MODE} = 'testing' };
+
+use utf8;
+
+use Test::More tests => 7;
+
+use Mojolicious::Lite;
+use Test::Mojo;
+use File::Temp qw( tempdir );
+
+use FindBin ();
+use lib "$FindBin::Bin/templates";
+
+use_ok 'Foo';
+
+push @{app->renderer->classes}, 'Foo';
+
+plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1, COMPILE_DIR => tempdir( CLEANUP => 1 )}};
+
+app->log->level('fatal'); 
+
+get '/with_include' => 'include';
+get '/with_wrapper' => 'wrapper';
+
+my $t = Test::Mojo->new;
+
+# With include
+$t->get_ok('/with_include')->status_is(200)->content_is("HelloInclude!Hallo");
+
+# With wrapper
+$t->get_ok('/with_wrapper')->status_is(200)->content_is("wrapped");
+
+__DATA__
+
+@@ wrapper.html.tt
+[%- WRAPPER 'layouts/layout.html.tt' -%]
+rappe
+[%- END -%]
+
+@@ include.html.tt 
+[%- INCLUDE 'include.inc' -%]
+Include!
+[%- INCLUDE 'includes/sub/include.inc' -%]