From 5de072c73082d901cc319a810fe6159065c26257 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Sat, 12 Jul 2014 02:58:43 -0700
Subject: [PATCH 1/2] Added failing test case for #16131

---
 .../core_ext/object/json_cherry_pick_test.rb  | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 activesupport/test/core_ext/object/json_cherry_pick_test.rb

diff --git a/activesupport/test/core_ext/object/json_cherry_pick_test.rb b/activesupport/test/core_ext/object/json_cherry_pick_test.rb
new file mode 100644
index 0000000000..2f7ea3a497
--- /dev/null
+++ b/activesupport/test/core_ext/object/json_cherry_pick_test.rb
@@ -0,0 +1,42 @@
+require 'abstract_unit'
+
+# These test cases were added to test that cherry-picking the json extensions
+# works correctly, primarily for dependencies problems reported in #16131. They
+# need to be executed in isolation to reproduce the scenario correctly, because
+# other test cases might have already loaded additional dependencies.
+
+class JsonCherryPickTest < ActiveSupport::TestCase
+  include ActiveSupport::Testing::Isolation
+
+  def test_time_as_json
+    require_or_skip 'active_support/core_ext/object/json'
+
+    expected = Time.new(2004, 7, 25)
+    actual   = Time.parse(expected.as_json)
+
+    assert_equal expected, actual
+  end
+
+  def test_date_as_json
+    require_or_skip 'active_support/core_ext/object/json'
+
+    expected = Date.new(2004, 7, 25)
+    actual   = Date.parse(expected.as_json)
+
+    assert_equal expected, actual
+  end
+
+  def test_datetime_as_json
+    require_or_skip 'active_support/core_ext/object/json'
+
+    expected = DateTime.new(2004, 7, 25)
+    actual   = DateTime.parse(expected.as_json)
+
+    assert_equal expected, actual
+  end
+
+  private
+    def require_or_skip(file)
+      require(file) || skip("'#{file}' was already loaded")
+    end
+end

From bf7fbe64f70aa15de00dce30ed90f3669540bab7 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Sat, 12 Jul 2014 03:03:35 -0700
Subject: [PATCH 2/2] Fixed a compatibility issue with the `Oj` gem

`Time#as_json`, `Date#as_json` and `DateTime#as_json` incorrectly depends on a
delegation that is set up in `active_support/json/encoding`. We cannot simply
require that file in `core_ext/object/json` because it would cause a circular
dependency problem (see #12203 for background). We should instead rely on AS's
autoload to load that file for us on-demand.

To trigger autoload correctly, we need to reference the `AS::JSON::Encoding`
constant instead of using the delegated version.

Fixes #16131.
---
 activesupport/CHANGELOG.md                               | 7 +++++++
 activesupport/lib/active_support/core_ext/object/json.rb | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 02aea8d21f..2a53fa95c1 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   Fixed a compatibility issue with the `Oj` gem when cherry-picking the file
+    `active_support/core_ext/object/json` without requiring `active_support/json`.
+
+    Fixes #16131.
+
+    *Godfrey Chan*
+
 *   Make `Hash#with_indifferent_access` copy the default proc too.
 
     *arthurnn*, *Xanders*
diff --git a/activesupport/lib/active_support/core_ext/object/json.rb b/activesupport/lib/active_support/core_ext/object/json.rb
index 5496692373..698b2d1920 100644
--- a/activesupport/lib/active_support/core_ext/object/json.rb
+++ b/activesupport/lib/active_support/core_ext/object/json.rb
@@ -162,7 +162,7 @@ def as_json(options = nil) #:nodoc:
 
 class Time
   def as_json(options = nil) #:nodoc:
-    if ActiveSupport.use_standard_json_time_format
+    if ActiveSupport::JSON::Encoding.use_standard_json_time_format
       xmlschema(ActiveSupport::JSON::Encoding.time_precision)
     else
       %(#{strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)})
@@ -172,7 +172,7 @@ def as_json(options = nil) #:nodoc:
 
 class Date
   def as_json(options = nil) #:nodoc:
-    if ActiveSupport.use_standard_json_time_format
+    if ActiveSupport::JSON::Encoding.use_standard_json_time_format
       strftime("%Y-%m-%d")
     else
       strftime("%Y/%m/%d")
@@ -182,7 +182,7 @@ def as_json(options = nil) #:nodoc:
 
 class DateTime
   def as_json(options = nil) #:nodoc:
-    if ActiveSupport.use_standard_json_time_format
+    if ActiveSupport::JSON::Encoding.use_standard_json_time_format
       xmlschema(ActiveSupport::JSON::Encoding.time_precision)
     else
       strftime('%Y/%m/%d %H:%M:%S %z')