r75776 - in /trunk/libchi-perl: ./ debian/ 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:32:28 UTC 2011
Author: carnil
Date: Wed Jun 15 14:32:26 2011
New Revision: 75776
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=75776
Log:
* Team upload.
* New upstream release
Modified:
trunk/libchi-perl/Changes
trunk/libchi-perl/META.json
trunk/libchi-perl/META.yml
trunk/libchi-perl/Makefile.PL
trunk/libchi-perl/README
trunk/libchi-perl/debian/changelog
trunk/libchi-perl/lib/CHI.pm
trunk/libchi-perl/lib/CHI/Benchmarks.pod
trunk/libchi-perl/lib/CHI/CacheObject.pm
trunk/libchi-perl/lib/CHI/Constants.pm
trunk/libchi-perl/lib/CHI/Driver.pm
trunk/libchi-perl/lib/CHI/Driver/Base/CacheContainer.pm
trunk/libchi-perl/lib/CHI/Driver/CacheCache.pm
trunk/libchi-perl/lib/CHI/Driver/Development.pod
trunk/libchi-perl/lib/CHI/Driver/FastMmap.pm
trunk/libchi-perl/lib/CHI/Driver/File.pm
trunk/libchi-perl/lib/CHI/Driver/Memory.pm
trunk/libchi-perl/lib/CHI/Driver/Metacache.pm
trunk/libchi-perl/lib/CHI/Driver/Null.pm
trunk/libchi-perl/lib/CHI/Driver/RawMemory.pm
trunk/libchi-perl/lib/CHI/Driver/Role/Universal.pm
trunk/libchi-perl/lib/CHI/Stats.pm
trunk/libchi-perl/lib/CHI/t/Driver.pm
trunk/libchi-perl/lib/CHI/t/Driver/Memory.pm
Modified: trunk/libchi-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/Changes?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/Changes (original)
+++ trunk/libchi-perl/Changes Wed Jun 15 14:32:26 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: trunk/libchi-perl/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/META.json?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/META.json (original)
+++ trunk/libchi-perl/META.json Wed Jun 15 14:32:26 2011
@@ -77,6 +77,6 @@
"web" : "https://github.com/jonswar/perl-chi"
}
},
- "version" : "0.47"
+ "version" : "0.48"
}
Modified: trunk/libchi-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/META.yml?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/META.yml (original)
+++ trunk/libchi-perl/META.yml Wed Jun 15 14:32:26 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: trunk/libchi-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/Makefile.PL?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/Makefile.PL (original)
+++ trunk/libchi-perl/Makefile.PL Wed Jun 15 14:32:26 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: trunk/libchi-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/README?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/README (original)
+++ trunk/libchi-perl/README Wed Jun 15 14:32:26 2011
@@ -2,7 +2,7 @@
CHI - Unified cache handling interface
VERSION
- version 0.47
+ version 0.48
SYNOPSIS
use CHI;
Modified: trunk/libchi-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/debian/changelog?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/debian/changelog (original)
+++ trunk/libchi-perl/debian/changelog Wed Jun 15 14:32:26 2011
@@ -1,3 +1,10 @@
+libchi-perl (0.48-1) UNRELEASED; urgency=low
+
+ * Team upload.
+ * New upstream release
+
+ -- Salvatore Bonaccorso <carnil at debian.org> Wed, 15 Jun 2011 16:03:26 +0200
+
libchi-perl (0.47-1) unstable; urgency=low
* Team upload.
Modified: trunk/libchi-perl/lib/CHI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI.pm (original)
+++ trunk/libchi-perl/lib/CHI.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Benchmarks.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Benchmarks.pod?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Benchmarks.pod (original)
+++ trunk/libchi-perl/lib/CHI/Benchmarks.pod Wed Jun 15 14:32:26 2011
@@ -9,7 +9,7 @@
=head1 VERSION
-version 0.47
+version 0.48
=head1 DESCRIPTION
Modified: trunk/libchi-perl/lib/CHI/CacheObject.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/CacheObject.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/CacheObject.pm (original)
+++ trunk/libchi-perl/lib/CHI/CacheObject.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Constants.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Constants.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Constants.pm (original)
+++ trunk/libchi-perl/lib/CHI/Constants.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Driver.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Driver.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Driver.pm (original)
+++ trunk/libchi-perl/lib/CHI/Driver.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Driver/Base/CacheContainer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Driver/Base/CacheContainer.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Driver/Base/CacheContainer.pm (original)
+++ trunk/libchi-perl/lib/CHI/Driver/Base/CacheContainer.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Driver/CacheCache.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Driver/CacheCache.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Driver/CacheCache.pm (original)
+++ trunk/libchi-perl/lib/CHI/Driver/CacheCache.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Driver/Development.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Driver/Development.pod?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Driver/Development.pod (original)
+++ trunk/libchi-perl/lib/CHI/Driver/Development.pod Wed Jun 15 14:32:26 2011
@@ -9,7 +9,7 @@
=head1 VERSION
-version 0.47
+version 0.48
=head1 SYNOPSIS
Modified: trunk/libchi-perl/lib/CHI/Driver/FastMmap.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Driver/FastMmap.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Driver/FastMmap.pm (original)
+++ trunk/libchi-perl/lib/CHI/Driver/FastMmap.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Driver/File.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Driver/File.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Driver/File.pm (original)
+++ trunk/libchi-perl/lib/CHI/Driver/File.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Driver/Memory.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Driver/Memory.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Driver/Memory.pm (original)
+++ trunk/libchi-perl/lib/CHI/Driver/Memory.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Driver/Metacache.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Driver/Metacache.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Driver/Metacache.pm (original)
+++ trunk/libchi-perl/lib/CHI/Driver/Metacache.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Driver/Null.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Driver/Null.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Driver/Null.pm (original)
+++ trunk/libchi-perl/lib/CHI/Driver/Null.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Driver/RawMemory.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Driver/RawMemory.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Driver/RawMemory.pm (original)
+++ trunk/libchi-perl/lib/CHI/Driver/RawMemory.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Driver/Role/Universal.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Driver/Role/Universal.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Driver/Role/Universal.pm (original)
+++ trunk/libchi-perl/lib/CHI/Driver/Role/Universal.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/Stats.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/Stats.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/Stats.pm (original)
+++ trunk/libchi-perl/lib/CHI/Stats.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/t/Driver.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/t/Driver.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/t/Driver.pm (original)
+++ trunk/libchi-perl/lib/CHI/t/Driver.pm Wed Jun 15 14:32:26 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: trunk/libchi-perl/lib/CHI/t/Driver/Memory.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libchi-perl/lib/CHI/t/Driver/Memory.pm?rev=75776&op=diff
==============================================================================
--- trunk/libchi-perl/lib/CHI/t/Driver/Memory.pm (original)
+++ trunk/libchi-perl/lib/CHI/t/Driver/Memory.pm Wed Jun 15 14:32:26 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