niftie-multiton 0.6 → 0.6.1

data/lib/multiton.rb

@@ -1,45 +1,35 @@
 require 'monitor'
 
 module Kernel
-  def Multiton(size)
-    @instance_map = Multiton::LRUMap.new(size)
+  def Multiton(limit)
+    const_set('INSTANCE_MAP', Multiton::LRUMap.new(limit))
     Multiton
   end
 end
 
 module Multiton
-  def self.included(base)
-    base.instance_eval do
-      @instance_map ||= Multiton::Map.new
+  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
     
-    class << base
-      attr_reader :instance_map
-      
-      def inherited(subclass)
-        def subclass.instance_map
-          superclass.instance_map
-        end
-        super
+    def base.instance(*args, &block)
+      key = begin
+        multiton_key(*args, &block)
+      rescue NameError
+        args
       end
       
-      def instance(*args, &block)
-        key = begin
-          multiton_key(*args, &block)
+      instance_map.synchronize do
+        instance_map[key] ||= begin
+          multiton_new(*args, &block)
         rescue NameError
-          args
-        end
-        
-        instance_map.synchronize do
-          instance_map[key] ||= begin
-            multiton_new(*args, &block)
-          rescue NameError
-            new(*args, &block)
-          end
+          new(*args, &block)
         end
       end
     end
-    
   end
   
   class Map

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.6'
-  s.date         = '2008-12-04'
+  s.version      = '0.6.1'
+  s.date         = '2008-12-10'
   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.6"
+  version: 0.6.1
 platform: ruby
 authors: 
 - Nicolas Steenlant
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-04 00:00:00 -08:00
+date: 2008-12-10 00:00:00 -08:00
 default_executable: 
 dependencies: []