Fixes an issue when decoding a json string which looks like a date but is invalid. This DateTime parse error is now caught and the original string is instead passed back [#6286 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>

activesupport/lib/active_support/json/backends/jsongem.rb

@@ -26,7 +26,11 @@ module ActiveSupport
           when nil
             nil
           when DATE_REGEX
-            DateTime.parse(data)
+            begin
+              DateTime.parse(data)
+            rescue ArgumentError
+              data
+            end
           when Array
             data.map! { |d| convert_dates_from(d) }
           when Hash

activesupport/lib/active_support/json/backends/yajl.rb

@@ -23,7 +23,11 @@ module ActiveSupport
           when nil
             nil
           when DATE_REGEX
-            DateTime.parse(data)
+            begin
+              DateTime.parse(data)
+            rescue ArgumentError
+              data
+            end
           when Array
             data.map! { |d| convert_dates_from(d) }
           when Hash

activesupport/lib/active_support/json/backends/yaml.rb

@@ -36,7 +36,7 @@ module ActiveSupport
                   quoting = char
                   pos = scanner.pos
                 elsif quoting == char
-                  if json[pos..scanner.pos-2] =~ DATE_REGEX
+                  if valid_date?(json[pos..scanner.pos-2])
                     # found a date, track the exact positions of the quotes so we can
                     # overwrite them with spaces later.
                     times << pos
@@ -94,6 +94,16 @@ module ActiveSupport
               output
             end
           end
+
+        private
+          def valid_date?(date_string)
+            begin
+              date_string =~ DATE_REGEX && DateTime.parse(date_string)
+            rescue ArgumentError
+              false
+            end
+          end
+
       end
     end
   end

activesupport/test/json/decoding_test.rb

@@ -19,6 +19,8 @@ class TestJSONDecoding < ActiveSupport::TestCase
     %({"a": "2007-01-01 01:12:34 Z"})            => {'a' => Time.utc(2007, 1, 1, 1, 12, 34)},
     # no time zone
     %({"a": "2007-01-01 01:12:34"})              => {'a' => "2007-01-01 01:12:34"},
+    # invalid date
+    %({"a": "1089-10-40"})                       => {'a' => "1089-10-40"},
     # needs to be *exact*
     %({"a": " 2007-01-01 01:12:34 Z "})          => {'a' => " 2007-01-01 01:12:34 Z "},
     %({"a": "2007-01-01 : it's your birthday"})  => {'a' => "2007-01-01 : it's your birthday"},