[Catalyst-commits] r9623 - in tags/Catalyst-Plugin-Session-Store-DBIC/0.08: . lib/Catalyst/Plugin/Session/Store t

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2009-03-30 22:31:45 +0100 (Mon, 30 Mar 2009)
New Revision: 9623

Modified:
   tags/Catalyst-Plugin-Session-Store-DBIC/0.08/Makefile.PL
   tags/Catalyst-Plugin-Session-Store-DBIC/0.08/lib/Catalyst/Plugin/Session/Store/DBIC.pm
   tags/Catalyst-Plugin-Session-Store-DBIC/0.08/t/04dbic.t
Log:
Revert the previous two commits. They were supposed to go to trunk instead of tags/.

Modified: tags/Catalyst-Plugin-Session-Store-DBIC/0.08/Makefile.PL
===================================================================
--- tags/Catalyst-Plugin-Session-Store-DBIC/0.08/Makefile.PL	2009-03-30 21:27:32 UTC (rev 9622)
+++ tags/Catalyst-Plugin-Session-Store-DBIC/0.08/Makefile.PL	2009-03-30 21:31:45 UTC (rev 9623)
@@ -15,7 +15,7 @@
         'Class::Accessor::Fast'                      => 0,
         'DBIx::Class'                                => '0.07000',  # For find with unique constraints
         'MIME::Base64'                               => 0,
-        'MRO::Compat'                                 => 0,
+        'NEXT'                                       => 0,
         'Scalar::Util'                               => 0,
         'Storable'                                   => 0,
         'FindBin'                                    => 0,

Modified: tags/Catalyst-Plugin-Session-Store-DBIC/0.08/lib/Catalyst/Plugin/Session/Store/DBIC.pm
===================================================================
--- tags/Catalyst-Plugin-Session-Store-DBIC/0.08/lib/Catalyst/Plugin/Session/Store/DBIC.pm	2009-03-30 21:27:32 UTC (rev 9622)
+++ tags/Catalyst-Plugin-Session-Store-DBIC/0.08/lib/Catalyst/Plugin/Session/Store/DBIC.pm	2009-03-30 21:31:45 UTC (rev 9623)
@@ -6,7 +6,7 @@
 use Catalyst::Exception;
 use Catalyst::Plugin::Session::Store::DBIC::Delegate;
 use MIME::Base64 ();
-use MRO::Compat;
+use NEXT;
 use Storable ();
 
 our $VERSION = '0.08';
@@ -69,7 +69,7 @@
 sub setup_finished {
     my $c = shift;
 
-    return $c->next::method unless @_;
+    return $c->NEXT::setup_finished unless @_;
 
     # Try to determine id_field if it isn't set
     unless ($c->config->{session}->{id_field}) {
@@ -86,7 +86,7 @@
         $c->config->{session}->{id_field} = $primary_columns[0];
     }
 
-    $c->next::method(@_);
+    $c->NEXT::setup_finished(@_);
 }
 
 =head2 session_store_dbic_class
@@ -170,7 +170,7 @@
 sub session_store_delegate_key_to_accessor {
     my $c = shift;
     my $key = $_[0];
-    my ($field, @args) = $c->next::method(@_);
+    my ($field, @args) = $c->NEXT::session_store_delegate_key_to_accessor(@_);
 
     my ($type) = ($key =~ /^(\w+):/);
 

Modified: tags/Catalyst-Plugin-Session-Store-DBIC/0.08/t/04dbic.t
===================================================================
--- tags/Catalyst-Plugin-Session-Store-DBIC/0.08/t/04dbic.t	2009-03-30 21:27:32 UTC (rev 9622)
+++ tags/Catalyst-Plugin-Session-Store-DBIC/0.08/t/04dbic.t	2009-03-30 21:31:45 UTC (rev 9623)
@@ -25,7 +25,7 @@
     $ENV{TESTAPP_CONFIG} = {
         name    => 'TestApp',
         session => {
-            dbic_class    => 'DBIC::Session',
+            dbic_class    => 'TestApp::Model::DBIC::Session',
             expires       => 3600,
             id_field      => 'id',
             data_field    => 'data',