niftie-multiton 0.6.1 → 0.6.5

data/lib/multiton.rb

@@ -1,32 +1,26 @@
 require 'monitor'
 
-module Kernel
-  def Multiton(limit)
-    const_set('INSTANCE_MAP', Multiton::LRUMap.new(limit))
-    Multiton
-  end
-end
-
 module Multiton
   def self.append_features(base)
-    base.const_set('INSTANCE_MAP', Multiton::Map.new) unless base.constants.include?('INSTANCE_MAP')
-    
-    def base.instance_map
-      const_get('INSTANCE_MAP')
-    end
-    
-    def base.instance(*args, &block)
-      key = begin
-        multiton_key(*args, &block)
-      rescue NameError
-        args
+    base.const_set('INSTANCE_MAP', Multiton::Map.new)
+    base.class_eval do
+      def self.instance_map
+        const_get('INSTANCE_MAP')
       end
-      
-      instance_map.synchronize do
-        instance_map[key] ||= begin
-          multiton_new(*args, &block)
+
+      def self.instance(*args, &block)
+        key = begin
+          multiton_key(*args, &block)
         rescue NameError
-          new(*args, &block)
+          args
+        end
+
+        instance_map.synchronize do
+          instance_map[key] ||= begin
+            multiton_new(*args, &block)
+          rescue NameError
+            new(*args, &block)
+          end
         end
       end
     end
@@ -64,94 +58,4 @@ module Multiton
     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 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
-  
 end

data/multiton.gemspec

@@ -3,9 +3,9 @@ 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.6.1'
-  s.date         = '2008-12-10'
-  s.summary      = ''
-  s.files        = ['multiton.gemspec', 'lib/multiton.rb']
+  s.version      = '0.6.5'
+  s.date         = '2008-12-18'
+  s.summary      = 'implementation of the multiton pattern'
+  s.files        = ['README', 'multiton.gemspec', 'lib/multiton.rb']
   s.require_path = 'lib'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: niftie-multiton
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.5
 platform: ruby
 authors: 
 - Nicolas Steenlant
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-10 00:00:00 -08:00
+date: 2008-12-18 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- README
 - multiton.gemspec
 - lib/multiton.rb
 has_rdoc: false
@@ -49,6 +50,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: ""
+summary: implementation of the multiton pattern
 test_files: []