Changeset 8698

Timestamp:

01/23/08 02:46:47 (5 months ago)

Author:

gbuesing

Message:

Adding Time and DateTime #formatted_offset, for outputting +HH:MM utc offset strings with cross-platform consistency

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/date_time/conversions.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/time/conversions.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/json/encoders/time.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/date_time_ext_test.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/time_ext_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Adding Time and DateTime #formatted_offset, for outputting +HH:MM utc offset strings with cross-platform consistency [Geoff Buesing]
-
-* Adding alternate_utc_string option to TimeZone#formatted_offset. Removing unneeded TimeZone#offset. [Geoff Buesing]

trunk/activesupport/lib/active_support/core_ext/date_time/conversions.rb

@@ -53 +53 @@
-        end
-
+        # Returns the utc_offset as an +HH:MM formatted string. Examples:
+        #
+        #   datetime = DateTime.civil(2000, 1, 1, 0, 0, 0, Rational(-6, 24))
+        #   datetime.formatted_offset         # => "-06:00"
+        #   datetime.formatted_offset(false)  # => "-0600"
+        def formatted_offset(colon = true, alternate_utc_string = nil)
+          utc? && alternate_utc_string || utc_offset.to_utc_offset_s(colon)
+        end
+        
-        # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005 14:30:00 +0000"
-        def readable_inspect

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

@@ -56 +56 @@
-          end
-        end
+        
+        # Returns the utc_offset as an +HH:MM formatted string. Examples:
+        #
+        #   Time.local(2000).formatted_offset         # => "-06:00"
+        #   Time.local(2000).formatted_offset(false)  # => "-0600"
+        def formatted_offset(colon = true, alternate_utc_string = nil)
+          utc? && alternate_utc_string || utc_offset.to_utc_offset_s(colon)
+        end
-
-        # Convert a Time object to a Date, dropping hour, minute, and second precision.

trunk/activesupport/lib/active_support/json/encoders/time.rb

@@ -1 +1 @@
-class Time
-  def to_json(options = nil) #:nodoc:
-utc_offset.to_utc_offset_s
+formatted_offset
-  end
-end

trunk/activesupport/test/core_ext/date_time_ext_test.rb

@@ -242 +242 @@
-    assert_equal DateTime.civil(2005, 2, 21, 9, 11, 12, 0), DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(1, 24)).utc
-  end
+  
+  def test_formatted_offset_with_utc
+    assert_equal '+00:00', DateTime.civil(2000).formatted_offset
+    assert_equal '+0000', DateTime.civil(2000).formatted_offset(false)
+    assert_equal 'UTC', DateTime.civil(2000).formatted_offset(true, 'UTC')
+  end
+  
+  def test_formatted_offset_with_local
+    dt = DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(-5, 24))
+    assert_equal '-05:00', dt.formatted_offset
+    assert_equal '-0500', dt.formatted_offset(false)
+  end
-
-  protected

trunk/activesupport/test/core_ext/time_ext_test.rb

@@ -410 +410 @@
-    assert Time.new.acts_like_time?
-  end
+  
+  def test_formatted_offset_with_utc
+    assert_equal '+00:00', Time.utc(2000).formatted_offset
+    assert_equal '+0000', Time.utc(2000).formatted_offset(false)
+    assert_equal 'UTC', Time.utc(2000).formatted_offset(true, 'UTC')
+  end
+  
+  def test_formatted_offset_with_local
+    with_timezone 'US/Eastern' do
+      assert_equal '-05:00', Time.local(2000).formatted_offset
+      assert_equal '-0500', Time.local(2000).formatted_offset(false)
+      assert_equal '-04:00', Time.local(2000, 7).formatted_offset
+      assert_equal '-0400', Time.local(2000, 7).formatted_offset(false)
+    end
+  end
-
-  protected