Checking in changes prior to tagging of version 0.30. Changelog diff is:

[catagits/Catalyst-Plugin-Session.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index b56ccfe..e9482f6 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -30,7 +30,6 @@ requires 'Test::More';
 
 test_requires 'Test::Deep';
 test_requires 'Test::Exception';
-test_requires 'Test::MockObject' => '1.01';
 
 resources repository => 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Plugin-Session/0.00/trunk/';
 
@@ -43,13 +42,15 @@ sub is_upgrading_needed {
     );
 
     foreach my $module (keys %state) {
-        if ( eval "require Catalyst::Plugin::Session::State::$module" and
-        ${"Catalyst::Plugin::Session::State::${module}::VERSION"} < $state{$module} ) {
-            warn <<WARN;
+        my $package = 'Catalyst::Plugin::Session::State::' . $module;
+
+        next if not eval "require $package;";
 
+        if( not eval { $package->VERSION( $state{ $module } ); } ) {
+            warn <<WARN;
 ********** NOTE **********
 
-Catalyst::Plugin::Session::State::$module must also be updated!
+$package must also be updated!
 
 The currently installed version is *not* compatible with this version of
 Catalyst::Plugin::Session!