forget-me-not 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDBlMjk4MDJmODI1YmU4Njc5NDA0ZjMxNjA3MmUwZTMyODgzMDg1YQ==
+    MjkxMWJmMmY2NWMwYmZiN2FhNDFlZjY3N2E4NGMwYjljMGMyNzJjOQ==
   data.tar.gz: !binary |-
-    Mjc4Yjg0YjcwOGJjOTE4NDVkZWQ3MDg0NWZhODhiMjI4N2RhNTFmNg==
+    MzczYmI5Yzc5MjIwMmY4NDc2OWQxNzkwYzlhNDllMTZmMDEyMmVhYQ==
 SHA512:
   metadata.gz: !binary |-
-    MmZhOTEwOTE3NGY2YzljODFhNzgzZTU0YjMwMzU3YjBhMjA1ZjEwYjZmN2Jh
-    MmFmYzM2YjFlOTQzNmExNzAxYjE3YzFhNzUyZmQ1MzZlMzQyYWMzZTNhODhh
-    M2EyY2M5Y2U0MjE3OTU2Zjk0ODg5OTUxOTQ4ZDNjOTUzY2NkYTE=
+    YzYyY2IwZDkxZDQwNzYxMzFiNTAwMTc4NzE1NDgzNjE5NGFkM2VmNWQwOWEz
+    NThiMTgyNzVjOGZjMTg4YjIwMDkxOGMzYWJjZDA0ZjZmMjM5NDE2NWM2YWJh
+    MTJiOTMwOGZmNDBkODUxYmNhYWEyNDM2NDA4MWY2NGRjODYwOWM=
   data.tar.gz: !binary |-
-    YzRiN2VhZmNkYTBlNzYwY2YxYWY5MzM1MGE4MzQxYWU4YTllZGFlNTA4OGM5
-    MTgxZjlkYzhlYjdmNDU3ZWVjYTliMTk4MDZmNWJmOTBjZWViZDg5NTdiMWMy
-    YWFmNGU3MjI5ZmJiM2RkZTY3MDY4Y2FhNWI5ZWM1M2U1ZjhiNGE=
+    ZTVjZmM1NjJmZmZmNmIxZGJiZTBhODdjOGYxODMxNmFiN2E1ZDk0MTgxOThi
+    NGVlODkyNGFiODkwNjVlMWUzMDlmNDE2ZTBiNzk3YjViN2Y5NDE3OTEyNGM5
+    YzZkNTgyY2M2Mzc2MGIxYTVkMWU0MjcxODBiNjViOGQ4NzZkNmE=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.2.0 - Revise the method for computing keys in cacheable.
+Need to use the digest for both the arguments and the instance properties.
+
+## 0.3.1.0 - Fix the method for computing argument keys in cacheable.
+Was using Ruby's hash(), but that varies by ruby runtime.
+
 ## 0.3.0.0 - Detect attempts to pass a block to cached or memoized methods and raise an error.
 ## 0.2.0.0 - Still pre release, but made a new method for memoizing methods with args.
 ## 0.1.0.0 - Pre Release

data/lib/forget-me-not/cacheable.rb

@@ -31,22 +31,27 @@ module ForgetMeNot
       def define_cache_method(method, options)
         method_name = method.name.to_sym
         key_prefix = "/cached_method_result/#{self.name}"
-        instance_key = get_instance_key_proc(options[:include]) if options.has_key?(:include)
+        instance_key_proc = get_instance_key_proc(options[:include]) if options.has_key?(:include)
 
         undef_method(method_name)
         define_method(method_name) do |*args, &block|
           raise 'Cannot pass blocks to cached methods' if block
+          instance_key = instance_key_proc.call(self) if instance_key_proc
+          instance_key_hash = Digest::SHA1.hexdigest(instance_key.to_s) if instance_key
 
           cache_key = [
             key_prefix,
-            (instance_key && instance_key.call(self)),
+            instance_key_hash,
             method_name,
             Digest::SHA1.hexdigest(args.to_s)
           ].compact.join '/'
 
-          puts "key: #{cache_key}" if defined?(Testing)
+          # 'Double bagging' the key makes sure that we do not overflow the range of a string hash key
+          cache_key_hash = Digest::SHA1.hexdigest(cache_key)
 
-          Cacheable.cache_fetch(cache_key) do
+          puts "key: #{cache_key} (#{cache_key_hash})" if defined?(Testing)
+
+          Cacheable.cache_fetch(cache_key_hash) do
             method.bind(self).call(*args)
           end
         end
@@ -55,7 +60,7 @@ module ForgetMeNot
       def get_instance_key_proc(instance_key_methods)
         instance_keys = Array.new(instance_key_methods).flatten
         Proc.new do |instance|
-          instance_keys.map { |key| instance.send(key) }.hash
+          instance_keys.map { |key| instance.send(key) }
         end
       end
 

data/lib/forget-me-not/version.rb

@@ -1,3 +1,3 @@
 module ForgetMeNot
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/cacheable_spec.rb

@@ -201,6 +201,16 @@ module ForgetMeNot
         expect(bar.method1).to eq '[general,201311].method1'
         expect(TestClass2.count(:method1)).to eq 2
       end
+
+      it 'Retains key consistency across process runs' do
+        foo = TestClass2.new('general', 201312)
+        foo.method1
+
+        puts Cacheable.cache.inspect
+        puts Cacheable.cache.instance_variable_get('@data').inspect
+        ugly_hash_key = "dd22a078b1a5e6e8cb2a0f8f0bf1105823103249"
+        expect(Cacheable.cache.read(ugly_hash_key)).not_to be_nil
+      end
     end
 
     describe 'cachers' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forget-me-not
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Koan Health