diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-25 14:24:46 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-26 22:21:18 -0300 |
| commit | 0ee6aa749cde21dad0e5f394a7feb3173f357d2f (patch) | |
| tree | 81105a9a27084b1a759a65f98e0d1766a89d4cd6 /activemodel/lib/active_model/validations | |
| parent | 60571b853920707c1103c5f9659e7b690d8eae73 (diff) | |
| download | rails-0ee6aa749cde21dad0e5f394a7feb3173f357d2f.tar.gz rails-0ee6aa749cde21dad0e5f394a7feb3173f357d2f.tar.bz2 rails-0ee6aa749cde21dad0e5f394a7feb3173f357d2f.zip | |
Set hash value instead of merge a single key, and use flatten! if possible
There's no need to create two extra hashes with options.merge(another_hash),
with the goal of setting only one value, so lets just set it.
Also refactor validates_each to use _merge_attributes, like other
validates_* helpers do.
Diffstat (limited to 'activemodel/lib/active_model/validations')
| -rw-r--r-- | activemodel/lib/active_model/validations/with.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/validations/with.rb b/activemodel/lib/active_model/validations/with.rb index 3158f36b6e..3c516f8b22 100644 --- a/activemodel/lib/active_model/validations/with.rb +++ b/activemodel/lib/active_model/validations/with.rb @@ -3,8 +3,10 @@ module ActiveModel module HelperMethods private def _merge_attributes(attr_names) - options = attr_names.extract_options! - options.merge(:attributes => attr_names.flatten) + options = attr_names.extract_options!.symbolize_keys + attr_names.flatten! + options[:attributes] = attr_names + options end end |