diff options
author | Jeremy Evans <code@jeremyevans.net> | 2019-08-15 15:21:55 -0700 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-10-26 09:25:06 +0900 |
commit | d00551a7bb1d5dbabb0a8c95d6bd2d9d4e86934a (patch) | |
tree | b854d144bee1428eff5ad4a2a81e86adfd2142d1 | |
parent | b15e0983f7504c4688afce0ee29a2f4746b6631a (diff) | |
download | ruby-d00551a7bb1d5dbabb0a8c95d6bd2d9d4e86934a.tar.gz |
[ruby/forwardable] Make def_{instance,single}_delegators skip :__send__ and :__id__
Previously, __send__ and __id__ were skipped if provided as strings,
but not skipped if provided as symbols.
Fixes Ruby Bug 8855.
https://github.com/ruby/forwardable/commit/2e61c8c66c
-rw-r--r-- | lib/forwardable.rb | 10 | ||||
-rw-r--r-- | test/test_forwardable.rb | 24 |
2 files changed, 28 insertions, 6 deletions
diff --git a/lib/forwardable.rb b/lib/forwardable.rb index 7f219235d0..3ca8a252dd 100644 --- a/lib/forwardable.rb +++ b/lib/forwardable.rb @@ -149,9 +149,8 @@ module Forwardable # def_delegator :@records, :map # def def_instance_delegators(accessor, *methods) - methods.delete("__send__") - methods.delete("__id__") - for method in methods + methods.each do |method| + next if method.to_s == "__send__" || method.to_s == "__id__" def_instance_delegator(accessor, method) end end @@ -286,9 +285,8 @@ module SingleForwardable # def_delegator :@records, :map # def def_single_delegators(accessor, *methods) - methods.delete("__send__") - methods.delete("__id__") - for method in methods + methods.each do |method| + next if method.to_s == "__send__" || method.to_s == "__id__" def_single_delegator(accessor, method) end end diff --git a/test/test_forwardable.rb b/test/test_forwardable.rb index 0a90d3a878..2c91d6f87c 100644 --- a/test/test_forwardable.rb +++ b/test/test_forwardable.rb @@ -107,6 +107,18 @@ class TestForwardable < Test::Unit::TestCase end end + def test_def_instance_delegators_send_id + %i[def_delegators def_instance_delegators].each do |m| + cls = forwardable_class do + attr_reader :receiver + __send__ m, :@receiver, :__send__, :__id__ + end + + assert_not_equal cls.new.__id__, cls.new.receiver.__id__ + assert_not_equal cls.new.__send__(:__id__), cls.new.receiver.__send__(:__id__) + end + end + def test_instance_delegate %i[delegate instance_delegate].each do |m| cls = forwardable_class do @@ -215,6 +227,18 @@ class TestForwardable < Test::Unit::TestCase end end + def test_obj_single_delegators_send_id + %i[def_delegators def_single_delegators].each do |m| + obj = single_forwardable_object do + singleton_class.attr_reader :receiver + __send__ m, :@receiver, :__send__, :__id__ + end + + assert_not_equal obj.__id__, obj.receiver.__id__ + assert_not_equal obj.__send__(:__id__), obj.receiver.__send__(:__id__) + end + end + def test_obj_single_delegate %i[delegate single_delegate].each do |m| obj = single_forwardable_object do |