@@ -18,11 +18,11 @@ module TzTimeHelpers time end end - end - - define_method "#{attribute}=" do |local_time| - fixed = (local_time.acts_like?(:time) || local_time.acts_like?(:date)) ? TzTime.at(local_time) : nil - write_attribute(attribute, fixed) + + define_method "#{attribute}=" do |local_time| + fixed = (local_time.acts_like?(:time) || local_time.acts_like?(:date)) ? TzTime.at(local_time) : nil + write_attribute attribute, fixed + end end end end lib/tz_time_helpers/active_record_methods.rb @@ -34,29 +34,23 @@ module TzTimeHelpers def setup TzTime.zone = TimeZone["Central Time (US & Canada)"] @record = MockRecord.new + @record.instance_variable_set(:@due_on, Time.utc(2006, 1, 1)) end def test_should_access_utc_time_as_local_with_getter_method - @record.due_on = Time.utc(2006, 1, 1) assert_equal TzTime.local(2005, 12, 31, 18), @record.due_on end def test_should_fix_local_timezones @record.due_on = Time.utc(2006, 1, 1) - assert_equal TzTime.local(2005, 12, 31, 18), @record.due_on - @record.send :fix_timezone - assert_equal Time.utc(2006, 1, 1), @record[:due_on] + assert_equal TzTime.local(2006, 1, 1), @record.due_on + assert_equal TzTime.local(2006, 1, 1), @record[:due_on] end def test_should_not_fix_utc_timezones - @record.due_on = Time.utc(2006, 1, 1) - @record.send :fix_timezone assert_equal Time.utc(2006, 1, 1), @record[:due_on] end - def test_should_only_fix_timezones_that_have_been_written - @record.instance_variable_set(:@due_on, Time.utc(2006, 1, 1)) - @record.send :fix_timezone assert_equal TzTime.utc(2006, 1, 1), @record.due_on end end test/active_record_methods_test.rb be9d8cd3268202c57f682ca33e6f9a8df93044b1 Rick Olson technoweenie@gmail.com http://github.com/rails/tztime/commit/c6729afb8c459217293ce1d50d5fc3600a4e90e3 c6729afb8c459217293ce1d50d5fc3600a4e90e3 2008-03-18T15:31:19-07:00 2008-03-18T15:31:19-07:00 [tz_time plugin] fix previous attempt at fixing #10058 1b60dc6e70a1ddcf17607b1e4c57edf5db5bc3f3 Rick Olson technoweenie@gmail.com