From 162faf632a24d7fdc88aee7c30b651bd738ab188 Mon Sep 17 00:00:00 2001 From: Adam Meehan Date: Sat, 12 Sep 2009 12:24:19 +1000 Subject: [PATCH] push strict override for format option into Formats.parse --- lib/validates_timeliness/formats.rb | 1 + lib/validates_timeliness/validator.rb | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/validates_timeliness/formats.rb b/lib/validates_timeliness/formats.rb index 5b0fec2..df84b9f 100644 --- a/lib/validates_timeliness/formats.rb +++ b/lib/validates_timeliness/formats.rb @@ -179,6 +179,7 @@ module ValidatesTimeliness options.reverse_merge!(:strict => true) sets = if options[:format] + options[:strict] = true [ send("#{type}_expressions").assoc(options[:format]) ] else expression_set(type, string) diff --git a/lib/validates_timeliness/validator.rb b/lib/validates_timeliness/validator.rb index 8340da6..e2a8dfd 100644 --- a/lib/validates_timeliness/validator.rb +++ b/lib/validates_timeliness/validator.rb @@ -32,8 +32,7 @@ module ValidatesTimeliness raw_value = raw_value(record, attr_name) || value if value.is_a?(String) || configuration[:format] - strict = !configuration[:format].nil? - value = ValidatesTimeliness::Parser.parse(raw_value, type, :strict => strict, :format => configuration[:format]) + value = ValidatesTimeliness::Parser.parse(raw_value, type, :strict => false, :format => configuration[:format]) end return if (raw_value.nil? && configuration[:allow_nil]) || (raw_value.blank? && configuration[:allow_blank])