diff --git a/Changes b/Changes index 73100da..af85550 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,7 @@ Revision history for MojoX-Renderer-TT + - Change to use relative paths. + {{$NEXT}} 1.0 January 22, 2011 diff --git a/lib/MojoX/Renderer/TT.pm b/lib/MojoX/Renderer/TT.pm index a3320d5..7cd47cf 100644 --- a/lib/MojoX/Renderer/TT.pm +++ b/lib/MojoX/Renderer/TT.pm @@ -8,6 +8,7 @@ use base 'Mojo::Base'; use File::Spec (); use Mojo::ByteStream 'b'; use Template (); +use Cwd qw/abs_path/; __PACKAGE__->attr('tt'); @@ -31,14 +32,13 @@ sub _init { # take and process options :-) my %config = ( - ($app ? (INCLUDE_PATH => $app->home->rel_dir('templates')) : ()), + ($app ? (INCLUDE_PATH => abs_path($app->home->rel_dir('templates'))) : ()), COMPILE_EXT => '.ttc', - COMPILE_DIR => ($dir || File::Spec->tmpdir), + COMPILE_DIR => ($dir || abs_path(File::Spec->tmpdir)), UNICODE => 1, ENCODING => 'utf-8', CACHE_SIZE => 128, RELATIVE => 1, - ABSOLUTE => 1, %{$args{template_options} || {}}, ); @@ -52,7 +52,6 @@ sub _init { return $self; } -use Data::Dumper; sub _render { my ($self, $renderer, $c, $output, $options) = @_; @@ -64,10 +63,6 @@ sub _render { $t = 'inline' if defined $inline; return unless $t; - # Path - my $path = $renderer->template_path($options); - $path = b($inline)->md5_sum->to_string if defined $inline; - return unless $path; my $helper = MojoX::Renderer::TT::Helper->new(ctx => $c); @@ -77,14 +72,14 @@ sub _render { my @params = ({%{$c->stash}, c => $c, h => $helper}, $output, {binmode => ':utf8'}); $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0]->ctx($c); - my $ok = $self->tt->process(defined $inline ? \$inline : $path, @params); + my $ok = $self->tt->process(defined $inline ? \$inline : $t, @params); # Error unless ($ok) { my $e = Mojo::Exception->new( $self->tt->error.'', - $self->tt->service->process(defined $inline ? \$inline : $path)); + $self->tt->service->process(defined $inline ? \$inline : $t)); $$output = ''; $c->app->log->error(qq/Template error in "$t": $e/); $c->render_exception($e); diff --git a/t/lite_app.t b/t/lite_app.t index d1112c4..183b4e9 100644 --- a/t/lite_app.t +++ b/t/lite_app.t @@ -3,6 +3,8 @@ use strict; use warnings; +BEGIN { $ENV{MOJO_MODE}='testing'; }; + use utf8; use Test::More tests => 31; @@ -45,7 +47,7 @@ get '/inline' => sub { shift->render(inline => '[% 1 + 1 %]', handler => 'tt') } my $t = Test::Mojo->new; # Exception -$t->get_ok('/exception')->status_is(500)->content_like(qr/error/i); +$t->get_ok('/exception')->status_is(500)->content_like(qr/Exception/i); # Normal rendering $t->get_ok('/bar/hello')->content_is("hello"); diff --git a/t/templates/exception.testing.html.ep b/t/templates/exception.testing.html.ep new file mode 100644 index 0000000..c3bdac4 --- /dev/null +++ b/t/templates/exception.testing.html.ep @@ -0,0 +1,8 @@ +% my $s = $self->stash; +% my $e = $self->stash('exception'); +% delete $s->{inner_template}; +% delete $s->{exception}; +% my $dump = dumper $s; +% $s->{exception} = $e; +An Exception has occured: <%= $e->message %> +at <%= $e->line->[0] %> in <%= $e->line->[1] %> \ No newline at end of file