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
+84 -90
View File
@@ -2,203 +2,197 @@ 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
1.52 2014-05-08 19:26:47 -0400 1.52 2014-05-08 19:26:47 -0400
- updated repository name - updated repository name
1.51 2014-03-21 14:59:39 -0400 1.51 2014-03-21 14:59:39 -0400
- extended diagnostics - extended diagnostics
- documentation tweaks - documentation tweaks
- fix non-lite app example (GH#41, uwisser) - fix non-lite app example (GH#41, uwisser)
1.50 2013-08-08T16:51:21-0400 1.50 2013-08-08T16:51:21-0400
- update Changes to follow spec (GH#39, Сергей Романов) - update Changes to follow spec (GH#39, Сергей Романов)
- minor documentation fixes - minor documentation fixes
1.49 2013-08-08T09:18:54-0400 1.49 2013-08-08T09:18:54-0400
- documentation - documentation
1.48 2013-08-08T09:13:19-0400 1.48 2013-08-08T09:13:19-0400
- documentation - documentation
1.47 2013-07-26T06:07:35-0400 1.47 2013-07-26T06:07:35-0400
- Template-Toolkit 2.25 compatability - Template-Toolkit 2.25 compatability
1.46 2013-05-19 1.46 2013-05-19
- Mojolicious 4.0 compatability - Mojolicious 4.0 compatability
1.45 2013-04-26 1.45 2013-04-26
- correctly support app->default->{layout} (GH#37, Fayland Lam) - correctly support app->default->{layout} (GH#37, Fayland Lam)
1.44 2013-04-13 1.44 2013-04-13
- promote development changes to production - promote development changes to production
1.43_01 2013-04-11 1.43_01 2013-04-11
- _template_modified returns value from super class instead of 1 if true (GH#36, Fayland Lam) - _template_modified returns value from super class instead of 1 if true (GH#36, Fayland Lam)
1.43 2013-04-08 1.43 2013-04-08
- promote development changes - promote development changes
1.42_04 2013-04-06 1.42_04 2013-04-06
- Updated meta for new github repo location - Updated meta for new github repo location
1.42_03 2013-03-22 1.42_03 2013-03-22
- Allow custom relative paths for cache_dir (GH#35, Jason Crowther) - Allow custom relative paths for cache_dir (GH#35, Jason Crowther)
1.42_02 2013-02-26 1.42_02 2013-02-26
- only create COMPILE_DIR based on UID if the user doesn't specify COMPILE_DIR - only create COMPILE_DIR based on UID if the user doesn't specify COMPILE_DIR
1.42_01 2013-02-24 1.42_01 2013-02-24
- set COMPILE_DIR based on UID so that multiple users can use TtRenderer with default config - set COMPILE_DIR based on UID so that multiple users can use TtRenderer with default config
1.42 2013-02-24 1.42 2013-02-24
- fix for test on solaris - fix for test on solaris
1.41 2013-02-23 1.41 2013-02-23
- Additional testing diagnostics - Additional testing diagnostics
1.40 2013-02-20 1.40 2013-02-20
- Added diagnostic for IO loop implementation in testing - Added diagnostic for IO loop implementation in testing
1.39 2013-01-28 1.39 2013-01-28
- Documentation updates. - Documentation updates.
1.38 2013-01-27 1.38 2013-01-27
- fixed but where DATA templates were not being rendered with empty renderer path - fixed but where DATA templates were not being rendered with empty renderer path
1.37 2013-01-12 1.37 2013-01-12
- fix default_template2.t to use temp directory for COMPILE_DIR - fix default_template2.t to use temp directory for COMPILE_DIR
1.36 2013-01-09 1.36 2013-01-09
- Use $provider->fetch to find templates (GH#34) - Use $provider->fetch to find templates (GH#34)
1.35 2012-12-30 1.35 2012-12-30
- Documentation fix - Documentation fix
1.34 2012-12-29 1.34 2012-12-29
- Include META.json in distribution. - Include META.json in distribution.
1.33 2012-12-27 1.33 2012-12-27
- Fix hang in t/deep_recursion.t on *BSD - Fix hang in t/deep_recursion.t on *BSD
1.32 2012-12-27 1.32 2012-12-27
- 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.31 2012-12-26 1.31 2012-12-26
- Set locale "C" in tests that rely on it - Set locale "C" in tests that rely on it
1.30 2012-12-22 1.30 2012-12-22
- Don't rely on English locale in the test t/tt_plugin_lite_app.t - Don't rely on English locale in the test t/tt_plugin_lite_app.t
1.29 2012-12-18 1.29 2012-12-18
- support multiple renderer paths - support multiple renderer paths
1.28 2012-10-11 1.28 2012-10-11
- specify minimum perl version - specify minimum perl version
1.27 2012-10-02 1.27 2012-10-02
- documentation fixes and updates. - documentation fixes and updates.
1.26 2012-08-31 1.26 2012-08-31
- Windows compatability with Cwd::abs_path - Windows compatability with Cwd::abs_path
1.25 2012-08-25 1.25 2012-08-25
- Return 0 on not found, die on error (GH#30) - Return 0 on not found, die on error (GH#30)
1.24 2012-08-23 1.24 2012-08-23
- Compatibility with Mojolicious 3.33+ - Compatibility with Mojolicious 3.33+
1.23 2012-08-23 1.23 2012-08-23
- Use die instead of render_exception (GH#29) - Use die instead of render_exception (GH#29)
1.22 2012-08-21 1.22 2012-08-21
- Compatibility with Mojolicious 3.05+ (GH#24) - Compatibility with Mojolicious 3.05+ (GH#24)
- Avoid deep recursion when exception template dies (GH#25,GH26) - Avoid deep recursion when exception template dies (GH#25,GH26)
- Fixed test failures (GH#27,GH#28) - Fixed test failures (GH#27,GH#28)
1.21 2012-06-05 1.21 2012-06-05
- Fixed double TT rendering on error (Matthias Bethke (GH#21)) - Fixed double TT rendering on error (Matthias Bethke (GH#21))
- Cache templates in tmpdir by default (Marcus Ramberg) - Cache templates in tmpdir by default (Marcus Ramberg)
- Require Mojolicious 2.51 to avoid memory leaks (GH#19) - Require Mojolicious 2.51 to avoid memory leaks (GH#19)
- Document the 'c' stash variable (RT#70866, Matthias Bethke) - Document the 'c' stash variable (RT#70866, Matthias Bethke)
- Fix memory leaks, add tests for them (GH#18, Magnus Holm) - Fix memory leaks, add tests for them (GH#18, Magnus Holm)
- Use app->renderer->paths to find template directories (GH#17) - Use app->renderer->paths to find template directories (GH#17)
1.20 2011-08-01 1.20 2011-08-01
- Drop use of MojoX namespace for Mojolicious::Plugin::TtRenderer:: - Drop use of MojoX namespace for Mojolicious::Plugin::TtRenderer::
(GH#12, Cosimo Streppone) (GH#12, Cosimo Streppone)
1.13 2011-06-07 1.13 2011-06-07
- Compatibility with Mojolicious 1.3+ - Compatibility with Mojolicious 1.3+
1.12 2011-02-28 1.12 2011-02-28
- Inline wrappers and includes now work on Windows - Inline wrappers and includes now work on Windows
(GH#13, Christiaan Kras) (GH#13, Christiaan Kras)
1.11 2011-02-06 1.11 2011-02-06
- Change to use relative paths (Marcus Ramberg) - Change to use relative paths (Marcus Ramberg)
- Add exception template for tests - Add exception template for tests
1.10 2011-02-05 1.10 2011-02-05
- Support Mojolicious 'layout'/'extends' (Maxim Vuets, Marcus - Support Mojolicious 'layout'/'extends' (Maxim Vuets, Marcus
Ramberg) Ramberg)
- Fix Strawberry Perl tests (RT#65282, Christiaan Kras, Ask) - Fix Strawberry Perl tests (RT#65282, Christiaan Kras, Ask)
- Update bugtracker URL in META.yml - Update bugtracker URL in META.yml
1.0 2011-01-22 1.0 2011-01-22
- Require (and be compatible with) Mojolicious 1.0+ - Require (and be compatible with) Mojolicious 1.0+
- Added inline template support (Viacheslav Tykhanovskyi & Ask) - Added inline template support (Viacheslav Tykhanovskyi & Ask)
- Fix inline rendering and test failures (Marcus Ramberg) - Fix inline rendering and test failures (Marcus Ramberg)
- Fixed helper compatibility with Mojolicious 1.0 (Árpád Szász) - Fixed helper compatibility with Mojolicious 1.0 (Árpád Szász)
- Support new mojolicious error template (Marcus) - Support new mojolicious error template (Marcus)
- Fix unicode test (Marcus & Spleenjack) - Fix unicode test (Marcus & Spleenjack)
- Replaced deprecated Mojo dependence with Mojolicious (spleenjack) - Replaced deprecated Mojo dependence with Mojolicious (spleenjack)
0.40 2010-08-02 0.40 2010-08-02
- Updated for newer Mojo (Viacheslav Tykhanovskyi) - Updated for newer Mojo (Viacheslav Tykhanovskyi)
- Added helpers (Viacheslav Tykhanovskyi) - Added helpers (Viacheslav Tykhanovskyi)
- Documentation updates - Documentation updates
0.31 2009-09-11 0.31 2009-09-11
- Remove deprecated 'new' method - Remove deprecated 'new' method
- Update MANIFEST (oops, thanks Sebastian) - Update MANIFEST (oops, thanks Sebastian)
0.30 2009-09-09 0.30 2009-09-09
- Revert the change of template_path stash key - Revert the change of template_path stash key
- Reflect recent changes in mojo project (v0.991251) (Sebastian Knapp) - Reflect recent changes in mojo project (v0.991251) (Sebastian Knapp)
- One test with Mojolicious added (Sebastian Knapp) - One test with Mojolicious added (Sebastian Knapp)
0.21 2009-07-29 0.21 2009-07-29
- Update stash key from 'template_path' to 'template' to - Update stash key from 'template_path' to 'template' to
match mojo change (Sebastian Knapp) match mojo change (Sebastian Knapp)
0.20 2008-12-09 0.20 2008-12-09
- Updates to work with Mojo 0.9 - Updates to work with Mojo 0.9
- Add default INCLUDE_PATH - Add default INCLUDE_PATH
- Made default compile dir not Unix specific (Viacheslav - Made default compile dir not Unix specific (Viacheslav
Tykhanovskyi) Tykhanovskyi)
0.10 2008-11-12 0.10 2008-11-12
- Update to work with named parameters in new version of Mojo - Update to work with named parameters in new version of Mojo
- Instead of "tx" pass the context in the "c" variable - Instead of "tx" pass the context in the "c" variable
- Rename "new" to "build" - Rename "new" to "build"
- Add real tests (Viacheslav Tykhanovskyi) - Add real tests (Viacheslav Tykhanovskyi)
- Update to work with new error handling in Mojo - Update to work with new error handling in Mojo
(Viacheslav Tykhanovskyi) (Viacheslav Tykhanovskyi)
0.02 2008-11-10 0.02 2008-11-10
- Add template_options parameter - Add template_options parameter
- Fix Template dependency - Fix Template dependency
0.01 2008-11-09 0.01 2008-11-09
- First version, released on an unsuspecting world. - First version, released on an unsuspecting world.
+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;
+4 -6
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.