Fix changelog, switch from NEXT to MRO::Compat

diff --git a/Changes b/Changes
index a86449b..234514c 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,10 +1,13 @@
 Revision history for Perl extension Catalyst::Plugin::Session::State::Cookie
 
-
-0.10    2008-12-02
+0.10    2009-02-08
         - POD addition.
+        - Switch from NEXT to MRO::Compat
 
-0.09    ??? Somebody forgot to Changes this release.
+0.09    2007-10-08
+        - Bump dependencies so that streaming a file also causes the cookie to 
+          be updated.
+          - Add tests for this
 
 0.08    2007-09-14
         - Fix live test with Mech version 0.37+

diff --git a/Makefile.PL b/Makefile.PL
index 6285099..e146bf3 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,6 +6,7 @@ all_from 'lib/Catalyst/Plugin/Session/State/Cookie.pm';
 requires 'Catalyst'                  => '5.7010';
 requires 'Catalyst::Plugin::Session' => '0.19';
 requires 'Test::MockObject'          => '1.01';
+requires 'MRO::Compat';
 
 auto_install;
 WriteAll;

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index 144442c..bec0b01 100644 (file)
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -4,7 +4,7 @@ use base qw/Catalyst::Plugin::Session::State Class::Accessor::Fast/;
 use strict;
 use warnings;
 
-use NEXT;
+use MRO::Compat;
 use Catalyst::Utils ();
 
 our $VERSION = "0.10";
@@ -14,7 +14,7 @@ BEGIN { __PACKAGE__->mk_accessors(qw/_deleted_session_id/) }
 sub setup_session {
     my $c = shift;
 
-    $c->NEXT::setup_session(@_);
+    $c->maybe::next::method(@_);
 
     $c->config->{session}{cookie_name}
         ||= Catalyst::Utils::appprefix($c) . '_session';
@@ -27,7 +27,7 @@ sub extend_session_id {
         $c->update_session_cookie( $c->make_session_cookie( $sid ) );
     }
 
-    $c->NEXT::extend_session_id( $sid, $expires );
+    $c->maybe::next::method( $sid, $expires );
 }
 
 sub set_session_id {
@@ -35,7 +35,7 @@ sub set_session_id {
 
     $c->update_session_cookie( $c->make_session_cookie( $sid ) );
 
-    return $c->NEXT::set_session_id($sid);
+    return $c->maybe::next::method($sid);
 }
 
 sub update_session_cookie {
@@ -79,14 +79,14 @@ sub make_session_cookie {
 
 sub calc_expiry { # compat
     my $c = shift;
-    $c->NEXT::calc_expiry( @_ ) || $c->calculate_session_cookie_expires( @_ );
+    $c->maybe::next::method( @_ ) || $c->calculate_session_cookie_expires( @_ );
 }
 
 sub calculate_session_cookie_expires {
     my $c   = shift;
     my $cfg = $c->config->{session};
 
-    my $value = $c->NEXT::calculate_session_cookie_expires(@_);
+    my $value = $c->maybe::next::method(@_);
     return $value if $value;
 
     if ( exists $cfg->{cookie_expires} ) {
@@ -119,7 +119,7 @@ sub get_session_id {
         return $sid if $sid;
     }
 
-    $c->NEXT::get_session_id(@_);
+    $c->maybe::next::method(@_);
 }
 
 sub delete_session_id {
@@ -129,7 +129,7 @@ sub delete_session_id {
 
     $c->update_session_cookie( $c->make_session_cookie( $sid, expires => 0 ) );
 
-    $c->NEXT::delete_session_id($sid);
+    $c->maybe::next::method($sid);
 }
 
 __PACKAGE__