[Catalyst-commits] r14343 - in trunk/Catalyst-Plugin-Session-DynamicExpiry: . lib/Catalyst/Plugin/Session

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2012-10-04 18:37:42 +0000 (Thu, 04 Oct 2012)
New Revision: 14343

Modified:
   trunk/Catalyst-Plugin-Session-DynamicExpiry/Makefile.PL
   trunk/Catalyst-Plugin-Session-DynamicExpiry/lib/Catalyst/Plugin/Session/DynamicExpiry.pm
Log:
Update to use modern modules

Modified: trunk/Catalyst-Plugin-Session-DynamicExpiry/Makefile.PL
===================================================================
--- trunk/Catalyst-Plugin-Session-DynamicExpiry/Makefile.PL	2012-10-03 22:03:03 UTC (rev 14342)
+++ trunk/Catalyst-Plugin-Session-DynamicExpiry/Makefile.PL	2012-10-04 18:37:42 UTC (rev 14343)
@@ -3,11 +3,14 @@
 name 'Catalyst-Plugin-Session-DynamicExpiry';
 all_from 'lib/Catalyst/Plugin/Session/DynamicExpiry.pm';
 
-requires 'Catalyst::Runtime';
+requires 'Catalyst::Runtime' => '5.80';
+requires 'Moose';
+requires 'namespace::autoclean';
+requires 'MRO::Compat';
+requires 'Try::Tiny';
 requires 'Catalyst::Plugin::Session' => '0.11';
 
 requires 'Test::More';
-requires 'Test::use::ok';
 
 auto_install;
 resources repository => 'http://dev.catalyst.perl.org/repos/Catalyst/trunk/Catalyst-Plugin-Session-DynamicExpiry/';

Modified: trunk/Catalyst-Plugin-Session-DynamicExpiry/lib/Catalyst/Plugin/Session/DynamicExpiry.pm
===================================================================
--- trunk/Catalyst-Plugin-Session-DynamicExpiry/lib/Catalyst/Plugin/Session/DynamicExpiry.pm	2012-10-03 22:03:03 UTC (rev 14342)
+++ trunk/Catalyst-Plugin-Session-DynamicExpiry/lib/Catalyst/Plugin/Session/DynamicExpiry.pm	2012-10-04 18:37:42 UTC (rev 14343)
@@ -1,21 +1,19 @@
 package Catalyst::Plugin::Session::DynamicExpiry;
-use base qw/Class::Accessor::Fast/;
+use Moose;
+use MRO::Compat;
+use Try::Tiny;
+use namespace::autoclean;
 
-use strict;
-use warnings;
-
-use NEXT;
-
 our $VERSION='0.03';
 
-__PACKAGE__->mk_accessors(qw/_session_time_to_live/);
+has [qw/_session_time_to_live/] => ( is => 'rw' );
 
 sub session_time_to_live {
     my ( $c, @args ) = @_;
 
     if ( @args ) {
         $c->_session_time_to_live($args[0]);
-        eval { $c->_session->{__time_to_live} = $args[0] };
+        try { $c->_session->{__time_to_live} = $args[0] };
     }
 
     return $c->_session_time_to_live || eval { $c->_session->{__time_to_live} };
@@ -23,13 +21,13 @@
 
 sub calculate_initial_session_expires {
     my $c = shift;
-    
+
     if ( defined( my $ttl = $c->_session_time_to_live ) ) {
         $c->log->debug("Overridden time to live: $ttl") if $c->debug;
         return time() + $ttl;
     }
 
-    return $c->NEXT::calculate_initial_session_expires( @_ );
+    return $c->next::method( @_ );
 }
 
 sub calculate_extended_session_expires {
@@ -41,7 +39,7 @@
         return time() + $ttl;
     }
 
-    return $c->NEXT::calculate_extended_session_expires( @_ );
+    return $c->next::method( @_ );
 }
 
 sub _save_session {
@@ -53,7 +51,7 @@
         }
     }
 
-    $c->NEXT::_save_session( @_ );
+    $c->next::method( @_ );
 }
 
 1;