zache 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc076a4fc749fc00a9d894de37dbca8ae03a9c607d5bab39dc04b57fbbf182d6
-  data.tar.gz: 1290c77d9339599eccafb37008b5a58561e901cbf76572f6a8538f7aeee42cc1
+  metadata.gz: aff25777e250a00476b61b3b8ff9e9d8492546b9e4c53fbdba28f7cba3c64a95
+  data.tar.gz: d7f7214d2829b7e2d513fa36b0de36326d9453ad33a41f21ab64485a263c3b6c
 SHA512:
-  metadata.gz: fee403d8ede6cfcf64d1e417df1e1c83025aa0ee14eb21c34945a1c40b7473c936079285ab3b61584d4baf03e75928eb5cb01c5451d0b0365e7c51be695c80d1
-  data.tar.gz: ff1d2b0e94dddd5c500a2a30e738bae6147a92ecd21b1f432a5cf5dc4df0a6ee23f5f632e1b28bf0575b740d2e1466ba661b9f32e33f4a9d05932fa4669716e1
+  metadata.gz: 401d5bcfb34777d3d0e0b22b0c65802bdd273eb9b3076710cfd8a31c63fa3f8f86fdda5c965f28bc599045c42fc24c187c0fa2bccb7fbd014cdfced6232bdcc1
+  data.tar.gz: 8993cc92f22c9941b457b8dfaa8ae86893015d996bde9ddcbc10a1459d2358310cea93097477f6f43fc7320e6e6b0f21e38a1a32fcedc1298edd0520f032dde6

data/.rubocop.yml

@@ -14,6 +14,6 @@ Metrics/AbcSize:
 Metrics/MethodLength:
   Max: 30
 Metrics/CyclomaticComplexity:
-  Max: 10
+  Max: 12
 Metrics/PerceivedComplexity:
-  Max: 10
+  Max: 12

data/lib/zache.rb

@@ -95,14 +95,15 @@ class Zache
   # If the <tt>dirty</tt> argument is set to <tt>true</tt>, a previously
   # calculated result will be returned if it exists and is already expired.
   def get(key, lifetime: 2**32, dirty: false)
-    if (dirty || @dirty) && locked? && key_expired?(key) && @hash.key?(key)
-      return @hash[key][:value]
-    end
     if block_given?
+      if (dirty || @dirty) && locked? && key_expired?(key) && @hash.key?(key)
+        return @hash[key][:value]
+      end
       synchronized { calc(key, lifetime) { yield } }
     else
       rec = @hash[key]
       if key_expired?(key)
+        return rec[:value] if dirty || @dirty
         @hash.delete(key)
         rec = nil
       end

data/test/test_zache.rb

@@ -208,7 +208,7 @@ class ZacheTest < Minitest::Test
   end
 
   def test_returns_dirty_result
-    cache = Zache.new
+    cache = Zache.new(dirty: true)
     cache.get(:x, lifetime: 0) { 1 }
     long = Thread.start do
       cache.get(:x) do
@@ -218,13 +218,21 @@ class ZacheTest < Minitest::Test
     end
     sleep 0.1
     Timeout.timeout(1) do
-      assert(cache.exists?(:x, dirty: true))
-      assert_equal(1, cache.get(:x, dirty: true))
-      assert_equal(1, cache.get(:x, dirty: true) { 2 })
+      assert(cache.exists?(:x))
+      assert_equal(1, cache.get(:x))
+      assert_equal(1, cache.get(:x) { 2 })
     end
     long.kill
   end
 
+  def test_returns_dirty_result_when_not_locked
+    cache = Zache.new(dirty: true)
+    cache.get(:x, lifetime: 0) { 1 }
+    assert(cache.exists?(:x))
+    assert_equal(1, cache.get(:x))
+    assert_equal(2, cache.get(:x) { 2 })
+  end
+
   def test_fetches_multiple_keys_in_many_threads_in_dirty_mode
     cache = Zache.new(dirty: true)
     set = Concurrent::Set.new

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.10.0'
+  s.version = '0.10.1'
   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.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Yegor Bugayenko