diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/delegate.rb | 41 |
2 files changed, 42 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Jun 22 13:23:13 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * lib/delegate.rb: Forward #trust, #untrust, #taint and #untaint + to both the delegator and __getobj__ [ruby-core:26138] + Mon Jun 21 23:41:08 2010 wanabe <s.wanabe@gmail.com> * eval_error.c (error_print): clear raised_flag while error-printing diff --git a/lib/delegate.rb b/lib/delegate.rb index 2c1db88a75..d5ab163850 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -137,7 +137,9 @@ class Delegator < BasicObject __setobj__(obj) end + # # Handles the magic of delegation through \_\_getobj\_\_. + # def method_missing(m, *args, &block) target = self.__getobj__ begin @@ -222,7 +224,9 @@ class Delegator < BasicObject raise NotImplementedError, "need to define `__setobj__'" end + # # Serialization support for the object returned by \_\_getobj\_\_. + # def marshal_dump ivars = instance_variables.reject {|var| /\A@delegate_/ =~ var} [ @@ -231,7 +235,10 @@ class Delegator < BasicObject __getobj__ ] end + + # # Reinitializes delegation from a serialized object. + # def marshal_load(data) version, vars, values, obj = data if version == :__v2__ @@ -250,10 +257,36 @@ class Delegator < BasicObject end private :initialize_clone, :initialize_dup - # Freeze self and target at once. - def freeze - __getobj__.freeze - super + ## + # :method: trust + # Trust both the object returned by \_\_getobj\_\_ and self. + # + + ## + # :method: untrust + # Untrust both the object returned by \_\_getobj\_\_ and self. + # + + ## + # :method: taint + # Taint both the object returned by \_\_getobj\_\_ and self. + # + + ## + # :method: untaint + # Untaint both the object returned by \_\_getobj\_\_ and self. + # + + ## + # :method: freeze + # Freeze both the object returned by \_\_getobj\_\_ and self. + # + + [:trust, :untrust, :taint, :untaint, :freeze].each do |method| + define_method method do + __getobj__.send(method) + super() + end end @delegator_api = self.public_instance_methods |