Compare commits
5 Commits
release/1.
...
release/1.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
90f8df88a9 | ||
|
|
fe963f6511 | ||
|
|
9be62a9c2c | ||
|
|
7f072b88be | ||
|
|
0faf79001b |
9
Changes
9
Changes
@@ -2,6 +2,15 @@ Revision history for Mojolicious::Plugin::TtRenderer
|
||||
|
||||
{{$NEXT}}
|
||||
|
||||
1.45 April 26, 2013
|
||||
- correctly support app->default->{layout} (GH#37, Fayland Lam)
|
||||
|
||||
1.44 April 13, 2013
|
||||
- promote development changes to production
|
||||
|
||||
1.43_01 April 11, 2013
|
||||
- _template_modified returns value from super class instead of 1 if true (GH#36, Fayland Lam)
|
||||
|
||||
1.43 April 8, 2013
|
||||
- promote development changes
|
||||
|
||||
|
||||
2
dist.ini
2
dist.ini
@@ -5,7 +5,7 @@ license = Perl_5
|
||||
copyright_holder = Ask Bjørn Hansen
|
||||
# copyright_year = 2009
|
||||
|
||||
version = 1.43
|
||||
version = 1.45
|
||||
|
||||
[Prereqs]
|
||||
Mojolicious = 3.33
|
||||
|
||||
@@ -81,12 +81,16 @@ sub _render {
|
||||
$t = 'inline' if defined $inline;
|
||||
return unless $t;
|
||||
|
||||
|
||||
my $helper = Mojolicious::Plugin::TtRenderer::Helper->new(ctx => $c);
|
||||
|
||||
# Purge previous result
|
||||
$$output = '';
|
||||
|
||||
# fixes for t/lite_app_with_default_layouts.t
|
||||
unless ($c->stash->{layout}) {
|
||||
$c->stash->{content} ||= $c->stash->{'mojo.content'}->{content};
|
||||
}
|
||||
|
||||
my @params = ({%{$c->stash}, c => $c, h => $helper}, $output, {binmode => ':utf8'});
|
||||
my $provider = $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0];
|
||||
$provider->options($options);
|
||||
@@ -177,8 +181,7 @@ sub options { @_ > 1 ? $_[0]->{options} = $_[1] : $_[0]->{options} }
|
||||
|
||||
sub _template_modified {
|
||||
my($self, $template) = @_;
|
||||
return 1 if $self->SUPER::_template_modified($template);
|
||||
return $template =~ /^templates(?:\/|\\)/;
|
||||
$self->SUPER::_template_modified($template) || $template =~ /^templates(?:\/|\\)/;
|
||||
}
|
||||
|
||||
sub _template_content {
|
||||
|
||||
37
t/lite_app_with_default_layouts.t
Normal file
37
t/lite_app_with_default_layouts.t
Normal file
@@ -0,0 +1,37 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
BEGIN { $ENV{MOJO_MODE}='testing'; };
|
||||
|
||||
use utf8;
|
||||
|
||||
use Test::More tests => 3;
|
||||
|
||||
use Mojolicious::Lite;
|
||||
use Mojo::ByteStream 'b';
|
||||
use Test::Mojo;
|
||||
use File::Temp qw( tempdir );
|
||||
|
||||
# Silence
|
||||
app->log->level('fatal');
|
||||
|
||||
use_ok('Mojolicious::Plugin::TtRenderer::Engine');
|
||||
|
||||
plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1, COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
|
||||
app->defaults(layout => 'wrapper');
|
||||
|
||||
get '/test' => 'test';
|
||||
|
||||
my $t = Test::Mojo->new;
|
||||
|
||||
$t->get_ok('/test')->content_is("WS-hello-EW");
|
||||
|
||||
__DATA__
|
||||
|
||||
@@ test.html.tt
|
||||
hello
|
||||
|
||||
@@ layouts/wrapper.html.tt
|
||||
WS-[%- content -%]-EW
|
||||
Reference in New Issue
Block a user