mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Don't tokenize string when counting characters
This commit is contained in:
@@ -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]
|
||||
|
||||
Reference in New Issue
Block a user