Committing switch from NEXT to MRO::Compat.

diff --git a/Changes b/Changes
index 12d66a1..be95b1a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+Wed May 27 16:34:00 2009 (agladdish) - Release 0.72
+  Switch from NEXT to MRO::Compat.
+  
 Sat Mar 28 09:16:09 PDT 2009 (hdp) - Release 0.71
   Fix RT#44641, missing documented 'end' action
 

diff --git a/Makefile.PL b/Makefile.PL
index 82e9a87..b39390b 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -13,6 +13,7 @@ requires('LWP::UserAgent'            => '2.033');
 requires('Data::Serializer'          => '0.36');
 requires('Class::Inspector'          => '1.13');
 requires('URI::Find'                 => undef);
+requires('MRO::Compat'               => '0.10');
 
 feature 'JSON (application/json) support',
     -default   => 0,

diff --git a/README b/README
index 692c135..a170970 100644 (file)
--- a/README
+++ b/README
@@ -284,22 +284,22 @@ IMPLEMENTATION DETAILS
         The "begin" method uses Catalyst::Action::Deserialize. The "end"
         method uses Catalyst::Action::Serialize. If you want to override
         either behavior, simply implement your own "begin" and "end" actions
-        and use NEXT:
+        and use MRO::Compat:
 
           my Foo::Controller::Monkey;
           use base qw(Catalyst::Controller::REST);
 
           sub begin :Private {
             my ($self, $c) = @_;
-            ... do things before Deserializing ...
-            $self->NEXT::begin($c); 
+            ... do things before Deserializing ...            
+            $self->maybe::next::method($c);
             ... do things after Deserializing ...
           } 
 
           sub end :Private {
             my ($self, $c) = @_;
-            ... do things before Serializing ...
-            $self->NEXT::end($c); 
+            ... do things before Serializing ...            
+            $self->maybe::next::method($c);
             ... do things after Serializing ...
           }
 

diff --git a/lib/Catalyst/Action/Deserialize.pm b/lib/Catalyst/Action/Deserialize.pm
index 24aac2a..9daf029 100644 (file)
--- a/lib/Catalyst/Action/Deserialize.pm
+++ b/lib/Catalyst/Action/Deserialize.pm
@@ -11,6 +11,7 @@ use warnings;
 
 use base 'Catalyst::Action::SerializeBase';
 use Module::Pluggable::Object;
+use MRO::Compat;
 
 __PACKAGE__->mk_accessors(qw(plugins));
 
@@ -38,7 +39,7 @@ sub execute {
         }
     }
 
-    $self->NEXT::execute(@_);
+    $self->maybe::next::method(@_);
 
     return 1;
 }

diff --git a/lib/Catalyst/Action/REST.pm b/lib/Catalyst/Action/REST.pm
index b9e84cf..806dd86 100644 (file)
--- a/lib/Catalyst/Action/REST.pm
+++ b/lib/Catalyst/Action/REST.pm
@@ -18,7 +18,7 @@ use Catalyst::Controller::REST;
 
 BEGIN { require 5.008001; }
 
-our $VERSION = '0.71';
+our $VERSION = '0.72';
 
 sub new {
   my $class  = shift;

diff --git a/lib/Catalyst/Action/Serialize.pm b/lib/Catalyst/Action/Serialize.pm
index 31597cf..1f6db7d 100644 (file)
--- a/lib/Catalyst/Action/Serialize.pm
+++ b/lib/Catalyst/Action/Serialize.pm
@@ -11,12 +11,13 @@ use warnings;
 
 use base 'Catalyst::Action::SerializeBase';
 use Module::Pluggable::Object;
+use MRO::Compat;
 
 sub execute {
     my $self = shift;
     my ( $controller, $c ) = @_;
 
-    $self->NEXT::execute(@_);
+    $self->maybe::next::method(@_);
 
     return 1 if $c->req->method eq 'HEAD';
     return 1 if length( $c->response->body );

diff --git a/lib/Catalyst/Controller/REST.pm b/lib/Catalyst/Controller/REST.pm
index bb7fda9..737cb13 100644 (file)
--- a/lib/Catalyst/Controller/REST.pm
+++ b/lib/Catalyst/Controller/REST.pm
@@ -442,22 +442,22 @@ L<Catalyst::Action::Serialize>.
 The C<begin> method uses L<Catalyst::Action::Deserialize>.  The C<end>
 method uses L<Catalyst::Action::Serialize>.  If you want to override
 either behavior, simply implement your own C<begin> and C<end> actions
-and use NEXT:
+and use MRO::Compat:
 
   my Foo::Controller::Monkey;
   use base qw(Catalyst::Controller::REST);
 
   sub begin :Private {
     my ($self, $c) = @_;
-    ... do things before Deserializing ...
-    $self->NEXT::begin($c); 
+    ... do things before Deserializing ...    
+    $self->maybe::next::method($c);    
     ... do things after Deserializing ...
   } 
 
   sub end :Private {
     my ($self, $c) = @_;
-    ... do things before Serializing ...
-    $self->NEXT::end($c); 
+    ... do things before Serializing ...    
+    $self->maybe::next::method($c);
     ... do things after Serializing ...
   }