diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-16 18:54:51 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-16 18:54:51 +0000 |
| commit | 8aaf3c1e553d18b40d9980951d496bffad56f37b (patch) | |
| tree | 2eddd2b50a5924420b30caa5c6d867f4870a71dc /activemodel/lib/active_model/validations/length.rb | |
| parent | 9abc94c44516afdcfe4a3b202c336c9578fd6d0d (diff) | |
| parent | 0eae62525696b57fe7fc4bbb0bf9c0bc7ee4e480 (diff) | |
| download | rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.gz rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.bz2 rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'activemodel/lib/active_model/validations/length.rb')
| -rw-r--r-- | activemodel/lib/active_model/validations/length.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb index 7af6c83460..72735cfb89 100644 --- a/activemodel/lib/active_model/validations/length.rb +++ b/activemodel/lib/active_model/validations/length.rb @@ -43,7 +43,8 @@ module ActiveModel value ||= [] if key == :maximum - next if value && value.size.send(validity_check, check_value) + value_length = value.respond_to?(:length) ? value.length : value.to_s.length + next if value_length.send(validity_check, check_value) errors_options = options.except(*RESERVED_OPTIONS) errors_options[:count] = check_value |