@@ -7,10 +7,6 @@ require 'validates_timeliness/active_record/attribute_methods' require 'validates_timeliness/active_record/multiparameter_attributes' require 'validates_timeliness/action_view/instance_tag' -require 'validates_timeliness/core_ext/time' -require 'validates_timeliness/core_ext/date' -require 'validates_timeliness/core_ext/date_time' - module ValidatesTimeliness mattr_accessor :default_timezone lib/validates_timeliness.rb @@ -197,11 +197,11 @@ module ValidatesTimeliness else value = case type when :time - value.to_dummy_time + dummy_time(value) when :date value.to_date when :datetime - if value.is_a?(DateTime) || value.is_a?(Time) + if value.is_a?(Time) || value.is_a?(DateTime) value.to_time else value.to_time(ValidatesTimeliness.default_timezone) @@ -217,6 +217,16 @@ module ValidatesTimeliness end end + def dummy_time(value) + if value.is_a?(Time) || value.is_a?(DateTime) + time = [value.hour, value.min, value.sec] + else + time = [0,0,0] + end + dummy_date = ValidatesTimeliness::Formats.dummy_date_for_time_type + Time.send(ValidatesTimeliness.default_timezone, *(dummy_date + time)) + end + end end lib/validates_timeliness/validator.rb @@ -1,3 +1,3 @@ module ValidatesTimeliness - VERSION = "2.2.0" + VERSION = "2.2.1" end lib/validates_timeliness/version.rb lib/validates_timeliness/core_ext/date.rb lib/validates_timeliness/core_ext/date_time.rb lib/validates_timeliness/core_ext/time.rb spec/core_ext/dummy_time_spec.rb 76e159b350aa3b4ee064f3d5734bf1dab27900e8 Adam Meehan adam.meehan@gmail.com http://github.com/adzap/validates_timeliness/commit/b11893eac03a46138f38980cbea7a98251d3fee6 b11893eac03a46138f38980cbea7a98251d3fee6 2009-09-11T21:14:37-07:00 2009-09-11T21:14:37-07:00 fix dummy date part in Validator.type_cast_value removed all core extensions 1ec199b949a3de4401a1c0a804523423f5f054c8 Adam Meehan adam.meehan@gmail.com