Prepare 0.30; update Mojo dependency

- Add test template with new naming schema

Signed-off-by: Ask Bjørn Hansen <ask@develooper.com>

Changes

@@ -1,5 +1,29 @@
 Revision history for MojoX-Renderer-TT
 
+0.30    September 9, 2009
+        - revert the change of stash key, template_path is the prior
+          source for the template file again (Sebastian Knapp)
+        - reflect recent changes in mojo project (v0.991251) (Sebastian Knapp)
+        - one test with Mojolicious added (Sebastian Knapp)
+
+0.21    July 29, 2009
+        - Update stash key from 'template_path' to 'template' to
+          match mojo change (Sebastian Knapp)
+
+0.20    December 9, 2008
+        - Updates to work with Mojo 0.9
+        - Add default INCLUDE_PATH
+        - Made default compile dir not Unix specific (Viacheslav
+          Tikhanovskii)
+
+0.10    November 12, 2008
+        - Update to work with named parameters in new version of Mojo
+        - Instead of "tx" pass the context in the "c" variable
+        - Rename "new" to "build"
+        - Add real tests (Viacheslav Tikhanovskii)
+        - Update to work with new error handling in Mojo
+          (Viacheslav Tikhanovskii)
+
 0.02    November 10, 2008
         - Add template_options parameter
         - Fix Template dependency

MANIFEST

@@ -7,4 +7,7 @@ lib/MojoX/Renderer/TT.pm
 t/00-load.t
 t/pod-coverage.t
 t/pod.t
+t/render.t
+t/render/template-error.tt2
+t/render/template.tt2
 .perltidyrc

MANIFEST.SKIP

@@ -3,3 +3,5 @@
 \.shipit$
 .*\.bak$
 ^\.gitignore$
+\.DS_Store
+Makefile

Makefile.PL

@@ -13,7 +13,7 @@ WriteMakefile(
     PL_FILES            => {},
     PREREQ_PM => {
         'Test::More' => 0,
-        'Mojo'       => 0.8009,
+        'Mojo'       => 0.991251,
         'Template'   => 2.18,
     },
     dist                => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },

README

@@ -21,6 +21,10 @@ perldoc command.
 
 You can also look for information at:
 
+    Git repository
+        http://git.develooper.com/?p=MojoX-Renderer-TT.git;a=summary
+        git://git.develooper.com/MojoX-Renderer-TT.git
+
     RT, CPAN's request tracker
         http://rt.cpan.org/NoAuth/Bugs.html?Dist=MojoX-Renderer-TT
 

lib/MojoX/Renderer/TT.pm

@@ -6,10 +6,15 @@ use base 'Mojo::Base';
 
 use Template ();
 use Carp     ();
+use File::Spec ();
 
-__PACKAGE__->attr('tt', chained => 1,);
+our $VERSION = '0.30';
 
-sub new {
+__PACKAGE__->attr('tt');
+
+sub new { Carp::croak "MojoX::Renderer::TT->new() is now ->build()" }
+
+sub build {
     my $self = shift->SUPER::new(@_);
     $self->_init(@_);
     return sub { $self->_render(@_) }
@@ -27,8 +32,9 @@ sub _init {
     #   take and process options :-)
 
     my %config = (
+        ( $mojo ? (INCLUDE_PATH => $mojo->home->rel_dir('templates') ) : () ),
         COMPILE_EXT => '.ttc',
-        COMPILE_DIR => ($dir || "/tmp"),
+        COMPILE_DIR => ($dir || File::Spec->tmpdir),
         UNICODE     => 1,
         ENCODING    => 'utf-8',
         CACHE_SIZE  => 128,
@@ -44,32 +50,39 @@ sub _init {
 }
 
 sub _render {
-    my ($self, $mojo, $tx, $path, $args) = @_;
+    my ($self, $renderer, $c, $output, $options) = @_;
 
-    $args ||= {};
+    my $template_path;
+    unless($template_path = $c->stash->{'template_path'}) {
+        $template_path = $renderer->template_path($options);
+    }
 
-    #use Data::Dump qw(dump);
-    #warn dump(\$args);
-
-    my $output;
-    unless ($self->tt->process($path, {%$args, tx => $tx}, \$output, {binmode => ":utf8"})) {
+    unless (
+        $self->tt->process(
+            $template_path, {%{$c->stash}, c => $c},
+            $output, {binmode => ":utf8"}
+        )
+      )
+    {
         Carp::carp $self->tt->error . "\n";
-        return $self->tt->error;
+        return 0;
     }
     else {
-        return $output;
+        return 1;
     }
 }
 
+
+1;    # End of MojoX::Renderer::TT
+
+__END__
+
+=encoding utf-8
+
 =head1 NAME
 
 MojoX::Renderer::TT - Template Toolkit renderer for Mojo
 
-=cut
-
-our $VERSION = '0.02';
-
-
 =head1 SYNOPSIS
 
 Add the handler:
@@ -79,7 +92,7 @@ Add the handler:
     sub startup {
        ...
 
-       my $tt = MojoX::Renderer::TT->new(
+       my $tt = MojoX::Renderer::TT->build(
             mojo => $self,
             template_options =>
              { PROCESS => 'tpl/wrapper',
@@ -93,22 +106,23 @@ Add the handler:
 And then in the handler call render which will call the
 MojoX::Renderer::TT renderer.
 
-   $c->render(foo => 123, bar => [qw(giz mo)]);
+   $c->render(templatename, format => 'tex', handler => 'tt2');
 
+Template parameter are taken from $c->stash
 
 =head1 METHODS
 
-=head2 new
+=head2 build
 
-This method returns not a TT object, but a handler for the Mojo renderer.
+This method returns a handler for the Mojolicious renderer.
 
 Supported parameters are
 
 =over 4
 
 =item mojo
-C<new> currently requires a C<mojo> parameter pointing to the base class (Mojo).
-object.
+C<build> currently uses a C<mojo> parameter pointing to the base class (Mojo).
+object. When used the INCLUDE_PATH will be set to 
 
 =item template_options
 
@@ -123,11 +137,8 @@ Ask Bjørn Hansen, C<< <ask at develooper.com> >>
 
 =head1 TODO
 
-   * Rename C<new> to something more sensical?
    * Better support non-Mojolicious frameworks
-   * Don't require the mojo parameter
    * Move the default template cache directory?
-   * Should the "tx" tpl parameter be called "c" (for context) instead?
    * Better way to pass parameters to the templates? (stash)
    * More sophisticated default search path?
 
@@ -146,19 +157,21 @@ You can find documentation for this module with the perldoc command.
 
     perldoc MojoX::Renderer::TT
 
-
 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 * AnnoCPAN: Annotated CPAN documentation
-
-L<http://annocpan.org/dist/MojoX-Renderer-TT>
-
 =item * CPAN Ratings
 
 L<http://cpanratings.perl.org/d/MojoX-Renderer-TT>
@@ -182,5 +195,3 @@ under the same terms as Perl itself.
 
 
 =cut
-
-1;    # End of MojoX::Renderer::TT

t/00-load.t

@@ -1,4 +1,4 @@
-#!perl -T
+#!perl
 
 use Test::More tests => 1;
 

t/render.t

@@ -0,0 +1,39 @@
+#!perl
+
+use strict;
+use warnings;
+
+use Test::More tests => 6;
+
+use Mojolicious;
+use Mojolicious::Controller;
+use MojoX::Renderer;
+
+use_ok('MojoX::Renderer::TT');
+
+my $c = Mojolicious::Controller->new(app => Mojolicious->new);
+$c->app->log->path(undef);
+$c->app->log->level('fatal');
+
+my $mt = MojoX::Renderer::TT->build;
+
+my $output;
+my $rv;
+
+$c->stash->{template_path} = 't/render/template.tt2';
+$rv = $mt->(undef, $c, \$output);
+is($rv, 1);
+is($output, "4\n");
+
+$c->stash->{template_path} = 't/render/error.tt2';
+$rv = $mt->(undef, $c, \$output);
+is($rv, 0);
+ok($output);
+
+delete $c->stash->{template_path};
+
+$c->app->renderer->root('./')->add_handler(tt2 => $mt);
+
+is($c->render('t/render/template','partial' => 1,handler => 'tt2'),"4\n");
+
+

t/render/template-error.tt2

@@ -0,0 +1 @@
+[% = 2 %]

t/render/template.html.tt2

@@ -0,0 +1 @@
+[% 2 + 2 %]

t/render/template.tt2

@@ -0,0 +1 @@
+[% 2 + 2 %]