zache 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aff25777e250a00476b61b3b8ff9e9d8492546b9e4c53fbdba28f7cba3c64a95
-  data.tar.gz: d7f7214d2829b7e2d513fa36b0de36326d9453ad33a41f21ab64485a263c3b6c
+  metadata.gz: 4686166302287dae583252d66cd7d1a265a9fea6f5cc6c68f321249a9fe04d5e
+  data.tar.gz: 7d960c4c23fa027e623f033a3ba618802d43d6d65a8b863c1ce99eb297fdacff
 SHA512:
-  metadata.gz: 401d5bcfb34777d3d0e0b22b0c65802bdd273eb9b3076710cfd8a31c63fa3f8f86fdda5c965f28bc599045c42fc24c187c0fa2bccb7fbd014cdfced6232bdcc1
-  data.tar.gz: 8993cc92f22c9941b457b8dfaa8ae86893015d996bde9ddcbc10a1459d2358310cea93097477f6f43fc7320e6e6b0f21e38a1a32fcedc1298edd0520f032dde6
+  metadata.gz: ef2ef6578ec02be0572e92f1e45ff104f9039bb3b189c5f2647c80d69a0c8f82a27bdd2f3238770b09c877b2424ace681b59f232713c6457cec07cf716ea85bf
+  data.tar.gz: f1651dd070af026762a57f2a1b34f45cceae1bac625a4b0bd5c32f1492615cf4e54f12fddaa8d50f19f84679b7d2096285670b839b79d190b50844531a865b8b

data/lib/zache.rb

@@ -96,13 +96,13 @@ class Zache
   # 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)
+      if (dirty || @dirty) && locked? && expired?(key) && @hash.key?(key)
         return @hash[key][:value]
       end
       synchronized { calc(key, lifetime) { yield } }
     else
       rec = @hash[key]
-      if key_expired?(key)
+      if expired?(key)
         return rec[:value] if dirty || @dirty
         @hash.delete(key)
         rec = nil
@@ -117,13 +117,20 @@ class Zache
   # it will be removed by this method and the result will be FALSE.
   def exists?(key, dirty: false)
     rec = @hash[key]
-    if key_expired?(key) && !dirty && !@dirty
+    if expired?(key) && !dirty && !@dirty
       @hash.delete(key)
       rec = nil
     end
     !rec.nil?
   end
 
+  # Checks whether the key exists in the cache and is expired. If the
+  # key is absent FALSE is returned.
+  def expired?(key)
+    rec = @hash[key]
+    !rec.nil? && rec[:start] < Time.now - rec[:lifetime]
+  end
+
   # Returns the modification time of the key, if it exists.
   # If not, current time is returned.
   def mtime(key)
@@ -160,14 +167,14 @@ class Zache
 
   # Remove keys that are expired.
   def clean
-    synchronized { @hash.delete_if { |_key, value| key_expired?(value) } }
+    synchronized { @hash.delete_if { |_key, value| expired?(value) } }
   end
 
   private
 
   def calc(key, lifetime)
     rec = @hash[key]
-    rec = nil if key_expired?(key)
+    rec = nil if expired?(key)
     if rec.nil?
       @hash[key] = {
         value: yield,
@@ -191,9 +198,4 @@ class Zache
       yield
     end
   end
-
-  def key_expired?(key)
-    rec = @hash[key]
-    !rec.nil? && rec[:start] < Time.now - rec[:lifetime]
-  end
 end

data/test/test_zache.rb

@@ -219,6 +219,7 @@ class ZacheTest < Minitest::Test
     sleep 0.1
     Timeout.timeout(1) do
       assert(cache.exists?(:x))
+      assert(cache.expired?(:x))
       assert_equal(1, cache.get(:x))
       assert_equal(1, cache.get(:x) { 2 })
     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.10.1'
+  s.version = '0.11.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.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby