Compare commits

...

12 Commits

Author SHA1 Message Date
Graham Ollis
88041ec8b0 fix cpantesters failures based on permissions 2013-01-12 09:05:35 -05:00
Graham Ollis
1fe6401667 update Changes 2013-01-09 14:19:22 -05:00
Graham Ollis
c00f8934de rm not_found, as it is no longer used. 2013-01-09 14:14:44 -05:00
Graham Ollis
d4902f8bf0 Merge pull request #34 from rkitover/master
fix reporting not found templates
2013-01-09 11:08:03 -08:00
Rafael Kitover
4225658dbc report not finding a template correctly
TtRenderer was dying with a 'not found' error when a template was not
found, instead of returning 0, which was interfering with things like
the error screen.

Use $provider->fetch to find templates and return 0 when a template is
not found.
2013-01-09 13:17:11 -05:00
Rafael Kitover
d45efa5405 failing test for not returning not found correctly 2013-01-09 13:13:53 -05:00
Graham Ollis
f3e65cedce v1.35 2012-12-30 10:33:14 -05:00
Graham Ollis
906c68db34 doco 2012-12-30 10:33:01 -05:00
Graham Ollis
c7012a1be0 doco typo 2012-12-29 10:27:32 -05:00
Graham Ollis
5e7728270f v1.34 2012-12-29 10:23:19 -05:00
Graham Ollis
7618cacaa4 fix hang in t/deep_recursion.t on *BSD 2012-12-27 14:51:34 -05:00
Graham Ollis
80340f9950 update changes 2012-12-27 13:37:31 -05:00
7 changed files with 81 additions and 11 deletions

15
Changes
View File

@@ -1,6 +1,21 @@
Revision history for Mojolicious::Plugin::TtRenderer
{{$NEXT}}
- 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.

View File

@@ -16,7 +16,7 @@ Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
=head1 DESCRIPTION
L<Mojolicous::Plugin::TtRenderer> is a simple loader for
L<Mojolicious::Plugin::TtRenderer> is a simple loader for
L<Mojolicious::Plugin::TtRenderer::Engine>.
=head1 METHODS

View File

@@ -55,3 +55,5 @@ location = root
format = %-7v %{MMMM d, yyyy}d
[MinimumPerl]
[MetaJSON]

View File

@@ -42,7 +42,7 @@ Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
=head1 DESCRIPTION
L<Mojolicous::Plugin::TtRenderer> is a simple loader for
L<Mojolicious::Plugin::TtRenderer> is a simple loader for
L<Mojolicious::Plugin::TtRenderer::Engine>.
=head1 METHODS

View File

@@ -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');
@@ -87,11 +88,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 +171,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 +198,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 }) {

View File

@@ -11,12 +11,14 @@ use Test::More tests => 3;
use Mojolicious::Lite;
use Test::Mojo;
use File::Temp qw( tempdir tempfile );
use File::Temp qw( tempdir );
use File::Spec;
my($fh_log,$filename_log) = tempfile('fooXXXXX', TMPDIR => 1, UNLINK => 1);
# Silence
# Send log to tmp file so that it doesn't clutter up the screen.
app->log->level('fatal');
app->log->path($filename_log);
app->log->path(do {
File::Spec->catfile(tempdir(CLEANUP => 1), 'mojo.log');
});
plugin 'tt_renderer' => {template_options => { COMPILE_DIR => tempdir( CLEANUP => 1 ) }};

37
t/default_template2.t Normal file
View File

@@ -0,0 +1,37 @@
use strict;
use warnings;
use Test::More tests => 3;
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';
};
my $t = Test::Mojo->new;
$t->get_ok('/')
->status_is(500)
->content_like(qr{foo});
__DATA__
@@ index.html.tt
anything