Changeset 9047

Timestamp:

03/17/08 05:50:13 (4 months ago)

Author:

gbuesing

Message:

Time, DateTime and TimeWithZone #in_time_zone defaults to Time.zone. Removing now unneeded #in_current_time_zone. ActiveRecord time zone aware attributes updated to use #in_time_zone

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/attribute_methods.rb (modified) (2 diffs)
• trunk/activerecord/test/cases/attribute_methods_test.rb (modified) (1 diff)
• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/time/zones.rb (modified) (2 diffs)
• trunk/activesupport/lib/active_support/time_with_zone.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/time_with_zone_test.rb (modified) (4 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Time zone aware attributes use Time#in_time_zone [Geoff Buesing]
-
-* Fixed that scoped joins would not always be respected #6821 [Theory/Danger]

trunk/activerecord/lib/active_record/attribute_methods.rb

@@ -162 +162 @@
-              return cached if cached && !reload
-              time = read_attribute('#{attr_name}')
-current_
+
-            end
-          EOV
@@ -182 +182 @@
-              if time
-                time = time.to_time rescue time unless time.acts_like?(:time)
-current_
+
-              end
-              write_attribute(:#{attr_name}, time)

trunk/activerecord/test/cases/attribute_methods_test.rb

@@ -179 +179 @@
-      in_time_zone "Pacific Time (US & Canada)" do
-        record   = @target.new
-current_
+
-        assert_equal utc_time, record.written_on
-        assert_equal TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Time, DateTime and TimeWithZone #in_time_zone defaults to Time.zone. Removing now unneeded #in_current_time_zone [Geoff Buesing]
-
-* TZInfo caches Timezone instances in its own internal hash cache, so TimeZone::MAPPING doesn't need to cache them as well [Geoff Buesing]

trunk/activesupport/lib/active_support/core_ext/time/zones.rb

@@ -20 +20 @@
-          # Rails TimeZone object (e.g., "Central Time (US & Canada)"), or a TZInfo::Timezone object
-          #
-current_
+
-          # Example:
-          #
-        
-current_
+
+
-          def zone=(time_zone)
-            Thread.current[:time_zone] = get_zone(time_zone)
@@ -44 +44 @@
-        end
-        
-the supplied zone. Examples
+Time.zone. Example
-        #
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        end
-
-        # Returns the simultaneous time in Time.zone
-        def in_current_time_zone
-          ::Time.zone ? in_time_zone(::Time.zone) : self
-        end
-        
-        private
-          def get_zone(time_zone)
-            ::Time.send!(:get_zone, time_zone)
-          end
-      end
-    end

trunk/activesupport/lib/active_support/time_with_zone.rb

@@ -30 +30 @@
-    end
-
-
-
+Time.zone, or 
+ = ::Time.zone
-      return self if time_zone == new_zone
-      utc.in_time_zone(new_zone)
-    end
-  
-    # Returns the simultaneous time in Time.zone
-    def in_current_time_zone
-      utc.in_current_time_zone
-    end
-  

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -22 +22 @@
-      assert_equal @time_zone, @twz.time_zone
-    end
-
+  
-    def test_in_time_zone
+      Time.use_zone 'Alaska' do
+        assert_equal ActiveSupport::TimeWithZone.new(@utc, TimeZone['Alaska']), @twz.in_time_zone
+      end
+    end
+  
+    def test_in_time_zone_with_argument
-      assert_equal ActiveSupport::TimeWithZone.new(@utc, TimeZone['Alaska']), @twz.in_time_zone('Alaska')
-    end
@@ -29 +35 @@
-    def test_in_time_zone_with_new_zone_equal_to_old_zone_does_not_create_new_object
-      assert_equal @twz.object_id, @twz.in_time_zone(TimeZone['Eastern Time (US & Canada)']).object_id
-    end
-  
-    def test_in_current_time_zone
-      Time.use_zone 'Alaska' do
-        assert_equal ActiveSupport::TimeWithZone.new(@utc, TimeZone['Alaska']), @twz.in_current_time_zone
-      end
-    end
-  
@@ -299 +299 @@
-      Time.zone = nil
-    end
-
+
-    def test_in_time_zone
+      silence_warnings do # silence warnings raised by tzinfo gem
+        Time.use_zone 'Alaska' do
+          assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @t.in_time_zone.inspect
+          assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @dt.in_time_zone.inspect
+        end
+        Time.use_zone 'Hawaii' do
+          assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @t.in_time_zone.inspect
+          assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @dt.in_time_zone.inspect
+        end
+        Time.use_zone nil do
+          assert_equal @t, @t.in_time_zone
+          assert_equal @dt, @dt.in_time_zone
+        end
+      end
+    end
+
+    def test_in_time_zone_with_argument
-      silence_warnings do # silence warnings raised by tzinfo gem
-        Time.use_zone 'Eastern Time (US & Canada)' do # Time.zone will not affect #in_time_zone(zone)
@@ -322 +339 @@
-      end
-    end
-
-    def test_in_current_time_zone
-      silence_warnings do # silence warnings raised by tzinfo gem
-        Time.use_zone 'Alaska' do
-          assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @t.in_current_time_zone.inspect
-          assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @dt.in_current_time_zone.inspect
-        end
-        Time.use_zone 'Hawaii' do
-          assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @t.in_current_time_zone.inspect
-          assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @dt.in_current_time_zone.inspect
-        end
-        Time.use_zone nil do
-          assert_equal @t, @t.in_current_time_zone
-          assert_equal @dt, @dt.in_current_time_zone
-        end
-      end
-    end
-    
-    def test_use_zone