1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/forwardable] Make def_*_delegator return name of method defined (Fixes #10)

Browse Source 
This restores compatibility with previous versions.  This behavior
was previously undefined, but it makes sense for the name of the
defined method to be returned.

https://github.com/ruby/forwardable/commit/a52ef3451e
This commit is contained in:
Jeremy Evans 2019-12-01 19:57:06 -08:00 committed by Hiroshi SHIBATA
parent c2f6aa4e48
commit 0dcd3340fb
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/forwardable.rb
View File

@ -160,6 +160,7 @@ module Forwardable
# +accessor.method+. +accessor+ should be a method name, instance # +accessor.method+. +accessor+ should be a method name, instance
# variable name, or constant name. Use the full path to the # variable name, or constant name. Use the full path to the
# constant if providing the constant name. # constant if providing the constant name.
# Returns the name of the method defined.
# #
# class MyQueue # class MyQueue
# CONST = 1 # CONST = 1
@ -184,8 +185,9 @@ module Forwardable
# If it's not a class or module, it's an instance # If it's not a class or module, it's an instance
mod = Module === self ? self : singleton_class mod = Module === self ? self : singleton_class
mod.module_eval(&gen) ret = mod.module_eval(&gen)
mod.send(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7' mod.send(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7'
ret
end end
alias delegate instance_delegate alias delegate instance_delegate
@ -299,11 +301,13 @@ module SingleForwardable
# Defines a method _method_ which delegates to _accessor_ (i.e. it calls # Defines a method _method_ which delegates to _accessor_ (i.e. it calls
# the method of the same name in _accessor_). If _new_name_ is # the method of the same name in _accessor_). If _new_name_ is
# provided, it is used as the name for the delegate method. # provided, it is used as the name for the delegate method.
# Returns the name of the method defined.
def def_single_delegator(accessor, method, ali = method) def def_single_delegator(accessor, method, ali = method)
gen = Forwardable._delegator_method(self, accessor, method, ali) gen = Forwardable._delegator_method(self, accessor, method, ali)
instance_eval(&gen) ret = instance_eval(&gen)
singleton_class.send(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7' singleton_class.send(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7'
ret
end end
alias delegate single_delegate alias delegate single_delegate

8
test/test_forwardable.rb
View File

@ -24,11 +24,13 @@ class TestForwardable < Test::Unit::TestCase
def test_def_instance_delegator def test_def_instance_delegator
%i[def_delegator def_instance_delegator].each do |m| %i[def_delegator def_instance_delegator].each do |m|
ret = nil
cls = forwardable_class do cls = forwardable_class do
__send__ m, :@receiver, :delegated1 ret = __send__ m, :@receiver, :delegated1
end end
assert_same RETURNED1, cls.new.delegated1 assert_same RETURNED1, cls.new.delegated1
assert_equal :delegated1, ret
end end
end end
@ -185,11 +187,13 @@ class TestForwardable < Test::Unit::TestCase
def test_class_single_delegator def test_class_single_delegator
%i[def_delegator def_single_delegator].each do |m| %i[def_delegator def_single_delegator].each do |m|
ret = nil
cls = single_forwardable_class do cls = single_forwardable_class do
__send__ m, :@receiver, :delegated1 ret = __send__ m, :@receiver, :delegated1
end end
assert_same RETURNED1, cls.delegated1 assert_same RETURNED1, cls.delegated1
assert_equal :delegated1, ret
end end
end end