kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

use private_methods and protected_methods instead of respond_to? to check

Browse source 
method visibility. [ruby-dev:26616]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
seki 2005-07-31 16:19:42 +00:00
parent 846a9c902f
commit 711b655f38
4 changed files with 56 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/drb/drb.rb
View file

@ -1448,7 +1448,9 @@ module DRb
# Coerce an object to a string, providing our own representation if
# to_s is not defined for the object.
def any_to_s(obj)
obj.to_s rescue sprintf("#<%s:0x%lx>", obj.class, obj.__id__)
obj.to_s + ":#{obj.class}"
rescue
sprintf("#<%s:0x%lx>", obj.class, obj.__id__)
end
# Check that a method is callable via dRuby.
@ -1463,22 +1465,19 @@ module DRb
return true if Proc === obj && msg_id == :__drb_yield
raise(ArgumentError, "#{any_to_s(msg_id)} is not a symbol") unless Symbol == msg_id.class
raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id)
unless obj.respond_to?(msg_id)
if obj.private_methods.include?(msg_id.to_s)
desc = any_to_s(obj)
if desc.nil? || desc[0] == '#'
desc << ":#{obj.class}"
end
if obj.private_methods.include?(msg_id.to_s)
raise NameError, "private method `#{msg_id}' called for #{desc}"
else
raise NameError, "undefined method `#{msg_id}' called for #{desc}"
end
raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
elsif obj.protected_methods.include?(msg_id.to_s)
desc = any_to_s(obj)
raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
else
true
end
true
end
public :check_insecure_method
class InvokeMethod # :nodoc:
def initialize(drb_server, client)
@drb_server = drb_server