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

delegate.rb: ignore unset target

Browse Source 
* lib/delegate.rb (Delegator#method_missing): ignore the target if not
  set, and delegate to global methods.  [ruby-core:58572] [Bug #9155]
* lib/delegate.rb (Delegator#respond_to_missing): ditto.
* lib/delegate.rb (SimpleDelegator#__getobj__): yield and return if
  not delegated but a block is given, like as Hash#fetch.
* lib/delegate.rb (DelegateClass#__getobj__): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-12-04 03:47:57 +00:00
parent b7c6db94ae
commit fc4de12302
3 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Wed Dec 4 12:47:54 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/delegate.rb (Delegator#method_missing): ignore the target if not
set, and delegate to global methods. [ruby-core:58572] [Bug #9155]
* lib/delegate.rb (Delegator#respond_to_missing): ditto.
* lib/delegate.rb (SimpleDelegator#__getobj__): yield and return if
not delegated but a block is given, like as Hash#fetch.
* lib/delegate.rb (DelegateClass#__getobj__): ditto.
Tue Dec 3 23:48:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Dec 3 23:48:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: check malloc_size() available on BSD. * configure.in: check malloc_size() available on BSD.

21
lib/delegate.rb
View File

@ -74,9 +74,10 @@ class Delegator < BasicObject
# Handles the magic of delegation through \_\_getobj\_\_. # Handles the magic of delegation through \_\_getobj\_\_.
# #
def method_missing(m, *args, &block) def method_missing(m, *args, &block)
target = self.__getobj__ r = true
target = self.__getobj__ {r = false}
begin begin
if target.respond_to?(m) if r && target.respond_to?(m)
target.__send__(m, *args, &block) target.__send__(m, *args, &block)
elsif ::Kernel.respond_to?(m, true) elsif ::Kernel.respond_to?(m, true)
::Kernel.instance_method(m).bind(self).(*args, &block) ::Kernel.instance_method(m).bind(self).(*args, &block)
@ -93,8 +94,10 @@ class Delegator < BasicObject
# call through \_\_getobj\_\_. # call through \_\_getobj\_\_.
# #
def respond_to_missing?(m, include_private) def respond_to_missing?(m, include_private)
r = self.__getobj__.respond_to?(m, include_private) r = true
if r && include_private && !self.__getobj__.respond_to?(m, false) target = self.__getobj__ {r = false}
r &&= target.respond_to?(m, include_private)
if r && include_private && !target.respond_to?(m, false)
warn "#{caller(3)[0]}: delegator does not forward private method \##{m}" warn "#{caller(3)[0]}: delegator does not forward private method \##{m}"
return false return false
end end
@ -306,7 +309,10 @@ end
class SimpleDelegator<Delegator class SimpleDelegator<Delegator
# Returns the current object method calls are being delegated to. # Returns the current object method calls are being delegated to.
def __getobj__ def __getobj__
__raise__ ::ArgumentError, "not delegated" unless defined?(@delegate_sd_obj) unless defined?(@delegate_sd_obj)
return yield if block_given?
__raise__ ::ArgumentError, "not delegated"
end
@delegate_sd_obj @delegate_sd_obj
end end
@ -381,7 +387,10 @@ def DelegateClass(superclass)
methods -= [:to_s,:inspect,:=~,:!~,:===] methods -= [:to_s,:inspect,:=~,:!~,:===]
klass.module_eval do klass.module_eval do
def __getobj__ # :nodoc: def __getobj__ # :nodoc:
__raise__ ::ArgumentError, "not delegated" unless defined?(@delegate_dc_obj) unless defined?(@delegate_dc_obj)
return yield if block_given?
__raise__ ::ArgumentError, "not delegated"
end
@delegate_dc_obj @delegate_dc_obj
end end
def __setobj__(obj) # :nodoc: def __setobj__(obj) # :nodoc:

12
test/test_delegate.rb
View File

@ -168,4 +168,16 @@ class TestDelegateClass < Test::Unit::TestCase
d.__getobj__ d.__getobj__
} }
end end
class Bug9155 < DelegateClass(Integer)
def initialize(value)
super(Integer(value))
end
end
def test_global_method_if_no_target
bug9155 = '[ruby-core:58572] [Bug #9155]'
x = assert_nothing_raised(ArgumentError, bug9155) {break Bug9155.new(1)}
assert_equal(1, x.to_i, bug9155)
end
end end