From: Florian Ragwitz <rafl@debian.org>
Date: Fri, 16 Oct 2009 15:48:37 +0000 (+0000)
Subject: Port to new session config key.
X-Git-Tag: v0.16~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Session-State-Cookie.git;a=commitdiff_plain;h=b6fda7bbdcf3eab275dad1fcaf9a9fcf55b7e603

Port to new session config key.
---

diff --git a/Makefile.PL b/Makefile.PL
index 5fbce0d..8084061 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,7 +4,7 @@ name 'Catalyst-Plugin-Session-State-Cookie';
 all_from 'lib/Catalyst/Plugin/Session/State/Cookie.pm';
 
 requires 'Catalyst'                  => '5.80005';
-requires 'Catalyst::Plugin::Session' => '0.19';
+requires 'Catalyst::Plugin::Session' => '0.27';
 requires 'MRO::Compat';
 requires 'Moose';
 requires 'namespace::autoclean';
diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index e6ee517..8cc945e 100644
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -11,14 +11,6 @@ our $VERSION = "0.15";
 
 has _deleted_session_id => ( is => 'rw' );
 
-# FIXME - Can go away when we dep on new Session..
-sub _session_plugin_config {
-    my $c = shift;
-    my $key = $c->config->{'Plugin::Session'} ?
-        'Plugin::Session' : 'session';
-    $c->config->{$key} ||= {};
-}
-
 sub setup_session {
     my $c = shift;
 
diff --git a/t/basic.t b/t/basic.t
index 76f53fe..60f1377 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -5,6 +5,8 @@ use warnings;
 
 use Test::More tests => 13;
 
+use Catalyst::Plugin::Session;
+
 my $m;
 BEGIN { use_ok( $m = "Catalyst::Plugin::Session::State::Cookie" ) }
 
@@ -23,7 +25,13 @@ my $cookies_called = 0;
 $res_meta->add_method( cookies => sub { $cookies_called++; \%res_cookies });
 my $res = $res_meta->name->new;
 
-my $cxt_meta = Class::MOP::Class->create_anon_class( superclasses => ["Catalyst::Plugin::Session::State::Cookie", 'Moose::Object'] );
+my $cxt_meta = Class::MOP::Class->create_anon_class(
+    superclasses => [qw/
+        Catalyst::Plugin::Session
+        Catalyst::Plugin::Session::State::Cookie
+        Moose::Object
+    /],
+);
 
 my $config = {};
 $cxt_meta->add_method( config   => sub { $config });
@@ -40,10 +48,10 @@ can_ok( $m, "setup_session" );
 my $cxt = $cxt_meta->name->new;
 $cxt->setup_session;
 
-like( $config->{session}{cookie_name},
+like( $config->{'Plugin::Session'}{cookie_name},
     qr/_session$/, "default cookie name is set" );
 
-$config->{session}{cookie_name} = "session";
+$config->{'Plugin::Session'}{cookie_name} = "session";
 
 can_ok( $m, "get_session_id" );