diff options
| author | Ian Young <ian.greenleaf@gmail.com> | 2011-12-04 23:20:54 -0800 |
|---|---|---|
| committer | Ian Young <ian.greenleaf@gmail.com> | 2011-12-04 23:20:54 -0800 |
| commit | 5ff71ac9f844f2c8bcde8cdd5de767c9bdd4cc9e (patch) | |
| tree | aee1f664ebafbbca2f7b0c8d76db1e75e6e83c27 /activemodel | |
| parent | cf6ccf0ebd632ae5a8d4fc3b30ba47eff9837eef (diff) | |
| download | rails-5ff71ac9f844f2c8bcde8cdd5de767c9bdd4cc9e.tar.gz rails-5ff71ac9f844f2c8bcde8cdd5de767c9bdd4cc9e.tar.bz2 rails-5ff71ac9f844f2c8bcde8cdd5de767c9bdd4cc9e.zip | |
Don't tokenize string when counting characters
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/validations/length.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb index 6bc928bab7..95a8ca49e9 100644 --- a/activemodel/lib/active_model/validations/length.rb +++ b/activemodel/lib/active_model/validations/length.rb @@ -6,7 +6,6 @@ module ActiveModel MESSAGES = { :is => :wrong_length, :minimum => :too_short, :maximum => :too_long }.freeze CHECKS = { :is => :==, :minimum => :>=, :maximum => :<= }.freeze - DEFAULT_TOKENIZER = lambda { |value| value.split(//) } RESERVED_OPTIONS = [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long] def initialize(options) @@ -36,7 +35,7 @@ module ActiveModel end def validate_each(record, attribute, value) - value = (options[:tokenizer] || DEFAULT_TOKENIZER).call(value) if value.kind_of?(String) + value = options[:tokenizer].call(value) if value.kind_of?(String) && options[:tokenizer].present? CHECKS.each do |key, validity_check| next unless check_value = options[key] |