Some cleanup of the code.

diff --git a/lib/Plack/Middleware/Session.pm b/lib/Plack/Middleware/Session.pm
index 782220f..a4e91e1 100644 (file)
--- a/lib/Plack/Middleware/Session.pm
+++ b/lib/Plack/Middleware/Session.pm
@@ -68,7 +68,7 @@ sub call {
     my $res = $self->app->($env);
     $self->response_cb($res, sub {
         my $res = Plack::Response->new(@{$_[0]});
-        $self->finalize($env, $res);
+        $self->finalize($env->{'psgix.session'}, $env->{'psgix.session.options'}, $res);
         $res = $res->finalize;
         $_[0]->[0] = $res->[0];
         $_[0]->[1] = $res->[1];
@@ -85,13 +85,13 @@ sub commit {
 }
 
 sub finalize {
-    my($self, $env, $response) = @_;
+    my($self, $session, $options, $response) = @_;
 
-    $self->commit($env->{'psgix.session'}, $env->{'psgix.session.options'});
-    if ($env->{'psgix.session.options'}->{expire}) {
-        $self->state->expire_session_id($env->{'psgix.session.options'}->{id}, $response);
+    $self->commit($session, $options);
+    if ($options->{expire}) {
+        $self->state->expire_session_id($options->{id}, $response);
     } else {
-        $self->state->finalize($env->{'psgix.session.options'}->{id}, $response, $env->{'psgix.session.options'});
+        $self->state->finalize($options->{id}, $response, $options);
     }
 }
 

diff --git a/lib/Plack/Middleware/Session/Cookie.pm b/lib/Plack/Middleware/Session/Cookie.pm
index f479823..2385101 100644 (file)
--- a/lib/Plack/Middleware/Session/Cookie.pm
+++ b/lib/Plack/Middleware/Session/Cookie.pm
@@ -50,13 +50,13 @@ sub prepare_app {
 }
 
 sub finalize {
-    my($self, $env, $response) = @_;
+    my($self, $session, $options, $response) = @_;
 
-    if ($env->{'psgix.session.options'}->{expire}) {
-        $self->state->expire_session_id($env->{'psgix.session.options'}->{id}, $response);
+    if ($options->{expire}) {
+        $self->state->expire_session_id($options->{id}, $response);
     } else {
-        my $cookie = $self->_serialize($env->{'psgix.session'});
-        $self->state->finalize($cookie, $response, $env->{'psgix.session.options'});
+        my $cookie = $self->_serialize($session);
+        $self->state->finalize($cookie, $response, $options);
     }
 }