Merge pull request #7253 from acapilleri/lenght_validator_errors_options

calculate errors_options one time in validate_each
rails · Aug 3, 2012 · 9895f6c · 9895f6c
2 parents c8a613b + 93b6faf
commit 9895f6c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb
@@ -36,12 +36,12 @@ def check_validity!
       def validate_each(record, attribute, value)
         value = tokenize(value)
         value_length = value.respond_to?(:length) ? value.length : value.to_s.length
-
+        errors_options = options.except(*RESERVED_OPTIONS)
+
         CHECKS.each do |key, validity_check|
           next unless check_value = options[key]
           next if value_length.send(validity_check, check_value)
 
-          errors_options = options.except(*RESERVED_OPTIONS)
           errors_options[:count] = check_value
 
           default_message = options[MESSAGES[key]]