rufus-lru 1.0.1 → 1.0.2

data/README.txt

@@ -10,7 +10,7 @@ LruHash class, a Hash with a max size, controlled by a LRU mechanism
 
 or at
 
-    http://rubyforge.org/frs/?group_id=4812
+http://rubyforge.org/frs/?group_id=4812
 
 
 == usage
@@ -34,23 +34,34 @@ least recently used (hence LRU).
     puts h.inspect # >> {:newer=>"b", 3=>"aaa", 4=>"aaaa"}
 
 
+== dependencies
+
+None.
+
+
 == mailing list
 
-On the OpenWFEru-user for now : 
+On the OpenWFEru-user list for now : 
+
+http://groups.google.com/group/openwferu-users
+
+
+== issue tracker
 
-    http://groups.google.com/group/openwferu-users
+http://rubyforge.org/tracker/?atid=18584&group_id=4812&func=browse
 
 
 == source
 
-    http://rufus.rubyforge.org/svn/trunk/lru
+http://rufus.rubyforge.org/svn/trunk/lru
 
     svn checkout http://rufus.rubyforge.org/svn/trunk/lru
 
 
 == author
 
-John Mettraux, jmettraux@gmail.com, http://jmettraux.wordpress.com
+John Mettraux, jmettraux@gmail.com 
+http://jmettraux.wordpress.com
 
 
 == license

data/lib/rufus/lru.rb

@@ -75,7 +75,7 @@ class LruHash < Hash
     def maxsize= (s)
 
         @maxsize = s
-        remove_lru while size > @maxsize
+        remove_lru
     end
 
     def clear
@@ -96,24 +96,31 @@ class LruHash < Hash
 
         value = super
         return nil unless value
-        touch(key)
+        touch key
 
         value
     end
 
     def []= (key, value)
 
-        remove_lru while size >= @maxsize
+        remove_lru
         super
-        touch(key)
+        touch key
 
         value
     end
 
+    def merge! (hash)
+
+        hash.each { |k, v| self[k] = v }
+
+        # not using 'super', but in order not guaranteed at all...
+    end
+
     def delete (key)
 
         value = super
-        @lru_keys.delete(key)
+        @lru_keys.delete key
 
         value
     end
@@ -126,18 +133,21 @@ class LruHash < Hash
         #
         def touch (key)
 
-            @lru_keys.delete(key)
+            @lru_keys.delete key
             @lru_keys << key
         end
 
         #
-        # Removes the lru value and returns it.
-        # Returns nil if the cache is currently empty.
+        # Makes sure that the hash fits its maxsize. If not, will remove 
+        # the least recently used items.
         #
         def remove_lru
 
-            key = @lru_keys.delete_at 0
-            delete key
+            while size >= @maxsize
+
+                key = @lru_keys.delete_at 0
+                delete key
+            end
         end
 end
 

data/test/test.rb

@@ -20,7 +20,7 @@ class LruTest < Test::Unit::TestCase
     #def teardown
     #end
 
-    def test_lru_0
+    def test_0
 
         h = LruHash.new 3
 
@@ -70,4 +70,16 @@ class LruTest < Test::Unit::TestCase
         assert_equal [ :b, :a, :d ], h.ordered_keys
     end
 
+    def test_1
+
+        h = LruHash.new 3
+
+        h[1] = 10
+
+        h.merge!({ 2 => 20, 3 => 30, 4 => 40, 5 => 50 })
+
+        assert_nil h[1]
+        assert_equal 3, h.size
+    end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-lru
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-15 00:00:00 +09:00
+date: 2008-01-18 00:00:00 +09:00
 default_executable: 
 dependencies: []