X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Session-State-Cookie.git;a=blobdiff_plain;f=lib%2FCatalyst%2FPlugin%2FSession%2FState%2FCookie.pm;h=1a9cdbe1d7939a9972bf991b2e60e65b07e2ac3e;hp=518d8077c1f5a3100e99619e02fc09370186317c;hb=47f47da510091b02abf3dd8421b042db630690b6;hpb=7acb108b5a1ada44cf65824df59a1d00a810b126

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index 518d807..1a9cdbe 100644
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -9,28 +9,48 @@ use NEXT;
 our $VERSION = "0.01";
 
 sub setup_session {
-	my $c = shift;
+    my $c = shift;
+
+    $c->NEXT::setup_session(@_);
+
+    $c->config->{session}{cookie_name} ||= "session";
+}
+
+sub finalize_cookies {
+    my $c = shift;
+
+    if ( $c->sessionid ) {
+        $c->update_session_cookie( $c->make_session_cookie );
+    }
 
-	$c->NEXT::setup_session(@_);
+    return $c->NEXT::finalize_cookies(@_);
+}
 
-	$c->config->{session}{cookie_name} ||= "session";
+sub update_session_cookie {
+    my ( $c, $updated ) = @_;
+    my $cookie_name = $c->config->{session}{cookie_name};
+    $c->response->cookies->{$cookie_name} = $updated;
 }
 
-sub finalize {
+sub make_session_cookie {
     my $c = shift;
 
-	my $cookie_name = $c->config->{session}{cookie_name};
+    my $cfg    = $c->config->{session};
+    my $cookie = {
+        value => $c->sessionid,
+        ( $cfg->{cookie_domain} ? ( domain => $cfg->{cookie_domain} ) : () ),
+    };
 
-    if ( my $sid = $c->sessionid ) {
-        my $cookie = $c->request->cookies->{$cookie_name};
-        if ( !$cookie or $cookie->value ne $sid ) {
-            $c->response->cookies->{$cookie_name} = { value => $sid };
-            $c->log->debug(qq/A cookie with the session id "$sid" was saved/)
-              if $c->debug;
-        }
+    if ( exists $cfg->{cookie_expires} ) {
+        if ( my $ttl = $cfg->{cookie_expires} ) {
+            $cookie->{expires} = time() + $ttl;
+        }    # else { cookie is non-persistent }
+    }
+    else {
+        $cookie->{expires} = $c->session->{__expires};
     }
 
-    return $c->NEXT::finalize(@_);
+    return $cookie;
 }
 
 sub prepare_cookies {
@@ -38,7 +58,7 @@ sub prepare_cookies {
 
     my $ret = $c->NEXT::prepare_cookies(@_);
 
-	my $cookie_name = $c->config->{session}{cookie_name};
+    my $cookie_name = $c->config->{session}{cookie_name};
 
     if ( my $cookie = $c->request->cookies->{$cookie_name} ) {
         my $sid = $cookie->value;
@@ -46,7 +66,7 @@ sub prepare_cookies {
         $c->log->debug(qq/Found sessionid "$sid" in cookie/) if $c->debug;
     }
 
-	return $ret;
+    return $ret;
 }
 
 __PACKAGE__
@@ -61,7 +81,7 @@ Catalyst::Plugin::Session::State::Cookie - A session ID
 
 =head1 SYNOPSIS
 
-	use Catalyst qw/Session Session::State::Cookie Session::Store::Foo/;
+    use Catalyst qw/Session Session::State::Cookie Session::Store::Foo/;
 
 =head1 DESCRIPTION
 
@@ -70,6 +90,20 @@ stored on the client, and the session data needs to be stored on the server.
 
 This plugin stores the session ID on the client using the cookie mechanism.
 
+=head1 METHODS
+
+=over 4
+
+=item make_session_cookie
+
+Returns a hash reference with the default values for new cookies.
+
+=item update_session_cookie $hash_ref
+
+Sets the cookie based on C<cookie_name> in the response object.
+
+=back
+
 =head1 EXTENDED METHODS
 
 =over 4
@@ -78,9 +112,14 @@ This plugin stores the session ID on the client using the cookie mechanism.
 
 Will restore if an appropriate cookie is found.
 
-=item finalize
+=item finalize_cookies
+
+Will set a cookie called C<session> if it doesn't exist or if it's value is not
+the current session id.
+
+=item setup_session
 
-Will set a cookie called C<session> if it doesn't exist or if it's value is not the current session id.
+Will set the C<cookie_name> parameter to it's default value if it isn't set.
 
 =back
 
@@ -92,18 +131,41 @@ Will set a cookie called C<session> if it doesn't exist or if it's value is not
 
 The name of the cookie to store (defaults to C<session>).
 
+=item cookie_domain
+
+The name of the domain to store in the cookie (defaults to current host)
+
 =back
 
+=head1 CAVEATS
+
+Sessions have to be created before the first write to be saved. For example:
+
+	sub action : Local {
+		my ( $self, $c ) = @_;
+		$c->res->write("foo");
+		$c->session( ... );
+		...
+	}
+
+Will cause a session ID to not be set, because by the time a session is
+actually created the headers have already been sent to the client.
+
 =head1 SEE ALSO
 
 L<Catalyst>, L<Catalyst::Plugin::Session>.
 
-=head1 AUTHOR
+=head1 AUTHORS
+
+This module is derived from L<Catalyst::Plugin::Session::FastMmap> code, and
+has been heavily modified since.
 
-Sebastian Riedel E<lt>C<sri@cpan.org>E<gt>,
-Marcus Ramberg E<lt>C<mramberg@cpan.org>E<gt>,
-Andrew Ford E<lt>C<andrewf@cpan.org>E<gt>,
-Yuval Kogman E<lt>C<nothingmuch@woobling.org>E<gt>
+Andrew Ford
+Andy Grundman
+Christian Hansen
+Yuval Kogman, C<nothingmuch@woobling.org>
+Marcus Ramberg
+Sebastian Riedel
 
 =head1 COPYRIGHT