kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #1085 from amatsuda/amo_validator_initializer_cleanup

Browse source 
cleanups on AMo validator initializers
This commit is contained in:
José Valim 2011-05-16 04:23:44 -07:00
commit 12a4376ae9
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activemodel/lib/active_model/validations/length.rb
View file

@ -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]

4
activemodel/lib/active_model/validations/numericality.rb
View file

@ -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|