refactoring chiba++ commit so we only extract session id once

diff --git a/lib/Plack/Session/State.pm b/lib/Plack/Session/State.pm
index 6f72c78..90140ed 100644 (file)
--- a/lib/Plack/Session/State.pm
+++ b/lib/Plack/Session/State.pm
@@ -35,39 +35,36 @@ sub is_session_expired {
 
 sub check_expired {
     my ($self, $id) = @_;
-    return unless $id && not $self->is_session_expired( $id );
+    return if $self->is_session_expired( $id );
     return $id;
 }
 
-sub validate_request_session_id {
-    my ($self, $request) = @_;
-
-    my $reqest_session_id = $self->get_request_session_id($request);
-
-    defined $reqest_session_id && $reqest_session_id =~ $self->sid_validator;
+sub validate_session_id {
+    my ($self, $id) = @_;
+    $id =~ $self->sid_validator;
 }
 
 sub get_session_id {
     my ($self, $request) = @_;
-    (
-        $self->validate_request_session_id($request)
-        &&
-        $self->extract( $request )
-    )
+    $self->extract( $request )
         ||
     $self->generate( $request )
 }
 
-sub get_request_session_id {
-    my ($self, $request ) = @_;
-
+sub get_session_id_from_request {
+    my ($self, $request) = @_;
     $request->param( $self->session_key );
 }
 
 sub extract {
     my ($self, $request) = @_;
 
-    $self->check_expired( $self->get_request_session_id($request) );
+    my $id = $self->get_session_id_from_request( $request );
+    return unless defined $id;
+
+    $self->validate_session_id( $id )
+        &&
+    $self->check_expired( $id );
 }
 
 sub generate {
@@ -140,7 +137,7 @@ concerned or interested, just read the source.
 
 =item B<sid_validator>
 
-This is a regex used to validate requested session id,
+This is a regex used to validate requested session id.
 
 =back
 
@@ -155,7 +152,16 @@ if the is expired or does not exist, it will then generate a new
 session. The C<$request> is expected to be a L<Plack::Request> instance
 or an object with an equivalent interface.
 
-=item B<get_request_session_id ( $request )>
+=item B<get_session_id_from_request ( $request )>
+
+This is the method used to extract the session id from a C<$request>.
+Subclasses will often only need to override this method and the
+C<finalize> method.
+
+=item B<validate_session_id ( $session_id )>
+
+This will use the C<sid_validator> regex and confirm that the
+C<$session_id> is valid.
 
 =item B<extract ( $request )>
 

diff --git a/lib/Plack/Session/State/Cookie.pm b/lib/Plack/Session/State/Cookie.pm
index 12631d4..1b889e4 100644 (file)
--- a/lib/Plack/Session/State/Cookie.pm
+++ b/lib/Plack/Session/State/Cookie.pm
@@ -17,14 +17,9 @@ sub expire_session_id {
     $self->expires( 0 );
 }
 
-sub get_request_session_id {
-    my ($self, $request ) = @_;
-    ($request->cookie( $self->session_key ) || return )->value;
-}
-
-sub extract {
+sub get_session_id_from_request {
     my ($self, $request) = @_;
-    $self->check_expired( $self->get_request_session_id($request) || return );
+    ( $request->cookie( $self->session_key ) || return )->value;
 }
 
 sub finalize {