Perltidy + restore of lost test fixes

diff --git a/lib/Catalyst/Plugin/Session.pm b/lib/Catalyst/Plugin/Session.pm
index 0b4bf4d..a4e93fc 100644 (file)
--- a/lib/Catalyst/Plugin/Session.pm
+++ b/lib/Catalyst/Plugin/Session.pm
@@ -8,143 +8,145 @@ use warnings;
 
 use NEXT;
 use Catalyst::Exception ();
-use Digest ();
-use overload ();
-use List::Util ();
+use Digest              ();
+use overload            ();
+use List::Util          ();
 
 BEGIN {
-       __PACKAGE__->mk_accessors(qw/sessionid session_delete_reason/);
+    __PACKAGE__->mk_accessors(qw/sessionid session_delete_reason/);
 }
 
 sub setup {
-       my $c = shift;
-       
-       $c->NEXT::setup(@_);
-       
-       $c->check_session_plugin_requirements;
-       $c->setup_session;
-
-       return $c;
+    my $c = shift;
+
+    $c->NEXT::setup(@_);
+
+    $c->check_session_plugin_requirements;
+    $c->setup_session;
+
+    return $c;
 }
 
 sub check_session_plugin_requirements {
-       my $c = shift;
+    my $c = shift;
 
-       unless ( $c->isa("Catalyst::Plugin::Session::State") && $c->isa("Catalyst::Plugin::Session::Store") ) {
-               my $err = (
-                       "The Session plugin requires both Session::State " .
-                       "and Session::Store plugins to be used as well."
-               );
+    unless ( $c->isa("Catalyst::Plugin::Session::State")
+        && $c->isa("Catalyst::Plugin::Session::Store") )
+    {
+        my $err =
+          (     "The Session plugin requires both Session::State "
+              . "and Session::Store plugins to be used as well." );
 
-               $c->log->fatal($err);
-               Catalyst::Exception->throw($err);
-       }
+        $c->log->fatal($err);
+        Catalyst::Exception->throw($err);
+    }
 }
 
 sub setup_session {
-       my $c = shift;
+    my $c = shift;
 
-       my $cfg = ($c->config->{session} ||= {});
+    my $cfg = ( $c->config->{session} ||= {} );
 
-       %$cfg = (
-               expires        => 7200,
-               verify_address => 1,
-               %$cfg,
-       );
+    %$cfg = (
+        expires        => 7200,
+        verify_address => 1,
+        %$cfg,
+    );
 
-       $c->NEXT::setup_session();
+    $c->NEXT::setup_session();
 }
 
 sub finalize {
-       my $c = shift;
+    my $c = shift;
+
+    if ( $c->{session} ) {
 
-       if ($c->{session}) {
-               # all sessions are extended at the end of the request
-               my $now = time;
-               @{ $c->{session} }{qw/__updated __expires/} = ($now, $c->config->{session}{expires} + $now);
-               $c->store_session_data( $c->sessionid, $c->{session} );
-       }
+        # all sessions are extended at the end of the request
+        my $now = time;
+        @{ $c->{session} }{qw/__updated __expires/} =
+          ( $now, $c->config->{session}{expires} + $now );
+        $c->store_session_data( $c->sessionid, $c->{session} );
+    }
 
-       $c->NEXT::finalize(@_);
+    $c->NEXT::finalize(@_);
 }
 
 sub prepare_action {
     my $c = shift;
 
+    my $ret = $c->NEXT::prepare_action;
 
-       my $ret = $c->NEXT::prepare_action;
-    
-       my $sid = $c->sessionid || return;
+    my $sid = $c->sessionid || return;
 
     $c->log->debug(qq/Found session "$sid"/) if $c->debug;
 
-       my $s = $c->{session} ||= $c->get_session_data($sid);
-       if ( !$s or $s->{__expires} < time ) {
-               # session expired
-               $c->log->debug("Deleting session $sid (expired)") if $c->debug;
-               $c->delete_session("session expired");
-               return $ret;
-       }
-
-       if ( $c->config->{session}{verify_address}
-         && $c->{session}{__address}
-         && $c->{session}{__address} ne $c->request->address
-       ) {
-               $c->log->warn(
-                       "Deleting session $sid due to address mismatch (".
-                       $c->{session}{__address} . " != " . $c->request->address . ")",
-               );
-               $c->delete_session("address mismatch");
-               return $ret;
-       }
+    my $s = $c->{session} ||= $c->get_session_data($sid);
+    if ( !$s or $s->{__expires} < time ) {
+
+        # session expired
+        $c->log->debug("Deleting session $sid (expired)") if $c->debug;
+        $c->delete_session("session expired");
+        return $ret;
+    }
+
+    if (   $c->config->{session}{verify_address}
+        && $c->{session}{__address}
+        && $c->{session}{__address} ne $c->request->address )
+    {
+        $c->log->warn(
+                "Deleting session $sid due to address mismatch ("
+              . $c->{session}{__address} . " != "
+              . $c->request->address . ")",
+        );
+        $c->delete_session("address mismatch");
+        return $ret;
+    }
 }
 
 sub delete_session {
-       my ( $c, $msg ) = @_;
+    my ( $c, $msg ) = @_;
 
-       # delete the session data
-       my $sid = $c->sessionid;
-       $c->delete_session_data($sid);
+    # delete the session data
+    my $sid = $c->sessionid;
+    $c->delete_session_data($sid);
 
-       # reset the values in the context object
-       $c->{session} = undef;
-       $c->sessionid(undef);
-       $c->session_delete_reason($msg);
+    # reset the values in the context object
+    $c->{session} = undef;
+    $c->sessionid(undef);
+    $c->session_delete_reason($msg);
 }
 
 sub session {
-       my $c = shift;
+    my $c = shift;
 
     return $c->{session} if $c->{session};
 
-       my $sid = $c->generate_session_id;
-       $c->sessionid($sid);
+    my $sid = $c->generate_session_id;
+    $c->sessionid($sid);
 
-       $c->log->debug(qq/Created session "$sid"/) if $c->debug;
+    $c->log->debug(qq/Created session "$sid"/) if $c->debug;
 
-       return $c->initialize_session_data;
+    return $c->initialize_session_data;
 }
 
 sub initialize_session_data {
-       my $c = shift;
+    my $c = shift;
 
-       my $now = time;
+    my $now = time;
 
-       return $c->{session} = {
-               __created => $now,
-               __updated => $now,
-               __expires => $now + $c->config->{session}{expires},
+    return $c->{session} = {
+        __created => $now,
+        __updated => $now,
+        __expires => $now + $c->config->{session}{expires},
 
-               ($c->config->{session}{verify_address}
-                       ? (__address => $c->request->address)
-                       : ()
-               ),
-       };
+        (
+            $c->config->{session}{verify_address}
+            ? ( __address => $c->request->address )
+            : ()
+        ),
+    };
 }
 
-
-
-
 # refactor into Catalyst::Plugin::Session::ID::Weak ?
 
 sub generate_session_id {
@@ -156,33 +158,31 @@ sub generate_session_id {
 }
 
 my $counter;
+
 sub session_hash_seed {
-       my $c = shift;
-
-    return join("",
-               ++$counter,
-               time,
-        rand,
-        $$,
-               {},
-               overload::StrVal($c),
-    );
+    my $c = shift;
+
+    return join( "", ++$counter, time, rand, $$, {}, overload::StrVal($c), );
 }
 
 my $usable;
+
 sub _find_digest () {
-       unless ($usable) {
-               $usable = List::Util::first(sub { eval { Digest->new($_) } }, qw/SHA-1 MD5 SHA-256/)
-                       or Catalyst::Exception->throw(
-                               "Could not find a suitable Digest module. Please install " .
-                               "Digest::SHA1, Digest::SHA, or Digest::MD5"
-                       );
-       }
+    unless ($usable) {
+        $usable = List::Util::first(
+            sub {
+                eval { Digest->new($_) };
+            },
+            qw/SHA-1 MD5 SHA-256/
+          )
+          or Catalyst::Exception->throw(
+                "Could not find a suitable Digest module. Please install "
+              . "Digest::SHA1, Digest::SHA, or Digest::MD5" );
+    }
 
     return Digest->new($usable);
 }
 
-
 __PACKAGE__;
 
 __END__

diff --git a/lib/Catalyst/Plugin/Session/State.pm b/lib/Catalyst/Plugin/Session/State.pm
index 1f91c6b..0693944 100644 (file)
--- a/lib/Catalyst/Plugin/Session/State.pm
+++ b/lib/Catalyst/Plugin/Session/State.pm
@@ -5,8 +5,6 @@ package Catalyst::Plugin::Session::State;
 use strict;
 use warnings;
 
-
-
 __PACKAGE__;
 
 __END__

diff --git a/lib/Catalyst/Plugin/Session/Store.pm b/lib/Catalyst/Plugin/Session/Store.pm
index 1168c51..185cbfc 100644 (file)
--- a/lib/Catalyst/Plugin/Session/Store.pm
+++ b/lib/Catalyst/Plugin/Session/Store.pm
@@ -5,7 +5,6 @@ package Catalyst::Plugin::Session::Store;
 use strict;
 use warnings;
 
-
 __PACKAGE__;
 
 __END__

diff --git a/t/01_setup.t b/t/01_setup.t
index c27f14e..0b19e43 100644 (file)
--- a/t/01_setup.t
+++ b/t/01_setup.t
@@ -52,11 +52,11 @@ ok(!$log->called("fatal"), "no fatal error logged either");
 
 cmp_deeply(
        [ keys %{ $config{session} } ],
-       bag(qw/expire verify_address/),
+       bag(qw/expires verify_address/),
        "default values for config were populated in successful setup",
 );
 
-%config = (session => { expire => 1234 });
+%config = (session => { expires => 1234 });
 MockCxt->new->setup;
-is($config{session}{expire}, 1234, "user values are not overwritten in config");
+is($config{session}{expires}, 1234, "user values are not overwritten in config");
 

diff --git a/t/02_session_data.t b/t/02_session_data.t
index cad59f2..5fdb2f3 100644 (file)
--- a/t/02_session_data.t
+++ b/t/02_session_data.t
@@ -29,6 +29,7 @@ $req->set_always(address => "127.0.0.1");
        sub debug { 0 }
        sub isa { 1 } # subvert the plugin tests, we're faking them
        sub get_session_data { \%session }
+       sub store_session_data { }
        sub delete_session_data { }
 }
 
@@ -36,7 +37,7 @@ $req->set_always(address => "127.0.0.1");
        my $c = MockCxt->new;
        $c->setup;
 
-       $c->prepare;
+       $c->prepare_action;
        ok(!$c->{session}, "without a session ID prepare doesn't load a session");
 }
 
@@ -54,7 +55,7 @@ $req->set_always(address => "127.0.0.1");
        $c->setup;
 
        $c->sessionid("the_session");
-       $c->prepare;
+       $c->prepare_action;
 
        ok($c->{session}, 'session "restored" with session id');
 }
@@ -71,7 +72,7 @@ $req->set_always(address => "127.0.0.1");
        $c->setup;
 
        $c->sessionid("the_session");
-       $c->prepare;
+       $c->prepare_action;
 
        ok(!$c->{session}, "expired sessions are deleted");
        like($c->session_delete_reason, qr/expire/i, "with appropriate reason");
@@ -90,7 +91,7 @@ $req->set_always(address => "127.0.0.1");
        $c->setup;
 
        $c->sessionid("the_session");
-       $c->prepare;
+       $c->prepare_action;
 
        ok(!$c->{session}, "hijacked sessions are deleted");
        like($c->session_delete_reason, qr/mismatch/, "with appropriate reason");
@@ -111,7 +112,7 @@ $req->set_always(address => "127.0.0.1");
        $c->setup;
 
        $c->sessionid("the_session");
-       $c->prepare;
+       $c->prepare_action;
 
        ok($c->{session}, "address mismatch is OK if verify_address is disabled");
 }
@@ -124,14 +125,14 @@ $req->set_always(address => "127.0.0.1");
 
        my $c = MockCxt->new;
        $c->setup;
-       $c->prepare;
+       $c->prepare_action;
 
        ok($c->session, "creating a session works");
        ok($c->sessionid, "session id generated");
 
        cmp_ok($c->session->{__created}, ">=", $now, "__created time is logical");
        cmp_ok($c->session->{__updated}, ">=", $now, "__updated time is logical");
-       cmp_ok($c->session->{__expires}, ">=", ($now + $config{session}{expire}), "__expires time is logical");
+       cmp_ok($c->session->{__expires}, ">=", ($now + $config{session}{expires}), "__expires time is logical");
        is($c->session->{__address}, $c->request->address, "address is also correct");
 
        cmp_deeply(
@@ -151,7 +152,7 @@ $req->set_always(address => "127.0.0.1");
                __address => "127.0.0.1",
        );
 
-       $config{session}{expire} = 2000;
+       $config{session}{expires} = 2000;
 
        my $c = MockCxt->new;
        $c->setup;
@@ -159,7 +160,7 @@ $req->set_always(address => "127.0.0.1");
        my $now = time();
        
        $c->sessionid("the_session");
-       $c->prepare;
+       $c->prepare_action;
        $c->finalize;
 
        ok($c->{session}, "session is still alive after 1/2 expired and finalized");