diff options
author | Geoff Buesing <gbuesing@gmail.com> | 2008-01-12 20:44:31 +0000 |
---|---|---|
committer | Geoff Buesing <gbuesing@gmail.com> | 2008-01-12 20:44:31 +0000 |
commit | e9dad7496d8249a1487a471978d316a4360627d1 (patch) | |
tree | d2a5d46d102576aa985ae3eb02a04b69f0b9d697 /activesupport/lib | |
parent | 7501451d7f417a304a56ac65f0b203c942920732 (diff) | |
download | rails-e9dad7496d8249a1487a471978d316a4360627d1.tar.gz rails-e9dad7496d8249a1487a471978d316a4360627d1.tar.bz2 rails-e9dad7496d8249a1487a471978d316a4360627d1.zip |
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
Diffstat (limited to 'activesupport/lib')
3 files changed, 23 insertions, 5 deletions
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 |