Changeset 9006

Timestamp:

03/11/08 04:26:20 (4 months ago)

Author:

gbuesing

Message:

TimeWithZone instances correctly enforce DST rules. Adding TimeZone#period_for_utc

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) (2 diffs)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* TimeWithZone instances correctly enforce DST rules. Adding TimeZone#period_for_utc [Geoff Buesing]
-
-* test_time_with_datetime_fallback expects DateTime.local_offset instead of DateTime.now.offset [Geoff Buesing]

trunk/activesupport/lib/active_support/time_with_zone.rb

@@ -28 +28 @@
-    # Returns the underlying TZInfo::TimezonePeriod for the local time
-    def period
-get_period_for_local
+time_zone.period_for_utc(utc)
-    end
-
@@ -151 +151 @@
-    end
-    
+    %w(asctime day hour min mon sec usec wday yday year).each do |name|
+      define_method(name) do
+        time.__send__(name)
+      end
+    end
+    alias_method :ctime, :asctime
+    alias_method :mday, :day
+    alias_method :month, :mon
+    
-    def to_a
-      time.to_a[0, 8].push(dst?, zone)
@@ -207 +216 @@
-    # Send the missing method to time instance, and wrap result in a new TimeWithZone with the existing time_zone
-    def method_missing(sym, *args, &block)
-time
-change
+utc
+in
-      result
-    end
-  
-    private
-      def get_period_for_local
-        t = time
-        begin
-          time_zone.period_for_local(t, true)
-        rescue ::TZInfo::PeriodNotFound # failover logic from TzTime
-          t -= 1.hour
-          retry
-        end
-      end
-  end
-end

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

@@ -213 +213 @@
-
-    # Available so that TimeZone instances respond like TZInfo::Timezone instances
+    def period_for_utc(time)
+      tzinfo.period_for_utc(time)
+    end
+
+    # Available so that TimeZone instances respond like TZInfo::Timezone instances
-    def period_for_local(time, dst=true)
-      tzinfo.period_for_local(time, dst)

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -164 +164 @@
-      twz2 = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), TimeZone['UTC'] )
-      assert_equal  86_400.0,  twz2 - twz1
+    end
+    
+    def test_plus_and_minus_enforce_spring_dst_rules
+      utc = Time.utc(2006,4,2,6,59,59) # == Apr 2 2006 01:59:59 EST; i.e., 1 second before daylight savings start
+      twz = ActiveSupport::TimeWithZone.new(utc, @time_zone)
+      assert_equal Time.utc(2006,4,2,1,59,59), twz.time
+      assert_equal false, twz.dst?
+      assert_equal 'EST', twz.zone
+      twz = twz + 1
+      assert_equal Time.utc(2006,4,2,3), twz.time # adding 1 sec springs forward to 3:00AM EDT
+      assert_equal true, twz.dst?
+      assert_equal 'EDT', twz.zone
+      twz = twz - 1 # subtracting 1 second takes goes back to 1:59:59AM EST
+      assert_equal Time.utc(2006,4,2,1,59,59), twz.time
+      assert_equal false, twz.dst?
+      assert_equal 'EST', twz.zone
+    end
+    
+    def test_plus_and_minus_enforce_fall_dst_rules
+      utc = Time.utc(2006,10,29,5,59,59) # == Oct 29 2006 01:59:59 EST; i.e., 1 second before daylight savings end
+      twz = ActiveSupport::TimeWithZone.new(utc, @time_zone)
+      assert_equal Time.utc(2006,10,29,1,59,59), twz.time
+      assert_equal true, twz.dst?
+      assert_equal 'EDT', twz.zone
+      twz = twz + 1
+      assert_equal Time.utc(2006,10,29,1), twz.time # adding 1 sec falls back from 1:59:59 EDT to 1:00AM EST
+      assert_equal false, twz.dst?
+      assert_equal 'EST', twz.zone
+      twz = twz - 1
+      assert_equal Time.utc(2006,10,29,1,59,59), twz.time # subtracting 1 sec goes back to 1:59:59AM EDT
+      assert_equal true, twz.dst?
+      assert_equal 'EDT', twz.zone
-    end
-    
@@ -220 +252 @@
-      
-    def test_method_missing_with_non_time_return_value
-
-
-
+
+
+
+
+
+
+
+
-    end
-  end