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

fix dummy date part in Validator.type_cast_value

Browse Source 
removed all core extensions
This commit is contained in:
Adam Meehan 2009-09-12 14:14:37 +10:00
parent 76e159b350
commit b11893eac0
7 changed files with 13 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/validates_timeliness.rb
View File

@ -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

13
lib/validates_timeliness/core_ext/date.rb
View File

@ -1,13 +0,0 @@
module ValidatesTimeliness
module CoreExtensions
module Date
def to_dummy_time
::Time.send(ValidatesTimeliness.default_timezone, 2000, 1, 1, 0, 0, 0)
end
end
end
end
Date.send(:include, ValidatesTimeliness::CoreExtensions::Date)

13
lib/validates_timeliness/core_ext/date_time.rb
View File

@ -1,13 +0,0 @@
module ValidatesTimeliness
module CoreExtensions
module DateTime
def to_dummy_time
::Time.send(ValidatesTimeliness.default_timezone, 2000, 1, 1, hour, min, sec)
end
end
end
end
DateTime.send(:include, ValidatesTimeliness::CoreExtensions::DateTime)

13
lib/validates_timeliness/core_ext/time.rb
View File

@ -1,13 +0,0 @@
module ValidatesTimeliness
module CoreExtensions
module Time
def to_dummy_time
self.class.send(ValidatesTimeliness.default_timezone, 2000, 1, 1, hour, min, sec)
end
end
end
end
Time.send(:include, ValidatesTimeliness::CoreExtensions::Time)

14
lib/validates_timeliness/validator.rb
View File

@ -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

2
lib/validates_timeliness/version.rb
View File

@ -1,3 +1,3 @@
module ValidatesTimeliness
VERSION = "2.2.0"
VERSION = "2.2.1"
end

31
spec/core_ext/dummy_time_spec.rb
View File

@ -1,31 +0,0 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
describe ValidatesTimeliness::CoreExtensions::Date do
before do
@a_date = Date.new(2008, 7, 1)
end
it "should make a date value into a dummy time value" do
@a_date.to_dummy_time.should == Time.utc(2000,1,1,0,0,0)
end
end
describe ValidatesTimeliness::CoreExtensions::Time do
before do
@a_time = Time.mktime(2008, 7, 1, 2, 3, 4)
end
it "should make a time value into a dummy time value" do
@a_time.to_dummy_time.should == Time.utc(2000,1,1,2,3,4)
end
end
describe ValidatesTimeliness::CoreExtensions::DateTime do
before do
@a_datetime = DateTime.new(2008, 7, 1, 2, 3, 4)
end
it "should make a datetime value into a dummy time value" do
@a_datetime.to_dummy_time.should == Time.utc(2000,1,1,2,3,4)
end
end