r55028 - in /trunk/libtext-micromason-perl: META.yml MicroMason.pm MicroMason/Docs/Changes.pod MicroMason/Docs/ReadMe.pod debian/changelog t/33-filters.t

[chrisb at users.alioth.debian.org]

Author: chrisb
Date: Mon Mar 29 19:15:49 2010
New Revision: 55028

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=55028
Log:
Integrating new upstream version 2.09

Modified:
    trunk/libtext-micromason-perl/META.yml
    trunk/libtext-micromason-perl/MicroMason.pm
    trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod
    trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod
    trunk/libtext-micromason-perl/debian/changelog
    trunk/libtext-micromason-perl/t/33-filters.t

Modified: trunk/libtext-micromason-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/META.yml?rev=55028&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/META.yml (original)
+++ trunk/libtext-micromason-perl/META.yml Mon Mar 29 19:15:49 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Text-MicroMason
-version:            2.08
+version:            2.09
 abstract:           Simple and Extensible Templating
 author:
     - Alan Ferrency <ferrency at cpan.org>

Modified: trunk/libtext-micromason-perl/MicroMason.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason.pm?rev=55028&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason.pm (original)
+++ trunk/libtext-micromason-perl/MicroMason.pm Mon Mar 29 19:15:49 2010
@@ -1,5 +1,5 @@
 package Text::MicroMason;
-$VERSION = '2.08';
+$VERSION = '2.09';
 
 # The #line directive requires Perl 5.6 to work correctly the way we use
 # it in Base.

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=55028&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod (original)
+++ trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod Mon Mar 29 19:15:49 2010
@@ -6,6 +6,15 @@
 =head1 VERSION 2 HISTORY
 
 =over 4
+
+=head2 Version 2.09
+
+=item 2010-03-24
+
+Fix test that was broken by changes in URI::Escape 1.30.  Double
+quotes aren't reserved characters in URIs but they were previously
+encoded anyway.  Test modified to use reserved single quotes instead,
+for URI::Escape testing.
 
 =head2 Version 2.08
 

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=55028&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod (original)
+++ trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod Mon Mar 29 19:15:49 2010
@@ -50,7 +50,7 @@
 
 =head1 DISTRIBUTION STATUS
 
-This is version 2.08 of Text::MicroMason. 
+This is version 2.09 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/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/changelog?rev=55028&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/changelog (original)
+++ trunk/libtext-micromason-perl/debian/changelog Mon Mar 29 19:15:49 2010
@@ -1,3 +1,9 @@
+libtext-micromason-perl (2.09-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Chris Butler <chrisb at debian.org>  Mon, 29 Mar 2010 20:12:56 +0100
+
 libtext-micromason-perl (2.08-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libtext-micromason-perl/t/33-filters.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/t/33-filters.t?rev=55028&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/t/33-filters.t (original)
+++ trunk/libtext-micromason-perl/t/33-filters.t Mon Mar 29 19:15:49 2010
@@ -48,12 +48,12 @@
     skip "URI::Escape is not installed", 8
         unless URI::Escape->can('uri_escape');
 
-    my $res_u = 'Hello %3C%22world%22%3E!';
+    my $res_u = 'Hello %3C%27world%27%3E!';
 
-    is $m->execute(text => qq(Hello <% '<"world">' |u %>!)), $res_u,
+    is $m->execute(text => qq(Hello <% "<'world'>" |u %>!)), $res_u,
         "Execute text with URI::Escape filter";
 
-    ok my $res = eval {$m->execute(text => qq(Hello <% '<"world">'|u %>!))},
+    ok my $res = eval {$m->execute(text => qq(Hello <% "<'world'>"|u %>!))},
         "Execute text with URI::Escape filter and no space";
     is $res, $res_u;
 
@@ -65,18 +65,18 @@
     # Test u as a default filter
     {
         local $m->{default_filters} = 'u';
-        my $src_u2 = qq(Hello <% '<"world">' %>!);
+        my $src_u2 = qq(Hello <% "<'world'>" %>!);
         is $m->execute( text => $src_u2), $res_u, "Execute text with URI::Escape default filter";
 
         # Explicitly disable the default filters
-        my $src_u3 = qq(Hello <% '<"world">' | n %>!);
-        my $res_u3 = 'Hello <"world">!';
-        is $m->execute( text => $src_u3), $res_nofilter, "Execute text with URI::Escape default turned off";
+        my $src_u3 = qq(Hello <% "<'world'>" | n %>!);
+        my $res_u3 = q(Hello <'world'>!);
+        is $m->execute( text => $src_u3), "Hello <'world'>!", "Execute text with URI::Escape default turned off";
     }
 
     # Test stacking and canceling with n
-    my $res_hnu = 'Hello %3C%22world%22%3E!';  
-    my $src_hnu = qq(Hello <% '<"world">' |hnu %>!);
+    my $res_hnu = 'Hello %3C%27world%27%3E!';  
+    my $src_hnu = qq(Hello <% "<'world'>" |hnu %>!);
     is $m->execute( text => $src_hnu), $res_hnu, "Execute text with stacking u filter";
 }