Bug #11512 ยป fix-delegate-class-method-visibility.patch
lib/delegate.rb | ||
---|---|---|
#
|
||
def DelegateClass(superclass)
|
||
klass = Class.new(Delegator)
|
||
methods = superclass.instance_methods
|
||
methods -= ::Delegator.public_api
|
||
methods -= [:to_s, :inspect, :=~, :!~, :===]
|
||
ignores = [*::Delegator.public_api, :to_s, :inspect, :=~, :!~, :===]
|
||
protected_instance_methods = superclass.protected_instance_methods
|
||
protected_instance_methods -= ignores
|
||
public_instance_methods = superclass.public_instance_methods
|
||
public_instance_methods -= ignores
|
||
klass.module_eval do
|
||
def __getobj__ # :nodoc:
|
||
unless defined?(@delegate_dc_obj)
|
||
... | ... | |
__raise__ ::ArgumentError, "cannot delegate to self" if self.equal?(obj)
|
||
@delegate_dc_obj = obj
|
||
end
|
||
methods.each do |method|
|
||
protected_instance_methods.each do |method|
|
||
define_method(method, Delegator.delegating_block(method))
|
||
protected method
|
||
end
|
||
public_instance_methods.each do |method|
|
||
define_method(method, Delegator.delegating_block(method))
|
||
end
|
||
end
|
||
klass.define_singleton_method :public_instance_methods do |all=true|
|
||
super(all) - superclass.protected_instance_methods
|
||
super(all) | superclass.public_instance_methods
|
||
end
|
||
klass.define_singleton_method :protected_instance_methods do |all=true|
|
||
super(all) | superclass.protected_instance_methods
|
test/test_delegate.rb | ||
---|---|---|
assert_equal(:m, bar.send(:delegate_test_m), bug)
|
||
end
|
||
class Parent
|
||
def parent_public; end
|
||
protected
|
||
def parent_protected; end
|
||
end
|
||
class Child < DelegateClass(Parent)
|
||
end
|
||
class Parent
|
||
def parent_public_added; end
|
||
protected
|
||
def parent_protected_added; end
|
||
end
|
||
def test_public_instance_methods
|
||
ignores = Object.public_instance_methods | Delegator.public_instance_methods
|
||
assert_equal([:parent_public, :parent_public_added], (Child.public_instance_methods - ignores).sort)
|
||
assert_equal([:parent_public, :parent_public_added], (Child.new(Parent.new).public_methods - ignores).sort)
|
||
end
|
||
def test_protected_instance_methods
|
||
ignores = Object.protected_instance_methods | Delegator.protected_instance_methods
|
||
assert_equal([:parent_protected, :parent_protected_added], (Child.protected_instance_methods - ignores).sort)
|
||
assert_equal([:parent_protected, :parent_protected_added], (Child.new(Parent.new).protected_methods - ignores).sort)
|
||
end
|
||
class IV < DelegateClass(Integer)
|
||
attr_accessor :var
|
||