rm unnecessary returns

- Mojo 6.x compat

.travis.yml

@@ -4,7 +4,8 @@ install:
   - cpanm -n Template
 script: HARNESS_IS_VERBOSE=1 prove -v -Ilib t
 perl:
-  - "5.19"
+  - "5.21"
+  - "5.20"
   - "5.18"
   - "5.16"
   - "5.14"

Changes

@@ -2,197 +2,203 @@ Revision history for Mojolicious::Plugin::TtRenderer
 
 {{$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
-        - Mojolicious 5.0 support
+  - Mojolicious 5.0 support
 
 1.52      2014-05-08 19:26:47 -0400
-        - updated repository name
+  - updated repository name
 
 1.51      2014-03-21 14:59:39 -0400
-        - extended diagnostics
-        - documentation tweaks
-        - fix non-lite app example (GH#41, uwisser)
+  - extended diagnostics
+  - documentation tweaks
+  - fix non-lite app example (GH#41, uwisser)
 
 1.50      2013-08-08T16:51:21-0400
-        - update Changes to follow spec (GH#39, Сергей Романов)
-        - minor documentation fixes
+  - update Changes to follow spec (GH#39, Сергей Романов)
+  - minor documentation fixes
 
 1.49    2013-08-08T09:18:54-0400
-        - documentation
+  - documentation
 
 1.48    2013-08-08T09:13:19-0400
-        - documentation
+  - documentation
 
 1.47    2013-07-26T06:07:35-0400
-        - Template-Toolkit 2.25 compatability
+  - Template-Toolkit 2.25 compatability
 
 1.46    2013-05-19
-        - Mojolicious 4.0 compatability
+  - Mojolicious 4.0 compatability
 
 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
-        - promote development changes to production
+  - promote development changes to production
 
 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
-        - promote development changes
+  - promote development changes
 
 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
-        - 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
-        - 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
-        - 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
-        - fix for test on solaris
+  - fix for test on solaris
 
 1.41    2013-02-23
-        - Additional testing diagnostics
+  - Additional testing diagnostics
 
 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
-        - Documentation updates.
+  - Documentation updates.
 
 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
-        - 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
-        - Use $provider->fetch to find templates (GH#34)
+  - Use $provider->fetch to find templates (GH#34)
 
 1.35    2012-12-30
-        - Documentation fix
+  - Documentation fix
 
 1.34    2012-12-29
-        - Include META.json in distribution.
+  - Include META.json in distribution.
 
 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
-        - silenced a few annoying warnings during test
-        - use temp directory for COMPILE_DIR in tests to avoid failures if the
+  - silenced a few annoying warnings during test
+  - use temp directory for COMPILE_DIR in tests to avoid failures if the
           default compile directory already exists and is owned by someone else.
 
 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
-        - 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
-        - support multiple renderer paths
+  - support multiple renderer paths
 
 1.28    2012-10-11
-        - specify minimum perl version
+  - specify minimum perl version
 
 1.27    2012-10-02
-        - documentation fixes and updates.
+  - documentation fixes and updates.
 
 1.26    2012-08-31
-        - Windows compatability with Cwd::abs_path
+  - Windows compatability with Cwd::abs_path
 
 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
-        - Compatibility with Mojolicious 3.33+
+  - Compatibility with Mojolicious 3.33+
 
 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
-        - Compatibility with Mojolicious 3.05+ (GH#24)
-        - Avoid deep recursion when exception template dies (GH#25,GH26)
-        - Fixed test failures (GH#27,GH#28)
+  - Compatibility with Mojolicious 3.05+ (GH#24)
+  - Avoid deep recursion when exception template dies (GH#25,GH26)
+  - Fixed test failures (GH#27,GH#28)
 
 1.21    2012-06-05
-        - Fixed double TT rendering on error (Matthias Bethke (GH#21))
-        - Cache templates in tmpdir by default (Marcus Ramberg)
-        - Require Mojolicious 2.51 to avoid memory leaks (GH#19)
-        - Document the 'c' stash variable (RT#70866, Matthias Bethke)
-        - Fix memory leaks, add tests for them (GH#18, Magnus Holm)
-        - Use app->renderer->paths to find template directories (GH#17)
+  - Fixed double TT rendering on error (Matthias Bethke (GH#21))
+  - Cache templates in tmpdir by default (Marcus Ramberg)
+  - Require Mojolicious 2.51 to avoid memory leaks (GH#19)
+  - Document the 'c' stash variable (RT#70866, Matthias Bethke)
+  - Fix memory leaks, add tests for them (GH#18, Magnus Holm)
+  - Use app->renderer->paths to find template directories (GH#17)
 
 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)
 
 1.13    2011-06-07
-        - Compatibility with Mojolicious 1.3+
+  - Compatibility with Mojolicious 1.3+
 
 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)
 
 1.11    2011-02-06
-        - Change to use relative paths (Marcus Ramberg)
-        - Add exception template for tests
+  - Change to use relative paths (Marcus Ramberg)
+  - Add exception template for tests
 
 1.10    2011-02-05
-        - Support Mojolicious 'layout'/'extends' (Maxim Vuets, Marcus
+  - Support Mojolicious 'layout'/'extends' (Maxim Vuets, Marcus
           Ramberg)
-        - Fix Strawberry Perl tests (RT#65282, Christiaan Kras, Ask)
-        - Update bugtracker URL in META.yml
+  - Fix Strawberry Perl tests (RT#65282, Christiaan Kras, Ask)
+  - Update bugtracker URL in META.yml
 
 1.0     2011-01-22
-        - Require (and be compatible with) Mojolicious 1.0+
-        - Added inline template support (Viacheslav Tykhanovskyi & Ask)
-        - Fix inline rendering and test failures (Marcus Ramberg)
-        - Fixed helper compatibility with Mojolicious 1.0 (Árpád Szász)
-        - Support new mojolicious error template (Marcus)
-        - Fix unicode test (Marcus & Spleenjack)
-        - Replaced deprecated Mojo dependence with Mojolicious (spleenjack)
+  - Require (and be compatible with) Mojolicious 1.0+
+  - Added inline template support (Viacheslav Tykhanovskyi & Ask)
+  - Fix inline rendering and test failures (Marcus Ramberg)
+  - Fixed helper compatibility with Mojolicious 1.0 (Árpád Szász)
+  - Support new mojolicious error template (Marcus)
+  - Fix unicode test (Marcus & Spleenjack)
+  - Replaced deprecated Mojo dependence with Mojolicious (spleenjack)
 
 0.40    2010-08-02
-        - Updated for newer Mojo (Viacheslav Tykhanovskyi)
-        - Added helpers (Viacheslav Tykhanovskyi)
-        - Documentation updates
+  - Updated for newer Mojo (Viacheslav Tykhanovskyi)
+  - Added helpers (Viacheslav Tykhanovskyi)
+  - Documentation updates
 
 0.31    2009-09-11
-        - Remove deprecated 'new' method
-        - Update MANIFEST (oops, thanks Sebastian)
+  - Remove deprecated 'new' method
+  - Update MANIFEST (oops, thanks Sebastian)
 
 0.30    2009-09-09
-        - Revert the change of template_path stash key
-        - Reflect recent changes in mojo project (v0.991251) (Sebastian Knapp)
-        - One test with Mojolicious added (Sebastian Knapp)
+  - Revert the change of template_path stash key
+  - Reflect recent changes in mojo project (v0.991251) (Sebastian Knapp)
+  - One test with Mojolicious added (Sebastian Knapp)
 
 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)
 
 0.20    2008-12-09
-        - Updates to work with Mojo 0.9
-        - Add default INCLUDE_PATH
-        - Made default compile dir not Unix specific (Viacheslav
+  - Updates to work with Mojo 0.9
+  - Add default INCLUDE_PATH
+  - Made default compile dir not Unix specific (Viacheslav
           Tykhanovskyi)
 
 0.10    2008-11-12
-        - Update to work with named parameters in new version of Mojo
-        - Instead of "tx" pass the context in the "c" variable
-        - Rename "new" to "build"
-        - Add real tests (Viacheslav Tykhanovskyi)
-        - Update to work with new error handling in Mojo
+  - Update to work with named parameters in new version of Mojo
+  - Instead of "tx" pass the context in the "c" variable
+  - Rename "new" to "build"
+  - Add real tests (Viacheslav Tykhanovskyi)
+  - Update to work with new error handling in Mojo
           (Viacheslav Tykhanovskyi)
 
 0.02    2008-11-10
-        - Add template_options parameter
-        - Fix Template dependency
+  - Add template_options parameter
+  - Fix Template dependency
 
 0.01    2008-11-09
-        - First version, released on an unsuspecting world.
+  - First version, released on an unsuspecting world.

README.md

@@ -187,11 +187,11 @@ distribution, including the support files required for the full
 
 # 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
 
@@ -225,7 +225,7 @@ uwisser
 
 # 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
 the same terms as the Perl 5 programming language system itself.

dist.ini

@@ -5,7 +5,7 @@ license = Perl_5
 copyright_holder = Ask Bjørn Hansen
 # copyright_year   = 2009
 
-version = 1.53
+version = 1.55
 
 [@Author::Plicease]
 release_tests = 1
@@ -13,7 +13,7 @@ travis_status = 1
 installer     = ModuleBuild
 
 [Prereqs]
-Mojolicious  = 3.33
+Mojolicious  = 5.81
 Template     = 2.18
 
 [Author::Plicease::Thanks]
@@ -65,3 +65,4 @@ remove = Mojo::IOLoop
 remove = Mojolicious::Lite
 remove = Test::Mojo
 
+[Author::Plicease::InstallerPerlVersion]

lib/Mojolicious/Plugin/TtRenderer/Engine.pm

@@ -21,7 +21,7 @@ sub build {
     my $self = shift->SUPER::new(@_);
     weaken($self->{app});
     $self->_init(@_);
-    return sub { $self->_render(@_) }
+    sub { $self->_render(@_) }
 }
 
 sub _init {
@@ -68,7 +68,7 @@ sub _init {
     $self->tt(Template->new(\%config))
       or Carp::croak "Could not initialize Template object: $Template::ERROR";
 
-    return $self;
+    $self;
 }
 
 sub _render {
@@ -120,7 +120,7 @@ sub _render {
     # Error
     die $self->tt->error unless $ok;
 
-    return 1;
+    1;
 }
 
 1;    # End of Mojolicious::Plugin::TtRenderer::Engine
@@ -150,7 +150,7 @@ sub AUTOLOAD {
 
     die qq/Unknown helper: $method/ unless $self->ctx->app->renderer->helpers->{$method};
 
-    return $self->ctx->$method(@_);
+    $self->ctx->$method(@_);
 }
 
 1;
@@ -173,7 +173,7 @@ sub new {
     my $self = $class->SUPER::new(%params);
     $self->renderer($renderer);
     weaken($self->{renderer});
-    return $self;
+    $self;
 }
 
 sub renderer      { @_ > 1 ? $_[0]->{renderer}      = $_[1] : $_[0]->{renderer} }
@@ -206,9 +206,8 @@ sub _template_content {
     if(defined $options) {
         $data = $self->renderer->get_data_template($options);
     } else {
-        my $loader = Mojo::Loader->new;
         foreach my $class (@{ $self->renderer->classes }) {
-            $data = $loader->data($class, $t);
+            $data = Mojo::Loader::data_section($class, $t);
             last if $data;
         }
     }
@@ -217,7 +216,7 @@ sub _template_content {
         $data = '';
         $error = "$path: not found";
     }
-    return wantarray ? ($data, $error, time) : $data;
+    wantarray ? ($data, $error, time) : $data;
 }
 
 1;

t/00_diag.t

@@ -11,10 +11,12 @@ BEGIN {
   } || die $@;
   do {
     my $fh;
-    open($fh, '<', File::Spec->catfile($FindBin::Bin, '00_diag.pre.txt'));
-    @modules = <$fh>;
-    close $fh;
-    chomp @modules;
+    if(open($fh, '<', File::Spec->catfile($FindBin::Bin, '00_diag.pre.txt')))
+    {
+      @modules = <$fh>;
+      close $fh;
+      chomp @modules;
+    }
   };
   eval qq{ require $_ } for @modules;
 };

t/deep_recursion.t

@@ -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 + % %]

xt/release/fixme.t

@@ -3,7 +3,7 @@ use warnings;
 use Test::More;
 BEGIN { 
   plan skip_all => 'test requires Test::Fixme' 
-    unless eval q{ use Test::Fixme; 1 };
+    unless eval q{ use Test::Fixme 0.14; 1 };
 };
 use Test::Fixme 0.07;
 use FindBin;
@@ -14,5 +14,6 @@ chdir(File::Spec->catdir($FindBin::Bin, File::Spec->updir, File::Spec->updir));
 run_tests(
   match => qr/FIXME/,
   where => [ grep { -e $_ } qw( bin lib t Makefile.PL )],
+  warn  => 1,
 );
 

xt/release/pod_coverage.t

@@ -27,6 +27,9 @@ chdir(File::Spec->catdir($FindBin::Bin, File::Spec->updir, File::Spec->updir));
 my @private_classes;
 my %private_methods;
 
+push @{ $config->{pod_coverage}->{private} },
+  'Alien::.*::Install::Files#Inline';
+
 foreach my $private (@{ $config->{pod_coverage}->{private} })
 {
   my($class,$method) = split /#/, $private;

xt/release/pod_spelling_common.t

@@ -4,11 +4,23 @@ use Test::More;
 BEGIN { 
   plan skip_all => 'test requires Test::Pod::Spelling::CommonMistakes' 
     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 FindBin;
 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));
 
 # FIXME test files in bin too.