niftie-multiton 0.3 → 0.4

data/lib/multiton.rb

@@ -1,26 +1,63 @@
-require 'thread'
+require 'monitor'
 
 module Multiton
-  MUTEX = Mutex.new
-  POOLS = {}
+  def self.extended(base)
+    base.instance_variable_set(:@instance_map, Map.new)
+    class << base
+      attr_reader :instance_map
+    end
+  end
   
-  def self.append_features(base)
-    
-    def base.instance(*args, &block)
-      key = if respond_to?(:multiton_key)
-        multiton_key(*args, &block)
-      else
-        args
+  def inherited(desc)
+    super
+    class << desc
+      def instance_map
+        superclass.instance_map
       end
-      
-      Multiton::MUTEX.synchronize do
-        (Multiton::POOLS[self] ||= {})[key] ||= if respond_to?(:multiton_new)
-          multiton_new(*args, &block)
-        else
-          new(*args, &block)
-        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)
       end
     end
+  end
+  
+  class Map
+    def initialize
+      @store = {}
+      extend MonitorMixin
+    end
     
+    def [](key)
+      @store[key]
+    end
+    
+    def []=(key, val)
+      synchronize { @store[key] = val }
+    end
+    
+    def clear
+      synchronize { @store.clear }
+    end
+    
+    def delete(key)
+      synchronize { @store.delete(key) }
+    end
+    
+    def store
+      synchronize { yield @store }
+    end
   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.3'
-  s.date         = '2008-11-21'
+  s.version      = '0.4'
+  s.date         = '2008-11-27'
   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.3"
+  version: "0.4"
 platform: ruby
 authors: 
 - Nicolas Steenlant
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-21 00:00:00 -08:00
+date: 2008-11-27 00:00:00 -08:00
 default_executable: 
 dependencies: []