From b019f876253e04911e9bda3c639cbf09d73ff415 Mon Sep 17 00:00:00 2001 From: Adam Meehan Date: Wed, 14 May 2008 09:42:34 +1000 Subject: [PATCH] reverted parser method as not working with raised exception --- lib/validates_timeliness/validations.rb | 32 ++++++++++--------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/lib/validates_timeliness/validations.rb b/lib/validates_timeliness/validations.rb index dd12cc9..670d81a 100644 --- a/lib/validates_timeliness/validations.rb +++ b/lib/validates_timeliness/validations.rb @@ -9,24 +9,6 @@ module ValidatesTimeliness end module ClassMethods - - def timeliness_date_time_parser(time) - begin - if raw_value.acts_like?(:time) || raw_value.is_a?(Date) - raw_value - else - time_array = ParseDate.parsedate(raw_value) - - # checks if date is valid which enforces number of days in a month unlike Time - Date.new(*time_array[0..2]) - - # checks if time is valid and return object - Time.mktime(*time_array) - end - rescue - raise ValidatesTimeliness::DateTimeInvalid - end - end def validates_timeliness_of(*attr_names) configuration = { :on => :save, :allow_nil => false, :allow_blank => false } @@ -47,7 +29,17 @@ module ValidatesTimeliness column = record.column_for_attribute(attr_name) begin - time = timeliness_date_time_parser(raw_value) + time = if raw_value.acts_like?(:time) || raw_value.is_a?(Date) + raw_value + else + time_array = ParseDate.parsedate(raw_value) + + # checks if date is valid which enforces number of days in a month unlike Time + Date.new(*time_array[0..2]) + + # checks if time is valid and return object + Time.mktime(*time_array) + end conversion_method = column.type == :date ? :to_date : :to_time time = time.send(conversion_method) @@ -75,7 +67,7 @@ module ValidatesTimeliness end end end - rescue ValidatesTimeliness::DateTimeInvalid + rescue record.send("#{attr_name}=", nil) record.errors.add(attr_name, "is not a valid #{column.type}") next