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.rb | |
| 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.rb')
| -rw-r--r-- | activemodel/lib/active_model/validations.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb index cd596e37d2..55ea6be796 100644 --- a/activemodel/lib/active_model/validations.rb +++ b/activemodel/lib/active_model/validations.rb @@ -82,8 +82,7 @@ module ActiveModel # <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The # method, proc or string should return or evaluate to a true or false value. def validates_each(*attr_names, &block) - options = attr_names.extract_options!.symbolize_keys - validates_with BlockValidator, options.merge(:attributes => attr_names.flatten), &block + validates_with BlockValidator, _merge_attributes(attr_names), &block end # Adds a validation method or block to the class. This is useful when |