Fixes #4732. Error executing elm-install from elm_install gem.

Wow! So order of when method_added and singleton_method_added matter for some gems (in this case contracts).
jruby · Aug 17, 2017 · bd96c06 · bd96c06
1 parent d73a05b
commit bd96c06
Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/Helpers.java b/core/src/main/java/org/jruby/runtime/Helpers.java
@@ -1563,14 +1563,15 @@ public static RubySymbol addInstanceMethod(RubyModule containingClass, String na
         containingClass.addMethod(name, method);
 
         RubySymbol sym = runtime.fastNewSymbol(name);
-        if (visibility == Visibility.MODULE_FUNCTION) {
-            addModuleMethod(containingClass, name, method, context, sym);
-        }
 
         if (!containingClass.isRefinement()) {
             callNormalMethodHook(containingClass, context, sym);
         }
 
+        if (visibility == Visibility.MODULE_FUNCTION) {
+            addModuleMethod(containingClass, name, method, context, sym);
+        }
+
         return sym;
     }
 

diff --git a/spec/regression/GH-4732-make_sure_method_added_before_method_singleton_added_spec.rb b/spec/regression/GH-4732-make_sure_method_added_before_method_singleton_added_spec.rb
@@ -0,0 +1,24 @@
+describe "Module#module_function" do
+  it "will call method_added before method_singleton_added" do
+    module GH4732
+      def self.order
+        @order ||= []
+      end
+
+      def self.method_added(name)
+        order << [:method_added, name]
+      end
+
+      def self.singleton_method_added(name)
+        order << [:singleton_method_added, name]
+      end
+
+      module_function
+
+      def foo
+      end
+    end
+
+    expect(GH4732.order).to eq([[:singleton_method_added, :singleton_method_added], [:method_added, :foo], [:singleton_method_added, :foo]])
+  end
+end