From cbe1d2488b12460dd752a3805ea813f37e4fe94e Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Mon, 16 May 2011 14:31:00 +0900 Subject: Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use it only when needed. --- activemodel/lib/active_model/validations/length.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb index 72735cfb89..d595a5fb43 100644 --- a/activemodel/lib/active_model/validations/length.rb +++ b/activemodel/lib/active_model/validations/length.rb @@ -16,7 +16,7 @@ module ActiveModel options[:maximum] -= 1 if range.exclude_end? end - super(options.reverse_merge(:tokenizer => DEFAULT_TOKENIZER)) + super end def check_validity! @@ -36,7 +36,7 @@ module ActiveModel end def validate_each(record, attribute, value) - value = options[:tokenizer].call(value) if value.kind_of?(String) + value = (options[:tokenizer] || DEFAULT_TOKENIZER).call(value) if value.kind_of?(String) CHECKS.each do |key, validity_check| next unless check_value = options[key] -- cgit v1.2.3 From 35c5ccb30cf01028970f157894a77fdf54973567 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Mon, 16 May 2011 14:53:30 +0900 Subject: Remove unneeded merge with default false options --- activemodel/lib/active_model/validations/numericality.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'activemodel/lib') diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb index ae576462e6..42556c80a9 100644 --- a/activemodel/lib/active_model/validations/numericality.rb +++ b/activemodel/lib/active_model/validations/numericality.rb @@ -9,10 +9,6 @@ module ActiveModel RESERVED_OPTIONS = CHECKS.keys + [:only_integer] - def initialize(options) - super(options.reverse_merge(:only_integer => false, :allow_nil => false)) - end - def check_validity! keys = CHECKS.keys - [:odd, :even] options.slice(*keys).each do |option, value| -- cgit v1.2.3