TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove code duplication.

Browse Source
This commit is contained in:
José Valim 2011-04-11 18:01:10 +02:00
parent df5691aa94
commit 7379114c2f
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemodel/lib/active_model/validations/exclusion.rb
View File

@ -9,13 +9,14 @@ class ExclusionValidator < EachValidator
"and must be supplied as the :in option of the configuration hash"
def check_validity!
unless [:include?, :call].any?{ |method| options[:in].respond_to?(method) }
unless [:include?, :call].any? { |method| options[:in].respond_to?(method) }
raise ArgumentError, ERROR_MESSAGE
end
end
def validate_each(record, attribute, value)
exclusions = options[:in].respond_to?(:call) ? options[:in].call(record) : options[:in]
delimiter = options[:in]
exclusions = delimiter.respond_to?(:call) ? delimiter.call(record) : delimiter
if exclusions.send(inclusion_method(exclusions), value)
record.errors.add(attribute, :exclusion, options.except(:in).merge!(:value => value))
end

39
activemodel/lib/active_model/validations/format.rb
View File

@ -5,19 +5,11 @@ module Validations
class FormatValidator < EachValidator
def validate_each(record, attribute, value)
if options[:with]
regexp = options[:with].respond_to?(:call) ? options[:with].call(record) : options[:with]
if regexp.is_a?(Regexp)
record.errors.add(attribute, :invalid, options.except(:with).merge!(:value => value)) if value.to_s !~ regexp
else
raise ArgumentError, "A proc or lambda given to :with option must returns a regular expression"
end
regexp = option_call(record, :with)
record_error(record, attribute, :with, value) if value.to_s !~ regexp
elsif options[:without]
regexp = options[:without].respond_to?(:call) ? options[:without].call(record) : options[:without]
if regexp.is_a?(Regexp)
record.errors.add(attribute, :invalid, options.except(:without).merge!(:value => value)) if value.to_s =~ regexp
else
raise ArgumentError, "A proc or lambda given to :without option must returns a regular expression"
end
regexp = option_call(record, :without)
record_error(record, attribute, :without, value) if value.to_s =~ regexp
end
end
@ -26,12 +18,25 @@ def check_validity!
raise ArgumentError, "Either :with or :without must be supplied (but not both)"
end
if options[:with] && !options[:with].is_a?(Regexp) && !options[:with].respond_to?(:call)
raise ArgumentError, "A regular expression or a proc or lambda must be supplied as the :with option of the configuration hash"
end
check_options_validity(options, :with)
check_options_validity(options, :without)
end
if options[:without] && !options[:without].is_a?(Regexp) && !options[:without].respond_to?(:call)
raise ArgumentError, "A regular expression or a proc or lambda must be supplied as the :without option of the configuration hash"
private
def option_call(record, name)
option = options[name]
option.respond_to?(:call) ? option.call(record) : option
end
def record_error(record, attribute, name, value)
record.errors.add(attribute, :invalid, options.except(name).merge!(:value => value))
end
def check_options_validity(options, name)
option = options[name]
if option && !option.is_a?(Regexp) && !option.respond_to?(:call)
raise ArgumentError, "A regular expression or a proc or lambda must be supplied as :#{name}"
end
end
end

3
activemodel/lib/active_model/validations/inclusion.rb
View File

@ -15,7 +15,8 @@ def check_validity!
end
def validate_each(record, attribute, value)
exclusions = options[:in].respond_to?(:call) ? options[:in].call(record) : options[:in]
delimiter = options[:in]
exclusions = delimiter.respond_to?(:call) ? delimiter.call(record) : delimiter
unless exclusions.send(inclusion_method(exclusions), value)
record.errors.add(attribute, :inclusion, options.except(:in).merge!(:value => value))
end