Changeset 8697

Timestamp:

01/23/08 02:11:00 (4 months ago)

Author:

gbuesing

Message:

Adding alternate_utc_string option to TimeZone#formatted_offset. Removing unneeded TimeZone#offset

Files:

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

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Adding alternate_utc_string option to TimeZone#formatted_offset. Removing unneeded TimeZone#offset. [Geoff Buesing]
-
-* Introduce ActiveSupport::TimeWithZone, for wrapping Time instances with a TimeZone. Introduce instance methods to Time for creating TimeWithZone instances, and class methods for managing a global time zone. [Geoff Buesing]

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

@@ -157 +157 @@
-
-  # Returns the offset of this time zone as a formatted string, of the
-  # format "+HH:MM". If the offset is zero, this returns the empty
-  # string. If +colon+ is false, a colon will not be inserted into the
-  # result.
-  def formatted_offset(colon=true)
-    utc_offset == 0 ? '' : offset(colon)
-  end
-  
-  # Returns the offset of this time zone as a formatted string, of the
-  # format "+HH:MM".
-offset(colon=true
-
+formatted_offset(colon=true, alternate_utc_string = nil
+ == 0 && alternate_utc_string || utc_offset
-  end
-

trunk/activesupport/test/time_zone_test.rb

@@ -78 +78 @@
-  end
-  
+  def test_formatted_offset_zero
+    zone = TimeZone['London']
+    assert_equal "+00:00", zone.formatted_offset
+    assert_equal "UTC", zone.formatted_offset(true, 'UTC')
+  end
+  
-  def test_zone_compare
-    zone1 = TimeZone['Central Time (US & Canada)'] # offset -0600