use Cache::LRU in Session::Cache

eisuke · Dec 24, 2010 · e2887af · e2887af
1 parent 7ba5da9
commit e2887af
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 31 deletions.
diff --git a/META.yml b/META.yml
@@ -25,6 +25,7 @@ recommends:
   Log::Any::Adapter::Dispatch: 0
   Mouse: 0.42
 requires:
+  Cache::LRU: 0
   Capture::Tiny: 0
   Carp::Clan: 0
   Class::Data::Inheritable: 0

diff --git a/Makefile.PL b/Makefile.PL
@@ -32,6 +32,7 @@ requires 'Sub::Exporter';
 requires 'Capture::Tiny';
 requires 'Data::Dump';
 requires 'Module::Find';
+requires 'Cache::LRU';
 
 build_requires 'Test::More'     => 0.88;
 test_requires 'Test::Builder'   => 0.33;

diff --git a/lib/DBIx/ObjectMapper/Session.pm b/lib/DBIx/ObjectMapper/Session.pm
@@ -24,9 +24,8 @@ sub new {
                 type      => OBJECT,
                 callbacks => {
                     'ducktype' => sub {
-                        ( grep { $_[0]->can($_) } qw(get set remove clear) )
-                            == 4;
-                        }
+                        ( grep { $_[0]->can($_) } qw(get set remove) ) == 3;
+                    }
                 },
                 default => DBIx::ObjectMapper::Session::Cache->new()
             },

diff --git a/lib/DBIx/ObjectMapper/Session/Cache.pm b/lib/DBIx/ObjectMapper/Session/Cache.pm
@@ -1,31 +1,8 @@
 package DBIx::ObjectMapper::Session::Cache;
 use strict;
 use warnings;
-use Scalar::Util qw(weaken);
+use base 'Cache::LRU';
 
-our $weaken = 1;
-
-sub new { bless +{}, $_[0] }
-
-sub set {
-    $_[0]->{$_[1]} = $_[2];
-    weaken($_[0]->{$_[1]}) if $weaken;
-    $_[2];
-}
-
-sub get { $_[0]->{$_[1]} }
-
-sub remove { delete $_[0]->{$_[1]} }
-
-sub clear {
-    my $self = shift;
-    $self->{$_} = undef for keys %$self;
-}
-
-sub DESTROY {
-    my $self = shift;
-    warn "DESTROY $self" if $ENV{MAPPER_DEBUG};
-}
 
 1;
 

diff --git a/t/05_engine/011_dbi_query_cache.t b/t/05_engine/011_dbi_query_cache.t
@@ -6,7 +6,6 @@ use Test::Exception;
 use DBIx::ObjectMapper::Engine;
 use DBIx::ObjectMapper::Engine::DBI;
 use DBIx::ObjectMapper::Session::Cache;
-$DBIx::ObjectMapper::Session::Cache::weaken = 0;
 
 ok my $engine = DBIx::ObjectMapper::Engine::DBI->new(
     [
@@ -59,7 +58,7 @@ sub get_it {
     get_it('DBIx::ObjectMapper::Engine::DBI::Iterator');
     get_it('DBIx::ObjectMapper::Iterator') for 1 .. 3;
     is $engine->{sql_cnt}, 13;
-    $engine->cache->clear;
+    $engine->{cache} = DBIx::ObjectMapper::Session::Cache->new;
 };
 
 {
@@ -71,7 +70,7 @@ sub get_it {
 {
     get_it('DBIx::ObjectMapper::Iterator');
     is $engine->{sql_cnt}, 14;
-    $engine->cache->clear;
+    $engine->{cache} = DBIx::ObjectMapper::Session::Cache->new;
 };
 
 {
@@ -82,7 +81,7 @@ sub get_it {
 
     get_it('DBIx::ObjectMapper::Iterator');
     is $engine->{sql_cnt}, 15;
-    $engine->cache->clear;
+    $engine->{cache} = DBIx::ObjectMapper::Session::Cache->new;
 };
 
 done_testing;