Compare commits

...
3 Commits
Author SHA1 Message Date
Graham Ollis bba3793735 v1.55
- Mojo 6.x compat
2015-02-28 10:32:15 -05:00
Graham Ollis ac65e8797e update changes 2015-02-28 10:31:34 -05:00
Graham Ollis 32f8daf9cd mojo 6.x compat 2015-02-28 10:31:27 -05:00
5 changed files with 10 additions and 77 deletions

No files matched your search

+3
View File
@@ -2,6 +2,9 @@ Revision history for Mojolicious::Plugin::TtRenderer
{{$NEXT}} {{$NEXT}}
1.55 2015-02-28 10:31:58 -0500
- Mojo 6.x compat
1.54 2014-12-20 10:17:47 -0500 1.54 2014-12-20 10:17:47 -0500
- cpantesters: do not report on older perls - cpantesters: do not report on older perls
+4 -4
View File
@@ -187,11 +187,11 @@ distribution, including the support files required for the full
# AUTHOR # AUTHOR
original author: Ask Bjørn Hansen Original author: Ask Bjørn Hansen
current maintainer: Graham Ollis <plicease@cpan.org> Current maintainer: Graham Ollis <plicease@cpan.org>
contributors: Contributors:
vti vti
@@ -225,7 +225,7 @@ uwisser
# COPYRIGHT AND LICENSE # COPYRIGHT AND LICENSE
This software is copyright (c) 2014 by Ask Bjørn Hansen. This software is copyright (c) 2015 by Ask Bjørn Hansen.
This is free software; you can redistribute it and/or modify it under This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself. the same terms as the Perl 5 programming language system itself.
+2 -2
View File
@@ -5,7 +5,7 @@ license = Perl_5
copyright_holder = Ask Bjørn Hansen copyright_holder = Ask Bjørn Hansen
# copyright_year = 2009 # copyright_year = 2009
version = 1.54 version = 1.55
[@Author::Plicease] [@Author::Plicease]
release_tests = 1 release_tests = 1
@@ -13,7 +13,7 @@ travis_status = 1
installer = ModuleBuild installer = ModuleBuild
[Prereqs] [Prereqs]
Mojolicious = 3.33 Mojolicious = 5.81
Template = 2.18 Template = 2.18
[Author::Plicease::Thanks] [Author::Plicease::Thanks]
+1 -2
View File
@@ -206,9 +206,8 @@ sub _template_content {
if(defined $options) { if(defined $options) {
$data = $self->renderer->get_data_template($options); $data = $self->renderer->get_data_template($options);
} else { } else {
my $loader = Mojo::Loader->new;
foreach my $class (@{ $self->renderer->classes }) { foreach my $class (@{ $self->renderer->classes }) {
$data = $loader->data($class, $t); $data = Mojo::Loader::data_section($class, $t);
last if $data; last if $data;
} }
} }
-69
View File
@@ -1,69 +0,0 @@
#!/usr/bin/env perl
use strict;
use warnings;
#BEGIN { $ENV{MOJO_MODE}='testing'; };
use utf8;
use Test::More;
use Mojolicious::Lite;
use Test::Mojo;
use File::Temp qw( tempdir );
use File::Spec;
if($Mojolicious::VERSION >= 4.0)
{
plan skip_all => 'test broken in mojo 4.0';
}
else
{
plan tests => 3;
}
# Send log to tmp file so that it doesn't clutter up the screen.
app->log->level('fatal');
app->log->path(do {
File::Spec->catfile(tempdir(CLEANUP => 1), 'mojo.log');
});
plugin 'tt_renderer' => {template_options => { COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
get '/exception' => sub { die };
#say app->mode;
#app->start;
#exit;
my $t = Test::Mojo->new;
$t->app->renderer->default_handler('tt');
my $deep_recursion = 0;
do {
local $SIG{__WARN__} = sub {
my $warning = shift;
if($warning =~ /Deep recursion/) {
$deep_recursion = 1;
die $warning;
}
};
$t->get_ok('/exception')
->status_is(500);
};
ok !$deep_recursion, 'no deep recursion';
__DATA__
@@ exception.development.html.tt
[% 1 + % %]
@@ exception.html.tt
[% 1 + % %]
@@ exception.testing.html.tt
[% 1 + % %]