Changeset 8853

Timestamp:

02/10/08 20:35:47 (7 months ago)

Author:

gbuesing

Message:

TimeWithZone #in_time_zone returns +self+ if zone argument is the same as #time_zone

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/time_with_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 #in_time_zone returns +self+ if zone argument is the same as #time_zone [Geoff Buesing]
-
-* Adding TimeWithZone #to_a, #to_f, #to_i, #httpdate, #rfc2822 [Geoff Buesing]

trunk/activesupport/lib/active_support/time_with_zone.rb

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

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -25 +25 @@
-    def test_in_time_zone
-      assert_equal ActiveSupport::TimeWithZone.new(@utc, TimeZone['Alaska']), @twz.in_time_zone('Alaska')
+    end
+    
+    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
-