diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-01-05 19:52:31 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-01-06 01:04:33 -0300 |
commit | 2a663dcf09b380279b22537db6a7caaefdf8b961 (patch) | |
tree | c3584bc1f30c106013eab4a3d2bd9f07787dbb10 /activemodel/lib/active_model/validations | |
parent | 8f309e31057e1b26fefedb199ab0526126fb1fe4 (diff) | |
download | rails-2a663dcf09b380279b22537db6a7caaefdf8b961.tar.gz rails-2a663dcf09b380279b22537db6a7caaefdf8b961.tar.bz2 rails-2a663dcf09b380279b22537db6a7caaefdf8b961.zip |
Remove Array.wrap call in ActiveModel
Diffstat (limited to 'activemodel/lib/active_model/validations')
-rw-r--r-- | activemodel/lib/active_model/validations/callbacks.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb index 22a77320dc..c80ace7b82 100644 --- a/activemodel/lib/active_model/validations/callbacks.rb +++ b/activemodel/lib/active_model/validations/callbacks.rb @@ -30,7 +30,7 @@ module ActiveModel def before_validation(*args, &block) options = args.last if options.is_a?(Hash) && options[:on] - options[:if] = Array.wrap(options[:if]) + options[:if] = Array(options[:if]) options[:if].unshift("self.validation_context == :#{options[:on]}") end set_callback(:validation, :before, *args, &block) @@ -39,7 +39,7 @@ module ActiveModel def after_validation(*args, &block) options = args.extract_options! options[:prepend] = true - options[:if] = Array.wrap(options[:if]) + options[:if] = Array(options[:if]) options[:if] << "!halted" options[:if].unshift("self.validation_context == :#{options[:on]}") if options[:on] set_callback(:validation, :after, *(args << options), &block) |