Changeset 52

Timestamp:

11/27/07 12:24:50 (12 months ago)

Author:

jweiss

Message:

fix tztime to not corrupt timestamps - see Rails ticket http://dev.rubyonrails.org/ticket/10058

Location:

trunk/vendor/plugins/tztime

Files:

• lib/tz_time_helpers/active_record_methods.rb (modified) (1 diff)
• test/active_record_methods_test.rb (modified) (2 diffs)

trunk/vendor/plugins/tztime/lib/tz_time_helpers/active_record_methods.rb

@@ -19 +19 @@
             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)
+          end
         end
-        
-        protected
-          def fix_timezone
-            tz_time_attributes.each do |attribute|
-              time  = read_attribute(attribute)
-              fixed = (time.acts_like?(:time) || time.acts_like?(:date)) ? TzTime.at(time) : nil
-              write_attribute(attribute, fixed)
-            end
-          end
       end
-      before_validation :fix_timezone
     end
   end

trunk/vendor/plugins/tztime/test/active_record_methods_test.rb

@@ -28 +28 @@
     
     def test_should_access_utc_time_as_local_with_getter_method
-      @record.due_on = Time.utc(2006, 1, 1)
+      @record.instance_variable_set(:@due_on, Time.utc(2006, 1, 1))
       assert_equal @record.due_on, TzTime.local(2005, 12, 31, 18)
     end
@@ -34 +34 @@
     def test_should_fix_timezones
       @record.due_on = Time.utc(2006, 1, 1)
-      @record.send :fix_timezone
       assert_equal @record.due_on, TzTime.local(2006, 1, 1)
+    end
+    
+    def test_should_only_fix_timezones_that_have_been_written
+      @record.instance_variable_set(:@due_on, Time.utc(2006, 1, 1))
+      assert_equal TzTime.utc(2006, 1, 1), @record.due_on
     end
   end