lru_redux 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ea015033987bd1895311ed7621db04aaff3ab6b
-  data.tar.gz: 0a9ee0f191f866e5070e381c958b0d12bc1a00bb
+  metadata.gz: 5db2f5b8b5846daedc0bb154d16890dce33de740
+  data.tar.gz: 054c9c30e079882048d96316d01287dc9fea4ed0
 SHA512:
-  metadata.gz: 615ebf6f43f5b111b63dd136272d84019d5100e889951c458a00b50d901bf07e927614659dbd9e9095967c95b14e4da29d9b840a8a57b7004e4b8b3155f29a4d
-  data.tar.gz: 9be61a373c5c8ff1a212999996b690b14c77a996e469b896362b2164dba4b52f061a69a62c30e94380cf4c6e2887c2fa7fcbe8dc8107cc7f06f71ba012bd0f43
+  metadata.gz: 158d6276f7699180a9d1044ea68d8c36c5627c916ed28d39809ae661b8c117382cf6d0dbb2a0d9939bbc769bc5e654fa6c0f35d11d04f8942c5355a5ae0dff47
+  data.tar.gz: b718d96261b1bc002dd2d684f7f600c946e087d75598b629b5802528ed564502d04c94b5a5a39c8c9ca47869a5b9b59b245d7b5bbbed74616aef6cb8692f7fdd

data/README.md

@@ -43,7 +43,7 @@ cache.delete(:a)
 cache.each {|k,v| p "#{k} #{v}"}
 # b 2
 
-cache.max_size(200) # cache now stores 200 items
+cache.max_size = 200 # cache now stores 200 items
 cache.clear # cache has no items
 
 cache.getset(:a){1}
@@ -57,7 +57,7 @@ cache.to_a
 
 # for thread safe access, all methods on cache
 # are protected with a mutex
-cache = LruRedux::ThreadSafeCache(100)
+cache = LruRedux::ThreadSafeCache.new(100)
 
 ```
 
@@ -95,6 +95,19 @@ lru_redux thread safe   2.480000   0.000000   2.480000 (  2.488169)
 
 ## Changlog
 
+###version 0.8.2 - 16-Feb-2014
+
+- Perf: use #size instead of #count when checking length @Sebrius
+- Fix: Cache could grow beyond its size in Ruby 1.8 @Sebrius
+- Fix: #each could deadlock in Ruby 1.8 @Sebrius
+
+
+###version 0.8.1 - 7-Sep-2013
+
+- Fix #each implementation
+- Fix deadlocks with ThreadSafeCache
+- Version jump is because its been used in production for quite a while now
+
 ###version 0.0.6 - 24-April-2013
 
 - Fix bug in getset, overflow was not returning the yeilded val

data/lib/lru_redux/cache.rb

@@ -28,7 +28,7 @@ class LruRedux::Cache
       move_to_head(node)
       node[2]
     else
-     self[key] = yield
+      self[key] = yield
     end
   end
 
@@ -38,7 +38,7 @@ class LruRedux::Cache
       move_to_head(node)
       node[2]
     else
-     yield if block_given?
+      yield if block_given?
     end
   end
 
@@ -63,7 +63,15 @@ class LruRedux::Cache
   end
 
   def each
-    if n = @head
+    a = to_a
+    a.each do |pair|
+      yield pair
+    end
+  end
+
+  def each_unsafe
+    n = @head
+    if n
       while n
         yield [n[1], n[2]]
         n = n[0]
@@ -71,9 +79,6 @@ class LruRedux::Cache
     end
   end
 
-  # used further up the chain, non thread safe each
-  alias_method :each_unsafe, :each
-
   def to_a
     a = []
     self.each_unsafe do |k,v|
@@ -82,8 +87,21 @@ class LruRedux::Cache
     a
   end
 
-  def delete(k)
-    if node = @data.delete(k)
+  def delete(key)
+    node = @data.delete(key)
+    return unless node
+
+    if node[3].nil?
+      @head = @head[0]
+      if @head.nil?
+        @tail = nil
+      else
+        @head[3] = nil
+      end
+    elsif node[0].nil?
+      @tail = @tail[3]
+      @tail[0] = nil
+    else
       prev = node[0]
       nex = node[3]
 
@@ -98,19 +116,17 @@ class LruRedux::Cache
   end
 
   def count
-    @data.count
+    @data.size
   end
 
   # for cache validation only, ensures all is sound
   def valid?
-    expected = {}
-
     count = 0
     self.each_unsafe do |k,v|
       return false if @data[k][2] != v
       count += 1
     end
-    count == @data.count
+    count == @data.size
   end
 
   protected
@@ -153,5 +169,4 @@ class LruRedux::Cache
       true
     end
   end
-
 end

data/lib/lru_redux/cache19.rb

@@ -82,7 +82,7 @@ class LruRedux::Cache
   end
 
   def count
-    @data.count
+    @data.size
   end
 
 

data/lib/lru_redux/version.rb

@@ -1,3 +1,3 @@
 module LruRedux
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/test/cache_test.rb

@@ -57,9 +57,18 @@ class CacheTest < MiniTest::Unit::TestCase
     @c[:a] = 1
     @c[:b] = 2
     @c[:c] = 3
+    @c.delete(:a)
 
+    assert_equal [[:c,3],[:b,2]], @c.to_a
+    assert_nil @c[:a]
+
+    # Regression test for a bug in the legacy delete method
     @c.delete(:b)
-    assert_equal [[:c,3],[:a,1]], @c.to_a
+    @c[:d] = 4
+    @c[:e] = 5
+    @c[:f] = 6
+
+    assert_equal [[:f,6],[:e,5],[:d,4]], @c.to_a
     assert_nil @c[:b]
   end
 

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: lru_redux
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An efficient implementation of an lru cache
@@ -101,8 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- CHANGELOG
+- ".gitignore"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -127,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An efficient implementation of an lru cache

data/CHANGELOG

@@ -1,5 +0,0 @@
-7-Sep-2013
-
-* fix #each implementation
-* fix deadlocks with ThreadSafeCache
-* version 0.8.1 ( its been used in prd for quite a while now )