r75773 - in /branches/upstream/libchi-perl/current: ./ lib/ lib/CHI/ lib/CHI/Driver/ lib/CHI/Driver/Base/ lib/CHI/Driver/Role/ lib/CHI/t/ lib/CHI/t/Driver/

carnil at users.alioth.debian.org carnil at users.alioth.debian.org
Wed Jun 15 14:03:14 UTC 2011


Author: carnil
Date: Wed Jun 15 14:03:09 2011
New Revision: 75773

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=75773
Log:
[svn-upgrade] new version libchi-perl (0.48)

Modified:
    branches/upstream/libchi-perl/current/Changes
    branches/upstream/libchi-perl/current/META.json
    branches/upstream/libchi-perl/current/META.yml
    branches/upstream/libchi-perl/current/Makefile.PL
    branches/upstream/libchi-perl/current/README
    branches/upstream/libchi-perl/current/lib/CHI.pm
    branches/upstream/libchi-perl/current/lib/CHI/Benchmarks.pod
    branches/upstream/libchi-perl/current/lib/CHI/CacheObject.pm
    branches/upstream/libchi-perl/current/lib/CHI/Constants.pm
    branches/upstream/libchi-perl/current/lib/CHI/Driver.pm
    branches/upstream/libchi-perl/current/lib/CHI/Driver/Base/CacheContainer.pm
    branches/upstream/libchi-perl/current/lib/CHI/Driver/CacheCache.pm
    branches/upstream/libchi-perl/current/lib/CHI/Driver/Development.pod
    branches/upstream/libchi-perl/current/lib/CHI/Driver/FastMmap.pm
    branches/upstream/libchi-perl/current/lib/CHI/Driver/File.pm
    branches/upstream/libchi-perl/current/lib/CHI/Driver/Memory.pm
    branches/upstream/libchi-perl/current/lib/CHI/Driver/Metacache.pm
    branches/upstream/libchi-perl/current/lib/CHI/Driver/Null.pm
    branches/upstream/libchi-perl/current/lib/CHI/Driver/RawMemory.pm
    branches/upstream/libchi-perl/current/lib/CHI/Driver/Role/Universal.pm
    branches/upstream/libchi-perl/current/lib/CHI/Stats.pm
    branches/upstream/libchi-perl/current/lib/CHI/t/Driver.pm
    branches/upstream/libchi-perl/current/lib/CHI/t/Driver/Memory.pm

Modified: branches/upstream/libchi-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/Changes?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/Changes (original)
+++ branches/upstream/libchi-perl/current/Changes Wed Jun 15 14:03:09 2011
@@ -1,6 +1,11 @@
 Revision history for CHI
 
 ** denotes an incompatible change
+
+0.48  Jun 15, 2011
+
+* Fixes
+  - Disregard default expires_at and expires_in if either are provided - RT #67970 (spjw)
 
 0.47  Apr 28, 2011
 

Modified: branches/upstream/libchi-perl/current/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/META.json?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/META.json (original)
+++ branches/upstream/libchi-perl/current/META.json Wed Jun 15 14:03:09 2011
@@ -77,6 +77,6 @@
          "web" : "https://github.com/jonswar/perl-chi"
       }
    },
-   "version" : "0.47"
+   "version" : "0.48"
 }
 

Modified: branches/upstream/libchi-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/META.yml?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/META.yml (original)
+++ branches/upstream/libchi-perl/current/META.yml Wed Jun 15 14:03:09 2011
@@ -50,4 +50,4 @@
 resources:
   bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=CHI
   repository: git://github.com/jonswar/perl-chi.git
-version: 0.47
+version: 0.48

Modified: branches/upstream/libchi-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/Makefile.PL?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/Makefile.PL (original)
+++ branches/upstream/libchi-perl/current/Makefile.PL Wed Jun 15 14:03:09 2011
@@ -44,7 +44,7 @@
     'Time::Duration::Parse' => '0.03',
     'Try::Tiny' => '0.05'
   },
-  'VERSION' => '0.47',
+  'VERSION' => '0.48',
   'test' => {
     'TESTS' => 't/*.t'
   }

Modified: branches/upstream/libchi-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/README?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/README (original)
+++ branches/upstream/libchi-perl/current/README Wed Jun 15 14:03:09 2011
@@ -2,7 +2,7 @@
     CHI - Unified cache handling interface
 
 VERSION
-    version 0.47
+    version 0.48
 
 SYNOPSIS
         use CHI;

Modified: branches/upstream/libchi-perl/current/lib/CHI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI;
 BEGIN {
-  $CHI::VERSION = '0.47';
+  $CHI::VERSION = '0.48';
 }
 use 5.006;
 use Carp;
@@ -93,7 +93,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Benchmarks.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Benchmarks.pod?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Benchmarks.pod (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Benchmarks.pod Wed Jun 15 14:03:09 2011
@@ -9,7 +9,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 DESCRIPTION
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/CacheObject.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/CacheObject.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/CacheObject.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/CacheObject.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::CacheObject;
 BEGIN {
-  $CHI::CacheObject::VERSION = '0.47';
+  $CHI::CacheObject::VERSION = '0.48';
 }
 use CHI::Constants qw(CHI_Max_Time);
 use Encode;
@@ -180,7 +180,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Constants.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Constants.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Constants.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Constants.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Constants;
 BEGIN {
-  $CHI::Constants::VERSION = '0.47';
+  $CHI::Constants::VERSION = '0.48';
 }
 use strict;
 use warnings;
@@ -28,7 +28,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 DESCRIPTION
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Driver.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Driver.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Driver.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Driver.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Driver;
 BEGIN {
-  $CHI::Driver::VERSION = '0.47';
+  $CHI::Driver::VERSION = '0.48';
 }
 use Carp;
 use CHI::CacheObject;
@@ -283,7 +283,18 @@
                 $options = { expires_in => $options };
             }
         }
-        $options = { %{ $self->_default_set_options }, %$options };
+
+        # Disregard default expires_at and expires_in if either are provided
+        #
+        if (   exists( $options->{expires_at} )
+            || exists( $options->{expires_in} ) )
+        {
+            $options =
+              { expires_variance => $self->expires_variance, %$options };
+        }
+        else {
+            $options = { %{ $self->_default_set_options }, %$options };
+        }
     }
 
     $self->set_with_options( $key, $value, $options );
@@ -686,7 +697,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 DESCRIPTION
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Driver/Base/CacheContainer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Driver/Base/CacheContainer.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Driver/Base/CacheContainer.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Driver/Base/CacheContainer.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Driver::Base::CacheContainer;
 BEGIN {
-  $CHI::Driver::Base::CacheContainer::VERSION = '0.47';
+  $CHI::Driver::Base::CacheContainer::VERSION = '0.48';
 }
 use Moose;
 use Moose::Util::TypeConstraints;
@@ -62,7 +62,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 DESCRIPTION
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Driver/CacheCache.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Driver/CacheCache.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Driver/CacheCache.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Driver/CacheCache.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Driver::CacheCache;
 BEGIN {
-  $CHI::Driver::CacheCache::VERSION = '0.47';
+  $CHI::Driver::CacheCache::VERSION = '0.48';
 }
 use Cache::Cache;
 use Carp;
@@ -47,7 +47,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Driver/Development.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Driver/Development.pod?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Driver/Development.pod (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Driver/Development.pod Wed Jun 15 14:03:09 2011
@@ -9,7 +9,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Driver/FastMmap.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Driver/FastMmap.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Driver/FastMmap.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Driver/FastMmap.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Driver::FastMmap;
 BEGIN {
-  $CHI::Driver::FastMmap::VERSION = '0.47';
+  $CHI::Driver::FastMmap::VERSION = '0.48';
 }
 use Carp;
 use Cache::FastMmap;
@@ -89,7 +89,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Driver/File.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Driver/File.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Driver/File.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Driver/File.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Driver::File;
 BEGIN {
-  $CHI::Driver::File::VERSION = '0.47';
+  $CHI::Driver::File::VERSION = '0.48';
 }
 use Carp;
 use Cwd qw(realpath cwd);
@@ -248,7 +248,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Driver/Memory.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Driver/Memory.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Driver/Memory.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Driver/Memory.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Driver::Memory;
 BEGIN {
-  $CHI::Driver::Memory::VERSION = '0.47';
+  $CHI::Driver::Memory::VERSION = '0.48';
 }
 use Carp qw(cluck croak);
 use CHI::Constants qw(CHI_Meta_Namespace);
@@ -105,7 +105,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Driver/Metacache.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Driver/Metacache.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Driver/Metacache.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Driver/Metacache.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Driver::Metacache;
 BEGIN {
-  $CHI::Driver::Metacache::VERSION = '0.47';
+  $CHI::Driver::Metacache::VERSION = '0.48';
 }
 use CHI::Constants qw(CHI_Meta_Namespace);
 use Moose;
@@ -66,7 +66,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Driver/Null.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Driver/Null.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Driver/Null.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Driver/Null.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Driver::Null;
 BEGIN {
-  $CHI::Driver::Null::VERSION = '0.47';
+  $CHI::Driver::Null::VERSION = '0.48';
 }
 use Moose;
 use strict;
@@ -28,7 +28,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Driver/RawMemory.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Driver/RawMemory.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Driver/RawMemory.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Driver/RawMemory.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Driver::RawMemory;
 BEGIN {
-  $CHI::Driver::RawMemory::VERSION = '0.47';
+  $CHI::Driver::RawMemory::VERSION = '0.48';
 }
 use Moose;
 use strict;
@@ -30,7 +30,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/Driver/Role/Universal.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Driver/Role/Universal.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Driver/Role/Universal.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Driver/Role/Universal.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Driver::Role::Universal;
 BEGIN {
-  $CHI::Driver::Role::Universal::VERSION = '0.47';
+  $CHI::Driver::Role::Universal::VERSION = '0.48';
 }
 use CHI::Constants qw(CHI_Meta_Namespace);
 use Moose::Role;

Modified: branches/upstream/libchi-perl/current/lib/CHI/Stats.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/Stats.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/Stats.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/Stats.pm Wed Jun 15 14:03:09 2011
@@ -1,6 +1,6 @@
 package CHI::Stats;
 BEGIN {
-  $CHI::Stats::VERSION = '0.47';
+  $CHI::Stats::VERSION = '0.48';
 }
 use Log::Any qw($log);
 use Moose;
@@ -137,7 +137,7 @@
 
 =head1 VERSION
 
-version 0.47
+version 0.48
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libchi-perl/current/lib/CHI/t/Driver.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/t/Driver.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/t/Driver.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/t/Driver.pm Wed Jun 15 14:03:09 2011
@@ -298,8 +298,10 @@
 }
 
 sub test_expires_immediately : Tests {
-    my $self  = shift;
-    my $cache = $self->{cache};
+    my $self = shift;
+
+    # expires_in default should be ignored
+    my $cache = $self->new_cache( expires_in => '1 hour' );
 
     # Expires immediately
     my $test_expires_immediately = sub {
@@ -326,8 +328,10 @@
 }
 
 sub test_expires_shortly : Tests {
-    my $self  = shift;
-    my $cache = $self->{cache};
+    my $self = shift;
+
+    # expires_in default should be ignored
+    my $cache = $self->new_cache( expires_in => '1 hour' );
 
     # Expires shortly (real time)
     my $test_expires_shortly = sub {
@@ -360,8 +364,10 @@
 }
 
 sub test_expires_later : Tests {
-    my $self  = shift;
-    my $cache = $self->{cache};
+    my $self = shift;
+
+    # expires_in default should be ignored
+    my $cache = $self->new_cache( expires_in => '1s' );
 
     # Expires later (test time)
     my $test_expires_later = sub {
@@ -373,16 +379,16 @@
         my $start_time = time();
         is_between(
             $cache->get_expires_at($key),
-            $start_time + 3599,
-            $start_time + 3601,
+            $start_time + 3590,
+            $start_time + 3610,
             "expires_at ($desc)"
         );
         ok( !$cache->exists_and_is_expired($key), "not expired ($desc)" );
         ok( $cache->is_valid($key),               "valid ($desc)" );
-        local $CHI::Driver::Test_Time = $start_time + 3598;
+        local $CHI::Driver::Test_Time = $start_time + 3590;
         ok( !$cache->exists_and_is_expired($key), "not expired ($desc)" );
         ok( $cache->is_valid($key),               "valid ($desc)" );
-        local $CHI::Driver::Test_Time = $start_time + 3602;
+        local $CHI::Driver::Test_Time = $start_time + 3610;
         ok( !defined $cache->get($key),          "miss after 1 hour ($desc)" );
         ok( $cache->exists_and_is_expired($key), "is_expired ($desc)" );
         ok( !$cache->is_valid($key),             "invalid ($desc)" );
@@ -393,8 +399,8 @@
 }
 
 sub test_expires_never : Tests {
-    my $self  = shift;
-    my $cache = $self->{cache};
+    my $self = shift;
+    my $cache;
 
     # Expires never (will fail in 2037)
     my ( $key, $value ) = $self->kvpair();
@@ -409,7 +415,13 @@
         ok( !$cache->exists_and_is_expired($key), "not expired" );
         ok( $cache->is_valid($key),               "valid" );
     };
+
+    # never is default
+    $cache = $self->new_cache();
     $test_expires_never->();
+
+    # expires_in default should be ignored when never passed to set (RT #67970)
+    $cache = $self->new_cache( expires_in => '1s' );
     $test_expires_never->('never');
 }
 
@@ -1434,7 +1446,9 @@
 }
 
 sub test_discard_timeout : Tests {
-    my $self       = shift;
+    my $self = shift;
+    return 'author testing only' unless ( $ENV{AUTHOR_TESTING} );
+
     my $bad_policy = sub {
         return sub { '1' };
     };

Modified: branches/upstream/libchi-perl/current/lib/CHI/t/Driver/Memory.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchi-perl/current/lib/CHI/t/Driver/Memory.pm?rev=75773&op=diff
==============================================================================
--- branches/upstream/libchi-perl/current/lib/CHI/t/Driver/Memory.pm (original)
+++ branches/upstream/libchi-perl/current/lib/CHI/t/Driver/Memory.pm Wed Jun 15 14:03:09 2011
@@ -90,6 +90,8 @@
 
 sub test_lru_discard : Tests {
     my $self = shift;
+    return 'author testing only' unless ( $ENV{AUTHOR_TESTING} );
+
     my $cache = $self->new_cleared_cache( max_size => 41 );
     is( $cache->discard_policy, 'lru' );
     my $value_20 = 'x' x 6;




More information about the Pkg-perl-cvs-commits mailing list