send -> send! for some private methods
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7659 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
b01a7c69fc
commit
053d057a88
|
@ -1,25 +1,25 @@
|
|||
module ActiveSupport
|
||||
class OptionMerger #:nodoc:
|
||||
instance_methods.each do |method|
|
||||
instance_methods.each do |method|
|
||||
undef_method(method) if method !~ /^(__|instance_eval|class|object_id)/
|
||||
end
|
||||
|
||||
|
||||
def initialize(context, options)
|
||||
@context, @options = context, options
|
||||
end
|
||||
|
||||
|
||||
private
|
||||
def method_missing(method, *arguments, &block)
|
||||
merge_argument_options! arguments
|
||||
@context.send(method, *arguments, &block)
|
||||
@context.send!(method, *arguments, &block)
|
||||
end
|
||||
|
||||
|
||||
def merge_argument_options!(arguments)
|
||||
arguments << if arguments.last.respond_to? :to_hash
|
||||
@options.merge(arguments.pop)
|
||||
else
|
||||
@options.dup
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -76,7 +76,7 @@ class TimeZone
|
|||
# Create a new TimeZone instance with the given name and offset.
|
||||
def create(name, offset)
|
||||
zone = allocate
|
||||
zone.send :initialize, name, offset
|
||||
zone.send!(:initialize, name, offset)
|
||||
zone
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue