niftie-multiton 0.5 → 0.6

data/lib/multiton.rb

@@ -1,62 +1,166 @@
 require 'monitor'
 
+module Kernel
+  def Multiton(size)
+    @instance_map = Multiton::LRUMap.new(size)
+    Multiton
+  end
+end
+
 module Multiton
-  def self.extended(base)
-    base.instance_variable_set(:@instance_map, Map.new)
+  def self.included(base)
+    base.instance_eval do
+      @instance_map ||= Multiton::Map.new
+    end
+    
     class << base
       attr_reader :instance_map
-    end
-  end
-  
-  def inherited(desc)
-    super
-    class << desc
-      def instance_map
-        superclass.instance_map
+      
+      def inherited(subclass)
+        def subclass.instance_map
+          superclass.instance_map
+        end
+        super
       end
-    end
-  end
-  
-  def instance(*args, &block)
-    key = begin
-      multiton_key(*args, &block)
-    rescue NameError
-      args
-    end
-    
-    instance_map.synchronize do
-      instance_map[key] ||= begin
-        multiton_new(*args, &block)
-      rescue NameError
-        new(*args, &block)
+      
+      def instance(*args, &block)
+        key = begin
+          multiton_key(*args, &block)
+        rescue NameError
+          args
+        end
+        
+        instance_map.synchronize do
+          instance_map[key] ||= begin
+            multiton_new(*args, &block)
+          rescue NameError
+            new(*args, &block)
+          end
+        end
       end
     end
+    
   end
   
   class Map
     def initialize
-      @store = {}
       extend MonitorMixin
+      @store = {}
     end
     
     def [](key)
       @store[key]
     end
     
-    def []=(key, val)
-      synchronize { @store[key] = val }
+    def []=(key, value)
+      synchronize { @store[key] = value }
+    end
+    
+    def delete_if(&block)
+      synchronize { @store.delete_if(&block) }
+      self
+    end
+    
+    def delete(key)
+      synchronize { @store.delete(key) }
     end
     
     def clear
       synchronize { @store.clear }
     end
     
-    def delete_if(&block)
-      synchronize { @store.delete_if(&block) }
+    def size
+      @store.size
+    end
+  end
+  
+  class LRUMap < Map
+    Item = Struct.new(:key, :value, :prev, :next)
+    
+    def initialize(limit)
+      raise ArgumentError, "limit must be an Integer" unless limit.is_a? Integer
+      super()
+      @limit = limit
+      setup
+    end
+    
+    def [](key)
+      if item = super
+        synchronize do
+          remove(item)
+          append(head, item)
+        end
+        item.value
+      end
+    end
+    
+    def []=(key, value)
+      item = Item.new(key, value)
+      synchronize do
+        super(key, item)
+        
+        delete(last.key) if size > @limit
+        append(head, item)
+      end
+      item.value
+    end
+    
+    def delete_if
+      synchronize do
+        @store.keys.each { |key| delete(key) if yield key, @store[key].value }
+      end
+      self
     end
     
     def delete(key)
-      synchronize { @store.delete(key) }
+      synchronize do
+        if item = super
+          remove(item)
+          return item.value
+        end
+      end
+    end
+    
+    def clear
+      synchronize do
+        super
+        setup
+      end
+    end
+    
+    private
+    
+    def head
+      @head
+    end
+    
+    def tail
+      @tail
+    end
+    
+    def last
+      @tail.prev
+    end
+    
+    def setup
+      @head = Item.new
+      @tail = Item.new
+      join(head, tail)
+    end
+    
+    def remove(item)
+      join(item.prev, item.next)
+      item
+    end
+    
+    def append(x, y)
+      join(y, x.next)
+      join(x, y)
+    end
+    
+    def join(x, y)
+      x.next = y
+      y.prev = x
     end
   end
   

data/multiton.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.homepage     = 'http://github.com/niftie/multiton'
   s.author       = 'Nicolas Steenlant'
   s.email        = 'nicolas.steenlant@gmail.com'
-  s.version      = '0.5'
-  s.date         = '2008-11-28'
+  s.version      = '0.6'
+  s.date         = '2008-12-04'
   s.summary      = ''
   s.files        = ['multiton.gemspec', 'lib/multiton.rb']
   s.require_path = 'lib'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: niftie-multiton
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: "0.6"
 platform: ruby
 authors: 
 - Nicolas Steenlant
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-28 00:00:00 -08:00
+date: 2008-12-04 00:00:00 -08:00
 default_executable: 
 dependencies: []