Changeset 9007

Timestamp:

03/11/08 05:39:13 (6 months ago)

Author:

gbuesing

Message:

TimeZone #local and #now correctly enforce DST rules

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/values/time_zone.rb (modified) (3 diffs)
• trunk/activesupport/test/time_zone_test.rb (modified) (2 diffs)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* TimeZone #local and #now correctly enforce DST rules [Geoff Buesing]
-
-* TimeWithZone instances correctly enforce DST rules. Adding TimeZone#period_for_utc [Geoff Buesing]

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

@@ -175 +175 @@
-    "(UTC#{formatted_offset}) #{name}"
-  end
-  
-  # Method for creating new ActiveSupport::TimeWithZone instance in time zone of self. Example:
-  #
-  #   Time.zone = "Hawaii"                      # => "Hawaii"
-  #   Time.zone.local(2007, 2, 1, 15, 30, 45)   # => Thu, 01 Feb 2007 15:30:45 HST -10:00
-  def local(*args)
-    Time.utc_time(*args).change_time_zone(self)
-  end
-
-  begin # the following methods depend on the tzinfo gem
-    require_library_or_gem "tzinfo" unless Object.const_defined?(:TZInfo)
+    
+    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+. Example:
+    #
+    #   Time.zone = "Hawaii"                      # => "Hawaii"
+    #   Time.zone.local(2007, 2, 1, 15, 30, 45)   # => Thu, 01 Feb 2007 15:30:45 HST -10:00
+    def local(*args)
+      t = Time.utc_time(*args)
+      begin
+        result = local_to_utc(t)
+      rescue TZInfo::PeriodNotFound
+        t += 1.hour
+        retry
+      end
+      result.in_time_zone(self)
+    end
-    
-    # Returns an ActiveSupport::TimeWithZone instance representing the current time
@@ -193 +200 @@
-    #   Time.zone.now         # => Wed, 23 Jan 2008 20:24:27 HST -10:00
-    def now
-tzinfo.now.change
+Time.now.utc.in
-    end
-
@@ -234 +241 @@
-  rescue LoadError # Tzinfo gem is not available
-    # re-raise LoadError only when a tzinfo-dependent method is called:
-now today utc_to_local local_to
+local now today utc_to_local local_to_utc period_for
-      define_method(method) {|*args| raise LoadError, "TZInfo gem is required for TimeZone##{method}. `gem install tzinfo` and try again."}
-    end

trunk/activesupport/test/time_zone_test.rb

@@ -63 +63 @@
-    uses_mocha 'TestTimeZoneNowAndToday' do
-      def test_now
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-    
@@ -135 +156 @@
-    assert_equal TimeZone["Hawaii"], time.time_zone
-  end
+  
+  def test_local_enforces_spring_dst_rules
+    zone = TimeZone['Eastern Time (US & Canada)']
+    twz = zone.local(2006,4,2,1,59,59) # 1 second before DST start
+    assert_equal Time.utc(2006,4,2,1,59,59), twz.time
+    assert_equal Time.utc(2006,4,2,6,59,59), twz.utc
+    assert_equal false, twz.dst?
+    assert_equal 'EST', twz.zone
+    twz2 = zone.local(2006,4,2,2) # 2AM does not exist because at 2AM, time springs forward to 3AM
+    assert_equal Time.utc(2006,4,2,3), twz2.time # twz is created for 3AM
+    assert_equal Time.utc(2006,4,2,7), twz2.utc
+    assert_equal true, twz2.dst?
+    assert_equal 'EDT', twz2.zone
+    twz3 = zone.local(2006,4,2,2,30) # 2:30AM does not exist because at 2AM, time springs forward to 3AM
+    assert_equal Time.utc(2006,4,2,3,30), twz3.time # twz is created for 3:30AM
+    assert_equal Time.utc(2006,4,2,7,30), twz3.utc
+    assert_equal true, twz3.dst?
+    assert_equal 'EDT', twz3.zone
+  end
+  
+  def test_local_enforces_fall_dst_rules
+    # 1AM during fall DST transition is ambiguous, it could be either DST or non-DST 1AM
+    # Mirroring Time.local behavior, this method selects the DST time
+    zone = TimeZone['Eastern Time (US & Canada)']
+    twz = zone.local(2006,10,29,1)
+    assert_equal Time.utc(2006,10,29,1), twz.time
+    assert_equal Time.utc(2006,10,29,5), twz.utc
+    assert_equal true, twz.dst? 
+    assert_equal 'EDT', twz.zone
+  end
+
+  protected
+    def with_env_tz(new_tz = 'US/Eastern')
+      old_tz, ENV['TZ'] = ENV['TZ'], new_tz
+      yield
+    ensure
+      old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
+    end  
-end
-