switch from CAF to Moose (fixes bug raised in Session::Store::File)

diff --git a/Changes b/Changes
index ba87695..2510d96 100644 (file)
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@ Revision history for Perl extension Catalyst::Plugin::Session
 
 0.21 Not released
         - Hide the internal packages in Catalyst::Plugin::Session::Test::Store from PAUSE.
+        - Convert from CAF to Moose with Moosex::Emulate::Class::Accessor::Fast
 
 0.20 2009-02-05
         - No code changes since 0.19_01 dev release.

diff --git a/Makefile.PL b/Makefile.PL
index 62f2e13..d84829a 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -18,6 +18,8 @@ requires 'File::Spec';
 requires 'File::Temp';
 requires 'Object::Signature';
 requires 'MRO::Compat';
+requires 'Moose';
+requires 'MooseX::Emulate::Class::Accessor::Fast';
 
 # an indirect dep. needs a certain version.
 requires 'Tie::RefHash' => '1.34';

diff --git a/lib/Catalyst/Plugin/Session.pm b/lib/Catalyst/Plugin/Session.pm
index 6a3c46a..9cdf628 100644 (file)
--- a/lib/Catalyst/Plugin/Session.pm
+++ b/lib/Catalyst/Plugin/Session.pm
@@ -1,11 +1,12 @@
 #!/usr/bin/perl
 
 package Catalyst::Plugin::Session;
-use base qw/Class::Accessor::Fast/;
 
 use strict;
 use warnings;
 
+use Moose;
+with 'MooseX::Emulate::Class::Accessor::Fast';
 use MRO::Compat;
 use Catalyst::Exception ();
 use Digest              ();
@@ -13,11 +14,11 @@ use overload            ();
 use Object::Signature   ();
 use Carp;
 
-our $VERSION = '0.20';
+our $VERSION = '0.21';
 
 my @session_data_accessors; # used in delete_session
-BEGIN {
-    __PACKAGE__->mk_accessors(
+
+__PACKAGE__->mk_accessors(
         "_session_delete_reason",
         @session_data_accessors = qw/
           _sessionid
@@ -33,8 +34,8 @@ BEGIN {
           _tried_loading_session_expires
           _tried_loading_flash_data
           /
-    );
-}
+);
+
 
 sub setup {
     my $c = shift;

diff --git a/lib/Catalyst/Plugin/Session/Test/Store.pm b/lib/Catalyst/Plugin/Session/Test/Store.pm
index db75e23..89490c9 100644 (file)
--- a/lib/Catalyst/Plugin/Session/Test/Store.pm
+++ b/lib/Catalyst/Plugin/Session/Test/Store.pm
@@ -1,4 +1,4 @@
-\feff#!/usr/bin/perl
+#!/usr/bin/perl
 
 package Catalyst::Plugin::Session::Test::Store;
 

diff --git a/t/00_basic_sanity.t b/t/00_basic_sanity.t
index c68a880..19c7bb0 100644 (file)
--- a/t/00_basic_sanity.t
+++ b/t/00_basic_sanity.t
@@ -9,3 +9,6 @@ use Test::More tests => 4;
 my $m; BEGIN { use_ok($m = "Catalyst::Plugin::Session") }
 
 can_ok($m, $_) for qw/sessionid session session_delete_reason/;
+
+diag("Testing Catalyst::Plugin::Session $Catalyst::Plugin::Session::VERSION");
+