cache_method 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.2.1 / 2012-03-01
+
+* Enhancements
+
+  * Use user-defined #as_cache_key for both obj and args digests (cache keys); previously it was only used for obj
+
 0.2.0 / 2012-02-29
 
 * API changes:

data/lib/cache_method/cached_result.rb

@@ -1,6 +1,26 @@
 require 'digest/sha1'
 module CacheMethod
   class CachedResult #:nodoc: all
+    class << self
+      def resolve_cache_key(obj)
+        case obj
+        when ::Array
+          obj.map do |v|
+            resolve_cache_key v
+          end
+        when ::Hash
+          obj.inject({}) do |memo, (k, v)|
+            kk = resolve_cache_key k
+            vv = resolve_cache_key v
+            memo[kk] = vv
+            memo
+          end
+        else
+          obj.respond_to?(:as_cache_key) ? obj.as_cache_key : obj
+        end
+      end
+    end
+    
     CACHE_KEY_JOINER = ','
 
     def initialize(obj, method_id, original_method_id, ttl, args)
@@ -44,11 +64,11 @@ module CacheMethod
     end
             
     def obj_digest
-      @obj_digest ||= ::Digest::SHA1.hexdigest(::Marshal.dump(obj.respond_to?(:as_cache_key) ? obj.as_cache_key : obj))
+      @obj_digest ||= ::Digest::SHA1.hexdigest(::Marshal.dump(CachedResult.resolve_cache_key(obj)))
     end
   
     def args_digest
-      @args_digest ||= args.empty? ? 'empty' : ::Digest::SHA1.hexdigest(::Marshal.dump(args))
+      @args_digest ||= args.empty? ? 'empty' : ::Digest::SHA1.hexdigest(::Marshal.dump(CachedResult.resolve_cache_key(args)))
     end
         
     def current_generation
@@ -56,9 +76,5 @@ module CacheMethod
         @current_generation ||= Generation.new(obj, method_id).current
       end
     end
-
-    def arity
-      @arity ||= obj.method(original_method_id).arity
-    end
   end
 end

data/lib/cache_method/version.rb

@@ -1,3 +1,3 @@
 module CacheMethod
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/helper.rb

@@ -2,7 +2,11 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 require 'test/unit'
-# require 'ruby-debug'
+
+if ::Bundler.definition.specs['ruby-debug19'].first or ::Bundler.definition.specs['ruby-debug'].first
+  require 'ruby-debug'
+end
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'cache_method'
@@ -27,6 +31,14 @@ class CopyCat1
     self.echo_count += 1
     return *args
   end
+  attr_writer :ack_count
+  def ack_count
+    @ack_count ||= 0
+  end
+  def ack(*args)
+    self.ack_count += 1
+    'ACK'
+  end
   def marshal_dump
     raise "Used marshal_dump"
   end
@@ -34,6 +46,7 @@ class CopyCat1
     name
   end
   cache_method :echo
+  cache_method :ack
 end
 
 class CopyCat1a < CopyCat1
@@ -151,6 +164,21 @@ CopyCat1.send :include, Say
 
 class DontStringifyMe < Struct.new(:message)
   def to_s
-    "Don't stringify me, read my message!"
+    raise "Don't stringify me, read my message!"
+  end
+  alias :inspect :to_s
+end
+
+class DontMarshalMe < Struct.new(:message)
+  def marshal_dump
+    raise "Don't marshal dump me!"
+  end
+
+  def marshal_load(src)
+    raise "Don't marshal load me! Maybe I'm a HASH WITH A DEFAULT PROC!"
+  end
+
+  def as_cache_key
+    message
   end
 end

data/test/test_cache_method.rb

@@ -402,4 +402,38 @@ class TestCacheMethod < Test::Unit::TestCase
     a.echo(world)
     assert_equal 2, a.echo_count
   end
+
+  def test_doesnt_marshal_if_as_cache_key_defined
+    hello = DontMarshalMe.new("hello")
+    world = DontMarshalMe.new("world")
+
+    a = CopyCat1.new 'mimo'
+    ack_count = 0
+
+    [
+      hello,
+      world,
+      [hello],
+      [world],
+      [[hello]],
+      [[world]],
+      { hello => world },
+      { world => hello },
+      [{hello => world}],
+      [{world => hello}],
+      [[{hello => world}]],
+      [[{world => hello}]],
+      {hello => [{hello => world}]},
+      {world => [{hello => world}]},
+    ].each do |nasty|
+      ack_count += 1
+      5.times do
+        a.ack(nasty)
+        assert_equal ack_count, a.ack_count
+
+        a.ack(nasty)
+        assert_equal ack_count, a.ack_count
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cache_method
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cache
-  requirement: &2156275580 !ruby/object:Gem::Requirement
+  requirement: &2153251040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156275580
+  version_requirements: *2153251040
 description: Like alias_method, but it's cache_method!
 email:
 - seamus@abshere.net