[Catalyst-commits] r9911 - in trunk/Catalyst-Plugin-Unicode-Encoding: . lib/Catalyst/Plugin/Unicode

[marcus at dev.catalyst.perl.org]

Author: marcus
Date: 2009-04-28 14:25:25 +0100 (Tue, 28 Apr 2009)
New Revision: 9911

Modified:
   trunk/Catalyst-Plugin-Unicode-Encoding/Changes
   trunk/Catalyst-Plugin-Unicode-Encoding/META.yml
   trunk/Catalyst-Plugin-Unicode-Encoding/Makefile.PL
   trunk/Catalyst-Plugin-Unicode-Encoding/lib/Catalyst/Plugin/Unicode/Encoding.pm
Log:
Prepare to update U-Encoding for 5.8


Modified: trunk/Catalyst-Plugin-Unicode-Encoding/Changes
===================================================================
--- trunk/Catalyst-Plugin-Unicode-Encoding/Changes	2009-04-28 12:35:52 UTC (rev 9910)
+++ trunk/Catalyst-Plugin-Unicode-Encoding/Changes	2009-04-28 13:25:25 UTC (rev 9911)
@@ -1,4 +1,7 @@
 Revision history for Perl extension Catalyst::Plugin::Unicode::Encoding
 
-0.1  2005-06-17 23:29:00 2005
+0.2  2009-04-28 11:43:00 
+        - Switch to MRO::Compat for Catalyst 5.8
+
+0.1  2005-06-17 23:29:00
         - inital CPAN release.

Modified: trunk/Catalyst-Plugin-Unicode-Encoding/META.yml
===================================================================
--- trunk/Catalyst-Plugin-Unicode-Encoding/META.yml	2009-04-28 12:35:52 UTC (rev 9910)
+++ trunk/Catalyst-Plugin-Unicode-Encoding/META.yml	2009-04-28 13:25:25 UTC (rev 9911)
@@ -1,15 +1,20 @@
 ---
 name: Catalyst-Plugin-Unicode-Encoding
-version: 0.1
+version: 0.2
 author:
   - 'Christian Hansen, C<ch at ngmedia.com>'
 abstract: Unicode aware Catalyst
 license: perl
+resources:
+  license: http://dev.perl.org/licenses/
 requires:
   Catalyst: 5.2
   Encode: 2.1
 provides:
   Catalyst::Plugin::Unicode::Encoding:
     file: lib/Catalyst/Plugin/Unicode/Encoding.pm
-    version: 0.1
-generated_by: Module::Build version 0.26
+    version: 0.2
+generated_by: Module::Build version 0.3
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.2.html
+  version: 1.2

Modified: trunk/Catalyst-Plugin-Unicode-Encoding/Makefile.PL
===================================================================
--- trunk/Catalyst-Plugin-Unicode-Encoding/Makefile.PL	2009-04-28 12:35:52 UTC (rev 9910)
+++ trunk/Catalyst-Plugin-Unicode-Encoding/Makefile.PL	2009-04-28 13:25:25 UTC (rev 9911)
@@ -1,4 +1,4 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
+# Note: this file was auto-generated by Module::Build::Compat version 0.30
     
     unless (eval "use Module::Build::Compat 0.02; 1" ) {
       print "This module requires Module::Build to install itself.\n";
@@ -17,15 +17,15 @@
       
       # Save this 'cause CPAN will chdir all over the place.
       my $cwd = Cwd::cwd();
-      my $makefile = File::Spec->rel2abs($0);
       
-      CPAN::Shell->install('Module::Build::Compat')
-	or die " *** Cannot install without Module::Build.  Exiting ...\n";
+      CPAN::Shell->install('Module::Build::Compat');
+      CPAN::Shell->expand("Module", "Module::Build::Compat")->uptodate
+	or die "Couldn't install Module::Build, giving up.\n";
       
       chdir $cwd or die "Cannot chdir() back to $cwd: $!";
     }
     eval "use Module::Build::Compat 0.02; 1" or die $@;
-    use lib '_build/lib';
+    
     Module::Build::Compat->run_build_pl(args => \@ARGV);
     require Module::Build;
     Module::Build::Compat->write_makefile(build_class => 'Module::Build');

Modified: trunk/Catalyst-Plugin-Unicode-Encoding/lib/Catalyst/Plugin/Unicode/Encoding.pm
===================================================================
--- trunk/Catalyst-Plugin-Unicode-Encoding/lib/Catalyst/Plugin/Unicode/Encoding.pm	2009-04-28 12:35:52 UTC (rev 9910)
+++ trunk/Catalyst-Plugin-Unicode-Encoding/lib/Catalyst/Plugin/Unicode/Encoding.pm	2009-04-28 13:25:25 UTC (rev 9911)
@@ -6,7 +6,8 @@
 use Carp ();
 use Encode 2.10 ();
 
-our $VERSION = '0.1';
+use MRO::Compat;
+our $VERSION = '0.2';
 our $CHECK   = Encode::FB_CROAK | Encode::LEAVE_SRC;
 
 __PACKAGE__->mk_classdata('_encoding');
@@ -42,26 +43,26 @@
     my $c = shift;
 
     unless ( $c->response->body ) {
-        return $c->NEXT::finalize;
+        return $c->next::method(@_);
     }
 
     unless ( $c->response->content_type =~ /^text|xml$|javascript$/ ) {
-        return $c->NEXT::finalize;
+        return $c->next::method(@_);
     }
 
     unless ( Encode::is_utf8( $c->response->body ) ) {
-        return $c->NEXT::finalize;
+        return $c->next::method(@_);
     }
 
     $c->response->body( $c->encoding->encode( $c->response->body, $CHECK ) );
 
-    $c->NEXT::finalize;
+    $c->next::method(@_);
 }
 
 sub prepare_parameters {
     my $c = shift;
 
-    $c->NEXT::prepare_parameters;
+    $c->next::method(@_);
 
     for my $value ( values %{ $c->request->{parameters} } ) {
 
@@ -78,7 +79,7 @@
 
     $self->encoding( $self->config->{encoding} || 'UTF-8' );
 
-    return $self->NEXT::setup(@_);
+    $self->next::method(@_);
 }
 
 1;