ditkrg/validates_timeliness
4
0
Fork 0
mirror of https://github.com/ditkrg/validates_timeliness.git synced 2026-01-24 14:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

consistently use instance methods vs vars in validator

Browse Source
This commit is contained in:
Adam Meehan 2009-04-12 10:17:33 +10:00
parent 51afb2852e
commit 88ee33ae41
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/validates_timeliness/validator.rb
View File

@ -31,9 +31,9 @@ module ValidatesTimeliness
def call(record, attr_name, value) def call(record, attr_name, value)
raw_value = raw_value(record, attr_name) || value raw_value = raw_value(record, attr_name) || value
if value.is_a?(String) || @configuration[:format] if value.is_a?(String) || configuration[:format]
strict = !@configuration[:format].nil? strict = !configuration[:format].nil?
value = ValidatesTimeliness::Parser.parse(raw_value, type, :strict => strict, :format => @configuration[:format]) value = ValidatesTimeliness::Parser.parse(raw_value, type, :strict => strict, :format => configuration[:format])
end end
return if (raw_value.nil? && configuration[:allow_nil]) || (raw_value.blank? && configuration[:allow_blank]) return if (raw_value.nil? && configuration[:allow_nil]) || (raw_value.blank? && configuration[:allow_blank])
@ -55,12 +55,12 @@ module ValidatesTimeliness
end end
def validate_restrictions(record, attr_name, value) def validate_restrictions(record, attr_name, value)
value = if @configuration[:with_time] || @configuration[:with_date] value = if configuration[:with_time] || configuration[:with_date]
restriction_type = :datetime restriction_type = :datetime
combine_date_and_time(value, record) combine_date_and_time(value, record)
else else
restriction_type = type restriction_type = type
self.class.type_cast_value(value, type, @configuration[:ignore_usec]) self.class.type_cast_value(value, type, configuration[:ignore_usec])
end end
return if value.nil? return if value.nil?
@ -69,7 +69,7 @@ module ValidatesTimeliness
begin begin
restriction = self.class.evaluate_option_value(restriction, restriction_type, record) restriction = self.class.evaluate_option_value(restriction, restriction_type, record)
next if restriction.nil? next if restriction.nil?
restriction = self.class.type_cast_value(restriction, restriction_type, @configuration[:ignore_usec]) restriction = self.class.type_cast_value(restriction, restriction_type, configuration[:ignore_usec])
unless evaluate_restriction(restriction, value, method) unless evaluate_restriction(restriction, value, method)
add_error(record, attr_name, option, interpolation_values(option, restriction)) add_error(record, attr_name, option, interpolation_values(option, restriction))
@ -131,9 +131,9 @@ module ValidatesTimeliness
def combine_date_and_time(value, record) def combine_date_and_time(value, record)
if type == :date if type == :date
date = value date = value
time = @configuration[:with_time] time = configuration[:with_time]
else else
date = @configuration[:with_date] date = configuration[:with_date]
time = value time = value
end end
date, time = self.class.evaluate_option_value(date, :date, record), self.class.evaluate_option_value(time, :time, record) date, time = self.class.evaluate_option_value(date, :date, record), self.class.evaluate_option_value(time, :time, record)
@ -142,9 +142,9 @@ module ValidatesTimeliness
end end
def validate_options(options) def validate_options(options)
invalid_for_type = ([:time, :date, :datetime] - [@type]).map {|k| "invalid_#{k}_message".to_sym } invalid_for_type = ([:time, :date, :datetime] - [type]).map {|k| "invalid_#{k}_message".to_sym }
invalid_for_type << :with_date unless @type == :time invalid_for_type << :with_date unless type == :time
invalid_for_type << :with_time unless @type == :date invalid_for_type << :with_time unless type == :date
options.assert_valid_keys(VALID_OPTIONS - invalid_for_type) options.assert_valid_keys(VALID_OPTIONS - invalid_for_type)
end end