Opt in to JSON

rails · Apr 22, 2009 · 6fee981 · 6fee981
1 parent ab32126
commit 6fee981
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -1,3 +1,5 @@
+require 'active_support/json'
+
 module ActionDispatch
   class ParamsParser
     ActionController::Base.param_parsers[Mime::XML] = :xml_simple

diff --git a/activerecord/lib/active_record/serializers/json_serializer.rb b/activerecord/lib/active_record/serializers/json_serializer.rb
@@ -1,3 +1,5 @@
+require 'active_support/json'
+
 module ActiveRecord #:nodoc:
   module Serialization
     def self.included(base)

diff --git a/activeresource/lib/active_resource/formats/json_format.rb b/activeresource/lib/active_resource/formats/json_format.rb
@@ -1,3 +1,5 @@
+require 'active_support/json'
+
 module ActiveResource
   module Formats
     module JsonFormat

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
@@ -52,6 +52,5 @@ def self.load_all!
 
 require 'active_support/vendor'
 require 'active_support/dependencies'
-require 'active_support/json'
 
 I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'abstract_unit'
+require 'active_support/json'
 
 class TestJSONDecoding < ActiveSupport::TestCase
   TESTS = {