diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-27 11:50:11 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-27 11:50:11 -0700 |
commit | a98db7c6ef7384d60a1c7f02d43ee601e2647eea (patch) | |
tree | bbb35149bedc0354617f809641413eda637b1cc9 /activemodel/lib/active_model/callbacks.rb | |
parent | c3cea9b59460bb9e67dafcc055f39b8e69542405 (diff) | |
download | rails-a98db7c6ef7384d60a1c7f02d43ee601e2647eea.tar.gz rails-a98db7c6ef7384d60a1c7f02d43ee601e2647eea.tar.bz2 rails-a98db7c6ef7384d60a1c7f02d43ee601e2647eea.zip |
Use Array.wrap uniformly
Diffstat (limited to 'activemodel/lib/active_model/callbacks.rb')
-rw-r--r-- | activemodel/lib/active_model/callbacks.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb index a7e0cf90c1..d4e98de57b 100644 --- a/activemodel/lib/active_model/callbacks.rb +++ b/activemodel/lib/active_model/callbacks.rb @@ -1,3 +1,4 @@ +require 'active_support/core_ext/array/wrap' require 'active_support/callbacks' module ActiveModel @@ -91,7 +92,7 @@ module ActiveModel options = callbacks.extract_options! options = { :terminator => "result == false", :scope => [:kind, :name] }.merge(options) - types = Array(options.delete(:only)) + types = Array.wrap(options.delete(:only)) types = [:before, :around, :after] if types.empty? callbacks.each do |callback| @@ -124,10 +125,10 @@ module ActiveModel def self.after_#{callback}(*args, &block) options = args.extract_options! options[:prepend] = true - options[:if] = Array(options[:if]) << "!halted && value != false" + options[:if] = Array.wrap(options[:if]) << "!halted && value != false" set_callback(:#{callback}, :after, *(args << options), &block) end CALLBACK end end -end
\ No newline at end of file +end |