Changeset 9040

Timestamp:

03/17/08 02:40:28 (4 months ago)

Author:

gbuesing

Message:

TimeWithZone caches TZInfo::TimezonePeriod used for time conversion so that it can be reused, and enforces DST rules correctly when instance is created from a local time

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/time_with_zone.rb (modified) (3 diffs)
• trunk/activesupport/lib/active_support/values/time_zone.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/time_with_zone_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* TimeWithZone caches TZInfo::TimezonePeriod used for time conversion so that it can be reused, and enforces DST rules correctly when instance is created from a local time [Geoff Buesing]
-
-* Fixed that BufferedLogger should create its own directory if one doesn't already exist #11285 [lotswholetime]

trunk/activesupport/lib/active_support/time_with_zone.rb

@@ -6 +6 @@
-    attr_reader :time_zone
-  
-
-
-
-
+
+
+
-    end
-  
-    # Returns a Time instance that represents the time in time_zone
-    def time
-time_zone.utc_to_local(@utc)
+utc_to_local
-    end
-
-    # Returns a Time instance that represents the time in UTC
-    def utc
-time_zone.local_to_utc(@time)
+local_to_utc
-    end
-    alias_method :comparable_time, :utc
@@ -26 +25 @@
-    alias_method :gmtime, :utc
-  
- for the local time
+
-    def period
-
+@
-    end
-
@@ -215 +214 @@
-      result
-    end
+    
+    private      
+      def get_period_and_ensure_valid_local_time
+        @time_zone.period_for_local(@time)
+      rescue ::TZInfo::PeriodNotFound
+        # time is in the "spring forward" hour gap, so we're moving the time forward one hour and trying again
+        @time += 1.hour
+        retry
+      end
+    
+      # Replicating logic from TZInfo::Timezone#utc_to_local because we want to cache the period in an instance variable for reuse
+      def utc_to_local
+        ::TZInfo::TimeOrDateTime.wrap(utc) {|utc| period.to_local(utc)}
+      end
+      
+      # Replicating logic from TZInfo::Timezone#local_to_utc because we want to cache the period in an instance variable for reuse
+      def local_to_utc
+        ::TZInfo::TimeOrDateTime.wrap(time) {|time| period.to_utc(time)}
+      end
-  end
-end

trunk/activesupport/lib/active_support/values/time_zone.rb

@@ -184 +184 @@
-    #   Time.zone.local(2007, 2, 1, 15, 30, 45)   # => Thu, 01 Feb 2007 15:30:45 HST -10:00
-    def local(*args)
-
-
-
-
-
-
-
-
+
+
-    end
-    

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -256 +256 @@
-      assert_equal 17, twz.sec
-      assert_equal 500, twz.usec
+    end
+    
+    def test_utc_to_local_conversion_saves_period_in_instance_variable
+      assert_nil @twz.instance_variable_get('@period')
+      @twz.time
+      assert_kind_of TZInfo::TimezonePeriod, @twz.instance_variable_get('@period')
+    end
+    
+    def test_instance_created_with_local_time_returns_correct_utc_time
+      twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(1999, 12, 31, 19))
+      assert_equal Time.utc(2000), twz.utc
+    end
+    
+    def test_instance_created_with_local_time_enforces_spring_dst_rules
+      twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,2,2)) # first second of DST
+      assert_equal Time.utc(2006,4,2,3), twz.time # springs forward to 3AM
+      assert_equal true, twz.dst?
+      assert_equal 'EDT', twz.zone
+    end
+    
+    def test_instance_created_with_local_time_enforces_fall_dst_rules
+      twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,10,29,1)) # 1AM can be either DST or non-DST; we'll pick DST
+      assert_equal Time.utc(2006,10,29,1), twz.time
+      assert_equal true, twz.dst?
+      assert_equal 'EDT', twz.zone
-    end
-  end