Compare commits

..
2 Commits
Author SHA1 Message Date
Graham Ollis 5c11f60f3d remove / prefix 2014-10-21 16:13:24 -04:00
Graham Ollis 2a9d4476c7 rm old test 2014-10-21 16:12:58 -04:00
8 changed files with 104 additions and 127 deletions
-6
View File
@@ -2,12 +2,6 @@ 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
- cpantesters: do not report on older perls
1.53 2014-05-31 06:22:47 -0400 1.53 2014-05-31 06:22:47 -0400
- Mojolicious 5.0 support - Mojolicious 5.0 support
+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) 2015 by Ask Bjørn Hansen. This software is copyright (c) 2014 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 -3
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.55 version = 1.53
[@Author::Plicease] [@Author::Plicease]
release_tests = 1 release_tests = 1
@@ -13,7 +13,7 @@ travis_status = 1
installer = ModuleBuild installer = ModuleBuild
[Prereqs] [Prereqs]
Mojolicious = 5.81 Mojolicious = 3.33
Template = 2.18 Template = 2.18
[Author::Plicease::Thanks] [Author::Plicease::Thanks]
@@ -65,4 +65,3 @@ remove = Mojo::IOLoop
remove = Mojolicious::Lite remove = Mojolicious::Lite
remove = Test::Mojo remove = Test::Mojo
[Author::Plicease::InstallerPerlVersion]
+9 -7
View File
@@ -21,7 +21,7 @@ sub build {
my $self = shift->SUPER::new(@_); my $self = shift->SUPER::new(@_);
weaken($self->{app}); weaken($self->{app});
$self->_init(@_); $self->_init(@_);
sub { $self->_render(@_) } return sub { $self->_render(@_) }
} }
sub _init { sub _init {
@@ -68,7 +68,7 @@ sub _init {
$self->tt(Template->new(\%config)) $self->tt(Template->new(\%config))
or Carp::croak "Could not initialize Template object: $Template::ERROR"; or Carp::croak "Could not initialize Template object: $Template::ERROR";
$self; return $self;
} }
sub _render { sub _render {
@@ -102,6 +102,7 @@ sub _render {
$self->tt->process(\$inline, @params); $self->tt->process(\$inline, @params);
} }
else { else {
$t =~ s{^/}{};
my @ret = $provider->fetch($t); my @ret = $provider->fetch($t);
if (not defined $ret[1]) { if (not defined $ret[1]) {
@@ -120,7 +121,7 @@ sub _render {
# Error # Error
die $self->tt->error unless $ok; die $self->tt->error unless $ok;
1; return 1;
} }
1; # End of Mojolicious::Plugin::TtRenderer::Engine 1; # End of Mojolicious::Plugin::TtRenderer::Engine
@@ -150,7 +151,7 @@ sub AUTOLOAD {
die qq/Unknown helper: $method/ unless $self->ctx->app->renderer->helpers->{$method}; die qq/Unknown helper: $method/ unless $self->ctx->app->renderer->helpers->{$method};
$self->ctx->$method(@_); return $self->ctx->$method(@_);
} }
1; 1;
@@ -173,7 +174,7 @@ sub new {
my $self = $class->SUPER::new(%params); my $self = $class->SUPER::new(%params);
$self->renderer($renderer); $self->renderer($renderer);
weaken($self->{renderer}); weaken($self->{renderer});
$self; return $self;
} }
sub renderer { @_ > 1 ? $_[0]->{renderer} = $_[1] : $_[0]->{renderer} } sub renderer { @_ > 1 ? $_[0]->{renderer} = $_[1] : $_[0]->{renderer} }
@@ -206,8 +207,9 @@ 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 = Mojo::Loader::data_section($class, $t); $data = $loader->data($class, $t);
last if $data; last if $data;
} }
} }
@@ -216,7 +218,7 @@ sub _template_content {
$data = ''; $data = '';
$error = "$path: not found"; $error = "$path: not found";
} }
wantarray ? ($data, $error, time) : $data; return wantarray ? ($data, $error, time) : $data;
} }
1; 1;
+1 -3
View File
@@ -11,12 +11,10 @@ BEGIN {
} || die $@; } || die $@;
do { do {
my $fh; my $fh;
if(open($fh, '<', File::Spec->catfile($FindBin::Bin, '00_diag.pre.txt'))) open($fh, '<', File::Spec->catfile($FindBin::Bin, '00_diag.pre.txt'));
{
@modules = <$fh>; @modules = <$fh>;
close $fh; close $fh;
chomp @modules; chomp @modules;
}
}; };
eval qq{ require $_ } for @modules; eval qq{ require $_ } for @modules;
}; };
+1 -2
View File
@@ -3,7 +3,7 @@ use warnings;
use Test::More; use Test::More;
BEGIN { BEGIN {
plan skip_all => 'test requires Test::Fixme' plan skip_all => 'test requires Test::Fixme'
unless eval q{ use Test::Fixme 0.14; 1 }; unless eval q{ use Test::Fixme; 1 };
}; };
use Test::Fixme 0.07; use Test::Fixme 0.07;
use FindBin; use FindBin;
@@ -14,6 +14,5 @@ chdir(File::Spec->catdir($FindBin::Bin, File::Spec->updir, File::Spec->updir));
run_tests( run_tests(
match => qr/FIXME/, match => qr/FIXME/,
where => [ grep { -e $_ } qw( bin lib t Makefile.PL )], where => [ grep { -e $_ } qw( bin lib t Makefile.PL )],
warn => 1,
); );
-3
View File
@@ -27,9 +27,6 @@ chdir(File::Spec->catdir($FindBin::Bin, File::Spec->updir, File::Spec->updir));
my @private_classes; my @private_classes;
my %private_methods; my %private_methods;
push @{ $config->{pod_coverage}->{private} },
'Alien::.*::Install::Files#Inline';
foreach my $private (@{ $config->{pod_coverage}->{private} }) foreach my $private (@{ $config->{pod_coverage}->{private} })
{ {
my($class,$method) = split /#/, $private; my($class,$method) = split /#/, $private;
-12
View File
@@ -4,23 +4,11 @@ use Test::More;
BEGIN { BEGIN {
plan skip_all => 'test requires Test::Pod::Spelling::CommonMistakes' plan skip_all => 'test requires Test::Pod::Spelling::CommonMistakes'
unless eval q{ use Test::Pod::Spelling::CommonMistakes; 1 }; unless eval q{ use Test::Pod::Spelling::CommonMistakes; 1 };
plan skip_all => 'test requires YAML'
unless eval q{ use YAML qw( LoadFile ); 1 };
}; };
use Test::Pod::Spelling::CommonMistakes; use Test::Pod::Spelling::CommonMistakes;
use FindBin; use FindBin;
use File::Spec; use File::Spec;
my $config_filename = File::Spec->catfile(
$FindBin::Bin, 'release.yml'
);
my $config;
$config = LoadFile($config_filename)
if -r $config_filename;
plan skip_all => 'disabled' if $config->{pod_spelling_common}->{skip};
chdir(File::Spec->catdir($FindBin::Bin, File::Spec->updir, File::Spec->updir)); chdir(File::Spec->catdir($FindBin::Bin, File::Spec->updir, File::Spec->updir));
# FIXME test files in bin too. # FIXME test files in bin too.