diff options
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time')
-rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/calculations.rb | 10 | ||||
-rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/conversions.rb | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb index b672ada7b9..2e85d14579 100644 --- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb @@ -5,6 +5,16 @@ module ActiveSupport #:nodoc: module DateTime #:nodoc: # Enables the use of time calculations within DateTime itself module Calculations + def self.included(base) #:nodoc: + base.extend ClassMethods + end + + module ClassMethods + # DateTimes aren't aware of DST rules, so use a consistent non-DST offset when creating a DateTime with an offset in the local zone + def local_offset + ::Time.local(2007).utc_offset.to_r / 86400 + end + end # Seconds since midnight: DateTime.now.seconds_since_midnight def seconds_since_midnight diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb index 776f1806f9..45d09f344d 100644 --- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb @@ -35,10 +35,9 @@ module ActiveSupport #:nodoc: end # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class - # If self.offset is 0, then will attempt to cast as a utc time; otherwise will attempt to cast in local time zone + # If self has an offset other than 0, self will just be returned unaltered, since there's no clean way to map it to a Time def to_time - method = if self.offset == 0 then 'utc' else 'local' end - ::Time.send(method, year, month, day, hour, min, sec) rescue self + self.offset == 0 ? ::Time.utc_time(year, month, day, hour, min, sec) : self end # To be able to keep Times, Dates and DateTimes interchangeable on conversions |