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=b65430fcb2a4276430ffcccbe9359c6bcae62693;hp=b0e18ddc4601435eba2bb84161b02c1aea6b8cfa;hb=74586782a63bf750618a42e0a5d5ea1549a65ede;hpb=db1cda22b4b70937a8fd6f3c105082985baacce7

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index b0e18dd..b65430f 100644
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -5,51 +5,56 @@ use strict;
 use warnings;
 
 use NEXT;
+use Catalyst::Utils ();
 
-our $VERSION = "0.01";
+our $VERSION = "0.02";
 
 sub setup_session {
     my $c = shift;
 
     $c->NEXT::setup_session(@_);
-
-    $c->config->{session}{cookie_name} ||= "session";
+    $c->config->{session}{cookie_name}
+        ||= Catalyst::Utils::appprefix($c) . '_session';
 }
 
 sub finalize_cookies {
     my $c = shift;
 
-    if ( $c->sessionid) {
-		$c->update_session_cookie( $c->make_session_cookie );
-	}
+    if ( $c->sessionid ) {
+        $c->update_session_cookie( $c->make_session_cookie );
+    }
 
     return $c->NEXT::finalize_cookies(@_);
 }
 
 sub update_session_cookie {
-	my ( $c, $updated ) = @_;
+    my ( $c, $updated ) = @_;
     my $cookie_name = $c->config->{session}{cookie_name};
-	$c->response->cookies->{$cookie_name} = $updated;
+    $c->response->cookies->{$cookie_name} = $updated;
 }
 
 sub make_session_cookie {
-	my $c = shift;
-
-	my $cfg = $c->config->{session};
-	my $cookie = {
-		value   => $c->sessionid,
-		($cfg->{cookie_domain} ? (domain => $cfg->{cookie_domain}) : ()),
-	};
-
-	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};
-	}
+    my $c = shift;
 
-	return $cookie;
+    my $cfg    = $c->config->{session};
+    my $cookie = {
+        value => $c->sessionid,
+        ( $cfg->{cookie_domain} ? ( domain => $cfg->{cookie_domain} ) : () ),
+    };
+
+    if ( exists $cfg->{cookie_expires} ) {
+        if ( $cfg->{cookie_expires} > 0 ) {
+            $cookie->{expires} = time() + $cfg->{cookie_expires};
+        }
+        else {
+            $cookie->{expires} = undef;
+        }
+    }
+    else {
+        $cookie->{expires} = $c->session_expires;
+    }
+
+    return $cookie;
 }
 
 sub prepare_cookies {
@@ -89,6 +94,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
@@ -114,15 +133,21 @@ Will set the C<cookie_name> parameter to it's default value if it isn't set.
 
 =item cookie_name
 
-The name of the cookie to store (defaults to C<session>).
+The name of the cookie to store (defaults to C<Catalyst::Utils::apprefix($c) . '_session'>).
 
 =item cookie_domain
 
 The name of the domain to store in the cookie (defaults to current host)
 
+=item cookie_expires
+
+Number of seconds from now you want to elapse before cookie will expire. 
+Set to 0 to create a session cookie, ie one which will die when the 
+user's browser is shut down.
+
 =back
 
-=item CAVEATS
+=head1 CAVEATS
 
 Sessions have to be created before the first write to be saved. For example:
 
@@ -140,12 +165,17 @@ actually created the headers have already been sent to the client.
 
 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