threadsafe-lru 0.0.2 → 0.0.3

data/.rspec

@@ -0,0 +1 @@
+--color

data/lib/threadsafe-lru.rb

@@ -1,3 +1,4 @@
+require 'threadsafe-lru/DoubleLinkedList'
 require 'threadsafe-lru/ThreadSafeLruCache'
 
 module ThreadSafeLru

data/lib/threadsafe-lru/DoubleLinkedList.rb

@@ -1,6 +1,72 @@
-module ThreadSafeLru 
+module ThreadSafeLru
+  class ListNode
+    def initialize value
+      @value=value
+    end
+
+    def insert_between prev_node, next_node      
+      self.next=next_node
+      self.prev=prev_node
+      prev_node.next=self
+      next_node.prev=self      
+      self
+    end
+
+    def remove
+      self.prev.next=self.next
+      self.next.prev=self.prev
+      self.next=nil
+      self.prev=nil
+    end
+
+    attr_reader :value
+    attr_accessor :next
+    attr_accessor :prev
+
+  end
+
   class DoubleLinkedList
-    
-    
+
+    def initialize
+      @head=ListNode.new "head"
+      @tail=ListNode.new "tail"
+      @head.next=@tail
+      @tail.prev=@head      
+    end
+
+
+    def add_to_head value
+      new_node=ListNode.new value
+      new_node.insert_between @head,@head.next
+      new_node
+    end
+
+    def bump_to_top node
+      node.remove
+      node.insert_between @head,@head.next
+    end
+
+    def remove_last
+      node=@tail.prev
+      node.remove
+      node
+    end
+
+    def clear
+      @head.next=@tail
+      @tail.prev=@head
+    end
+
+
+    def to_a
+      result=[]
+      current=@head.next
+      while current != @tail
+        result << current.value
+        current=current.next
+      end
+      result
+    end
+
   end
 end

data/lib/threadsafe-lru/ThreadSafeLruCache.rb

@@ -1,4 +1,5 @@
 require 'thread'
+require 'threadsafe-lru/DoubleLinkedList'
 
 module ThreadSafeLru
   class LruCache
@@ -6,19 +7,20 @@ module ThreadSafeLru
       @size=size
       @cached_values={}
       @factory_block=block
-      @recently_used=[]
+      @recently_used=ThreadSafeLru::DoubleLinkedList.new
       @lock=Mutex.new
     end
 
     def size
-      @recently_used.size
+      @cached_values.size
     end
 
     
     def drop key
       @lock.synchronize do
-        @cached_values.delete key
-        @recently_used.delete key
+        node=@cached_values.delete key
+        node.remove if node
+          
       end
     end
       
@@ -42,19 +44,18 @@ module ThreadSafeLru
 
     def get_node key
       if @cached_values.has_key?(key)
-        @recently_used.delete(key)
-        @recently_used << key
+        dll_node=@cached_values[key]
+        @recently_used.bump_to_top dll_node
       else
-        while (@recently_used.size >= @size) do
-          dropped=@recently_used.shift
-          @cached_values.delete(dropped)
+        while (size >= @size) do
+          dropped=@recently_used.remove_last
+          @cached_values.delete(dropped.value.key)
         end
         node=Node.new key
-        @cached_values[key]=node
-        @recently_used << key
+        dll_node=@recently_used.add_to_head node
+        @cached_values[key]=dll_node        
       end
-
-      @cached_values[key]
+      @cached_values[key].value
     end
 
   end
@@ -67,6 +68,8 @@ module ThreadSafeLru
       @lock=Mutex.new
     end
 
+    attr_reader :key
+
     def get_value block
       @lock.synchronize do
         unless (@produced)

data/lib/threadsafe-lru/version.rb

@@ -1,3 +1,3 @@
 module ThreadSafeLru 
-    VERSION = "0.0.2" 
+    VERSION = "0.0.3" 
 end

data/spec/threadsafe-lru/DoubleLinkedList_spec.rb

@@ -0,0 +1,77 @@
+require 'threadsafe-lru'
+
+module ThreadSafeLru
+  describe DoubleLinkedList do
+
+    describe :clear do
+      it "should clear all values" do
+        subject.add_to_head("value1")
+        subject.clear
+        subject.to_a.should == []
+      end
+    end
+
+    describe :add_to_head do
+      it "should append node to head" do
+        subject.add_to_head("value1").should be_a ListNode
+        subject.to_a.should == ["value1"]
+        subject.add_to_head("value0").should be_a ListNode
+        subject.to_a.should == ["value0","value1"]
+      end
+    end
+
+    describe :remove_last do
+      it "should remove last element from the linked list" do
+        subject.add_to_head("v1")
+        subject.add_to_head("v2")
+        subject.remove_last
+        subject.to_a.should == ["v2"]
+      end
+    end
+
+    describe :bump_to_top do
+      it "should move node to the top of the list" do
+        last=subject.add_to_head("v1")
+        first=subject.add_to_head("v2")
+        subject.bump_to_top last
+        subject.to_a.should == ["v1","v2"]
+      end
+    end
+  end
+
+  describe ListNode do
+    subject {ListNode.new "value"}
+
+    describe :insert_between do
+      let(:prev_node) {ListNode.new "prev"}
+      let(:next_node) {ListNode.new "next"}
+
+      it "should insert node in the chain between prev and next" do
+        subject.insert_between(prev_node,next_node)
+        subject.prev.should == prev_node
+        subject.next.should == next_node
+        prev_node.next.should == subject
+        next_node.prev.should == subject
+      end
+    end
+
+    describe :remove do
+      let(:prev_node) {ListNode.new "prev"}
+      let(:next_node) {ListNode.new "next"}
+      it "should remove itself from the chain" do
+        subject.insert_between prev_node, next_node
+        subject.remove
+        subject.next.should == nil
+        subject.prev.should == nil
+
+        prev_node.next.should == next_node
+        next_node.prev.should == prev_node
+
+      end
+    end
+
+  end
+
+
+
+end

metadata

@@ -1,49 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: threadsafe-lru
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.2
+  version: 0.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Dragan Milic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: autotest
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
-description: Thread safe implemenation of in-memory LRU cache compatible with Java Memory Model
+description: Thread safe implemenation of in-memory LRU cache compatible with Java
+  Memory Model
 email:
 - dragan@netice9.com
 executables: []
@@ -52,39 +53,40 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .project
+- .rspec
 - LICENSE
 - README.md
-- autotest/discover.rb
 - lib/threadsafe-lru.rb
 - lib/threadsafe-lru/DoubleLinkedList.rb
 - lib/threadsafe-lru/ThreadSafeLruCache.rb
 - lib/threadsafe-lru/version.rb
+- spec/threadsafe-lru/DoubleLinkedList_spec.rb
 - spec/threadsafe-lru/ThreadSafeLruCache_spec.rb
 - threadsafe-lru.gemspec
 homepage: https://github.com/draganm/threadsafe-lru
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.25
+signing_key: 
 specification_version: 3
 summary: Thread safe in memory LRU cache
 test_files:
+- spec/threadsafe-lru/DoubleLinkedList_spec.rb
 - spec/threadsafe-lru/ThreadSafeLruCache_spec.rb
-...

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery {"rspec2"}