lock_and_cache 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fdd50ceeb6a6661c5b8977e566de0136cc13f0f
-  data.tar.gz: 00b87565ce88354f9b0c1ae697356f026a920823
+  metadata.gz: 3a7645f81f4e7ee4980cdb47c841b853a9fdbe6b
+  data.tar.gz: 3c5288088f4f243f7713255676985214bea7db49
 SHA512:
-  metadata.gz: 169dd34cdded7eafae43d737b3c047eac8583cafed39d820536a4c0704050aa28d42b0baebe93820643b052ec98ce9b22052087e5b5c7baf77e5e2d68fdbfcfe
-  data.tar.gz: afdf91150e573ed70b36463cb390e60ce19e0f14405188f23803df94ea4b5adad3cc2ec03a9b8903955c8b9fce896b40939e0e1abb1a322275555fc5adc00258
+  metadata.gz: 82aa1f3555638e500820ffabc1cc6d668928acc692c8e720f20d68962e9b9d0c7182d34cd787def3cc14c69feefea8c60e8d9b36deae2d1f3946122a252c009f
+  data.tar.gz: 84c281f244ca8b551fd57ba9e48e8193882274e0c3d7abfc12b2a973d3d02bbb109e711cd3446db631f142aa21778be18c7889ff4de0725a53eec824f98a0907

data/CHANGELOG

@@ -1,3 +1,13 @@
+2.0.2 / 2015-10-16
+
+* Bug fixes (?)
+
+  * Make sure cached values are valid marshal format (seen in the wild that they're nil)
+
+* Enhancements
+
+  * Use original redlock gem now that it supports extend
+
 2.0.1 / 2015-09-14
 
 * Bug fixes

data/lib/lock_and_cache.rb

@@ -136,8 +136,8 @@ module LockAndCache
     digest = key.digest
     storage = LockAndCache.storage or raise("must set LockAndCache.storage=[Redis]")
     Thread.exclusive { $stderr.puts "[lock_and_cache] A1 #{key.debug} #{Base64.encode64(digest).strip} #{Digest::SHA1.hexdigest digest}" } if debug
-    if storage.exists digest
-      return ::Marshal.load(storage.get(digest))
+    if storage.exists(digest) and (existing = storage.get(digest)).is_a?(String)
+      return ::Marshal.load(existing)
     end
     Thread.exclusive { $stderr.puts "[lock_and_cache] B1 #{key.debug} #{Base64.encode64(digest).strip} #{Digest::SHA1.hexdigest digest}" } if debug
     retval = nil
@@ -152,10 +152,11 @@ module LockAndCache
         end
       end
       Thread.exclusive { $stderr.puts "[lock_and_cache] D1 #{key.debug} #{Base64.encode64(digest).strip} #{Digest::SHA1.hexdigest digest}" } if debug
-      if storage.exists digest
+      if storage.exists(digest) and (existing = storage.get(digest)).is_a?(String)
         Thread.exclusive { $stderr.puts "[lock_and_cache] E1 #{key.debug} #{Base64.encode64(digest).strip} #{Digest::SHA1.hexdigest digest}" } if debug
-        retval = ::Marshal.load storage.get(digest)
-      else
+        retval = ::Marshal.load existing
+      end
+      unless retval
         Thread.exclusive { $stderr.puts "[lock_and_cache] F1 #{key.debug} #{Base64.encode64(digest).strip} #{Digest::SHA1.hexdigest digest}" } if debug
         done = false
         begin

data/lib/lock_and_cache/version.rb

@@ -1,3 +1,3 @@
 module LockAndCache
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/lock_and_cache.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'redis'
   # temporary until https://github.com/leandromoreira/redlock-rb/pull/20 is merged
-  spec.add_runtime_dependency 'seamusabshere-redlock'
+  spec.add_runtime_dependency 'redlock', '>=0.1.3'
 
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'bundler', '~> 1.6'

data/spec/lock_and_cache_spec.rb

@@ -15,6 +15,12 @@ class Foo
     end
   end
 
+  def click_null
+    lock_and_cache do
+      nil
+    end
+  end
+
   def click_exp
     lock_and_cache(expires: 1, foo: :bar) do
       @count_exp += 1
@@ -111,6 +117,11 @@ describe LockAndCache do
       sleep 2
       expect(foo.click_exp).to eq(2)
     end
+
+    it "can cache null" do
+      expect(foo.click_null).to eq(nil)
+      expect(foo.click_null).to eq(nil)
+    end
   end
 
   describe "locking" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lock_and_cache
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: seamusabshere-redlock
+  name: redlock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement