[Catalyst-commits] r9280 - in trunk/Catalyst-Plugin-Session-Store-Delegate: . lib/Catalyst/Plugin/Session/Store t t/lib t/lib/SessionStoreTest t/lib/SessionStoreTest/Model t/lib/SessionStoreTest2 t/lib/SessionStoreTest2/Model

t0m at dev.catalyst.perl.org t0m at dev.catalyst.perl.org
Tue Feb 10 23:35:03 GMT 2009 

Author: t0m
Date: 2009-02-10 23:35:03 +0000 (Tue, 10 Feb 2009)
New Revision: 9280

Added:
   trunk/Catalyst-Plugin-Session-Store-Delegate/.shipit
   trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/
   trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest/
   trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest/Model/
   trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest/Model/Session.pm
   trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest2/
   trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest2/Model/
   trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest2/Model/Session.pm
Modified:
   trunk/Catalyst-Plugin-Session-Store-Delegate/Changes
   trunk/Catalyst-Plugin-Session-Store-Delegate/MANIFEST.SKIP
   trunk/Catalyst-Plugin-Session-Store-Delegate/Makefile.PL
   trunk/Catalyst-Plugin-Session-Store-Delegate/lib/Catalyst/Plugin/Session/Store/Delegate.pm
   trunk/Catalyst-Plugin-Session-Store-Delegate/t/basic.t
Log:
Appears to work again, broke due to the tightning up of ->model calls in 5.71

Added: trunk/Catalyst-Plugin-Session-Store-Delegate/.shipit
===================================================================
--- trunk/Catalyst-Plugin-Session-Store-Delegate/.shipit	                        (rev 0)
+++ trunk/Catalyst-Plugin-Session-Store-Delegate/.shipit	2009-02-10 23:35:03 UTC (rev 9280)
@@ -0,0 +1,5 @@
+# auto-generated shipit config file.
+steps = FindVersion, ChangeVersion, CheckChangeLog, DistTest, Commit, Tag, MakeDist, UploadCPAN
+
+svn.tagpattern = http://dev.catalyst.perl.org/repos/Catalyst/tags/Catalyst-Plugin-Session-Store-Delegate/%v
+CheckChangeLog.files = Changes

Modified: trunk/Catalyst-Plugin-Session-Store-Delegate/Changes
===================================================================
--- trunk/Catalyst-Plugin-Session-Store-Delegate/Changes	2009-02-10 22:46:35 UTC (rev 9279)
+++ trunk/Catalyst-Plugin-Session-Store-Delegate/Changes	2009-02-10 23:35:03 UTC (rev 9280)
@@ -1,3 +1,7 @@
+0.03
+        - Fix tests to work with tightened up $c->model in 5.71
+        - Switch from NEXT to MRO::Compat for method redispatch
+
 0.02
         - Internal API refactorings
 

Modified: trunk/Catalyst-Plugin-Session-Store-Delegate/MANIFEST.SKIP
===================================================================
--- trunk/Catalyst-Plugin-Session-Store-Delegate/MANIFEST.SKIP	2009-02-10 22:46:35 UTC (rev 9279)
+++ trunk/Catalyst-Plugin-Session-Store-Delegate/MANIFEST.SKIP	2009-02-10 23:35:03 UTC (rev 9280)
@@ -30,3 +30,6 @@
 
 # Module::Bane
 \bBuild.PL$
+
+^.shipit$
+

Modified: trunk/Catalyst-Plugin-Session-Store-Delegate/Makefile.PL
===================================================================
--- trunk/Catalyst-Plugin-Session-Store-Delegate/Makefile.PL	2009-02-10 22:46:35 UTC (rev 9279)
+++ trunk/Catalyst-Plugin-Session-Store-Delegate/Makefile.PL	2009-02-10 23:35:03 UTC (rev 9280)
@@ -12,7 +12,8 @@
         'Catalyst::Plugin::Session' => '0.12',
         'Class::Accessor::Fast'     => '0',
         'Test::More'                => '0',
-        'Test::use::ok'             => '0'
+        'Test::use::ok'             => '0',
+        'MRO::Compat'               => '0',
     },
     'INSTALLDIRS' => 'site',
     'EXE_FILES'   => [],

Modified: trunk/Catalyst-Plugin-Session-Store-Delegate/lib/Catalyst/Plugin/Session/Store/Delegate.pm
===================================================================
--- trunk/Catalyst-Plugin-Session-Store-Delegate/lib/Catalyst/Plugin/Session/Store/Delegate.pm	2009-02-10 22:46:35 UTC (rev 9279)
+++ trunk/Catalyst-Plugin-Session-Store-Delegate/lib/Catalyst/Plugin/Session/Store/Delegate.pm	2009-02-10 23:35:03 UTC (rev 9280)
@@ -9,8 +9,10 @@
 use strict;
 use warnings;
 
-our $VERSION = "0.02";
+use MRO::Compat;
 
+our $VERSION = "0.03";
+
 __PACKAGE__->mk_accessors(qw/_session_store_delegate/);
 
 sub session_store_model_name {
@@ -58,7 +60,7 @@
 
 sub _clear_session_instance_data {
     my ( $c, @args ) = @_;
-    my $ret = $c->NEXT::_clear_session_instance_data(@args); # let the session plugin do it's thing
+    my $ret = $c->maybe::next::method(@args); # let the session plugin do it's thing
     
     my $delegate = $c->_session_store_delegate;
     $c->_session_store_delegate(undef);
@@ -137,7 +139,7 @@
 
 This is normally something like DBIC's resultset object.
 
-The model must respond to the C<get_model> method or closure in the sesion
+The model must respond to the C<get_delegate> method or closure in the sesion
 config hash (defaults to C<get_session_store_delegate>).
 
 An object B<must always> be returned from this method, even if it means
@@ -259,4 +261,15 @@
 
 =cut
 
+=head1 AUTHORS
 
+Yuval Kogman, C<nothingmuch at woobling.org>
+
+Tomas Doran, (t0m) C<bobtfish at bobtfish.net> (current maintainer)
+
+=head1 COPYRIGHT & LICENSE 
+
+Copyright (c) 2006 the aforementioned authors. 
+This program is free software; you can redistribute
+it and/or modify it under the same terms as Perl itself.
+

Modified: trunk/Catalyst-Plugin-Session-Store-Delegate/t/basic.t
===================================================================
--- trunk/Catalyst-Plugin-Session-Store-Delegate/t/basic.t	2009-02-10 22:46:35 UTC (rev 9279)
+++ trunk/Catalyst-Plugin-Session-Store-Delegate/t/basic.t	2009-02-10 23:35:03 UTC (rev 9280)
@@ -2,6 +2,8 @@
 
 use strict;
 use warnings;
+use FindBin qw/$Bin/;
+use lib "$Bin/lib";
 
 use File::Temp;
 use File::Spec;
@@ -23,6 +25,7 @@
     extra_tests => 4,
     backend     => "Delegate",
     config      => {
+        model => 'Session',
         get_delegate => sub {
             my ( $model, $id ) = @_;
             

Added: trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest/Model/Session.pm
===================================================================
--- trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest/Model/Session.pm	                        (rev 0)
+++ trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest/Model/Session.pm	2009-02-10 23:35:03 UTC (rev 9280)
@@ -0,0 +1,11 @@
+package SessionStoreTest::Model::Session;
+use base qw/Catalyst::Model/;
+use strict;
+use warnings;
+
+# This is currently just a stub!
+# t/basic.t implements a closure which gets the model but does nothing with it.
+# Tests without a closure should be added.
+
+1;
+

Added: trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest2/Model/Session.pm
===================================================================
--- trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest2/Model/Session.pm	                        (rev 0)
+++ trunk/Catalyst-Plugin-Session-Store-Delegate/t/lib/SessionStoreTest2/Model/Session.pm	2009-02-10 23:35:03 UTC (rev 9280)
@@ -0,0 +1,7 @@
+package SessionStoreTest2::Model::Session;
+use base qw/SessionStoreTest2::Model::Session/;
+use strict;
+use warnings;
+
+1;
+

More information about the Catalyst-commits mailing list