tobias-cache_value 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/cache_value.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cache_value}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Crawley"]
-  s.date = %q{2009-07-13}
+  s.date = %q{2009-07-14}
   s.email = %q{tcrawley@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -26,7 +26,8 @@ Gem::Specification.new do |s|
      "lib/cache_value/util.rb",
      "test/cache_machine_test.rb",
      "test/cache_value_test.rb",
-     "test/test_helper.rb"
+     "test/test_helper.rb",
+     "test/util_test.rb"
   ]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/tobias/cache_value}
@@ -37,7 +38,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/cache_machine_test.rb",
      "test/cache_value_test.rb",
-     "test/test_helper.rb"
+     "test/test_helper.rb",
+     "test/util_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/cache_value/cache_machine.rb

@@ -3,7 +3,6 @@ require 'active_support/core_ext/class'
 require 'active_support/inflector'
 require 'active_support/cache'
 require 'cache_value/util'
-require 'sha1'
 
 module CacheValue
   class CacheMachine
@@ -36,7 +35,7 @@ module CacheValue
       def cache_key(object, method, arguments = nil)
         raise ConfigurationException.new("object of class #{object.class.name} does not respond to :cache_key") unless object.respond_to?(:cache_key)
         key = object.cache_key.gsub('/', '_') + "_#{method}"
-        key << '_' + Digest::SHA1.hexdigest(arguments.to_yaml) if arguments
+        key << '_' + hex_digest(arguments) if arguments
         key
       end
 
@@ -51,7 +50,7 @@ module CacheValue
 
       def call_and_store_value(object, method, arguments = nil)
         without_method = caching_method_names(method).first
-        value = arguments ? object.send(without_method, arguments) : object.send(without_method)
+        value = arguments ? object.send(without_method, *arguments) : object.send(without_method)
         cache_store.write(cache_key(object, method, arguments), [value, Time.now].to_yaml)
         
         value
@@ -65,6 +64,7 @@ module CacheValue
           cached_age > Time.now - options
         end
       end
+
     end
   end
 

data/lib/cache_value/cache_value.rb

@@ -8,8 +8,8 @@ module CacheValue
     def cache_value(method, option)
       without_method, with_method = caching_method_names(method)
       class_eval do
-        define_method with_method do
-          CacheValue::CacheMachine.lookup(self, method, option)
+        define_method with_method do |*args|
+          CacheValue::CacheMachine.lookup(self, method, option, args)
         end
         
         alias_method without_method, method

data/lib/cache_value/util.rb

@@ -1,3 +1,5 @@
+require 'sha1'
+
 module CacheValue
   module Util
     def caching_method_names(method)
@@ -6,5 +8,23 @@ module CacheValue
       ["#{washed_method}_without_value_caching#{punctuation}",
        "#{washed_method}_with_value_caching#{punctuation}"]
     end
+
+    def hex_digest(values)
+      Digest::SHA1.hexdigest(stringify_value(values))
+    end
+    
+    protected
+    def stringify_value(value)
+      if value.respond_to?(:to_str)
+        value.to_str
+      elsif value.respond_to?(:cache_key)
+        value.cache_key.to_s
+      elsif value.respond_to?(:collect)
+        value.collect { |x| stringify_value(x) }.join
+      else
+        value.to_s
+      end
+    end
+    
   end
 end

data/test/cache_machine_test.rb

@@ -4,7 +4,7 @@ require 'cache_value/cache_machine'
 
 
 class CacheMachineTest < Test::Unit::TestCase
-  
+
   def setup
     @cm = CacheValue::CacheMachine
     @obj = mock
@@ -68,7 +68,7 @@ class CacheMachineTest < Test::Unit::TestCase
 
       should 'should include the hash in the key' do
         now = Time.now
-        assert_match /_method_#{Digest::SHA1.hexdigest([1, 2, now].to_yaml)}$/, @cm.cache_key(@obj, :method, [1, 2, now])
+        assert_match /_method_#{@cm.send(:hex_digest, [1, 2, now])}$/, @cm.cache_key(@obj, :method, [1, 2, now])
       end
 
     end

data/test/cache_value_test.rb

@@ -20,7 +20,7 @@ class CacheValueTest < Test::Unit::TestCase
   end
 
   should 'delegate the cache lookup to CacheMachine' do
-    CacheValue::CacheMachine.expects(:lookup).with(@cacher, :do_something, 'yo')
+    CacheValue::CacheMachine.expects(:lookup).with(@cacher, :do_something, 'yo', [])
     @cacher.do_something
   end
   

data/test/util_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+require 'cache_value/util'
+
+
+class UtilTest < Test::Unit::TestCase
+  include CacheValue::Util
+  
+  should 'be true' do
+    assert true
+  end
+  
+  should 'have some tests here' 
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tobias-cache_value
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tobias Crawley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-13 00:00:00 -07:00
+date: 2009-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - test/cache_machine_test.rb
 - test/cache_value_test.rb
 - test/test_helper.rb
+- test/util_test.rb
 has_rdoc: true
 homepage: http://github.com/tobias/cache_value
 post_install_message: 
@@ -67,3 +68,4 @@ test_files:
 - test/cache_machine_test.rb
 - test/cache_value_test.rb
 - test/test_helper.rb
+- test/util_test.rb