[GR-18163] Refinements take place at Object#method and Module#instance_method (#2004)

PullRequest: truffleruby/2383

Author: eregon

CHANGELOG.md

@@ -47,6 +47,7 @@ Compatibility:
 * Implemented `Module#const_source_location` (#2212, @tomstuart and @wildmaples).
 * Do not call `File.exist?` in `Dir.glob` as `File.exist?` is often mocked (#2236, @gogainda).
 * Coerce the inherit argument to a boolean in `Module#const_defined?` and `Module#const_get` (#2240).
+* Refinements take place at `Object#method` and `Module#instance_method` (#2004, @ssnickolay).
 
 Performance:
 

lib/truffle/truffle/cext.rb

@@ -423,6 +423,10 @@ def rb_obj_method_arity(object, id)
     object.method(id).arity
   end
 
+  def rb_obj_method(object, id)
+    object.method(id)
+  end
+
   def rb_ivar_defined(object, id)
     Primitive.object_ivar_defined?(object, id)
   end

spec/ruby/core/kernel/fixtures/classes.rb

@@ -362,18 +362,19 @@ class SuperAmpersand
   class RespondViaMissing
     def respond_to_missing?(method, priv=false)
       case method
-        when :handled_publicly
-          true
-        when :handled_privately
-          priv
-        when :not_handled
-          false
-        else
-          raise "Typo in method name"
+      when :handled_publicly
+        true
+      when :handled_privately
+        priv
+      when :not_handled
+        false
+      else
+        raise "Typo in method name: #{method.inspect}"
       end
     end
 
     def method_missing(method, *args)
+      raise "the method name should be a Symbol" unless Symbol === method
       "Done #{method}(#{args})"
     end
   end

spec/ruby/core/kernel/shared/method.rb

@@ -15,12 +15,18 @@ class KernelSpecs::Foo; def self.bar; 'class done'; end; end
     m.call.should == 'class done'
   end
 
-  it "returns a method object if we repond_to_missing? method" do
+  it "returns a method object if respond_to_missing?(method) is true" do
     m = KernelSpecs::RespondViaMissing.new.send(@method, :handled_publicly)
     m.should be_an_instance_of Method
     m.call(42).should == "Done handled_publicly([42])"
   end
 
+  it "the returned method object if respond_to_missing?(method) calls #method_missing with a Symbol name" do
+    m = KernelSpecs::RespondViaMissing.new.send(@method, "handled_publicly")
+    m.should be_an_instance_of Method
+    m.call(42).should == "Done handled_publicly([42])"
+  end
+
   it "raises a NameError for an invalid method name" do
     class KernelSpecs::Foo; def bar; 'done'; end; end
     -> {

spec/ruby/core/module/refine_spec.rb

@@ -573,6 +573,43 @@ def foo; end
       end
     end
 
+    ruby_version_is "" ... "2.7" do
+      it "is not honored by Kernel#public_method" do
+        klass = Class.new
+        refinement = Module.new do
+          refine klass do
+            def foo; end
+          end
+        end
+
+        -> {
+          Module.new do
+            using refinement
+            klass.new.public_method(:foo)
+          end
+        }.should raise_error(NameError, /undefined method `foo'/)
+      end
+    end
+
+    ruby_version_is "2.7" do
+      it "is honored by Kernel#public_method" do
+        klass = Class.new
+        refinement = Module.new do
+          refine klass do
+            def foo; end
+          end
+        end
+
+        result = nil
+        Module.new do
+          using refinement
+          result = klass.new.public_method(:foo).class
+        end
+
+        result.should == Method
+      end
+    end
+
     ruby_version_is "" ... "2.7" do
       it "is not honored by Kernel#instance_method" do
         klass = Class.new
@@ -592,7 +629,7 @@ def foo; end
     end
 
     ruby_version_is "2.7" do
-      it "is honored by Kernel#method" do
+      it "is honored by Kernel#instance_method" do
         klass = Class.new
         refinement = Module.new do
           refine klass do

spec/ruby/optional/capi/ext/kernel_spec.c

@@ -310,10 +310,6 @@ static VALUE kernel_spec_rb_make_backtrace(VALUE self) {
   return rb_make_backtrace();
 }
 
-static VALUE kernel_spec_rb_obj_method(VALUE self, VALUE obj, VALUE method) {
-  return rb_obj_method(obj, method);
-}
-
 static VALUE kernel_spec_rb_funcall3(VALUE self, VALUE obj, VALUE method) {
   return rb_funcall3(obj, SYM2ID(method), 0, NULL);
 }
@@ -366,7 +362,6 @@ void Init_kernel_spec(void) {
   rb_define_method(cls, "rb_set_end_proc", kernel_spec_rb_set_end_proc, 1);
   rb_define_method(cls, "rb_f_sprintf", kernel_spec_rb_f_sprintf, 1);
   rb_define_method(cls, "rb_make_backtrace", kernel_spec_rb_make_backtrace, 0);
-  rb_define_method(cls, "rb_obj_method", kernel_spec_rb_obj_method, 2);
   rb_define_method(cls, "rb_funcall3", kernel_spec_rb_funcall3, 2);
   rb_define_method(cls, "rb_funcall_many_args", kernel_spec_rb_funcall_many_args, 2);
   rb_define_method(cls, "rb_funcall_with_block", kernel_spec_rb_funcall_with_block, 3);

spec/ruby/optional/capi/ext/object_spec.c

@@ -147,6 +147,10 @@ static VALUE object_specs_rb_obj_method_arity(VALUE self, VALUE obj, VALUE mid)
   return INT2FIX(rb_obj_method_arity(obj, SYM2ID(mid)));
 }
 
+static VALUE object_specs_rb_obj_method(VALUE self, VALUE obj, VALUE method) {
+  return rb_obj_method(obj, method);
+}
+
 static VALUE object_spec_rb_obj_taint(VALUE self, VALUE obj) {
   return rb_obj_taint(obj);
 }
@@ -420,6 +424,7 @@ void Init_object_spec(void) {
   rb_define_method(cls, "rb_obj_is_instance_of", so_instance_of, 2);
   rb_define_method(cls, "rb_obj_is_kind_of", so_kind_of, 2);
   rb_define_method(cls, "rb_obj_method_arity", object_specs_rb_obj_method_arity, 2);
+  rb_define_method(cls, "rb_obj_method", object_specs_rb_obj_method, 2);
   rb_define_method(cls, "rb_obj_taint", object_spec_rb_obj_taint, 1);
   rb_define_method(cls, "rb_require", so_require, 0);
   rb_define_method(cls, "rb_respond_to", so_respond_to, 2);

spec/ruby/optional/capi/kernel_spec.rb

@@ -559,20 +559,6 @@ def proc_caller
     end
   end
 
-  describe "rb_obj_method" do
-    it "returns the method object for a symbol" do
-      method = @s.rb_obj_method("test", :size)
-      method.owner.should == String
-      method.name.to_sym.should == :size
-    end
-
-    it "returns the method object for a string" do
-      method = @s.rb_obj_method("test", "size")
-      method.owner.should == String
-      method.name.to_sym.should == :size
-    end
-  end
-
   describe "rb_funcall3" do
     before :each do
       @obj = Object.new

spec/ruby/optional/capi/object_spec.rb

@@ -161,6 +161,20 @@ def six(a, b, *c, &d); end
     end
   end
 
+  describe "rb_obj_method" do
+    it "returns the method object for a symbol" do
+      method = @o.rb_obj_method("test", :size)
+      method.owner.should == String
+      method.name.to_sym.should == :size
+    end
+
+    it "returns the method object for a string" do
+      method = @o.rb_obj_method("test", "size")
+      method.owner.should == String
+      method.name.to_sym.should == :size
+    end
+  end
+
   describe "rb_method_boundp" do
     it "returns true when the given method is bound" do
       @o.rb_method_boundp(Object, :class, true).should == true

spec/tags/core/module/refine_tags.txt

@@ -1,2 +1 @@
 slow:Module#refine method lookup looks in the included modules for builtin methods
-fails:Module#refine for methods accessed indirectly is honored by Kernel#method