zache 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ad9aee02e0592400be73acb02cdf8878c314950df90fce1632ea00e7d07d396
-  data.tar.gz: 802eba8bf8ad6e027b17d85eb296957b0255fde72e9340713bad5b0b96e4dd67
+  metadata.gz: d27ca46de41af5519d5ad841403ce28c1527e8c7a2ec2243cb32c4c4924a684c
+  data.tar.gz: 0eab718467f7ee55909fc3d0aa7c4b6ac11881f38c7d6f2deaaa01cc231a259e
 SHA512:
-  metadata.gz: c756d6ba076c41371f3c47d1d2f825f06876ea9dea1d39a86f1d7f5f6b93a87d077427af2726e4dc211248e416b02dba26a130a54b1a40e74eeb8f3e64b982bc
-  data.tar.gz: af8e41d5048f8afa5275362d3e23da9b9276c6277f7f0db33d0353e40bac2e4223806da97f612621b5b587e9f8c964aa737310696a76b9829f242ec543b6fae1
+  metadata.gz: d05683cac3f782074b17f4fb0a0a26e025f6f5ed4c887c338f1f940079cc122601c02f81ed035789ca894ed93aa046dda3522f6f96a712c7f5c800192d6edcb4
+  data.tar.gz: b3b691d80b84f24c5542c0e33932fa541624aefa0f8ee216aef444788cafba7d7dbabf05694e83c3f340b64a18dd67048bad25edcd4c557c1fcdb7119630f724

data/.rubocop.yml

@@ -2,6 +2,9 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.3.3
 
+Metrics/ClassLength:
+  Exclude:
+    - 'test/*.rb'
 Layout/MultilineMethodCallIndentation:
   Enabled: false
 Metrics/AbcSize:

data/README.md

@@ -3,8 +3,10 @@
 [![We recommend RubyMine](http://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
 
 [![Build Status](https://travis-ci.org/yegor256/zache.svg)](https://travis-ci.org/yegor256/zache)
+[![Build status](https://ci.appveyor.com/api/projects/status/7eday736u9phnjiy?svg=true)](https://ci.appveyor.com/project/yegor256/zache)
 [![Gem Version](https://badge.fury.io/rb/zache.svg)](http://badge.fury.io/rb/zache)
 [![Maintainability](https://api.codeclimate.com/v1/badges/c136afe340fa94f14696/maintainability)](https://codeclimate.com/github/yegor256/zache/maintainability)
+[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/yegor256/zache/master/frames)
 
 It's a simple Ruby gem for in-memory cache.
 

data/appveyor.yml

@@ -0,0 +1,38 @@
+version: '{build}'
+skip_tags: true
+clone_depth: 10
+branches:
+  only:
+    - master
+  except:
+    - gh-pages
+os: Windows Server 2012
+environment:
+  matrix:
+    - ruby_version: "23-x64"
+    - ruby_version: "24-x64"
+    - ruby_version: "25-x64"
+install:
+  - ps: |
+      $Env:PATH = "C:\Ruby${Env:ruby_version}\bin;${Env:PATH}"
+      if ($Env:ruby_version -match "^23" ) {
+        # RubyInstaller; download OpenSSL headers from OpenKnapsack Project
+        $Env:openssl_dir = "C:\Ruby${Env:ruby_version}"
+        appveyor DownloadFile http://dl.bintray.com/oneclick/OpenKnapsack/x64/openssl-1.0.2j-x64-windows.tar.lzma
+        7z e openssl-1.0.2j-x64-windows.tar.lzma
+        7z x -y -oC:\Ruby${Env:ruby_version} openssl-1.0.2j-x64-windows.tar
+      } else {
+        # RubyInstaller2; openssl package seems to be installed already
+        $Env:openssl_dir = "C:\msys64\mingw64"
+      }
+  - bundle config --local path vendor/bundle
+  - bundle config build.openssl --with-openssl-dir=%openssl_dir%
+  - ruby -v
+  - bundle -v
+build_script:
+  - bundle update
+  - bundle install
+test_script:
+  - bundle exec rake --quiet
+cache:
+  - vendor/bundle

data/lib/zache.rb

@@ -22,6 +22,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'monitor'
+
 # It is a very simple thread-safe in-memory cache with an ability to expire
 # keys automatically, when their lifetime is over. Use it like this:
 #
@@ -44,7 +46,7 @@ class Zache
   def initialize(sync: true)
     @hash = {}
     @sync = sync
-    @mutex = Mutex.new
+    @monitor = Monitor.new
   end
 
   # Gets the value from the cache by the provided key. If the value is not
@@ -52,13 +54,7 @@ class Zache
   # the block is not given, an exception will be raised.
   def get(key, lifetime: 60 * 60)
     raise 'A block is required' unless block_given?
-    if @sync
-      @mutex.synchronize do
-        calc(key, lifetime) { yield }
-      end
-    else
-      calc(key, lifetime) { yield }
-    end
+    synchronized { calc(key, lifetime) { yield } }
   end
 
   # Checks whether the value exists in the cache by the provided key. Returns
@@ -76,27 +72,15 @@ class Zache
   # Removes the value from the hash, by the provied key. If the key is absent
   # and the block is provide, the block will be called.
   def remove(key)
-    if @sync
-      @mutex.synchronize do
-        @hash.delete(key) { yield if block_given? }
-      end
-    else
-      @hash.delete(key) { yield if block_given? }
-    end
+    synchronized { @hash.delete(key) { yield if block_given? } }
+  end
+
+  def remove_all
+    synchronized { @hash = {} }
   end
 
   def clean
-    if @sync
-      @mutex.synchronize do
-        @hash.delete_if do |_key, value|
-          value[:start] < Time.now - value[:lifetime]
-        end
-      end
-    else
-      @hash.delete_if do |_key, value|
-        value[:start] < Time.now - value[:lifetime]
-      end
-    end
+    synchronized { @hash.delete_if { |_key, value| key_expired?(value) } }
   end
 
   private
@@ -114,6 +98,14 @@ class Zache
     @hash[key][:value]
   end
 
+  def synchronized
+    if @sync
+      @monitor.synchronize { yield }
+    else
+      yield
+    end
+  end
+
   def key_expired?(key)
     rec = @hash[key]
     !rec.nil? && rec[:start] < Time.now - rec[:lifetime]

data/test/test_zache.rb

@@ -126,4 +126,39 @@ class ZacheTest < Minitest::Test
     cache.get(:hey, lifetime: 0) { Random.rand }
     assert(!cache.exists?(:hey))
   end
+
+  def test_remove_all_with_threads
+    cache = Zache.new
+    Threads.new(10).assert(100) do |i|
+      cache.get("hey#{i}".to_sym) { Random.rand }
+      assert(cache.exists?("hey#{i}".to_sym) == true)
+      cache.remove_all
+    end
+    10.times do |i|
+      assert(cache.exists?("hey#{i}".to_sym) == false)
+    end
+  end
+
+  def test_remove_all_with_sync
+    cache = Zache.new
+    cache.get(:hey) { Random.rand }
+    cache.get(:bye) { Random.rand }
+    cache.remove_all
+    assert(cache.exists?(:hey) == false)
+    assert(cache.exists?(:bye) == false)
+  end
+
+  def test_remove_all_without_sync
+    cache = Zache.new(sync: false)
+    cache.get(:hey) { Random.rand }
+    cache.get(:bye) { Random.rand }
+    cache.remove_all
+    assert(cache.exists?(:hey) == false)
+    assert(cache.exists?(:bye) == false)
+  end
+
+  def test_sync_zache_is_reentrant
+    cache = Zache.new
+    cache.get(:first) { cache.get(:second) { 1 } }
+  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.3.0'
+  s.version = '0.3.1'
   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.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -110,6 +110,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- appveyor.yml
 - lib/zache.rb
 - test/test_zache.rb
 - zache.gemspec