Compare commits
8 Commits
release/1.
...
release/1.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
408cba6c35 | ||
|
|
c1afea55a9 | ||
|
|
88041ec8b0 | ||
|
|
1fe6401667 | ||
|
|
c00f8934de | ||
|
|
d4902f8bf0 | ||
|
|
4225658dbc | ||
|
|
d45efa5405 |
9
Changes
9
Changes
@@ -1,6 +1,15 @@
|
||||
Revision history for Mojolicious::Plugin::TtRenderer
|
||||
|
||||
{{$NEXT}}
|
||||
- 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
|
||||
|
||||
@@ -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');
|
||||
|
||||
@@ -45,7 +46,7 @@ sub _init {
|
||||
my %config = (
|
||||
( @renderer_paths > 0
|
||||
? (INCLUDE_PATH => [@renderer_paths, 'templates'])
|
||||
: ()
|
||||
: (INCLUDE_PATH => ['templates'])
|
||||
),
|
||||
COMPILE_EXT => '.ttc',
|
||||
COMPILE_DIR => ($dir || abs_path(File::Spec->tmpdir)),
|
||||
@@ -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 }) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
use Test::More tests => 3;
|
||||
use Test::More tests => 9;
|
||||
use Test::Mojo;
|
||||
use File::Temp qw( tempdir );
|
||||
|
||||
@@ -11,7 +11,7 @@ app->plugin(
|
||||
tt_renderer => {
|
||||
template_options => {
|
||||
# These options are specific to TT
|
||||
INCLUDE_PATH => 'templates',
|
||||
#INCLUDE_PATH => 'templates',
|
||||
COMPILE_DIR => tempdir( CLEANUP => 1 ),
|
||||
COMPILE_EXT => '.ttc',
|
||||
# ... anything else to be passed on to TT should go here
|
||||
@@ -25,13 +25,29 @@ 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...
|
||||
|
||||
|
||||
52
t/default_template2.t
Normal file
52
t/default_template2.t
Normal file
@@ -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...
|
||||
37
t/default_template3.t
Normal file
37
t/default_template3.t
Normal file
@@ -0,0 +1,37 @@
|
||||
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';
|
||||
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->get_ok('/bar')
|
||||
->status_is(200)
|
||||
->content_like(qr{bar});
|
||||
|
||||
#note $t->tx->res->to_string;
|
||||
|
||||
__DATA__
|
||||
|
||||
@@ index.html.tt
|
||||
anything
|
||||
|
||||
@@ bar.html.tt
|
||||
sometimes, the bar, he eats you...
|
||||
|
||||
1
t/templates/grimlock.html.tt
Normal file
1
t/templates/grimlock.html.tt
Normal file
@@ -0,0 +1 @@
|
||||
Me Grimlock King!
|
||||
Reference in New Issue
Block a user