zache 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91965defa678c5b684064d7b868b46f7f8b31c9192209d6eb2f659055e790056
-  data.tar.gz: 35d397d7fa7179e0968b564cad219a8e1aedaf0c2efc92e4fb7079faaec36d49
+  metadata.gz: a1b2d35db53d59daaf2d281eb08c0381bc0d7302cbab9d817c39b22e8aec93b0
+  data.tar.gz: db7d2212ceea4cc6f7e2f8feb5954b720c16ed0fd12fab56ea50c2d2fed5621c
 SHA512:
-  metadata.gz: 88c5c68c7438dd4a34abc24a529815abb2020a4fc2502bab0d374fcc75e79b5bfb447c1f4b82d72cc7787c5bd0c0cb2aae8176da9a332b33bb8880ef3c286c4d
-  data.tar.gz: 734f9721d3e726ba433881a325a724e4e2cfa45c5b94962753879d61dc33d9ed763ec1bb144b2042c87673746cfd753a7b7b708b7c83ff610777caa1b5ed8ffa
+  metadata.gz: 63ffba8c6c32c96aabbf443b6faa94bcbe4b8e5a6fb2f2a39ac36bdc6a68906c7d0f46a8266d10d485ed4ec463104d38f65bfed4cb3bf246a8d4cfdbe2da545e
+  data.tar.gz: 9b46a730a46d6a177092b1499f3cd020796eb4c63782a17cb0e8c54ad55e1fabbaf9b9d96ff703ab41e502e41dcf8d338a184e9fad4aae29eaddd95a19555938

data/.rubocop.yml

@@ -13,3 +13,7 @@ Metrics/AbcSize:
   Max: 30
 Metrics/MethodLength:
   Max: 30
+Metrics/CyclomaticComplexity:
+  Max: 10
+Metrics/PerceivedComplexity:
+  Max: 10

data/lib/zache.rb

@@ -43,9 +43,13 @@ class Zache
   # "sync" is whether the hash is thread-safe (`true`)
   # or not (`false`); it is recommended to leave this parameter untouched,
   # unless you really know what you are doing.
-  def initialize(sync: true)
+  #
+  # If the <tt>dirty</tt> argument is set to <tt>true</tt>, a previously
+  # calculated result will be returned if it exists.
+  def initialize(sync: true, dirty: false)
     @hash = {}
     @sync = sync
+    @dirty = dirty
     @monitor = Monitor.new
   end
 
@@ -54,8 +58,14 @@ class Zache
   # the block is not given, an exception will be raised. The lifetime
   # must be in seconds. The default lifetime is huge, which means that the
   # key will never be expired.
-  def get(key, lifetime: 2**32)
+  #
+  # If the <tt>dirty</tt> argument is set to <tt>true</tt>, a previously
+  # calculated result will be returned if it exists.
+  def get(key, lifetime: 2**32, dirty: false)
     if block_given?
+      if (dirty || @dirty) && locked? && !key_expired?(key) && @hash.key?(key)
+        return @hash[key]
+      end
       synchronized { calc(key, lifetime) { yield } }
     else
       rec = @hash[key]
@@ -80,6 +90,11 @@ class Zache
     !rec.nil?
   end
 
+  # Is cache currently locked doing something?
+  def locked?
+    !@monitor.mon_try_enter { true }
+  end
+
   # Put a value into the cache.
   def put(key, value, lifetime: 2**32)
     synchronized do
@@ -124,7 +139,7 @@ class Zache
 
   def synchronized
     if @sync
-      @monitor.synchronize { yield }
+      @monitor.mon_synchronize { yield }
     else
       yield
     end

data/test/test_zache.rb

@@ -24,6 +24,7 @@
 
 require 'minitest/autorun'
 require 'threads'
+require 'timeout'
 require_relative '../lib/zache'
 
 # Cache test.
@@ -168,4 +169,32 @@ class ZacheTest < Minitest::Test
     cache = Zache.new
     cache.get(:first) { cache.get(:second) { cache.get(:third) { 1 } } }
   end
+
+  def test_calculates_only_once
+    cache = Zache.new
+    long = Thread.start do
+      cache.get(:x) do
+        sleep 0.5
+        'first'
+      end
+    end
+    sleep 0.1
+    assert(cache.locked?)
+    cache.get(:x) { 'second' }
+    assert(!cache.locked?)
+    long.kill
+  end
+
+  def test_returns_dirty_result
+    cache = Zache.new
+    cache.get(:first, lifetime: 10) { 1 }
+    long = Thread.start do
+      cache.get(:first) { sleep 1000 }
+    end
+    sleep 0.1
+    Timeout.timeout(1) do
+      assert_equal(1, cache.get(:first, dirty: true) { 2 })
+    end
+    long.kill
+  end
 end

data/zache.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zache
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-01 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest