diff options
| author | Andrew White <andrew.white@unboxedconsulting.com> | 2016-04-23 14:46:50 +0100 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxedconsulting.com> | 2016-04-23 15:03:50 +0100 |
| commit | c9c5788a527b70d7f983e2b4b47e3afd863d9f48 (patch) | |
| tree | 3b06bbd1555d74180ea48ad5a1ec6bbd5284261b /activesupport/lib/active_support/core_ext/date_time/compatibility.rb | |
| parent | 1ffa1a852e79feee9d4793fb60992a920909c316 (diff) | |
| download | rails-c9c5788a527b70d7f983e2b4b47e3afd863d9f48.tar.gz rails-c9c5788a527b70d7f983e2b4b47e3afd863d9f48.tar.bz2 rails-c9c5788a527b70d7f983e2b4b47e3afd863d9f48.zip | |
Add compatibility for Ruby 2.4 `to_time` changes
In Ruby 2.4 the `to_time` method for both `DateTime` and `Time` will
preserve the timezone of the receiver when converting to an instance
of `Time`. Since Rails 5.0 will support Ruby 2.2, 2.3 and later we
need to introduce a compatibility layer so that apps that upgrade do
not break. New apps will have a config initializer file that defaults
to match the new Ruby 2.4 behavior going forward.
For information about the changes to Ruby see:
https://bugs.ruby-lang.org/issues/12189
https://bugs.ruby-lang.org/issues/12271
Fixes #24617.
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time/compatibility.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/compatibility.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/compatibility.rb b/activesupport/lib/active_support/core_ext/date_time/compatibility.rb new file mode 100644 index 0000000000..63ac4c2f3a --- /dev/null +++ b/activesupport/lib/active_support/core_ext/date_time/compatibility.rb @@ -0,0 +1,16 @@ +require 'active_support/core_ext/date_and_time/compatibility' + +class DateTime + prepend DateAndTime::Compatibility + + # Returns a <tt>Time.local()</tt> instance of the simultaneous time in your + # system's <tt>ENV['TZ']</tt> zone. + def getlocal(utc_offset = nil) + utc = getutc + + Time.utc( + utc.year, utc.month, utc.day, + utc.hour, utc.min, utc.sec + utc.sec_fraction + ).getlocal(utc_offset) + end +end |