diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:44:47 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:44:47 +0000 |
commit | 3e23ba599d8c7787195333a5605de56df4c21b96 (patch) | |
tree | ec9fe51c0ce3009469fc9137d9642cfe9e3e07b8 /lib | |
parent | c8f9b4d5468e49962b94b245397f549eb9101e51 (diff) |
merges r25245 from trunk into ruby_1_9_1.
and fixes a mistake in the test case.
--
* lib/delegate.rb (Delegator::public_api): take snapshot of
public method at the beginning time.
* lib/delegate.rb (SimpleDelegator#initialize): use
Delegator.public_api since public_method might be added after
initialization. [ruby-dev:39383]
* lib/delegate.rb (DelegateClass): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/delegate.rb | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/delegate.rb b/lib/delegate.rb index cb16adbae9..f3474d45e6 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -196,6 +196,11 @@ class Delegator new.__setobj__(__getobj__.dup) new end + + @delegator_api = self.public_instance_methods + def self.public_api # :nodoc: + @delegator_api + end end # @@ -228,6 +233,17 @@ class SimpleDelegator<Delegator raise ArgumentError, "cannot delegate to self" if self.equal?(obj) @delegate_sd_obj = obj end + + def initialize(obj) # :nodoc: + (self.public_methods - Delegator.public_api).each do |m| + class << self + self + end.class_eval do + undef_method m + end + end + super + end end # :stopdoc: @@ -257,7 +273,7 @@ end def DelegateClass(superclass) klass = Class.new(Delegator) methods = superclass.public_instance_methods(true) - methods -= ::Delegator.public_instance_methods + methods -= ::Delegator.public_api methods -= [:to_s,:inspect,:=~,:!~,:===] klass.module_eval { def __getobj__ # :nodoc: |