niftie-multiton 0.6.5 → 2009.01

data/lib/multiton.rb

@@ -1,60 +1,62 @@
-require 'monitor'
+require 'sync'
 
 module Multiton
   def self.append_features(base)
-    base.const_set('INSTANCE_MAP', Multiton::Map.new)
-    base.class_eval do
-      def self.instance_map
-        const_get('INSTANCE_MAP')
-      end
-
-      def self.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
+    base.const_set(:INSTANCE_MAP, Map.new)
+    
+    def base.instance_map
+      const_get(:INSTANCE_MAP)
+    end
+    
+    def base.instance(*args, &block)
+      instance_map.lock.synchronize(:EX) do
+        instance_map[multiton_key(*args, &block)] ||= multiton_new(*args, &block)
       end
     end
+    
+    def base.multiton_key(*args, &block)
+      args
+    end
+    
+    def base.multiton_new(*args, &block)
+      new(*args, &block)
+    end
+    
+    base.private_class_method(:multiton_key)
+    base.private_class_method(:multiton_new)
   end
   
   class Map
+    attr_reader :lock
+    
     def initialize
-      extend MonitorMixin
-      @store = {}
+      @hash = Hash.new
+      @lock = Sync.new
     end
     
     def [](key)
-      @store[key]
+      lock.synchronize(:SH) { @hash[key] }
     end
     
     def []=(key, value)
-      synchronize { @store[key] = value }
+      lock.synchronize(:EX) { @hash[key] = value }
+    end
+    
+    def size
+      lock.synchronize(:SH) { @hash.size }
     end
     
     def delete_if(&block)
-      synchronize { @store.delete_if(&block) }
+      lock.synchronize(:EX) { @hash.delete_if(&block) }
       self
     end
     
     def delete(key)
-      synchronize { @store.delete(key) }
+      lock.synchronize(:EX) { @hash.delete(key) }
     end
     
     def clear
-      synchronize { @store.clear }
-    end
-    
-    def size
-      @store.size
+      lock.synchronize(:EX) { @hash.clear }
     end
   end
   

data/multiton.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name         = 'multiton'
-  s.homepage     = 'http://github.com/niftie/multiton'
+  s.homepage     = 'http://github.comn/niftie/multiton'
   s.author       = 'Nicolas Steenlant'
   s.email        = 'nicolas.steenlant@gmail.com'
-  s.version      = '0.6.5'
-  s.date         = '2008-12-18'
+  s.version      = '2009.01'
+  s.date         = '2009-01-03'
   s.summary      = 'implementation of the multiton pattern'
   s.files        = ['README', '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.6.5
+  version: "2009.01"
 platform: ruby
 authors: 
 - Nicolas Steenlant
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-18 00:00:00 -08:00
+date: 2009-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -26,7 +26,7 @@ files:
 - multiton.gemspec
 - lib/multiton.rb
 has_rdoc: false
-homepage: http://github.com/niftie/multiton
+homepage: http://github.comn/niftie/multiton
 post_install_message: 
 rdoc_options: []