diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-05 23:31:46 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-05 23:31:46 -0800 |
| commit | 75a630edf34d09bc57f3088136d418850abc4641 (patch) | |
| tree | b54d8b37ddc7c91d58054923a5212057ce6d9393 /activemodel/lib/active_model/callbacks.rb | |
| parent | e09c3c783433e01b11ee4ea12980340cc325472e (diff) | |
| parent | 4311fc45dcfaee61ea6bfbd1631d6672b46f787b (diff) | |
| download | rails-75a630edf34d09bc57f3088136d418850abc4641.tar.gz rails-75a630edf34d09bc57f3088136d418850abc4641.tar.bz2 rails-75a630edf34d09bc57f3088136d418850abc4641.zip | |
Merge pull request #4340 from rafaelfranca/patch-1
Remove more Array.wrap calls
Diffstat (limited to 'activemodel/lib/active_model/callbacks.rb')
| -rw-r--r-- | activemodel/lib/active_model/callbacks.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb index 15103f1185..25d26ede52 100644 --- a/activemodel/lib/active_model/callbacks.rb +++ b/activemodel/lib/active_model/callbacks.rb @@ -1,4 +1,3 @@ -require 'active_support/core_ext/array/wrap' require 'active_support/callbacks' module ActiveModel @@ -93,7 +92,7 @@ module ActiveModel :only => [:before, :around, :after] }.merge(options) - types = Array.wrap(options.delete(:only)) + types = Array(options.delete(:only)) callbacks.each do |callback| define_callbacks(callback, options) @@ -125,7 +124,7 @@ module ActiveModel def self.after_#{callback}(*args, &block) options = args.extract_options! options[:prepend] = true - options[:if] = Array.wrap(options[:if]) << "!halted && value != false" + options[:if] = Array(options[:if]) << "!halted && value != false" set_callback(:#{callback}, :after, *(args << options), &block) end CALLBACK |