ditkrg/validates_timeliness
4
0
Fork 0
mirror of https://github.com/ditkrg/validates_timeliness.git synced 2026-01-22 22:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

push strict override for format option into Formats.parse

Browse Source
This commit is contained in:
Adam Meehan 2009-09-12 12:24:19 +10:00
parent 1b865cc834
commit 162faf632a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/validates_timeliness/formats.rb
View File

@ -179,6 +179,7 @@ module ValidatesTimeliness
options.reverse_merge!(:strict => true) options.reverse_merge!(:strict => true)
sets = if options[:format] sets = if options[:format]
options[:strict] = true
[ send("#{type}_expressions").assoc(options[:format]) ] [ send("#{type}_expressions").assoc(options[:format]) ]
else else
expression_set(type, string) expression_set(type, string)

3
lib/validates_timeliness/validator.rb
View File

@ -32,8 +32,7 @@ module ValidatesTimeliness
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? value = ValidatesTimeliness::Parser.parse(raw_value, type, :strict => false, :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])