From: Sergio Salvi <sergio@salvi.ca>
Date: Thu, 11 Dec 2008 16:42:21 +0000 (+0000)
Subject: flash data is now stored inside the session
X-Git-Tag: v0.19_01~2^2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Session.git;a=commitdiff_plain;h=eb250519802344a677c86103e5bba640dc40d59f

flash data is now stored inside the session
---

diff --git a/Changes b/Changes
index 9b62b98..8f2f749 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,9 @@ Revision history for Perl extension Catalyst::Plugin::Session
 
 0.20    XXX
         - 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.
 
 0.19    2007-10-08
 
diff --git a/lib/Catalyst/Plugin/Session.pm b/lib/Catalyst/Plugin/Session.pm
index 1e9dd99..8b66e78 100644
--- a/lib/Catalyst/Plugin/Session.pm
+++ b/lib/Catalyst/Plugin/Session.pm
@@ -168,12 +168,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;
     }
 }
 
@@ -238,8 +241,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 });
             
@@ -687,6 +693,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
diff --git a/t/03_flash.t b/t/03_flash.t
index 0ed2242..4000422 100644
--- 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;
 
 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;
 
 is_deeply( $c->flash, { bar => "gorch" }, "one key in flash" );
@@ -55,6 +63,8 @@ $c->finalize;
 
 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;