Ensure a module can redefine a method it defined before

adambeynon · adambeynon · commit 901c223fdc0a · 2014-11-27T15:48:15.000Z
diff --git a/lib/opal/nodes/def.rb b/lib/opal/nodes/def.rb
@@ -108,7 +108,7 @@ def compile
         elsif scope.top?
           unshift "Opal.Object.$$proto#{jsid} = "
         else
-          raise "Unknown def type for `#{jsid}'"
+          unshift "def#{jsid} = "
         end
 
         wrap '(', ", nil) && '#{mid}'" if expr?
diff --git a/opal/corelib/module.rb b/opal/corelib/module.rb
@@ -233,7 +233,12 @@ def define_method(name, method = undefined, &block)
       block.$$s    = null;
       block.$$def  = block;
 
-      Opal.defn(self, jsid, block);
+      if (self.$$is_singleton) {
+        self.$$proto[jsid] = block;
+      }
+      else {
+        Opal.defn(self, jsid, block);
+      }
 
       return name;
     }
diff --git a/opal/corelib/runtime.js b/opal/corelib/runtime.js
@@ -975,8 +975,9 @@
           }
 
           // only redefine method on class if the module was included AFTER
-          // the module which defined the current method body
-          if (current_owner_index < module_index) {
+          // the module which defined the current method body. Also make sure
+          // a module can overwrite a method it defined before
+          if (current_owner_index <= module_index) {
             dest[jsid] = body;
             dest[jsid].$$donated = true;
           }
diff --git a/spec/opal/core/runtime/donate_spec.rb b/spec/opal/core/runtime/donate_spec.rb
@@ -5,6 +5,10 @@ module A
     def baz
       'a'
     end
+
+    def woosh
+      :kapow
+    end
   end
 
   module B
@@ -25,6 +29,7 @@ def baz; 'b'; end
 
   module A
     def bar; 'a'; end
+    def woosh; :kaplunk; end
   end
 end
 
@@ -41,4 +46,8 @@ def bar; 'a'; end
     @c.bar.should == 'b'
     @c.baz.should == 'b'
   end
+
+  it 'allows a module to override a method it previously defined' do
+    @c.woosh.should == :kaplunk
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -975,8 +975,9 @@`
`975`	`975`	`}`
`976`	`976`
`977`	`977`	`// only redefine method on class if the module was included AFTER`
`978`		`- // the module which defined the current method body`
`979`		`- if (current_owner_index < module_index) {`
	`978`	`+ // the module which defined the current method body. Also make sure`
	`979`	`+ // a module can overwrite a method it defined before`
	`980`	`+ if (current_owner_index <= module_index) {`
`980`	`981`	`dest[jsid] = body;`
`981`	`982`	`dest[jsid].$$donated = true;`
`982`	`983`	`}`