Merge flash in session and finalize before sending response patches

diff --git a/.shipit b/.shipit
new file mode 100644 (file)
index 0000000..9970de4
--- /dev/null
+++ b/.shipit
@@ -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/%v
+CheckChangeLog.files = Changes

diff --git a/Changes b/Changes
index 9b62b98..d23ead0 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,7 +1,14 @@
 Revision history for Perl extension Catalyst::Plugin::Session
 
-0.20    XXX
+0.19_01 2009-01-09
+        - Use shipit to package the dist
         - Switch to Module::install
+        - Flash data is now stored inside the session (key "__flash") to avoid
+          duplicate entry errors caused by simultaneous select/insert/delete of
+          flash rows when using DBI as a Store. (Sergio Salvi)
+        - Fix session finalization order that caused HTTP responses to be sent
+          before the session is actually finalized and stored in its Store.
+          (Sergio Salvi)
 
 0.19    2007-10-08
 

diff --git a/Makefile.PL b/Makefile.PL
index a8dfe6f..073ce16 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -16,6 +16,7 @@ requires 'Digest';
 requires 'File::Spec';
 requires 'File::Temp';
 requires 'Object::Signature';
+requires 'MRO::Compat';
 
 # an indirect dep. needs a certain version.
 requires 'Tie::RefHash' => '1.34';

diff --git a/lib/Catalyst/Plugin/Session.pm b/lib/Catalyst/Plugin/Session.pm
index ee8ea37..e9c2a13 100644 (file)
--- a/lib/Catalyst/Plugin/Session.pm
+++ b/lib/Catalyst/Plugin/Session.pm
@@ -13,7 +13,7 @@ use overload            ();
 use Object::Signature   ();
 use Carp;
 
-our $VERSION = '0.20';
+our $VERSION = '0.19_01';
 
 my @session_data_accessors; # used in delete_session
 BEGIN {
@@ -170,12 +170,15 @@ sub _save_flash {
         
         my $sid = $c->sessionid;
 
+        my $session_data = $c->_session;
         if (%$flash_data) {
-            $c->store_session_data( "flash:$sid", $flash_data );
+            $session_data->{__flash} = $flash_data;
         }
         else {
-            $c->delete_session_data("flash:$sid");
+            delete $session_data->{__flash};
         }
+        $c->_session($session_data);
+        $c->_save_session;
     }
 }
 
@@ -240,8 +243,11 @@ sub _load_flash {
     $c->_tried_loading_flash_data(1);
 
     if ( my $sid = $c->sessionid ) {
-        if ( my $flash_data = $c->_flash
-            || $c->_flash( $c->get_session_data("flash:$sid") ) )
+
+        my $session_data = $c->session;
+        $c->_flash($session_data->{__flash});
+
+        if ( my $flash_data = $c->_flash )
         {
             $c->_flash_key_hashes({ map { $_ => Object::Signature::signature( \$flash_data->{$_} ) } keys %$flash_data });
             
@@ -689,6 +695,8 @@ changed, call C<keep_flash> and pass in the keys as arguments.
 This method is used to invalidate a session. It takes an optional parameter
 which will be saved in C<session_delete_reason> if provided.
 
+NOTE: This method will B<also> delete your flash data.
+
 =item session_delete_reason
 
 This accessor contains a string with the reason a session was deleted. Possible
@@ -1004,10 +1012,14 @@ Andy Grundman
 
 Christian Hansen
 
-Yuval Kogman, C<nothingmuch@woobling.org> (current maintainer)
+Yuval Kogman, C<nothingmuch@woobling.org>
 
 Sebastian Riedel
 
+Tomas Doran (t0m) C<bobtfish@bobtfish.net> (current maintainer)
+
+Sergio Salvi
+
 And countless other contributers from #catalyst. Thanks guys!
 
 =head1 COPYRIGHT & LICENSE

diff --git a/t/03_flash.t b/t/03_flash.t
index 5873d98..f58222c 100644 (file)
--- a/t/03_flash.t
+++ b/t/03_flash.t
@@ -3,9 +3,10 @@
 use strict;
 use warnings;
 
-use Test::More tests => 8;
+use Test::More tests => 12;
 use Test::MockObject::Extends;
 use Test::Exception;
+use Test::Deep;
 
 my $m;
 BEGIN { use_ok( $m = "Catalyst::Plugin::Session" ) }
@@ -19,12 +20,15 @@ $c->mock(
         return $key =~ /expire/ ? time() + 1000 : $flash;
     },
 );
+$c->mock("debug" => sub { 0 });
 $c->mock("store_session_data" => sub { $flash = $_[2] });
 $c->mock("delete_session_data" => sub { $flash = {} });
 $c->set_always( _sessionid => "deadbeef" );
 $c->set_always( config     => { session => { expires => 1000 } } );
 $c->set_always( stash      => {} );
 
+is_deeply( $c->session, {}, "nothing in session" );
+
 is_deeply( $c->flash, {}, "nothing in flash" );
 
 $c->flash->{foo} = "moose";
@@ -33,10 +37,14 @@ $c->finalize_body;
 
 is_deeply( $c->flash, { foo => "moose" }, "one key in flash" );
 
+cmp_deeply( $c->session, { __updated => re('^\d+$'), __flash => $c->flash }, "session has __flash with flash data" );
+
 $c->flash(bar => "gorch");
 
 is_deeply( $c->flash, { foo => "moose", bar => "gorch" }, "two keys in flash" );
 
+cmp_deeply( $c->session, { __updated => re('^\d+$'), __flash => $c->flash }, "session still has __flash with flash data" );
+
 $c->finalize_body;
 
 is_deeply( $c->flash, { bar => "gorch" }, "one key in flash" );
@@ -55,6 +63,8 @@ $c->finalize_body;
 
 is_deeply( $c->flash, {}, "nothing in flash after finalize after clear_flash" );
 
+cmp_deeply( $c->session, { __updated => re('^\d+$'), }, "session has empty __flash after clear_flash + finalize" );
+
 $c->flash->{bar} = "gorch";
 
 $c->config->{session}{flash_to_stash} = 1;