archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 53382,53511,53512: [Backport #11916]

Browse source 
fix commit miss

	* test/test_forwardable.rb: add tests for r53381.
	* lib/forwardable.rb: Convert given accessors to String.
	  r53381 changed to accept only Symbol or String for accessors, but
	  there are several rubygems that pass classes (e.g. Array,
	  Hash, ...) as accessors. Prior r53381, it was accepted because Class#to_s
	  returns its class name. After r53381 given accessors are checked
	  with define_method, but it accepts only Symbol or String, otherwise
	  raises TypeError.
	      def_delegator Foo, :some_method
	  This change is to revert unwanted incompatibility. But this behavior
	  may change in the future.
	  This change is to revert unexpected incompatibility. But this behavior


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2016-04-22 15:24:35 +00:00
parent fdd8cf9762
commit 69dc2ce664
4 changed files with 120 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/forwardable.rb
View file

@ -178,6 +178,7 @@ module Forwardable
# q.push 23 #=> NoMethodError
#
def def_instance_delegator(accessor, method, ali = method)
accessor = accessor.to_s
if method_defined?(accessor) || private_method_defined?(accessor)
accessor = "#{accessor}()"
end
@ -274,6 +275,7 @@ module SingleForwardable
# the method of the same name in _accessor_). If _new_name_ is
# provided, it is used as the name for the delegate method.
def def_single_delegator(accessor, method, ali = method)
accessor = accessor.to_s
if method_defined?(accessor) || private_method_defined?(accessor)
accessor = "#{accessor}()"
end