zache 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dc54638fe09360b05870981cc7b8ede8697aa4aba65121a33da31a23a65f339
-  data.tar.gz: 3ba83d9a9231b3facc5faf87409a4c61ab6b9638a37bcd2a29a435965e4e530d
+  metadata.gz: 257081764cc35a64985d251872770a52136ad5bdab0a11c6183e61af038e2eed
+  data.tar.gz: 8fcdeb45bdb0471b97b3706ad0c82b6779a11fc7d930b9e2d7706691f400acb1
 SHA512:
-  metadata.gz: bf689543044621801b55f6bc9800dcb5cb7f9f38193d6872485f5551cfec85957207184d24113707a39c36fae1ce1ba54a5be0b432f61077e352a7c88adc334e
-  data.tar.gz: 555f8d872a9ff2780cc75a9c8f782d8fdf381ad8dce75020c58183644295ffe4b2417ba4285193d02a5bd16288920e94c3b3d8512865916abaa255106cb91e1d
+  metadata.gz: 0a232c9be3072ade8f8d83c647f67b85d7506cc34a2c17bd3ce6b85af5cf0cd8c5aed420d0019264ad62c73855ec28bbe7443b170f006dede7eec3d5dfb077f5
+  data.tar.gz: b0eb1264f9ad527ec8fa36f12b2911dfcdfb62c9add06c7de088401a546bb96836279692e7138a0e51e74c74b2f4e80b60a5e2d31007a1d9bf406463710abe91

data/lib/zache.rb

@@ -45,7 +45,7 @@ class Zache
   # unless you really know what you are doing.
   #
   # If the <tt>dirty</tt> argument is set to <tt>true</tt>, a previously
-  # calculated result will be returned if it exists.
+  # calculated result will be returned if it exists and is already expired.
   def initialize(sync: true, dirty: false)
     @hash = {}
     @sync = sync
@@ -60,11 +60,11 @@ class Zache
   # key will never be expired.
   #
   # If the <tt>dirty</tt> argument is set to <tt>true</tt>, a previously
-  # calculated result will be returned if it exists.
+  # calculated result will be returned if it exists and is already expired.
   def get(key, lifetime: 2**32, dirty: false)
     if block_given?
-      if (dirty || @dirty) && locked? && !key_expired?(key) && @hash.key?(key)
-        return @hash[key]
+      if (dirty || @dirty) && locked? && key_expired?(key) && @hash.key?(key)
+        return @hash[key][:value]
       end
       synchronized { calc(key, lifetime) { yield } }
     else

data/test/test_zache.rb

@@ -190,13 +190,16 @@ class ZacheTest < Minitest::Test
 
   def test_returns_dirty_result
     cache = Zache.new
-    cache.get(:first, lifetime: 10) { 1 }
+    cache.get(:x, lifetime: 0) { 1 }
     long = Thread.start do
-      cache.get(:first) { sleep 1000 }
+      cache.get(:x) do
+        sleep 1000
+        2
+      end
     end
     sleep 0.1
     Timeout.timeout(1) do
-      assert_equal(1, cache.get(:first, dirty: true) { 2 })
+      assert_equal(1, cache.get(:x, dirty: true) { 2 })
     end
     long.kill
   end

data/zache.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.5'
   s.required_ruby_version = '>=2.5'
   s.name = 'zache'
-  s.version = '0.5.1'
+  s.version = '0.5.2'
   s.license = 'MIT'
   s.summary = 'In-memory Cache'
   s.description = 'Zero-footprint in-memory thread-safe cache'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zache
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Yegor Bugayenko