r53993 - in /trunk/libtext-micromason-perl: ./ MicroMason/ MicroMason/Docs/ debian/ debian/patches/ debian/source/ t/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Tue Mar 9 20:38:45 UTC 2010
Author: jawnsy-guest
Date: Tue Mar 9 20:38:38 2010
New Revision: 53993
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53993
Log:
* New upstream release
+ Fixes bug where <%init> failed with -PassVariables plugin
+ Fixes RT#51727 (POD problems)
* Use new 3.0 (quilt) source format
Added:
trunk/libtext-micromason-perl/debian/source/
trunk/libtext-micromason-perl/debian/source/format
Removed:
trunk/libtext-micromason-perl/debian/README.source
Modified:
trunk/libtext-micromason-perl/META.yml
trunk/libtext-micromason-perl/MicroMason.pm
trunk/libtext-micromason-perl/MicroMason/Base.pm
trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod
trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod
trunk/libtext-micromason-perl/MicroMason/PassVariables.pm
trunk/libtext-micromason-perl/debian/changelog
trunk/libtext-micromason-perl/debian/control
trunk/libtext-micromason-perl/debian/patches/pod-errors
trunk/libtext-micromason-perl/debian/rules
trunk/libtext-micromason-perl/t/40-pass_variables.t
Modified: trunk/libtext-micromason-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/META.yml?rev=53993&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/META.yml (original)
+++ trunk/libtext-micromason-perl/META.yml Tue Mar 9 20:38:38 2010
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Text-MicroMason
-version: 2.07
+version: 2.08
abstract: Simple and Extensible Templating
author:
- Alan Ferrency <ferrency at cpan.org>
@@ -19,7 +19,7 @@
directory:
- t
- inc
-generated_by: ExtUtils::MakeMaker version 6.54
+generated_by: ExtUtils::MakeMaker version 6.56
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
Modified: trunk/libtext-micromason-perl/MicroMason.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason.pm?rev=53993&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason.pm (original)
+++ trunk/libtext-micromason-perl/MicroMason.pm Tue Mar 9 20:38:38 2010
@@ -1,5 +1,5 @@
package Text::MicroMason;
-$VERSION = '2.07';
+$VERSION = '2.08';
# The #line directive requires Perl 5.6 to work correctly the way we use
# it in Base.
Modified: trunk/libtext-micromason-perl/MicroMason/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason/Base.pm?rev=53993&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/Base.pm (original)
+++ trunk/libtext-micromason-perl/MicroMason/Base.pm Tue Mar 9 20:38:38 2010
@@ -235,7 +235,10 @@
# Mapping between token types
text_token => 'perl OUT( QUOTED );',
- expr_token => "perl OUT( do{\nTOKEN\n} );",
+ expr_token => "perl OUT( \"\".do{\nTOKEN\n} );",
+ # the "". here forces string context, and should hopefully make
+ # 'uninitialized' warnings appear closer to their source, rather
+ # than at the big join "", @OUT; at the end
file_token => "perl OUT( \$m->execute( file => do {\nTOKEN\n} ) );",
# Note that we need newline after TOKEN here in case it ends with a comment.
}
@@ -577,7 +580,7 @@
You can support a new token type be creating a method with a corresponding name prefixed by "assemble_". It is passed the token value or contents, and should return a new token pair that is supported by the assembler template.
-For example, if a subclass defined a method named assemble_sqlquery, callers could compile templates that contained a C<E<lt>%sqlqueryE<gt> ... E<lt>/%sqlqueryE<gt>> block. The assemble_sqlquery method could return a C<perl => $statements> pair with Perl code that performed some appropriate action.
+For example, if a subclass defined a method named assemble_sqlquery, callers could compile templates that contained a C<E<lt>%sqlqueryE<gt> ... E<lt>/%sqlqueryE<gt>> block. The assemble_sqlquery method could return a C<< perl => $statements >> pair with Perl code that performed some appropriate action.
=item compile
Modified: trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod?rev=53993&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod (original)
+++ trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod Tue Mar 9 20:38:38 2010
@@ -4,6 +4,22 @@
=head1 VERSION 2 HISTORY
+
+=over 4
+
+=head2 Version 2.08
+
+=item 2010-03-08
+
+Fixed PassVariables bug: <%init> failed with -PassVariables plugin.
+Thanks to William Kern for reporting this.
+
+=item 2009-11-19
+
+Fixed [rt.cpan.org #51727] [Patch] POD nit; thanks to Frank Wiegand for
+reporting this.
+
+=back
=head2 Version 2.07
Modified: trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod?rev=53993&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod (original)
+++ trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod Tue Mar 9 20:38:38 2010
@@ -50,9 +50,7 @@
=head1 DISTRIBUTION STATUS
-This is version 2.07 of Text::MicroMason.
-
-This module has been available on CPAN for over six years.
+This is version 2.08 of Text::MicroMason.
If you encounter any problems, please inform the current maintainer and
I'll endeavor to patch them promptly.
Modified: trunk/libtext-micromason-perl/MicroMason/PassVariables.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason/PassVariables.pm?rev=53993&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/PassVariables.pm (original)
+++ trunk/libtext-micromason-perl/MicroMason/PassVariables.pm Tue Mar 9 20:38:38 2010
@@ -16,14 +16,17 @@
# Text elements used for subroutine assembly
sub assembler_rules {
- (shift)->NEXT('assembler_rules', @_),
- template => [ qw( $eval_start $no_strict $sub_start $init_errs $init_output
- $init_args @perl $return_output $sub_end ) ],
- eval_start => 'package __PACKAGE__;',
- no_strict => 'no strict;',
- init_args => 'local %__PACKAGE__:: = %__PACKAGE__::;' . "\n" .
- 'my %ARGS = @_;' . "\n" .
+ my %rules = ((shift)->NEXT('assembler_rules', @_),
+ eval_start => 'package __PACKAGE__;',
+ no_strict => 'no strict;',
+ init_args => 'local %__PACKAGE__:: = %__PACKAGE__::;' . "\n" .
+ 'my %ARGS = @_;' . "\n" .
'$m->install_args_hash( "__PACKAGE__", \%ARGS );',
+ );
+
+ $rules{template} = ['$eval_start', '$no_strict', @{$rules{template}}];
+
+ return %rules;
}
sub assemble {
Modified: trunk/libtext-micromason-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/changelog?rev=53993&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/changelog (original)
+++ trunk/libtext-micromason-perl/debian/changelog Tue Mar 9 20:38:38 2010
@@ -1,3 +1,12 @@
+libtext-micromason-perl (2.08-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + Fixes bug where <%init> failed with -PassVariables plugin
+ + Fixes RT#51727 (POD problems)
+ * Use new 3.0 (quilt) source format
+
+ -- Jonathan Yu <jawnsy at cpan.org> Tue, 09 Mar 2010 09:30:43 -0500
+
libtext-micromason-perl (2.07-1) unstable; urgency=low
[ Jonathan Yu ]
Modified: trunk/libtext-micromason-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/control?rev=53993&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/control (original)
+++ trunk/libtext-micromason-perl/debian/control Tue Mar 9 20:38:38 2010
@@ -1,12 +1,12 @@
Source: libtext-micromason-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 7.0.50)
Build-Depends-Indep: perl, libclass-mixinfactory-perl (>= 0.9),
libhtml-parser-perl, liburi-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: gregor herrmann <gregoa at debian.org>, Jonathan Yu <jawnsy at cpan.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://search.cpan.org/dist/Text-MicroMason/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libtext-micromason-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libtext-micromason-perl/
Modified: trunk/libtext-micromason-perl/debian/patches/pod-errors
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/patches/pod-errors?rev=53993&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/patches/pod-errors (original)
+++ trunk/libtext-micromason-perl/debian/patches/pod-errors Tue Mar 9 20:38:38 2010
@@ -2,7 +2,7 @@
--- a/MicroMason/Docs/Changes.pod
+++ b/MicroMason/Docs/Changes.pod
-@@ -137,6 +137,8 @@
+@@ -153,6 +153,8 @@
Bump version to 2.0
Modified: trunk/libtext-micromason-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/rules?rev=53993&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/rules (original)
+++ trunk/libtext-micromason-perl/debian/rules Tue Mar 9 20:38:38 2010
@@ -4,7 +4,7 @@
TMP = $(CURDIR)/debian/$(PACKAGE)
%:
- dh --with quilt $@
+ dh $@
override_dh_auto_install:
dh_auto_install
Added: trunk/libtext-micromason-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/source/format?rev=53993&op=file
==============================================================================
--- trunk/libtext-micromason-perl/debian/source/format (added)
+++ trunk/libtext-micromason-perl/debian/source/format Tue Mar 9 20:38:38 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/libtext-micromason-perl/t/40-pass_variables.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/t/40-pass_variables.t?rev=53993&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/t/40-pass_variables.t (original)
+++ trunk/libtext-micromason-perl/t/40-pass_variables.t Tue Mar 9 20:38:38 2010
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
use strict;
-use Test::More tests => 9;
+use Test::More tests => 11;
use_ok 'Text::MicroMason';
@@ -36,3 +36,16 @@
}
######################################################################
+
+{
+ ok my $m = Text::MicroMason->new( -PassVariables, package => 'main' );
+ is $m->execute( text=> <<EOT ), "Hello jack\n";
+Hello <% \$ARGS{name} %>
+<%init>
+\$ARGS{name} = "jack";
+</%init>
+EOT
+
+}
+
+######################################################################
More information about the Pkg-perl-cvs-commits
mailing list