From 68783f08e2b2ce97e4674f4d41765e0c2d8b70cf Mon Sep 17 00:00:00 2001 From: vti Date: Tue, 11 Nov 2008 23:55:31 +0100 Subject: [PATCH] fixes due to new Mojo::Renderer error handling, tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ask Bjørn Hansen --- Changes | 5 +++++ lib/MojoX/Renderer/TT.pm | 12 +++++------- t/render.t | 23 +++++++++++++++++++++++ t/render/template-error.tt2 | 1 + t/render/template.tt2 | 1 + 5 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 t/render.t create mode 100644 t/render/template-error.tt2 create mode 100644 t/render/template.tt2 diff --git a/Changes b/Changes index 1e5ba84..73caaac 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,10 @@ Revision history for MojoX-Renderer-TT +0.03 + - 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 diff --git a/lib/MojoX/Renderer/TT.pm b/lib/MojoX/Renderer/TT.pm index 6361583..927fc53 100644 --- a/lib/MojoX/Renderer/TT.pm +++ b/lib/MojoX/Renderer/TT.pm @@ -44,20 +44,18 @@ sub _init { } sub _render { - my ($self, $mojo, $tx, $path, $args) = @_; + my ($self, $mojo, $path, $output, $tx, $args) = @_; $args ||= {}; #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($path, {%$args, tx => $tx}, $output, {binmode => ":utf8"})) { Carp::carp $self->tt->error . "\n"; - return $self->tt->error; - } - else { - return $output; + return 0; + } else { + return 1; } } diff --git a/t/render.t b/t/render.t new file mode 100644 index 0000000..4997beb --- /dev/null +++ b/t/render.t @@ -0,0 +1,23 @@ +#!perl + +use strict; +use warnings; + +use Test::More tests => 5; + +use Mojo::Transaction; + +use_ok('MojoX::Renderer::TT'); + +my $mt = MojoX::Renderer::TT->new; + +my $output; +my $rv; + +$rv = $mt->(undef, 't/render/template.tt2', \$output); +is($rv, 1); +is($output, "4\n"); + +$rv = $mt->(undef, 't/render/template-error.tt2', \$output); +is($rv, 0); +ok($output); diff --git a/t/render/template-error.tt2 b/t/render/template-error.tt2 new file mode 100644 index 0000000..6047416 --- /dev/null +++ b/t/render/template-error.tt2 @@ -0,0 +1 @@ +[% = 2 %] diff --git a/t/render/template.tt2 b/t/render/template.tt2 new file mode 100644 index 0000000..4c06c07 --- /dev/null +++ b/t/render/template.tt2 @@ -0,0 +1 @@ +[% 2 + 2 %]