Changeset 8849

Timestamp:

02/10/08 18:45:55 (7 months ago)

Author:

gbuesing

Message:

Time#in_time_zone handles Time.local instances correctly

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/time/zones.rb (modified) (2 diffs)
• trunk/activesupport/test/core_ext/time_with_zone_test.rb (modified) (2 diffs)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Time#in_time_zone handles Time.local instances correctly [Geoff Buesing]
-
-* Pruning unneeded Time#change_time_zone_to_current. Enhanced docs to #change_time_zone to explain the difference between this method and #in_time_zone [Geoff Buesing]

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

@@ -43 +43 @@
-        end
-        
-
-
-
+
-        #
-        #   t = Time.utc(2000)        # => Sat Jan 01 00:00:00 UTC 2000
@@ -51 +49 @@
-        #   t.in_time_zone('Hawaii')  # => Fri, 31 Dec 1999 14:00:00 HST -10:00
-        def in_time_zone(zone)
-self
+utc? ? self : getutc
-        end
-

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -175 +175 @@
-      end
-    end
+    
+    def test_in_time_zone_with_time_local_instance
+      silence_warnings do # silence warnings raised by tzinfo gem
+        with_env_tz 'US/Eastern' do
+          time = Time.local(1999, 12, 31, 19) # == Time.utc(2000)
+          assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', time.in_time_zone('Alaska').inspect
+        end
+      end
+    end
-
-    def test_in_current_time_zone
@@ -229 +238 @@
-      end
-    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
-end