mirror of
https://github.com/ditkrg/validates_timeliness.git
synced 2026-01-24 23:06:42 +00:00
fixed non-timezone write method not updating changed attributes hash
This commit is contained in:
parent
68e7adc028
commit
f23d2a0c2d
@ -104,7 +104,7 @@ module ValidatesTimeliness
|
|||||||
def define_write_method_for_time_zone_conversion(attr_name)
|
def define_write_method_for_time_zone_conversion(attr_name)
|
||||||
method_body = <<-EOV
|
method_body = <<-EOV
|
||||||
def #{attr_name}=(time)
|
def #{attr_name}=(time)
|
||||||
old = read_attribute('#{attr_name}') if defined?(ActiveRecord::Dirty)
|
old = read_attribute('#{attr_name}')
|
||||||
@attributes['#{attr_name}'] = time
|
@attributes['#{attr_name}'] = time
|
||||||
unless time.acts_like?(:time)
|
unless time.acts_like?(:time)
|
||||||
time = self.class.parse_date_time(time, :datetime)
|
time = self.class.parse_date_time(time, :datetime)
|
||||||
@ -146,7 +146,12 @@ module ValidatesTimeliness
|
|||||||
def define_write_method_for_dates_and_times(attr_name, type)
|
def define_write_method_for_dates_and_times(attr_name, type)
|
||||||
method_body = <<-EOV
|
method_body = <<-EOV
|
||||||
def #{attr_name}=(value)
|
def #{attr_name}=(value)
|
||||||
@attributes_cache['#{attr_name}'] = self.class.parse_date_time(value, :#{type})
|
old = read_attribute('#{attr_name}') if defined?(ActiveRecord::Dirty)
|
||||||
|
new = self.class.parse_date_time(value, :#{type})
|
||||||
|
@attributes_cache['#{attr_name}'] = new
|
||||||
|
if defined?(ActiveRecord::Dirty) && !changed_attributes.include?('#{attr_name}') && old != new
|
||||||
|
changed_attributes['#{attr_name}'] = (old.duplicable? ? old.clone : old)
|
||||||
|
end
|
||||||
@attributes['#{attr_name}'] = value
|
@attributes['#{attr_name}'] = value
|
||||||
end
|
end
|
||||||
EOV
|
EOV
|
||||||
|
|||||||
@ -113,18 +113,28 @@ describe ValidatesTimeliness::AttributeMethods do
|
|||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should return same time object on repeat reads" do
|
it "should return same time object on repeat reads on existing object" do
|
||||||
Time.zone = 'Melbourne' unless RAILS_VER < '2.1'
|
Time.zone = 'Melbourne' unless RAILS_VER < '2.1'
|
||||||
time_string = "2000-01-01 09:00:00"
|
time_string = "2000-01-01 09:00:00"
|
||||||
@person = Person.new
|
@person = Person.new
|
||||||
@person.birth_date_and_time = time_string
|
@person.birth_date_and_time = time_string
|
||||||
@person.save
|
@person.save!
|
||||||
@person.reload
|
@person.reload
|
||||||
time = @person.birth_date_and_time
|
time = @person.birth_date_and_time
|
||||||
@person.birth_date_and_time.should == time
|
@person.birth_date_and_time.should == time
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should return correct value after new value assigned" do
|
it "should return same date object on repeat reads on existing object" do
|
||||||
|
date_string = Date.today
|
||||||
|
@person = Person.new
|
||||||
|
@person.birth_date = date_string
|
||||||
|
@person.save!
|
||||||
|
@person.reload
|
||||||
|
date = @person.birth_date
|
||||||
|
@person.birth_date.should == date
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should return correct date value after new value assigned" do
|
||||||
today = Date.today
|
today = Date.today
|
||||||
tomorrow = Date.today + 1.day
|
tomorrow = Date.today + 1.day
|
||||||
@person = Person.new
|
@person = Person.new
|
||||||
@ -134,4 +144,14 @@ describe ValidatesTimeliness::AttributeMethods do
|
|||||||
@person.birth_date.should == tomorrow
|
@person.birth_date.should == tomorrow
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "should update date attribute on existing object" do
|
||||||
|
today = Date.today
|
||||||
|
tomorrow = Date.today + 1.day
|
||||||
|
@person = Person.create(:birth_date => today)
|
||||||
|
@person.birth_date = tomorrow
|
||||||
|
@person.save!
|
||||||
|
@person.reload
|
||||||
|
@person.birth_date.should == tomorrow
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user