rufus-lru 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d40c5ee89890b41593bb60c367782f88f3161f19
-  data.tar.gz: cc2e44a4052e047fcc8d19023e07f0c48697dba4
+  metadata.gz: fadaf6eb162f59102384bfd7ab2644dd4a92a3ac
+  data.tar.gz: 1125e6912736d8d81bd4cc3783a562d9b7b70269
 SHA512:
-  metadata.gz: 74bcdcd1aac5ce64c9df134a13c83835e749ed019d374c9915ea200229588e2f749f4031a93f9a7a9b2c01b16639586adf0b655d84f8f0971ccd9259d7827aa0
-  data.tar.gz: 12fb4a8406a3026f9957e9f48770d9aa5a8bf3d369ee04c6bde4b6411fadffcf06c85ad78bcf0cd54d4b0dc6f3acd1da9218bca144de39d42da4e6f07eee81ee
+  metadata.gz: 951c82d35ed2797a5b6fcb3a4ba9674cdb08879a0af9dee8cdf367a64171eb2f5868b362f85f37a4d623694a2777ce5e624f4aeba32cc9fac72f55f63ce7d336
+  data.tar.gz: cf87c4d1f79aba92cc4a696ec21de9bff71ab5723b2d92def56be6d16aa123811fb461581c586a114e000da820659b3e44bd6d47cecab83e40ca670fb78d9ce8

data/CHANGELOG.txt

@@ -2,6 +2,13 @@
 = rufus-lru CHANGELOG.txt
 
 
+== rufus-lru - 1.1.0    released 2016/05/09
+
+- respect maxsize (3 is 3, not 2) (hence the 1.1.x)
+- rename #remove_lru to #do_squeeze!
+- raise ArgumentError if maxsize < 0
+
+
 == rufus-lru - 1.0.7    released 2016/05/07
 
 - modernized spec/

data/lib/rufus/lru.rb

@@ -28,7 +28,7 @@ require 'thread'
 module Rufus
 module Lru
 
-  VERSION = '1.0.7'
+  VERSION = '1.1.0'
 
   #
   # A Hash that has a max size. After the maxsize has been reached, the
@@ -88,6 +88,8 @@ module Lru
     #
     def initialize(maxsize, opts={})
 
+      fail ArgumentError.new("maxsize must be >= 0") if maxsize < 0
+
       super()
 
       @maxsize = maxsize
@@ -107,8 +109,7 @@ module Lru
 
     def auto_squeeze=(b)
 
-      squeeze! if b
-      @auto_squeeze = b
+      squeeze! if (@auto_squeeze = b)
     end
 
     def auto_squeeze?
@@ -140,10 +141,9 @@ module Lru
 
     def []=(key, value)
 
-      remove_lru if @auto_squeeze
-      touch(key)
-
       super
+      touch(key)
+      do_squeeze! if @auto_squeeze
     end
 
     def merge!(hash)
@@ -170,8 +170,7 @@ module Lru
       {}.merge!(self)
     end
 
-    # public alias to remove_lru
-    def squeeze!; remove_lru; end
+    def squeeze!; do_squeeze!; end
 
     protected
 
@@ -187,10 +186,10 @@ module Lru
     # Makes sure that the hash fits its maxsize. If not, will remove
     # the least recently used items.
     #
-    def remove_lru
+    def do_squeeze!
 
-      while size >= @maxsize
-        delete(@lru_keys.delete_at(0))
+      while size > @maxsize
+        delete(@lru_keys.shift)
       end
     end
 
@@ -229,7 +228,7 @@ module Lru
 
     def squeeze!
 
-      @mutex.synchronize { super }
+      @mutex.synchronize { do_squeeze! }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufus-lru
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-07 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec