From 053d057a88ac7c4a713666a58306861a2b1bd78c Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 27 Sep 2007 10:41:12 +0000 Subject: send -> send! for some private methods git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7659 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/active_support/option_merger.rb | 12 ++++++------ activesupport/lib/active_support/values/time_zone.rb | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'activesupport/lib/active_support') diff --git a/activesupport/lib/active_support/option_merger.rb b/activesupport/lib/active_support/option_merger.rb index 29119d0dca..1a4ff9db9a 100644 --- a/activesupport/lib/active_support/option_merger.rb +++ b/activesupport/lib/active_support/option_merger.rb @@ -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 diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index c67af60926..ab9e2cfde8 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -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 -- cgit v1.2.3