Backport #23011 to 5-0-stable

activesupport/CHANGELOG.md

@@ -1,3 +1,14 @@
+## Rails 5.0.0.rc3 (Unreleased) ##
+
+*   Support parsing JSON time in ISO8601 local time strings in
+    `ActiveSupport::JSON.decode` when `parse_json_times` is enabled.
+    Strings in the format of `YYYY-MM-DD hh:mm:ss` (without a `Z` at
+    the end) will be parsed in the local timezone (`Time.zone`). In
+    addition, date strings (`YYYY-MM-DD`) are now parsed into `Date`
+    objects.
+
+    *Grzegorz Witek*
+
 ## Rails 5.0.0.rc2 (June 22, 2016) ##
 
 *   `Date.to_s` doesn't produce too many spaces. For example, `to_s(:short)`

activesupport/lib/active_support/json/decoding.rb

@@ -8,7 +8,8 @@ module ActiveSupport
 
   module JSON
     # matches YAML-formatted dates
-    DATE_REGEX = /^(?:\d{4}-\d{2}-\d{2}|\d{4}-\d{1,2}-\d{1,2}[T \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?))$/
+    DATE_REGEX = /^\d{4}-\d{2}-\d{2}$/
+    DATETIME_REGEX = /^(?:\d{4}-\d{2}-\d{2}|\d{4}-\d{1,2}-\d{1,2}[T \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?)?)$/
 
     class << self
       # Parses a JSON string (JavaScript Object Notation) into a hash.
@@ -48,7 +49,13 @@ def convert_dates_from(data)
           nil
         when DATE_REGEX
           begin
-            DateTime.parse(data)
+            Date.parse(data)
+          rescue ArgumentError
+            data
+          end
+        when DATETIME_REGEX
+          begin
+            Time.zone.parse(data)
           rescue ArgumentError
             data
           end

activesupport/test/json/decoding_test.rb

@@ -1,8 +1,11 @@
 require 'abstract_unit'
 require 'active_support/json'
 require 'active_support/time'
+require 'time_zone_test_helpers'
 
 class TestJSONDecoding < ActiveSupport::TestCase
+  include TimeZoneTestHelpers
+
   class Foo
     def self.json_create(object)
       "Foo"
@@ -24,10 +27,11 @@ def self.json_create(object)
     %(["2007-01-01 01:12:34 Z"])                 => [Time.utc(2007, 1, 1, 1, 12, 34)],
     %(["2007-01-01 01:12:34 Z", "2007-01-01 01:12:35 Z"]) => [Time.utc(2007, 1, 1, 1, 12, 34), Time.utc(2007, 1, 1, 1, 12, 35)],
     # no time zone
-    %({"a": "2007-01-01 01:12:34"})              => {'a' => "2007-01-01 01:12:34"},
+    %({"a": "2007-01-01 01:12:34"})              => {'a' => Time.new(2007, 1, 1, 1, 12, 34, "-05:00")},
     # invalid date
     %({"a": "1089-10-40"})                       => {'a' => "1089-10-40"},
     # xmlschema date notation
+    %({"a": "2009-08-10T19:01:02"})              => {'a' => Time.new(2009, 8, 10, 19, 1, 2, "-04:00")},
     %({"a": "2009-08-10T19:01:02Z"})             => {'a' => Time.utc(2009, 8, 10, 19, 1, 2)},
     %({"a": "2009-08-10T19:01:02+02:00"})        => {'a' => Time.utc(2009, 8, 10, 17, 1, 2)},
     %({"a": "2009-08-10T19:01:02-05:00"})        => {'a' => Time.utc(2009, 8, 11, 00, 1, 2)},
@@ -72,10 +76,12 @@ def self.json_create(object)
 
   TESTS.each_with_index do |(json, expected), index|
     test "json decodes #{index}" do
-      with_parse_json_times(true) do
-        silence_warnings do
-          assert_equal expected, ActiveSupport::JSON.decode(json), "JSON decoding \
-          failed for #{json}"
+      with_tz_default 'Eastern Time (US & Canada)' do
+        with_parse_json_times(true) do
+          silence_warnings do
+            assert_equal expected, ActiveSupport::JSON.decode(json), "JSON decoding \
+            failed for #{json}"
+          end
         end
       end
     end

guides/source/5_0_release_notes.md

@@ -961,6 +961,13 @@ Please refer to the [Changelog][active-support] for detailed changes.
 *   `ActiveSupport::Duration` now supports ISO8601 formatting and parsing.
     ([Pull Request](https://github.com/rails/rails/pull/16917))
 
+*   `ActiveSupport::JSON.decode` now supports parsing ISO8601 local times when
+    `parse_json_times` is enabled.
+    ([Pull Request](https://github.com/rails/rails/pull/23011))
+
+*   `ActiveSupport::JSON.decode` now return `Date` objects for date strings.
+    ([Pull Request](https://github.com/rails/rails/pull/23011))
+
 *   Added ability to `TaggedLogging` to allow loggers to be instantiated multiple
     times so that they don't share tags with each other.
     ([Pull Request](https://github.com/rails/rails/pull/9065))