Refactor number-to-HH:MM-string conversion logic from TimeZone#formatted_offset to reusable Numeric#to_utc_offset_s method

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8635 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

5 files changed, 40 insertions, 5 deletions

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index a4a605c782..bf32a00f2b 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Refactor number-to-HH:MM-string conversion logic from TimeZone#formatted_offset to a reusable Numeric#to_utc_offset_s method. [Geoff Buesing]
+
 * Continue evolution toward ActiveSupport::TestCase.  #10679 [Josh Peek]
 
 * TestCase: introduce declared setup and teardown callbacks. Pass a list of methods and an optional block to call before setup or after teardown. Setup callbacks are run in the order declared; teardown callbacks are run in reverse.  [Jeremy Kemper]
diff --git a/activesupport/lib/active_support/core_ext/numeric.rb b/activesupport/lib/active_support/core_ext/numeric.rb
index 59da205b3d..759b86b81d 100644
--- a/activesupport/lib/active_support/core_ext/numeric.rb
+++ b/activesupport/lib/active_support/core_ext/numeric.rb
@@ -1,7 +1,9 @@
 require 'active_support/core_ext/numeric/time'
 require 'active_support/core_ext/numeric/bytes'
+require 'active_support/core_ext/numeric/conversions'
 
 class Numeric #:nodoc:
   include ActiveSupport::CoreExtensions::Numeric::Time 
-  include ActiveSupport::CoreExtensions::Numeric::Bytes 
+  include ActiveSupport::CoreExtensions::Numeric::Bytes
+  include ActiveSupport::CoreExtensions::Numeric::Conversions 
 end
diff --git a/activesupport/lib/active_support/core_ext/numeric/conversions.rb b/activesupport/lib/active_support/core_ext/numeric/conversions.rb
new file mode 100644
index 0000000000..e652ae5ca8
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/numeric/conversions.rb
@@ -0,0 +1,19 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Numeric #:nodoc:
+      module Conversions
+        # Assumes self represents an offset from UTC in seconds (as returned from Time#utc_offset)
+        # and turns this into an +HH:MM formatted string. Example:
+        #
+        #   -21_600.to_utc_offset_s   # => "-06:00"
+        def to_utc_offset_s(colon=true)
+          seconds = self
+          sign = (seconds < 0 ? -1 : 1)
+          hours = seconds.abs / 3600
+          minutes = (seconds.abs % 3600) / 60
+          "%+03d%s%02d" % [ hours * sign, colon ? ":" : "", minutes ]
+        end
+      end
+    end
+  end
+end
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index b7df68fe33..09896c0aee 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -26,10 +26,7 @@ class TimeZone
   # result.
   def formatted_offset( colon=true )
     return "" if utc_offset == 0
-    sign = (utc_offset < 0 ? -1 : 1)
-    hours = utc_offset.abs / 3600
-    minutes = (utc_offset.abs % 3600) / 60
-    "%+03d%s%02d" % [ hours * sign, colon ? ":" : "", minutes ]
+    utc_offset.to_utc_offset_s(colon)
   end
 
   # Compute and return the current time, in the time zone represented by
diff --git a/activesupport/test/core_ext/numeric_ext_test.rb b/activesupport/test/core_ext/numeric_ext_test.rb
index 8672229fbb..35f90aa776 100644
--- a/activesupport/test/core_ext/numeric_ext_test.rb
+++ b/activesupport/test/core_ext/numeric_ext_test.rb
@@ -145,3 +145,18 @@ class NumericExtSizeTest < Test::Unit::TestCase
     assert_equal 3458764513820540928, 3.exabyte
   end
 end
+
+class NumericExtConversionsTest < Test::Unit::TestCase
+  
+  def test_to_utc_offset_s_with_colon
+    assert_equal "-06:00", -21_600.to_utc_offset_s
+    assert_equal "+00:00", 0.to_utc_offset_s
+    assert_equal "+05:00", 18_000.to_utc_offset_s
+  end
+  
+  def test_to_utc_offset_s_without_colon
+    assert_equal "-0600", -21_600.to_utc_offset_s(false)
+    assert_equal "+0000", 0.to_utc_offset_s(false)
+    assert_equal "+0500", 18_000.to_utc_offset_s(false)
+  end
+end