Changeset 8708

Timestamp:

01/23/08 18:49:54 (7 months ago)

Author:

gbuesing

Message:

Time #in_current_time_zone and #change_time_zone_to_current return self when Time.zone is nil

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_current_time_zone and #change_time_zone_to_current return self when Time.zone is nil [Geoff Buesing]
-
-* Remove unneeded #to_datetime_default_s alias for DateTime#to_s, given that we inherit a #to_default_s from Date that does exactly the same thing [Geoff Buesing]

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

@@ -47 +47 @@
-        # Returns the simultaneous time in Time.zone
-        def in_current_time_zone
-in_time_zone(::Time.zone)
+::Time.zone ? in_time_zone(::Time.zone) : self
-        end
-
@@ -61 +61 @@
-        # Replaces the existing zone to Time.zone; leaves time value intact
-        def change_time_zone_to_current
-change_time_zone(::Time.zone)
+::Time.zone ? change_time_zone(::Time.zone) : self
-        end
-      end

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -171 +171 @@
-      end
-      with_time_zone nil do
-'Sat, 01 Jan 2000 00:00:00 UTC +00:00', @t.in_current_time_zone.inspect
-'Sat, 01 Jan 2000 00:00:00 UTC +00:00', @dt.in_current_time_zone.inspect
+@t, @t.in_current_time_zone
+@dt, @dt.in_current_time_zone
-      end
-    end
@@ -197 +197 @@
-      end
-      with_time_zone nil do
-'Sat, 01 Jan 2000 00:00:00 UTC +00:00', @t.change_time_zone_to_current.inspec
-'Sat, 01 Jan 2000 00:00:00 UTC +00:00', @dt.change_time_zone_to_current.inspec
+@t, @t.change_time_zone_to_curren
+@dt, @dt.change_time_zone_to_curren
-      end
-    end