diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2012-12-11 07:06:34 +0000 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-12-11 07:06:34 +0000 |
| commit | 224d82ee5990b101b7a44c37bed026b602bd4f20 (patch) | |
| tree | e76a724627a6e0d8a85cde5a08665fdbc48c7c3a /activesupport/lib/active_support/core_ext/date/calculations.rb | |
| parent | 681697813be40395ef79e1aa0d295d01d99ae596 (diff) | |
| download | rails-224d82ee5990b101b7a44c37bed026b602bd4f20.tar.gz rails-224d82ee5990b101b7a44c37bed026b602bd4f20.tar.bz2 rails-224d82ee5990b101b7a44c37bed026b602bd4f20.zip | |
Deprecate Date#to_time_in_current_zone
The to_time_in_current_zone method doesn't match the naming of the methods
for converting to ActiveSupport::TimeWithZone on Time and DateTime. Since
DateTime inherits from Date that has led to confusion with some users
using the to_time_in_current_zone method with DateTime instances and having
the time part dropped and the UTC offset lost.
This commit fixes this by deprecating the old method and adding a new
in_time_zone method which matches the naming for DateTime and Time. This
should prevent accidently dropping times and UTC offsets when converting
DateTime instances to ActiveSupport::TimeWithZone.
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date/calculations.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date/calculations.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb index d76eba4de7..421aa12100 100644 --- a/activesupport/lib/active_support/core_ext/date/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date/calculations.rb @@ -53,19 +53,19 @@ class Date # Converts Date to a Time (or DateTime if necessary) with the time portion set to the beginning of the day (0:00) # and then subtracts the specified number of seconds. def ago(seconds) - to_time_in_current_zone.since(-seconds) + in_time_zone.since(-seconds) end # Converts Date to a Time (or DateTime if necessary) with the time portion set to the beginning of the day (0:00) # and then adds the specified number of seconds def since(seconds) - to_time_in_current_zone.since(seconds) + in_time_zone.since(seconds) end alias :in :since # Converts Date to a Time (or DateTime if necessary) with the time portion set to the beginning of the day (0:00) def beginning_of_day - to_time_in_current_zone + in_time_zone end alias :midnight :beginning_of_day alias :at_midnight :beginning_of_day @@ -73,7 +73,7 @@ class Date # Converts Date to a Time (or DateTime if necessary) with the time portion set to the end of the day (23:59:59) def end_of_day - to_time_in_current_zone.end_of_day + in_time_zone.end_of_day end alias :at_end_of_day :end_of_day |