motion-define-method 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-define-method (0.1.1)
+    motion-define-method (0.1.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/define-method/module_ext.rb

@@ -1,11 +1,12 @@
+$define_method_blocks ||= {}
+
 class Module
   def define_method(name, *args, &blk)
-    @define_method_blocks ||= {}
-
-    if args.count > 0
-      @define_method_blocks[name] = args[0]
+    $define_method_blocks[self.to_s] ||= {}
+    if block_given?
+      $define_method_blocks[self.to_s][name] = lambda(&blk)
     elsif 
-      @define_method_blocks[name] = lambda(&blk)
+      $define_method_blocks[self.to_s][name] = args[0]      
     end
   end
 end
@@ -14,16 +15,20 @@ class Object
   attr_accessor :define_method_blocks
   alias_method :original_module_method_missing, :method_missing
   def method_missing(method, *args, &block)
-    self.class.define_method_blocks ||= {}
-    if self.class.define_method_blocks && self.class.define_method_blocks.include?(method)
-      return self.class.define_method_blocks[method].call(*args)
+    if $define_method_blocks[self.class.to_s] && $define_method_blocks[self.class.to_s].include?(method)
+      return $define_method_blocks[self.class.to_s][method].call(*args)
+
+    elsif self.respond_to?(:metaclass) && $define_method_blocks[self.metaclass.to_s] && $define_method_blocks[self.metaclass.to_s].include?(method)
+      return $define_method_blocks[self.metaclass.to_s][method].call(*args)
+
     else
       self.class.ancestors.each do |clazz|
-        if clazz.define_method_blocks && clazz.define_method_blocks.include?(method)
-          return clazz.define_method_blocks[method].call(*args)
+        if $define_method_blocks[clazz.to_s] && $define_method_blocks[clazz.to_s].include?(method)
+          return $define_method_blocks[clazz.to_s][method].call(*args)
         end
       end
       return original_module_method_missing(method, *args)
+
     end
   end
 end

data/lib/define-method/version.rb

@@ -1,5 +1,5 @@
 module Motion
   module DefineMethod
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-define-method
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -75,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3361199952718360998
+      hash: 1104225112934665263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3361199952718360998
+      hash: 1104225112934665263
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24