[Catalyst-commits] r9249 - in trunk/Catalyst-Plugin-Static-Simple: . lib/Catalyst/Plugin/Static

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-02-08 07:54:22 +0000 (Sun, 08 Feb 2009)
New Revision: 9249

Modified:
   trunk/Catalyst-Plugin-Static-Simple/Changes
   trunk/Catalyst-Plugin-Static-Simple/Makefile.PL
   trunk/Catalyst-Plugin-Static-Simple/lib/Catalyst/Plugin/Static/Simple.pm
Log:
Change from NEXT to MRO::Compat - RT#40628

Modified: trunk/Catalyst-Plugin-Static-Simple/Changes
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/Changes	2009-02-08 07:47:36 UTC (rev 9248)
+++ trunk/Catalyst-Plugin-Static-Simple/Changes	2009-02-08 07:54:22 UTC (rev 9249)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Catalyst::Plugin::Static::Simple
 
+0.21    XXX
+        - Change from NEXT to MRO::Compat - RT#40628 (ilmari)
+
 0.20    2007-09-24 10:00:00
         - Fixed issue where the static dir regex did not add a trailing
           slash so URLs such as /static1 were served as static when they

Modified: trunk/Catalyst-Plugin-Static-Simple/Makefile.PL
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/Makefile.PL	2009-02-08 07:47:36 UTC (rev 9248)
+++ trunk/Catalyst-Plugin-Static-Simple/Makefile.PL	2009-02-08 07:54:22 UTC (rev 9249)
@@ -6,6 +6,7 @@
 requires 'Catalyst::Runtime' => '5.30';
 requires 'MIME::Types' => '1.15';
 requires 'Test::More';
+requires 'MRO::Compat';
 
 unless( can_use 'Catalyst' => '5.33' ) {
     requires 'File::Slurp';

Modified: trunk/Catalyst-Plugin-Static-Simple/lib/Catalyst/Plugin/Static/Simple.pm
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/lib/Catalyst/Plugin/Static/Simple.pm	2009-02-08 07:47:36 UTC (rev 9248)
+++ trunk/Catalyst-Plugin-Static-Simple/lib/Catalyst/Plugin/Static/Simple.pm	2009-02-08 07:54:22 UTC (rev 9249)
@@ -7,8 +7,9 @@
 use File::Spec ();
 use IO::File ();
 use MIME::Types ();
+use MRO::Compat;
 
-our $VERSION = '0.20';
+our $VERSION = '0.21';
 
 __PACKAGE__->mk_accessors( qw/_static_file _static_debug_message/ );
 
@@ -49,7 +50,7 @@
         $c->_locate_static_file( $path );
     }
     
-    return $c->NEXT::ACTUAL::prepare_action(@_);
+    return $c->next::method(@_);
 }
 
 sub dispatch {
@@ -64,7 +65,7 @@
         return $c->_serve_static;
     }
     else {
-        return $c->NEXT::ACTUAL::dispatch(@_);
+        return $c->next::method(@_);
     }
 }
 
@@ -76,13 +77,13 @@
         $c->log->debug( 'Static::Simple: ' . join q{ }, @{$c->_debug_msg} );
     }
     
-    return $c->NEXT::ACTUAL::finalize(@_);
+    return $c->next::method(@_);
 }
 
 sub setup {
     my $c = shift;
     
-    $c->NEXT::setup(@_);
+    $c->next::method(@_);
     
     if ( Catalyst->VERSION le '5.33' ) {
         require File::Slurp;