diff -Nru libmason-perl-2.20/Changes libmason-perl-2.21/Changes --- libmason-perl-2.20/Changes 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/Changes 2014-01-18 21:27:52.000000000 +0000 @@ -2,6 +2,15 @@ ** marks an incompatible change +2.21 Jan 18, 2014 + +* Fixes + - Replace deprecated Class::MOP methods with Class::Load - perl-mason/pull/21 (Leeft) + +* Improvements + - Add class_header shortcut to add to each component class header - perl-mason/pull/14 + (jomo666) + 2.20 Jul 12, 2012 * Improvements diff -Nru libmason-perl-2.20/LICENSE libmason-perl-2.21/LICENSE --- libmason-perl-2.20/LICENSE 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/LICENSE 2014-01-18 21:27:52.000000000 +0000 @@ -18,15 +18,16 @@ The GNU General Public License, Version 1, February 1989 - GNU GENERAL PUBLIC LICENSE - Version 1, February 1989 + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 Copyright (C) 1989 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The license agreements of most software companies try to keep users at the mercy of those companies. By contrast, our General Public @@ -67,7 +68,7 @@ The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any program or other work which @@ -185,7 +186,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -207,9 +208,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + Appendix: How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to humanity, the best way to achieve this is to make it @@ -235,8 +236,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + Also add information on how to contact you by electronic and paper mail. diff -Nru libmason-perl-2.20/META.json libmason-perl-2.21/META.json --- libmason-perl-2.20/META.json 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/META.json 2014-01-18 21:27:52.000000000 +0000 @@ -4,7 +4,7 @@ "Jonathan Swartz " ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 4.200008, CPAN::Meta::Converter version 2.113640", + "generated_by" : "Dist::Zilla version 4.300034, CPAN::Meta::Converter version 2.131560", "license" : [ "perl_5" ], @@ -35,29 +35,30 @@ }, "runtime" : { "requires" : { - "Capture::Tiny" : 0, - "Class::Unload" : 0, - "Devel::GlobalDestruction" : 0, - "Exception::Class" : 0, - "File::Spec" : 0, - "File::Temp" : 0, - "Guard" : 0, - "IPC::System::Simple" : 0, - "JSON" : 0, + "Capture::Tiny" : "0", + "Class::Load" : "0", + "Class::Unload" : "0", + "Devel::GlobalDestruction" : "0", + "Exception::Class" : "0", + "File::Spec" : "0", + "File::Temp" : "0", + "Guard" : "0", + "IPC::System::Simple" : "0", + "JSON" : "0", "Log::Any" : "0.08", - "Memoize" : 0, - "Method::Signatures::Simple" : 0, + "Memoize" : "0", + "Method::Signatures::Simple" : "0", "Moose" : "1.15", "MooseX::HasDefaults" : "0.03", "MooseX::StrictConstructor" : "0.13", "Scalar::Util" : "1.01", - "Try::Tiny" : 0 + "Try::Tiny" : "0" } }, "test" : { "requires" : { - "Test::Class::Most" : 0, - "Test::LongString" : 0 + "Test::Class::Most" : "0", + "Test::LongString" : "0" } } }, @@ -73,6 +74,6 @@ "web" : "https://github.com/jonswar/perl-mason" } }, - "version" : "2.20" + "version" : "2.21" } diff -Nru libmason-perl-2.20/META.yml libmason-perl-2.21/META.yml --- libmason-perl-2.20/META.yml 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/META.yml 2014-01-18 21:27:52.000000000 +0000 @@ -8,7 +8,7 @@ configure_requires: ExtUtils::MakeMaker: 6.30 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.200008, CPAN::Meta::Converter version 2.113640' +generated_by: 'Dist::Zilla version 4.300034, CPAN::Meta::Converter version 2.131560' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -27,6 +27,7 @@ - lib/Mason/Util.pm requires: Capture::Tiny: 0 + Class::Load: 0 Class::Unload: 0 Devel::GlobalDestruction: 0 Exception::Class: 0 @@ -46,4 +47,4 @@ resources: bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=Mason repository: git://github.com/jonswar/perl-mason.git -version: 2.20 +version: 2.21 diff -Nru libmason-perl-2.20/Makefile.PL libmason-perl-2.21/Makefile.PL --- libmason-perl-2.20/Makefile.PL 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/Makefile.PL 2014-01-18 21:27:52.000000000 +0000 @@ -9,47 +9,62 @@ my %WriteMakefileArgs = ( - 'ABSTRACT' => 'Powerful, high-performance templating for the web and beyond', - 'AUTHOR' => 'Jonathan Swartz ', - 'BUILD_REQUIRES' => { - 'Test::Class::Most' => '0', - 'Test::LongString' => '0' + "ABSTRACT" => "Powerful, high-performance templating for the web and beyond", + "AUTHOR" => "Jonathan Swartz ", + "BUILD_REQUIRES" => {}, + "CONFIGURE_REQUIRES" => { + "ExtUtils::MakeMaker" => "6.30" }, - 'CONFIGURE_REQUIRES' => { - 'ExtUtils::MakeMaker' => '6.30' - }, - 'DISTNAME' => 'Mason', - 'EXE_FILES' => [ - 'bin/mason.pl' + "DISTNAME" => "Mason", + "EXE_FILES" => [ + "bin/mason.pl" ], - 'LICENSE' => 'perl', - 'NAME' => 'Mason', - 'PREREQ_PM' => { - 'Capture::Tiny' => '0', - 'Class::Unload' => '0', - 'Devel::GlobalDestruction' => '0', - 'Exception::Class' => '0', - 'File::Spec' => '0', - 'File::Temp' => '0', - 'Guard' => '0', - 'IPC::System::Simple' => '0', - 'JSON' => '0', - 'Log::Any' => '0.08', - 'Memoize' => '0', - 'Method::Signatures::Simple' => '0', - 'Moose' => '1.15', - 'MooseX::HasDefaults' => '0.03', - 'MooseX::StrictConstructor' => '0.13', - 'Scalar::Util' => '1.01', - 'Try::Tiny' => '0' + "LICENSE" => "perl", + "NAME" => "Mason", + "PREREQ_PM" => { + "Capture::Tiny" => 0, + "Class::Load" => 0, + "Class::Unload" => 0, + "Devel::GlobalDestruction" => 0, + "Exception::Class" => 0, + "File::Spec" => 0, + "File::Temp" => 0, + "Guard" => 0, + "IPC::System::Simple" => 0, + "JSON" => 0, + "Log::Any" => "0.08", + "Memoize" => 0, + "Method::Signatures::Simple" => 0, + "Moose" => "1.15", + "MooseX::HasDefaults" => "0.03", + "MooseX::StrictConstructor" => "0.13", + "Scalar::Util" => "1.01", + "Try::Tiny" => 0 + }, + "TEST_REQUIRES" => { + "Test::Class::Most" => 0, + "Test::LongString" => 0 }, - 'VERSION' => '2.20', - 'test' => { - 'TESTS' => 't/*.t' + "VERSION" => "2.21", + "test" => { + "TESTS" => "t/*.t" } ); +unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) { + my $tr = delete $WriteMakefileArgs{TEST_REQUIRES}; + my $br = $WriteMakefileArgs{BUILD_REQUIRES}; + for my $mod ( keys %$tr ) { + if ( exists $br->{$mod} ) { + $br->{$mod} = $tr->{$mod} if $tr->{$mod} > $br->{$mod}; + } + else { + $br->{$mod} = $tr->{$mod}; + } + } +} + unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) { my $br = delete $WriteMakefileArgs{BUILD_REQUIRES}; my $pp = $WriteMakefileArgs{PREREQ_PM}; diff -Nru libmason-perl-2.20/bin/mason.pl libmason-perl-2.21/bin/mason.pl --- libmason-perl-2.20/bin/mason.pl 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/bin/mason.pl 2014-01-18 21:27:52.000000000 +0000 @@ -5,7 +5,7 @@ use Mason::App; Mason::App->run(); - +__END__ =pod @@ -79,7 +79,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/debian/changelog libmason-perl-2.21/debian/changelog --- libmason-perl-2.20/debian/changelog 2012-08-14 19:47:11.000000000 +0000 +++ libmason-perl-2.21/debian/changelog 2014-01-20 20:45:54.000000000 +0000 @@ -1,3 +1,19 @@ +libmason-perl (2.21-1) unstable; urgency=low + + [ Salvatore Bonaccorso ] + * Change Vcs-Git to canonical URI (git://anonscm.debian.org) + * Change search.cpan.org based URIs to metacpan.org based URIs + + [ Florian Schlichting ] + * Import Upstream version 2.21 + * Add (build-)dependency on Class::Load + * Email change: Florian Schlichting -> fsfs@debian.org + * Update years of packaging copyright + * Declare compliance with Debian Policy 3.9.5 + * New fix-pod2man-errors.patch + + -- Florian Schlichting Mon, 20 Jan 2014 21:28:59 +0100 + libmason-perl (2.20-1) unstable; urgency=low * Imported Upstream version 2.20. diff -Nru libmason-perl-2.20/debian/control libmason-perl-2.21/debian/control --- libmason-perl-2.20/debian/control 2012-08-14 19:47:11.000000000 +0000 +++ libmason-perl-2.21/debian/control 2014-01-20 20:28:38.000000000 +0000 @@ -2,10 +2,11 @@ Section: perl Priority: optional Maintainer: Debian Perl Group -Uploaders: Florian Schlichting +Uploaders: Florian Schlichting Build-Depends: debhelper (>= 8) Build-Depends-Indep: perl, libcapture-tiny-perl, + libclass-load-perl, libclass-unload-perl, libdevel-globaldestruction-perl, libexception-class-perl, @@ -20,15 +21,16 @@ libtry-tiny-perl, libtest-class-most-perl, libtest-longstring-perl -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libmason-perl.git -Vcs-Git: git://git.debian.org/pkg-perl/packages/libmason-perl.git -Homepage: http://search.cpan.org/dist/Mason/ +Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libmason-perl.git +Homepage: https://metacpan.org/release/Mason/ Package: libmason-perl Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, libcapture-tiny-perl, + libclass-load-perl, libclass-unload-perl, libdevel-globaldestruction-perl, libexception-class-perl, diff -Nru libmason-perl-2.20/debian/copyright libmason-perl-2.21/debian/copyright --- libmason-perl-2.20/debian/copyright 2012-08-14 19:47:11.000000000 +0000 +++ libmason-perl-2.21/debian/copyright 2014-01-20 20:28:09.000000000 +0000 @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: Jonathan Swartz -Source: http://search.cpan.org/dist/Mason/ +Source: https://metacpan.org/release/Mason/ Upstream-Name: Mason Files: * @@ -8,7 +8,7 @@ License: Artistic or GPL-1+ Files: debian/* -Copyright: 2011-2012, Florian Schlichting +Copyright: 2011-2014, Florian Schlichting License: Artistic or GPL-1+ License: Artistic diff -Nru libmason-perl-2.20/debian/patches/fix-pod2man-errors.patch libmason-perl-2.21/debian/patches/fix-pod2man-errors.patch --- libmason-perl-2.20/debian/patches/fix-pod2man-errors.patch 1970-01-01 00:00:00.000000000 +0000 +++ libmason-perl-2.21/debian/patches/fix-pod2man-errors.patch 2014-01-20 20:45:54.000000000 +0000 @@ -0,0 +1,26 @@ +Description fix two pod2man errors +Author: Florian Schlichting +Forwarded: https://github.com/jonswar/perl-mason/pull/20/files + +--- a/lib/Mason/Component.pm ++++ b/lib/Mason/Component.pm +@@ -194,7 +194,7 @@ + + This method is called when the request path has a path_info portion, to + determine whether the path_info is allowed. Default is false. See +-L. ++L. + + <%class> + method allow_path_info { 1 } +--- a/lib/Mason/Plugin/LvalueAttributes.pm ++++ b/lib/Mason/Plugin/LvalueAttributes.pm +@@ -56,7 +56,7 @@ + =head1 ACKNOWLEDGEMENTS + + Inspired by Christopher Brown's +-L. ++L. + + =head1 SEE ALSO + diff -Nru libmason-perl-2.20/debian/patches/series libmason-perl-2.21/debian/patches/series --- libmason-perl-2.20/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libmason-perl-2.21/debian/patches/series 2014-01-20 20:45:54.000000000 +0000 @@ -0,0 +1 @@ +fix-pod2man-errors.patch diff -Nru libmason-perl-2.20/debian/watch libmason-perl-2.21/debian/watch --- libmason-perl-2.20/debian/watch 2012-08-14 19:47:11.000000000 +0000 +++ libmason-perl-2.21/debian/watch 2013-01-27 17:55:29.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://search.cpan.org/dist/Mason/ .*/Mason-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ +https://metacpan.org/release/Mason/ .*/Mason-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ diff -Nru libmason-perl-2.20/lib/Mason/App.pm libmason-perl-2.21/lib/Mason/App.pm --- libmason-perl-2.20/lib/Mason/App.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/App.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::App; -BEGIN { - $Mason::App::VERSION = '2.20'; +{ + $Mason::App::VERSION = '2.21'; } use Cwd qw(realpath); use File::Basename; @@ -68,7 +68,7 @@ 1; - +__END__ =pod @@ -96,7 +96,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/CodeCache.pm libmason-perl-2.21/lib/Mason/CodeCache.pm --- libmason-perl-2.20/lib/Mason/CodeCache.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/CodeCache.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::CodeCache; -BEGIN { - $Mason::CodeCache::VERSION = '2.20'; +{ + $Mason::CodeCache::VERSION = '2.21'; } use Devel::GlobalDestruction; use Mason::Moose; @@ -12,7 +12,7 @@ return $self->{datastore}->{$key}; } -method set ( $key, $data ) { +method set ($key, $data) { $self->{datastore}->{$key} = $data; } @@ -36,7 +36,7 @@ 1; - +__END__ =pod @@ -64,7 +64,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Compilation.pm libmason-perl-2.21/lib/Mason/Compilation.pm --- libmason-perl-2.20/lib/Mason/Compilation.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Compilation.pm 2014-01-18 21:27:52.000000000 +0000 @@ -3,8 +3,8 @@ # under the same terms as Perl itself. package Mason::Compilation; -BEGIN { - $Mason::Compilation::VERSION = '2.20'; +{ + $Mason::Compilation::VERSION = '2.21'; } use File::Basename qw(dirname); use Guard; @@ -97,7 +97,7 @@ } method output_class_header () { - return ""; + return $self->interp->class_header; } method parse () { @@ -191,13 +191,16 @@ ); } -method _handle_after_block () { $self->_handle_method_modifier_block( 'after', @_ ) } -method _handle_around_block () { $self->_handle_method_modifier_block( 'around', @_ ) } -method _handle_augment_block () { $self->_handle_method_modifier_block( 'augment', @_ ) } -method _handle_before_block () { $self->_handle_method_modifier_block( 'before', @_ ) } -method _handle_override_block () { $self->_handle_method_modifier_block( 'override', @_ ) } +method _handle_after_block () { $self->_handle_method_modifier_block( 'after', @_ ) } +method _handle_around_block () { $self->_handle_method_modifier_block( 'around', @_ ) } +method _handle_augment_block () { $self->_handle_method_modifier_block( 'augment', @_ ) } +method _handle_before_block () { $self->_handle_method_modifier_block( 'before', @_ ) } + +method _handle_override_block () { + $self->_handle_method_modifier_block( 'override', @_ ); +} -method _handle_method_modifier_block ( $block_type, $contents, $name ) { +method _handle_method_modifier_block ($block_type, $contents, $name) { my $modifier = $block_type; $self->_throw_syntax_error("Invalid method modifier name '$name'") @@ -366,7 +369,7 @@ $self->_output_line_number_comment . $self->_processed_perl_code($contents); } -method _handle_method_block ( $contents, $name, $arglist ) { +method _handle_method_block ($contents, $name, $arglist) { $self->_throw_syntax_error("Invalid method name '$name'") if $name !~ /^$identifier$/; @@ -413,7 +416,7 @@ $self->_handle_attributes_list( $contents, 'shared' ); } -method _handle_substitution ( $text, $filter_list ) { +method _handle_substitution ($text, $filter_list) { # This is a comment tag if all lines of text contain only whitespace # or start with whitespace and a comment marker, e.g. @@ -808,7 +811,7 @@ my $start = $type eq 'apply_filter' ? "sub {" : $modifier eq 'around' ? "around '$name' => sub {\nmy \$orig = shift; my \$self = shift;" - : $type eq 'modifier' ? "$modifier '$name' => sub {\nmy \$self = shift;" + : $type eq 'modifier' ? "$modifier '$name' => sub {\nmy \$self = shift;" : "method $name $arglist {"; my $end = $modifier ? "};" : "}"; @@ -869,7 +872,7 @@ 1; - +__END__ =pod @@ -924,14 +927,18 @@ =item output_class_header () Perl code to be added at the top of the class, just after initialization of -Moose, C<$m> and other required pieces. Empty by default. +Moose, C<$m> and other required pieces. By default it consults the +L. # Add to the top of every component class: - # use Foo; - # use Bar qw(baz); + # use Modern::Perl; + # use JSON::XS qw(encode_json decode_json); # override 'output_class_header' => sub { - return join("\n", super(), 'use Foo;', 'use Bar qw(baz);'); + return join( "\n", + super(), + 'use Modern::Perl;', + 'use JSON::XS qw(encode_json decode_json);' ); }; =item process_perl_code ($coderef) @@ -968,7 +975,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Component/ClassMeta.pm libmason-perl-2.21/lib/Mason/Component/ClassMeta.pm --- libmason-perl-2.20/lib/Mason/Component/ClassMeta.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Component/ClassMeta.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Component::ClassMeta; -BEGIN { - $Mason::Component::ClassMeta::VERSION = '2.20'; +{ + $Mason::Component::ClassMeta::VERSION = '2.21'; } use File::Basename; use Mason::Moose; @@ -41,7 +41,7 @@ 1; - +__END__ =pod @@ -112,7 +112,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Component/Import.pm libmason-perl-2.21/lib/Mason/Component/Import.pm --- libmason-perl-2.20/lib/Mason/Component/Import.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Component/Import.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Component::Import; -BEGIN { - $Mason::Component::Import::VERSION = '2.20'; +{ + $Mason::Component::Import::VERSION = '2.21'; } use strict; use warnings; @@ -19,7 +19,7 @@ 1; - +__END__ =pod @@ -49,7 +49,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Component/Moose.pm libmason-perl-2.21/lib/Mason/Component/Moose.pm --- libmason-perl-2.20/lib/Mason/Component/Moose.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Component/Moose.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Component::Moose; -BEGIN { - $Mason::Component::Moose::VERSION = '2.20'; +{ + $Mason::Component::Moose::VERSION = '2.21'; } ## no critic (Moose::RequireMakeImmutable) use Moose (); use MooseX::HasDefaults::RW (); @@ -25,7 +25,7 @@ 1; - +__END__ =pod @@ -81,7 +81,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Component.pm libmason-perl-2.21/lib/Mason/Component.pm --- libmason-perl-2.20/lib/Mason/Component.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Component.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Component; -BEGIN { - $Mason::Component::VERSION = '2.20'; +{ + $Mason::Component::VERSION = '2.21'; } use Moose; # no Mason::Moose - don't want StrictConstructor use MooseX::HasDefaults::RO; @@ -69,7 +69,7 @@ 1; - +__END__ =pod @@ -197,7 +197,7 @@ L. <%class> - CLASS->allow_path_info(1); + method allow_path_info { 1 } =back @@ -242,7 +242,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/DynamicFilter.pm libmason-perl-2.21/lib/Mason/DynamicFilter.pm --- libmason-perl-2.20/lib/Mason/DynamicFilter.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/DynamicFilter.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::DynamicFilter; -BEGIN { - $Mason::DynamicFilter::VERSION = '2.20'; +{ + $Mason::DynamicFilter::VERSION = '2.21'; } use Mason::Moose; diff -Nru libmason-perl-2.20/lib/Mason/Exceptions.pm libmason-perl-2.21/lib/Mason/Exceptions.pm --- libmason-perl-2.20/lib/Mason/Exceptions.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Exceptions.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Exceptions; -BEGIN { - $Mason::Exceptions::VERSION = '2.20'; +{ + $Mason::Exceptions::VERSION = '2.21'; } use strict; use warnings; @@ -21,7 +21,7 @@ 1; - +__END__ =pod @@ -68,7 +68,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Filters/Standard.pm libmason-perl-2.21/lib/Mason/Filters/Standard.pm --- libmason-perl-2.20/lib/Mason/Filters/Standard.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Filters/Standard.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Filters::Standard; -BEGIN { - $Mason::Filters::Standard::VERSION = '2.20'; +{ + $Mason::Filters::Standard::VERSION = '2.21'; } use Mason::DynamicFilter; use Mason::Util; @@ -49,7 +49,7 @@ 1; - +__END__ =pod @@ -163,7 +163,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Interp.pm libmason-perl-2.21/lib/Mason/Interp.pm --- libmason-perl-2.20/lib/Mason/Interp.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Interp.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Interp; -BEGIN { - $Mason::Interp::VERSION = '2.20'; +{ + $Mason::Interp::VERSION = '2.21'; } use Carp; use Devel::GlobalDestruction; @@ -14,6 +14,7 @@ use Mason::Types; use Mason::Util qw(can_load catdir catfile combine_similar_paths find_wanted first_index is_absolute json_decode mason_canon_path read_file taint_is_on touch_file uniq write_file); +use Class::Load; use Memoize; use Moose::Util::TypeConstraints; use Mason::Moose; @@ -27,6 +28,7 @@ has 'allow_globals' => ( isa => 'ArrayRef[Str]', default => sub { [] }, trigger => sub { shift->_validate_allow_globals } ); has 'autobase_names' => ( isa => 'ArrayRef[Str]', lazy_build => 1 ); has 'autoextend_request_path' => ( isa => 'Bool', default => 1 ); +has 'class_header' => ( default => '' ); has 'comp_root' => ( required => 1, isa => 'Mason::Types::CompRoot', coerce => 1 ); has 'component_class_prefix' => ( lazy_build => 1 ); has 'data_dir' => ( lazy_build => 1 ); @@ -125,7 +127,7 @@ method _build_pure_perl_regex () { my $extensions = $self->pure_perl_extensions; if ( !@$extensions ) { - return qr/(?!)/; # matches nothing + return qr/(?!)/; # matches nothing } else { my $regex = join( '|', @$extensions ) . '$'; @@ -136,7 +138,7 @@ method _build_top_level_regex () { my $extensions = $self->top_level_extensions; if ( !@$extensions ) { - return qr/./; # matches everything + return qr/./; # matches everything } else { my $regex = join( '|', @$extensions ); @@ -391,7 +393,7 @@ $self->flush_code_cache() if defined( $self->{code_cache} ); } -method _compile ( $source_file, $path ) { +method _compile ($source_file, $path) { my $compilation = $self->compilation_class->new( source_file => $source_file, path => $path, @@ -400,7 +402,7 @@ return $compilation->compile(); } -method _compile_to_file ( $source_file, $path, $object_file ) { +method _compile_to_file ($source_file, $path, $object_file) { # We attempt to handle several cases in which a file already exists # and we wish to create a directory, or vice versa. However, not @@ -428,7 +430,7 @@ return ( $path =~ $self->top_level_regex ) ? 1 : 0; } -method _load_class_from_object_file ( $compc, $object_file, $path, $default_parent_path ) { +method _load_class_from_object_file ($compc, $object_file, $path, $default_parent_path) { my $flags = $self->_extract_flags_from_object_file($object_file); my $parent_compc = $self->_determine_parent_compc( $path, $flags ) @@ -512,7 +514,7 @@ $interp->_top_level_not_found( $request_path, \@tried_paths ) if $path eq '/'; my $name = basename($path); $path_info = - $path_info eq '/' ? "$name/" + $path_info eq '/' ? "$name/" : length($path_info) ? "$name/$path_info" : $name; $path = dirname($path); @@ -744,7 +746,7 @@ "_build_$method_name" => sub { my $self = shift; my $base_class = $self->$base_method_name; - Class::MOP::load_class($base_class); + Class::Load::load_class($base_class); return Mason::PluginManager->apply_plugins_to_class( $base_class, $name, $self->plugins ); } @@ -767,7 +769,7 @@ 1; - +__END__ =pod @@ -820,6 +822,28 @@ (by default ".mp" and ".mc") to the request path when searching for a matching page component. Defaults to true. +=item class_header + +Perl code to be added at the top of the compiled class for every component, +e.g. to bring in common features or import common methods. Default is the empty +string. + + # Add to the top of every component class: + # use Modern::Perl; + # use JSON::XS qw(encode_json decode_json); + # + my $mason = Mason->new( + ... + class_header => qq( + use Modern::Perl; + use JSON::XS qw(encode_json decode_json); + ), + ); + +This is used by +L. +For more advanced usage you can override that method in a subclass or plugin. + =item comp_root Required. The component root marks the top of your component hierarchy and @@ -1100,7 +1124,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Manual/Components.pod libmason-perl-2.21/lib/Mason/Manual/Components.pod --- libmason-perl-2.20/lib/Mason/Manual/Components.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/Components.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -146,8 +147,8 @@ $self->foo -In the rest of this documentation we will use C<$.> notation, but feel -free to substitute C<< $self-> >> conceptually and/or in reality. +In the rest of this documentation we will use C<$.> notation, but feel free to +substitute C<< $self-> >> conceptually and/or in reality. To set the attribute, you must use: @@ -423,4 +424,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual/Cookbook.pod libmason-perl-2.21/lib/Mason/Manual/Cookbook.pod --- libmason-perl-2.20/lib/Mason/Manual/Cookbook.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/Cookbook.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -46,4 +47,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual/FAQ.pod libmason-perl-2.21/lib/Mason/Manual/FAQ.pod --- libmason-perl-2.20/lib/Mason/Manual/FAQ.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/FAQ.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -172,4 +173,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual/Filters.pod libmason-perl-2.21/lib/Mason/Manual/Filters.pod --- libmason-perl-2.20/lib/Mason/Manual/Filters.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/Filters.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -29,9 +30,9 @@ call. The filtered content begins just afterwards and ends at the C<< }} >>. Both C<< {{ >> and C<< }} >> may be followed by a comment. -The expression C<< $.Trim >>, aka C<< $self->Trim >>, is a method call on -the component object which returns a filter. In general everything before the -C<< {{ >> is evaluated and is expected to return a filter or list of filters. +The expression C<< $.Trim >>, aka C<< $self->Trim >>, is a method call on the +component object which returns a filter. In general everything before the C<< +{{ >> is evaluated and is expected to return a filter or list of filters. By convention, and to avoid name clashes with other component methods, filters use CamelCase rather than traditional underscore names. @@ -46,8 +47,7 @@ There's no place like home. There's no place like home. -Since the expression C<< $.Repeat(3) >> returns a filter, it can be -curried: +Since the expression C<< $.Repeat(3) >> returns a filter, it can be curried: % my $repeat_three = $.Repeat(3); % $repeat_three {{ @@ -296,4 +296,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual/Intro.pod libmason-perl-2.21/lib/Mason/Manual/Intro.pod --- libmason-perl-2.20/lib/Mason/Manual/Intro.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/Intro.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -105,4 +106,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual/Plugins.pod libmason-perl-2.21/lib/Mason/Manual/Plugins.pod --- libmason-perl-2.20/lib/Mason/Manual/Plugins.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/Plugins.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -221,4 +222,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual/RequestDispatch.pod libmason-perl-2.21/lib/Mason/Manual/RequestDispatch.pod --- libmason-perl-2.20/lib/Mason/Manual/RequestDispatch.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/RequestDispatch.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -127,4 +128,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual/Setup.pod libmason-perl-2.21/lib/Mason/Manual/Setup.pod --- libmason-perl-2.20/lib/Mason/Manual/Setup.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/Setup.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -72,4 +73,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual/Subclasses.pod libmason-perl-2.21/lib/Mason/Manual/Subclasses.pod --- libmason-perl-2.20/lib/Mason/Manual/Subclasses.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/Subclasses.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -95,4 +96,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual/Syntax.pod libmason-perl-2.21/lib/Mason/Manual/Syntax.pod --- libmason-perl-2.20/lib/Mason/Manual/Syntax.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/Syntax.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -396,4 +397,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual/Tutorial.pod libmason-perl-2.21/lib/Mason/Manual/Tutorial.pod --- libmason-perl-2.20/lib/Mason/Manual/Tutorial.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/Tutorial.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -27,4 +28,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual/UpgradingFromMason1.pod libmason-perl-2.21/lib/Mason/Manual/UpgradingFromMason1.pod --- libmason-perl-2.20/lib/Mason/Manual/UpgradingFromMason1.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual/UpgradingFromMason1.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -124,6 +125,11 @@ =item * +The C<< <%ARGS> >> hash is gone, you can instead use C<< $.args >> or C<< +$self->args >> to get all the parameters passed to a component. + +=item * + C<< <%method> >> and C<< <%def> >> have been replaced with just C<< <%method> >>, which creates a true class method rather than a subcomponent. @@ -279,4 +285,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Manual.pod libmason-perl-2.21/lib/Mason/Manual.pod --- libmason-perl-2.20/lib/Mason/Manual.pod 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Manual.pod 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,7 @@ __END__ + =pod =head1 NAME @@ -92,4 +93,3 @@ the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libmason-perl-2.20/lib/Mason/Moose/Role.pm libmason-perl-2.21/lib/Mason/Moose/Role.pm --- libmason-perl-2.20/lib/Mason/Moose/Role.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Moose/Role.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Moose::Role; -BEGIN { - $Mason::Moose::Role::VERSION = '2.20'; +{ + $Mason::Moose::Role::VERSION = '2.21'; } use Moose::Role (); use Method::Signatures::Simple (); @@ -17,7 +17,7 @@ 1; - +__END__ =pod @@ -54,7 +54,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Moose.pm libmason-perl-2.21/lib/Mason/Moose.pm --- libmason-perl-2.20/lib/Mason/Moose.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Moose.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Moose; -BEGIN { - $Mason::Moose::VERSION = '2.20'; +{ + $Mason::Moose::VERSION = '2.21'; } ## no critic (Moose::RequireMakeImmutable) use Moose (); use MooseX::HasDefaults::RO (); @@ -27,7 +27,7 @@ 1; - +__END__ =pod @@ -67,7 +67,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Plugin/Defer/Filters.pm libmason-perl-2.21/lib/Mason/Plugin/Defer/Filters.pm --- libmason-perl-2.20/lib/Mason/Plugin/Defer/Filters.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Plugin/Defer/Filters.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Plugin::Defer::Filters; -BEGIN { - $Mason::Plugin::Defer::Filters::VERSION = '2.20'; +{ + $Mason::Plugin::Defer::Filters::VERSION = '2.21'; } use Mason::PluginRole; diff -Nru libmason-perl-2.20/lib/Mason/Plugin/Defer/Request.pm libmason-perl-2.21/lib/Mason/Plugin/Defer/Request.pm --- libmason-perl-2.20/lib/Mason/Plugin/Defer/Request.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Plugin/Defer/Request.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Plugin::Defer::Request; -BEGIN { - $Mason::Plugin::Defer::Request::VERSION = '2.20'; +{ + $Mason::Plugin::Defer::Request::VERSION = '2.21'; } use Mason::PluginRole; diff -Nru libmason-perl-2.20/lib/Mason/Plugin/Defer.pm libmason-perl-2.21/lib/Mason/Plugin/Defer.pm --- libmason-perl-2.20/lib/Mason/Plugin/Defer.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Plugin/Defer.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Plugin::Defer; -BEGIN { - $Mason::Plugin::Defer::VERSION = '2.20'; +{ + $Mason::Plugin::Defer::VERSION = '2.21'; } use Moose; with 'Mason::Plugin'; @@ -9,7 +9,7 @@ 1; - +__END__ =pod @@ -82,7 +82,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Plugin/DollarDot/Compilation.pm libmason-perl-2.21/lib/Mason/Plugin/DollarDot/Compilation.pm --- libmason-perl-2.20/lib/Mason/Plugin/DollarDot/Compilation.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Plugin/DollarDot/Compilation.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Plugin::DollarDot::Compilation; -BEGIN { - $Mason::Plugin::DollarDot::Compilation::VERSION = '2.20'; +{ + $Mason::Plugin::DollarDot::Compilation::VERSION = '2.21'; } use Mason::PluginRole; diff -Nru libmason-perl-2.20/lib/Mason/Plugin/DollarDot.pm libmason-perl-2.21/lib/Mason/Plugin/DollarDot.pm --- libmason-perl-2.20/lib/Mason/Plugin/DollarDot.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Plugin/DollarDot.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Plugin::DollarDot; -BEGIN { - $Mason::Plugin::DollarDot::VERSION = '2.20'; +{ + $Mason::Plugin::DollarDot::VERSION = '2.21'; } use Moose; with 'Mason::Plugin'; @@ -9,7 +9,7 @@ 1; - +__END__ =pod @@ -41,10 +41,9 @@ =head1 DESCRIPTION -This plugin substitutes C<< $.I >> for C<< -$self->I >> in all Perl code inside components, so that C<< $. ->> can be used when referring to attributes and calling methods. The actual -regex is +This plugin substitutes C<< $.I >> for C<< $self->I >> +in all Perl code inside components, so that C<< $. >> can be used when +referring to attributes and calling methods. The actual regex is s/ \$\.([^\W\d]\w*) / \$self->$1 /gx; @@ -56,8 +55,8 @@ This plugin falls under the heading of gratuitous source filtering, which the author generally agrees is Evil. That said, this is a very limited filter, and -seems unlikely to break any legitimate Perl syntax other than use of the C<< -$. >> special variable (input line number). +seems unlikely to break any legitimate Perl syntax other than use of the C<< $. +>> special variable (input line number). =head1 BUGS @@ -85,7 +84,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Plugin/LvalueAttributes/Interp.pm libmason-perl-2.21/lib/Mason/Plugin/LvalueAttributes/Interp.pm --- libmason-perl-2.20/lib/Mason/Plugin/LvalueAttributes/Interp.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Plugin/LvalueAttributes/Interp.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Plugin::LvalueAttributes::Interp; -BEGIN { - $Mason::Plugin::LvalueAttributes::Interp::VERSION = '2.20'; +{ + $Mason::Plugin::LvalueAttributes::Interp::VERSION = '2.21'; } use Mason::PluginRole; @@ -18,7 +18,7 @@ my $name = $attr->name; $class->meta->add_method( $name, - sub : lvalue { + sub : lvalue { if ( defined( $_[1] ) ) { $_[0]->{$name} = $_[1]; } diff -Nru libmason-perl-2.20/lib/Mason/Plugin/LvalueAttributes.pm libmason-perl-2.21/lib/Mason/Plugin/LvalueAttributes.pm --- libmason-perl-2.20/lib/Mason/Plugin/LvalueAttributes.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Plugin/LvalueAttributes.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Plugin::LvalueAttributes; -BEGIN { - $Mason::Plugin::LvalueAttributes::VERSION = '2.20'; +{ + $Mason::Plugin::LvalueAttributes::VERSION = '2.21'; } use Moose; with 'Mason::Plugin'; @@ -9,7 +9,7 @@ 1; - +__END__ =pod @@ -74,7 +74,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Plugin/TidyObjectFiles/Interp.pm libmason-perl-2.21/lib/Mason/Plugin/TidyObjectFiles/Interp.pm --- libmason-perl-2.20/lib/Mason/Plugin/TidyObjectFiles/Interp.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Plugin/TidyObjectFiles/Interp.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Plugin::TidyObjectFiles::Interp; -BEGIN { - $Mason::Plugin::TidyObjectFiles::Interp::VERSION = '2.20'; +{ + $Mason::Plugin::TidyObjectFiles::Interp::VERSION = '2.21'; } use Mason::PluginRole; use Perl::Tidy; diff -Nru libmason-perl-2.20/lib/Mason/Plugin/TidyObjectFiles.pm libmason-perl-2.21/lib/Mason/Plugin/TidyObjectFiles.pm --- libmason-perl-2.20/lib/Mason/Plugin/TidyObjectFiles.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Plugin/TidyObjectFiles.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Plugin::TidyObjectFiles; -BEGIN { - $Mason::Plugin::TidyObjectFiles::VERSION = '2.20'; +{ + $Mason::Plugin::TidyObjectFiles::VERSION = '2.21'; } use Moose; with 'Mason::Plugin'; @@ -9,7 +9,7 @@ 1; - +__END__ =pod @@ -54,7 +54,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Plugin.pm libmason-perl-2.21/lib/Mason/Plugin.pm --- libmason-perl-2.20/lib/Mason/Plugin.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Plugin.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,9 +1,10 @@ package Mason::Plugin; -BEGIN { - $Mason::Plugin::VERSION = '2.20'; +{ + $Mason::Plugin::VERSION = '2.21'; } use Mason::PluginRole; use Mason::Util qw(can_load); +use Class::Load; method requires_plugins ($plugin_class:) { return (); @@ -19,7 +20,7 @@ if ( $name eq 'Component' ) { push( @roles_to_try, join( "::", $plugin_class, 'Filters' ) ); } - my @roles = grep { Class::MOP::is_class_loaded($_) || can_load($_) } @roles_to_try; + my @roles = grep { Class::Load::is_class_loaded($_) || can_load($_) } @roles_to_try; return @roles; } diff -Nru libmason-perl-2.20/lib/Mason/PluginBundle/Default.pm libmason-perl-2.21/lib/Mason/PluginBundle/Default.pm --- libmason-perl-2.20/lib/Mason/PluginBundle/Default.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/PluginBundle/Default.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::PluginBundle::Default; -BEGIN { - $Mason::PluginBundle::Default::VERSION = '2.20'; +{ + $Mason::PluginBundle::Default::VERSION = '2.21'; } use Mason::PluginRole; with 'Mason::PluginBundle'; @@ -9,7 +9,7 @@ 1; - +__END__ =pod @@ -62,7 +62,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/PluginBundle.pm libmason-perl-2.21/lib/Mason/PluginBundle.pm --- libmason-perl-2.20/lib/Mason/PluginBundle.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/PluginBundle.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::PluginBundle; -BEGIN { - $Mason::PluginBundle::VERSION = '2.20'; +{ + $Mason::PluginBundle::VERSION = '2.21'; } use Mason::PluginRole; diff -Nru libmason-perl-2.20/lib/Mason/PluginManager.pm libmason-perl-2.21/lib/Mason/PluginManager.pm --- libmason-perl-2.20/lib/Mason/PluginManager.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/PluginManager.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::PluginManager; -BEGIN { - $Mason::PluginManager::VERSION = '2.20'; +{ + $Mason::PluginManager::VERSION = '2.21'; } use Carp; use Log::Any qw($log); diff -Nru libmason-perl-2.20/lib/Mason/PluginRole.pm libmason-perl-2.21/lib/Mason/PluginRole.pm --- libmason-perl-2.20/lib/Mason/PluginRole.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/PluginRole.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::PluginRole; -BEGIN { - $Mason::PluginRole::VERSION = '2.20'; +{ + $Mason::PluginRole::VERSION = '2.21'; } use Moose::Role (); use Method::Signatures::Simple (); @@ -17,7 +17,7 @@ 1; - +__END__ =pod @@ -54,7 +54,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Request.pm libmason-perl-2.21/lib/Mason/Request.pm --- libmason-perl-2.20/lib/Mason/Request.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Request.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Request; -BEGIN { - $Mason::Request::VERSION = '2.20'; +{ + $Mason::Request::VERSION = '2.21'; } use Carp; use File::Basename; @@ -429,7 +429,7 @@ 1; - +__END__ =pod @@ -762,7 +762,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Result.pm libmason-perl-2.21/lib/Mason/Result.pm --- libmason-perl-2.20/lib/Mason/Result.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Result.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Result; -BEGIN { - $Mason::Result::VERSION = '2.20'; +{ + $Mason::Result::VERSION = '2.21'; } use Mason::Moose; @@ -16,7 +16,7 @@ 1; - +__END__ =pod @@ -69,7 +69,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libmason-perl-2.20/lib/Mason/Test/Class.pm libmason-perl-2.21/lib/Mason/Test/Class.pm --- libmason-perl-2.20/lib/Mason/Test/Class.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/Class.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::Class; -BEGIN { - $Mason::Test::Class::VERSION = '2.20'; +{ + $Mason::Test::Class::VERSION = '2.21'; } use Carp; use File::Basename; @@ -11,6 +11,7 @@ use Method::Signatures::Simple; use Test::Class::Most; use Test::LongString; +use Class::Load; use strict; use warnings; @@ -57,7 +58,7 @@ my (%params) = @_; $params{plugins} = $default_plugins if @$default_plugins; my $mason_root_class = delete( $params{mason_root_class} ) || 'Mason'; - Class::MOP::load_class($mason_root_class); + Class::Load::load_class($mason_root_class); rmtree( $self->data_dir ); return $mason_root_class->new( comp_root => $self->comp_root, @@ -88,9 +89,9 @@ } method _gen_comp_path () { - my $caller = ( caller(2) )[3]; + my $caller = ( caller(2) )[3]; my ($caller_base) = ( $caller =~ /([^:]+)$/ ); - my $path = "/$caller_base" . ( ++$gen_path_count ) . ".mc"; + my $path = "/$caller_base" . ( ++$gen_path_count ) . ".mc"; return $path; } @@ -151,12 +152,12 @@ } method test_parse (%params) { - my $caller = ( caller(1) )[3]; + my $caller = ( caller(1) )[3]; my ($caller_base) = ( $caller =~ /([^:]+)$/ ); - my $desc = $params{desc}; - my $source = $params{src} || croak "must pass src"; - my $expect_list = $params{expect}; - my $expect_error = $params{expect_error}; + my $desc = $params{desc}; + my $source = $params{src} || croak "must pass src"; + my $expect_list = $params{expect}; + my $expect_error = $params{expect_error}; croak "must pass either expect or expect_error" unless $expect_list || $expect_error; my $path = "/parse/comp" . $parse_count++; @@ -181,13 +182,13 @@ } } -method mkpath_and_write_file ( $source_file, $source ) { +method mkpath_and_write_file ($source_file, $source) { unlink($source_file) if -e $source_file; mkpath( dirname($source_file), 0, 0775 ); write_file( $source_file, $source ); } -method _validate_keys ( $params, @allowed_keys ) { +method _validate_keys ($params, @allowed_keys) { my %is_allowed = map { ( $_, 1 ) } @allowed_keys; if ( my @bad_keys = grep { !$is_allowed{$_} } keys(%$params) ) { croak "bad parameters: " . join( ", ", @bad_keys ); diff -Nru libmason-perl-2.20/lib/Mason/Test/Overrides/Component/StrictMoose.pm libmason-perl-2.21/lib/Mason/Test/Overrides/Component/StrictMoose.pm --- libmason-perl-2.20/lib/Mason/Test/Overrides/Component/StrictMoose.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/Overrides/Component/StrictMoose.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::Overrides::Component::StrictMoose; -BEGIN { - $Mason::Test::Overrides::Component::StrictMoose::VERSION = '2.20'; +{ + $Mason::Test::Overrides::Component::StrictMoose::VERSION = '2.21'; } use Moose::Exporter; use MooseX::StrictConstructor (); diff -Nru libmason-perl-2.20/lib/Mason/Test/Plugins/Notify/Compilation.pm libmason-perl-2.21/lib/Mason/Test/Plugins/Notify/Compilation.pm --- libmason-perl-2.20/lib/Mason/Test/Plugins/Notify/Compilation.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/Plugins/Notify/Compilation.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::Plugins::Notify::Compilation; -BEGIN { - $Mason::Test::Plugins::Notify::Compilation::VERSION = '2.20'; +{ + $Mason::Test::Plugins::Notify::Compilation::VERSION = '2.21'; } use Mason::PluginRole; diff -Nru libmason-perl-2.20/lib/Mason/Test/Plugins/Notify/Component.pm libmason-perl-2.21/lib/Mason/Test/Plugins/Notify/Component.pm --- libmason-perl-2.20/lib/Mason/Test/Plugins/Notify/Component.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/Plugins/Notify/Component.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::Plugins::Notify::Component; -BEGIN { - $Mason::Test::Plugins::Notify::Component::VERSION = '2.20'; +{ + $Mason::Test::Plugins::Notify::Component::VERSION = '2.21'; } use Mason::PluginRole; diff -Nru libmason-perl-2.20/lib/Mason/Test/Plugins/Notify/Interp.pm libmason-perl-2.21/lib/Mason/Test/Plugins/Notify/Interp.pm --- libmason-perl-2.20/lib/Mason/Test/Plugins/Notify/Interp.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/Plugins/Notify/Interp.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::Plugins::Notify::Interp; -BEGIN { - $Mason::Test::Plugins::Notify::Interp::VERSION = '2.20'; +{ + $Mason::Test::Plugins::Notify::Interp::VERSION = '2.21'; } use Mason::PluginRole; diff -Nru libmason-perl-2.20/lib/Mason/Test/Plugins/Notify/Request.pm libmason-perl-2.21/lib/Mason/Test/Plugins/Notify/Request.pm --- libmason-perl-2.20/lib/Mason/Test/Plugins/Notify/Request.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/Plugins/Notify/Request.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::Plugins::Notify::Request; -BEGIN { - $Mason::Test::Plugins::Notify::Request::VERSION = '2.20'; +{ + $Mason::Test::Plugins::Notify::Request::VERSION = '2.21'; } use Mason::PluginRole; diff -Nru libmason-perl-2.20/lib/Mason/Test/Plugins/Notify.pm libmason-perl-2.21/lib/Mason/Test/Plugins/Notify.pm --- libmason-perl-2.20/lib/Mason/Test/Plugins/Notify.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/Plugins/Notify.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::Plugins::Notify; -BEGIN { - $Mason::Test::Plugins::Notify::VERSION = '2.20'; +{ + $Mason::Test::Plugins::Notify::VERSION = '2.21'; } use strict; use warnings; diff -Nru libmason-perl-2.20/lib/Mason/Test/RootClass/Compilation.pm libmason-perl-2.21/lib/Mason/Test/RootClass/Compilation.pm --- libmason-perl-2.20/lib/Mason/Test/RootClass/Compilation.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/RootClass/Compilation.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::RootClass::Compilation; -BEGIN { - $Mason::Test::RootClass::Compilation::VERSION = '2.20'; +{ + $Mason::Test::RootClass::Compilation::VERSION = '2.21'; } use Moose; extends 'Mason::Compilation'; diff -Nru libmason-perl-2.20/lib/Mason/Test/RootClass/Component.pm libmason-perl-2.21/lib/Mason/Test/RootClass/Component.pm --- libmason-perl-2.20/lib/Mason/Test/RootClass/Component.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/RootClass/Component.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::RootClass::Component; -BEGIN { - $Mason::Test::RootClass::Component::VERSION = '2.20'; +{ + $Mason::Test::RootClass::Component::VERSION = '2.21'; } use Moose; extends 'Mason::Component'; diff -Nru libmason-perl-2.20/lib/Mason/Test/RootClass/Interp.pm libmason-perl-2.21/lib/Mason/Test/RootClass/Interp.pm --- libmason-perl-2.20/lib/Mason/Test/RootClass/Interp.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/RootClass/Interp.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::RootClass::Interp; -BEGIN { - $Mason::Test::RootClass::Interp::VERSION = '2.20'; +{ + $Mason::Test::RootClass::Interp::VERSION = '2.21'; } use Moose; extends 'Mason::Interp'; diff -Nru libmason-perl-2.20/lib/Mason/Test/RootClass/Request.pm libmason-perl-2.21/lib/Mason/Test/RootClass/Request.pm --- libmason-perl-2.20/lib/Mason/Test/RootClass/Request.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/RootClass/Request.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::RootClass::Request; -BEGIN { - $Mason::Test::RootClass::Request::VERSION = '2.20'; +{ + $Mason::Test::RootClass::Request::VERSION = '2.21'; } use Moose; extends 'Mason::Request'; diff -Nru libmason-perl-2.20/lib/Mason/Test/RootClass.pm libmason-perl-2.21/lib/Mason/Test/RootClass.pm --- libmason-perl-2.20/lib/Mason/Test/RootClass.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Test/RootClass.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Test::RootClass; -BEGIN { - $Mason::Test::RootClass::VERSION = '2.20'; +{ + $Mason::Test::RootClass::VERSION = '2.21'; } use strict; use warnings; diff -Nru libmason-perl-2.20/lib/Mason/TieHandle.pm libmason-perl-2.21/lib/Mason/TieHandle.pm --- libmason-perl-2.20/lib/Mason/TieHandle.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/TieHandle.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::TieHandle; -BEGIN { - $Mason::TieHandle::VERSION = '2.20'; +{ + $Mason::TieHandle::VERSION = '2.21'; } use strict; use warnings; diff -Nru libmason-perl-2.20/lib/Mason/Types.pm libmason-perl-2.21/lib/Mason/Types.pm --- libmason-perl-2.20/lib/Mason/Types.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Types.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::Types; -BEGIN { - $Mason::Types::VERSION = '2.20'; +{ + $Mason::Types::VERSION = '2.21'; } use Moose::Util::TypeConstraints; use strict; diff -Nru libmason-perl-2.20/lib/Mason/Util.pm libmason-perl-2.21/lib/Mason/Util.pm --- libmason-perl-2.20/lib/Mason/Util.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/Util.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,10 +1,10 @@ package Mason::Util; -BEGIN { - $Mason::Util::VERSION = '2.20'; +{ + $Mason::Util::VERSION = '2.21'; } use Carp; -use Class::MOP; use Class::Unload; +use Class::Load; use Data::Dumper; use Fcntl qw( :DEFAULT :seek ); use File::Find; @@ -36,7 +36,7 @@ my $result; try { - Class::MOP::load_class($class_name); + Class::Load::load_class($class_name); $result = 1; } catch { diff -Nru libmason-perl-2.20/lib/Mason/t/Autobase.pm libmason-perl-2.21/lib/Mason/t/Autobase.pm --- libmason-perl-2.20/lib/Mason/t/Autobase.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Autobase.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Autobase; -BEGIN { - $Mason::t::Autobase::VERSION = '2.20'; +{ + $Mason::t::Autobase::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/Cache.pm libmason-perl-2.21/lib/Mason/t/Cache.pm --- libmason-perl-2.20/lib/Mason/t/Cache.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Cache.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Cache; -BEGIN { - $Mason::t::Cache::VERSION = '2.20'; +{ + $Mason::t::Cache::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/CompCalls.pm libmason-perl-2.21/lib/Mason/t/CompCalls.pm --- libmason-perl-2.20/lib/Mason/t/CompCalls.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/CompCalls.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::CompCalls; -BEGIN { - $Mason::t::CompCalls::VERSION = '2.20'; +{ + $Mason::t::CompCalls::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/Compilation.pm libmason-perl-2.21/lib/Mason/t/Compilation.pm --- libmason-perl-2.20/lib/Mason/t/Compilation.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Compilation.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Compilation; -BEGIN { - $Mason::t::Compilation::VERSION = '2.20'; +{ + $Mason::t::Compilation::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/ComponentMeta.pm libmason-perl-2.21/lib/Mason/t/ComponentMeta.pm --- libmason-perl-2.20/lib/Mason/t/ComponentMeta.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/ComponentMeta.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::ComponentMeta; -BEGIN { - $Mason::t::ComponentMeta::VERSION = '2.20'; +{ + $Mason::t::ComponentMeta::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/Defer.pm libmason-perl-2.21/lib/Mason/t/Defer.pm --- libmason-perl-2.20/lib/Mason/t/Defer.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Defer.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Defer; -BEGIN { - $Mason::t::Defer::VERSION = '2.20'; +{ + $Mason::t::Defer::VERSION = '2.21'; } use Test::More; use strict; diff -Nru libmason-perl-2.20/lib/Mason/t/DollarDot.pm libmason-perl-2.21/lib/Mason/t/DollarDot.pm --- libmason-perl-2.20/lib/Mason/t/DollarDot.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/DollarDot.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::DollarDot; -BEGIN { - $Mason::t::DollarDot::VERSION = '2.20'; +{ + $Mason::t::DollarDot::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/Errors.pm libmason-perl-2.21/lib/Mason/t/Errors.pm --- libmason-perl-2.20/lib/Mason/t/Errors.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Errors.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Errors; -BEGIN { - $Mason::t::Errors::VERSION = '2.20'; +{ + $Mason::t::Errors::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; @@ -34,7 +34,7 @@ $try->( '%my $i = 1;', qr/% must be followed by whitespace/ ); $try->( "<%5\n\n%>", qr/whitespace required after '<%' at .* line 1/ ); $try->( "<%\n\n5%>", qr/whitespace required before '%>' at .* line 3/ ); - $try->( "% \$.Upper {{\nHi", qr/'{{' without matching '}}'/ ); + $try->( "% \$.Upper {{\nHi", qr/'{{' without matching '}}'/ ); $try->( "Hi\n% }}", qr/'}}' without matching '{{'/ ); $try->( '<%method 1a>Hi', qr/Invalid method name '1a'/ ); $try->( '<%method cmeta>Hi', qr/'cmeta' is reserved.*method name/ ); diff -Nru libmason-perl-2.20/lib/Mason/t/Filters.pm libmason-perl-2.21/lib/Mason/t/Filters.pm --- libmason-perl-2.20/lib/Mason/t/Filters.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Filters.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Filters; -BEGIN { - $Mason::t::Filters::VERSION = '2.20'; +{ + $Mason::t::Filters::VERSION = '2.21'; } use Test::Warn; use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/Globals.pm libmason-perl-2.21/lib/Mason/t/Globals.pm --- libmason-perl-2.20/lib/Mason/t/Globals.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Globals.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Globals; -BEGIN { - $Mason::t::Globals::VERSION = '2.20'; +{ + $Mason::t::Globals::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/HTMLFilters.pm libmason-perl-2.21/lib/Mason/t/HTMLFilters.pm --- libmason-perl-2.20/lib/Mason/t/HTMLFilters.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/HTMLFilters.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::HTMLFilters; -BEGIN { - $Mason::t::HTMLFilters::VERSION = '2.20'; +{ + $Mason::t::HTMLFilters::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/Interp.pm libmason-perl-2.21/lib/Mason/t/Interp.pm --- libmason-perl-2.20/lib/Mason/t/Interp.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Interp.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,13 +1,13 @@ package Mason::t::Interp; -BEGIN { - $Mason::t::Interp::VERSION = '2.20'; +{ + $Mason::t::Interp::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; use Capture::Tiny qw(capture); { package MyInterp; -BEGIN { - $MyInterp::VERSION = '2.20'; +{ + $MyInterp::VERSION = '2.21'; } use Moose; extends 'Mason::Interp'; __PACKAGE__->meta->make_immutable() } sub test_base_interp_class : Tests { @@ -135,4 +135,11 @@ $self->test_parse( src => "hi\n<%init>my \$d = 0", expect => [qr/^(?!(?s:.*)\#line)/] ); } +sub test_class_header : Tests { + my $self = shift; + + $self->setup_interp( class_header => '# header' ); + $self->test_parse( src => "hi", expect => [qr/\# header/] ); +} + 1; diff -Nru libmason-perl-2.20/lib/Mason/t/LvalueAttributes.pm libmason-perl-2.21/lib/Mason/t/LvalueAttributes.pm --- libmason-perl-2.20/lib/Mason/t/LvalueAttributes.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/LvalueAttributes.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::LvalueAttributes; -BEGIN { - $Mason::t::LvalueAttributes::VERSION = '2.20'; +{ + $Mason::t::LvalueAttributes::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/Plugins.pm libmason-perl-2.21/lib/Mason/t/Plugins.pm --- libmason-perl-2.20/lib/Mason/t/Plugins.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Plugins.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Plugins; -BEGIN { - $Mason::t::Plugins::VERSION = '2.20'; +{ + $Mason::t::Plugins::VERSION = '2.21'; } ## no critic (Moose::RequireMakeImmutable) use Test::Class::Most parent => 'Mason::Test::Class'; use Capture::Tiny qw(capture_merged); @@ -70,29 +70,29 @@ } { package Mason::Test::Plugins::A; -BEGIN { - $Mason::Test::Plugins::A::VERSION = '2.20'; +{ + $Mason::Test::Plugins::A::VERSION = '2.21'; } use Moose; with 'Mason::Plugin'; } { package Mason::Plugin::B; -BEGIN { - $Mason::Plugin::B::VERSION = '2.20'; +{ + $Mason::Plugin::B::VERSION = '2.21'; } use Moose; with 'Mason::Plugin'; } { package Mason::Plugin::C; -BEGIN { - $Mason::Plugin::C::VERSION = '2.20'; +{ + $Mason::Plugin::C::VERSION = '2.21'; } use Moose; with 'Mason::Plugin'; } { package Mason::Plugin::D; -BEGIN { - $Mason::Plugin::D::VERSION = '2.20'; +{ + $Mason::Plugin::D::VERSION = '2.21'; } use Moose; with 'Mason::Plugin'; } { package Mason::Plugin::E; -BEGIN { - $Mason::Plugin::E::VERSION = '2.20'; +{ + $Mason::Plugin::E::VERSION = '2.21'; } use Moose; with 'Mason::Plugin'; } { package Mason::PluginBundle::F; -BEGIN { - $Mason::PluginBundle::F::VERSION = '2.20'; +{ + $Mason::PluginBundle::F::VERSION = '2.21'; } use Moose; with 'Mason::PluginBundle'; @@ -100,8 +100,8 @@ } { package Mason::Test::PluginBundle::G; -BEGIN { - $Mason::Test::PluginBundle::G::VERSION = '2.20'; +{ + $Mason::Test::PluginBundle::G::VERSION = '2.21'; } use Moose; with 'Mason::PluginBundle'; @@ -109,8 +109,8 @@ } { package Mason::Plugin::H; -BEGIN { - $Mason::Plugin::H::VERSION = '2.20'; +{ + $Mason::Plugin::H::VERSION = '2.21'; } use Moose; with 'Mason::Plugin'; @@ -118,8 +118,8 @@ } { package Mason::PluginBundle::I; -BEGIN { - $Mason::PluginBundle::I::VERSION = '2.20'; +{ + $Mason::PluginBundle::I::VERSION = '2.21'; } use Moose; with 'Mason::PluginBundle'; @@ -131,8 +131,8 @@ { package Mason::PluginBundle::J; -BEGIN { - $Mason::PluginBundle::J::VERSION = '2.20'; +{ + $Mason::PluginBundle::J::VERSION = '2.21'; } use Moose; with 'Mason::PluginBundle'; @@ -171,13 +171,13 @@ } { package Mason::Test::Plugins::Upper; -BEGIN { - $Mason::Test::Plugins::Upper::VERSION = '2.20'; +{ + $Mason::Test::Plugins::Upper::VERSION = '2.21'; } use Moose; with 'Mason::Plugin' } { package Mason::Test::Plugins::Upper::Request; -BEGIN { - $Mason::Test::Plugins::Upper::Request::VERSION = '2.20'; +{ + $Mason::Test::Plugins::Upper::Request::VERSION = '2.21'; } use Mason::PluginRole; after 'process_output' => sub { diff -Nru libmason-perl-2.20/lib/Mason/t/Reload.pm libmason-perl-2.21/lib/Mason/t/Reload.pm --- libmason-perl-2.20/lib/Mason/t/Reload.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Reload.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Reload; -BEGIN { - $Mason::t::Reload::VERSION = '2.20'; +{ + $Mason::t::Reload::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/Request.pm libmason-perl-2.21/lib/Mason/t/Request.pm --- libmason-perl-2.20/lib/Mason/t/Request.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Request.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Request; -BEGIN { - $Mason::t::Request::VERSION = '2.20'; +{ + $Mason::t::Request::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; use Log::Any::Test; diff -Nru libmason-perl-2.20/lib/Mason/t/ResolveURI.pm libmason-perl-2.21/lib/Mason/t/ResolveURI.pm --- libmason-perl-2.20/lib/Mason/t/ResolveURI.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/ResolveURI.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::ResolveURI; -BEGIN { - $Mason::t::ResolveURI::VERSION = '2.20'; +{ + $Mason::t::ResolveURI::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/Sanity.pm libmason-perl-2.21/lib/Mason/t/Sanity.pm --- libmason-perl-2.20/lib/Mason/t/Sanity.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Sanity.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Sanity; -BEGIN { - $Mason::t::Sanity::VERSION = '2.20'; +{ + $Mason::t::Sanity::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/Sections.pm libmason-perl-2.21/lib/Mason/t/Sections.pm --- libmason-perl-2.20/lib/Mason/t/Sections.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Sections.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Sections; -BEGIN { - $Mason::t::Sections::VERSION = '2.20'; +{ + $Mason::t::Sections::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; @@ -18,7 +18,7 @@ <%class> my $class_message = "class message"; -method init_message () { "init message" } +method init_message () { "init message" } @@ -34,7 +34,7 @@ <% $message %> <%init> -my $message = "method call"; +my $message = "message"; @@ -64,7 +64,7 @@ before method call -method call +message after method call diff -Nru libmason-perl-2.20/lib/Mason/t/Skel.pm libmason-perl-2.21/lib/Mason/t/Skel.pm --- libmason-perl-2.20/lib/Mason/t/Skel.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Skel.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Skel; -BEGIN { - $Mason::t::Skel::VERSION = '2.20'; +{ + $Mason::t::Skel::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; diff -Nru libmason-perl-2.20/lib/Mason/t/StaticSource.pm libmason-perl-2.21/lib/Mason/t/StaticSource.pm --- libmason-perl-2.20/lib/Mason/t/StaticSource.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/StaticSource.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::StaticSource; -BEGIN { - $Mason::t::StaticSource::VERSION = '2.20'; +{ + $Mason::t::StaticSource::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; use Mason::Util qw(write_file touch_file); diff -Nru libmason-perl-2.20/lib/Mason/t/Syntax.pm libmason-perl-2.21/lib/Mason/t/Syntax.pm --- libmason-perl-2.20/lib/Mason/t/Syntax.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Syntax.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Syntax; -BEGIN { - $Mason::t::Syntax::VERSION = '2.20'; +{ + $Mason::t::Syntax::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; @@ -222,7 +222,7 @@ $self->test_comp( src => ' <%class> -method foo () { $m->print("foo\n") } +method foo () { $m->print("foo\n") } <%method bar><%perl>$m->print("bar\n"); <% $.foo %> diff -Nru libmason-perl-2.20/lib/Mason/t/Util.pm libmason-perl-2.21/lib/Mason/t/Util.pm --- libmason-perl-2.20/lib/Mason/t/Util.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason/t/Util.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason::t::Util; -BEGIN { - $Mason::t::Util::VERSION = '2.20'; +{ + $Mason::t::Util::VERSION = '2.21'; } use Test::Class::Most parent => 'Mason::Test::Class'; use Mason::Util qw(combine_similar_paths); diff -Nru libmason-perl-2.20/lib/Mason.pm libmason-perl-2.21/lib/Mason.pm --- libmason-perl-2.20/lib/Mason.pm 2012-07-12 08:13:36.000000000 +0000 +++ libmason-perl-2.21/lib/Mason.pm 2014-01-18 21:27:52.000000000 +0000 @@ -1,6 +1,6 @@ package Mason; -BEGIN { - $Mason::VERSION = '2.20'; +{ + $Mason::VERSION = '2.21'; } use Mason::Interp; use Mason::PluginManager; @@ -44,7 +44,7 @@ 1; - +__END__ =pod @@ -131,7 +131,3 @@ the same terms as the Perl 5 programming language system itself. =cut - - -__END__ -