Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
88041ec8b0 | ||
|
|
1fe6401667 | ||
|
|
c00f8934de | ||
|
|
d4902f8bf0 | ||
|
|
4225658dbc | ||
|
|
d45efa5405 | ||
|
|
f3e65cedce | ||
|
|
906c68db34 | ||
|
|
c7012a1be0 | ||
|
|
5e7728270f | ||
|
|
7618cacaa4 | ||
|
|
80340f9950 |
@@ -1,6 +1,21 @@
|
|||||||
Revision history for Mojolicious::Plugin::TtRenderer
|
Revision history for Mojolicious::Plugin::TtRenderer
|
||||||
|
|
||||||
{{$NEXT}}
|
{{$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
|
- silenced a few annoying warnings during test
|
||||||
- use temp directory for COMPILE_DIR in tests to avoid failures if the
|
- use temp directory for COMPILE_DIR in tests to avoid failures if the
|
||||||
default compile directory already exists and is owned by someone else.
|
default compile directory already exists and is owned by someone else.
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
|
|||||||
|
|
||||||
=head1 DESCRIPTION
|
=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>.
|
L<Mojolicious::Plugin::TtRenderer::Engine>.
|
||||||
|
|
||||||
=head1 METHODS
|
=head1 METHODS
|
||||||
|
|||||||
@@ -55,3 +55,5 @@ location = root
|
|||||||
format = %-7v %{MMMM d, yyyy}d
|
format = %-7v %{MMMM d, yyyy}d
|
||||||
|
|
||||||
[MinimumPerl]
|
[MinimumPerl]
|
||||||
|
|
||||||
|
[MetaJSON]
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
|
|||||||
|
|
||||||
=head1 DESCRIPTION
|
=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>.
|
L<Mojolicious::Plugin::TtRenderer::Engine>.
|
||||||
|
|
||||||
=head1 METHODS
|
=head1 METHODS
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ use Mojo::ByteStream 'b';
|
|||||||
use Template ();
|
use Template ();
|
||||||
use Cwd qw/abs_path/;
|
use Cwd qw/abs_path/;
|
||||||
use Scalar::Util 'weaken';
|
use Scalar::Util 'weaken';
|
||||||
|
use POSIX ':errno_h';
|
||||||
|
|
||||||
__PACKAGE__->attr('tt');
|
__PACKAGE__->attr('tt');
|
||||||
|
|
||||||
@@ -87,11 +88,26 @@ sub _render {
|
|||||||
my $provider = $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0];
|
my $provider = $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0];
|
||||||
$provider->options($options);
|
$provider->options($options);
|
||||||
$provider->ctx($c);
|
$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
|
# Error
|
||||||
die $self->tt->error unless $ok;
|
die $self->tt->error unless $ok;
|
||||||
@@ -155,7 +171,6 @@ sub new {
|
|||||||
sub renderer { @_ > 1 ? $_[0]->{renderer} = $_[1] : $_[0]->{renderer} }
|
sub renderer { @_ > 1 ? $_[0]->{renderer} = $_[1] : $_[0]->{renderer} }
|
||||||
sub ctx { @_ > 1 ? $_[0]->{ctx} = $_[1] : $_[0]->{ctx} }
|
sub ctx { @_ > 1 ? $_[0]->{ctx} = $_[1] : $_[0]->{ctx} }
|
||||||
sub options { @_ > 1 ? $_[0]->{options} = $_[1] : $_[0]->{options} }
|
sub options { @_ > 1 ? $_[0]->{options} = $_[1] : $_[0]->{options} }
|
||||||
sub not_found { @_ > 1 ? $_[0]->{not_found} = $_[1] : $_[0]->{not_found} }
|
|
||||||
|
|
||||||
sub _template_modified {
|
sub _template_modified {
|
||||||
my($self, $template) = @_;
|
my($self, $template) = @_;
|
||||||
@@ -183,7 +198,6 @@ sub _template_content {
|
|||||||
# Try DATA section
|
# Try DATA section
|
||||||
if(defined $options) {
|
if(defined $options) {
|
||||||
$data = $self->renderer->get_data_template($options);
|
$data = $self->renderer->get_data_template($options);
|
||||||
$self->not_found(1) unless defined $data;
|
|
||||||
} else {
|
} else {
|
||||||
my $loader = Mojo::Loader->new;
|
my $loader = Mojo::Loader->new;
|
||||||
foreach my $class (@{ $self->renderer->classes }) {
|
foreach my $class (@{ $self->renderer->classes }) {
|
||||||
|
|||||||
+6
-4
@@ -11,12 +11,14 @@ use Test::More tests => 3;
|
|||||||
|
|
||||||
use Mojolicious::Lite;
|
use Mojolicious::Lite;
|
||||||
use Test::Mojo;
|
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);
|
# Send log to tmp file so that it doesn't clutter up the screen.
|
||||||
# Silence
|
|
||||||
app->log->level('fatal');
|
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 ) }};
|
plugin 'tt_renderer' => {template_options => { COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
Reference in New Issue
Block a user