From: Tomas Doran <bobtfish@bobtfish.net>
Date: Sun, 8 Feb 2009 07:54:22 +0000 (+0000)
Subject: Change from NEXT to MRO::Compat - RT#40628
X-Git-Tag: v0.21~6
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Static-Simple.git;a=commitdiff_plain;h=70e7680f72604eeddb561f77a578b996fd95b1a7

Change from NEXT to MRO::Compat - RT#40628
---

diff --git a/Changes b/Changes
index 14607ff..934a044 100644
--- a/Changes
+++ b/Changes
@@ -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
diff --git a/Makefile.PL b/Makefile.PL
index bdd3111..145180c 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,6 +6,7 @@ all_from 'lib/Catalyst/Plugin/Static/Simple.pm';
 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';
diff --git a/lib/Catalyst/Plugin/Static/Simple.pm b/lib/Catalyst/Plugin/Static/Simple.pm
index b1186ea..6d93423 100644
--- a/lib/Catalyst/Plugin/Static/Simple.pm
+++ b/lib/Catalyst/Plugin/Static/Simple.pm
@@ -7,8 +7,9 @@ use File::stat;
 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 @@ sub prepare_action {
         $c->_locate_static_file( $path );
     }
     
-    return $c->NEXT::ACTUAL::prepare_action(@_);
+    return $c->next::method(@_);
 }
 
 sub dispatch {
@@ -64,7 +65,7 @@ sub dispatch {
         return $c->_serve_static;
     }
     else {
-        return $c->NEXT::ACTUAL::dispatch(@_);
+        return $c->next::method(@_);
     }
 }
 
@@ -76,13 +77,13 @@ sub finalize {
         $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;