From 9551a974642d5b3e99068290a90e67bd27a41b0d Mon Sep 17 00:00:00 2001
From: Steve Klabnik <steve@steveklabnik.com>
Date: Wed, 3 Apr 2013 17:24:08 -0700
Subject: [PATCH] Revert 37b0690fb82846d01e28dc26f0ad53fa5f2794cf.

This feature causes more problems than it solves.
---
 lib/action_controller/serialization.rb   |  25 +-
 lib/active_model/serializer.rb           |   3 -
 lib/active_model/serializer/responder.rb |  21 --
 lib/active_model_serializers.rb          |   1 -
 test/no_serialization_scope_test.rb      |   2 +-
 test/responder_test.rb                   | 392 -----------------------
 test/test_helper.rb                      |   5 +-
 7 files changed, 8 insertions(+), 441 deletions(-)
 delete mode 100644 lib/active_model/serializer/responder.rb
 delete mode 100644 test/responder_test.rb

diff --git a/lib/action_controller/serialization.rb b/lib/action_controller/serialization.rb
index 0908d6ed..631c1f40 100644
--- a/lib/action_controller/serialization.rb
+++ b/lib/action_controller/serialization.rb
@@ -30,17 +30,6 @@ module ActionController
     included do
       class_attribute :_serialization_scope
       self._serialization_scope = :current_user
-
-      unless self.respond_to?(:responder=)
-        include ActionController::MimeResponds
-      end
-
-      self.responder = ActiveModel::Serializer::Responder
-      self.respond_to :json
-
-      unless ActiveModel::Serializer.use_default_render_json
-        self.send(:include, RenderJsonOverride)
-      end
     end
 
     def serialization_scope
@@ -50,15 +39,13 @@ module ActionController
     def default_serializer_options
     end
 
-    module RenderJsonOverride
-      def _render_option_json(resource, options)
-        json = ActiveModel::Serializer.build_json(self, resource, options)
+    def _render_option_json(resource, options)
+      json = ActiveModel::Serializer.build_json(self, resource, options)
 
-        if json
-          super(json, options)
-        else
-          super
-        end
+      if json
+        super(json, options)
+      else
+        super
       end
     end
 
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 436e9232..2dc4366e 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -66,9 +66,6 @@ module ActiveModel
     self._embed = :objects
     class_attribute :_root_embed
 
-    class_attribute :use_default_render_json
-    self.use_default_render_json = false
-
     class_attribute :cache
     class_attribute :perform_caching
 
diff --git a/lib/active_model/serializer/responder.rb b/lib/active_model/serializer/responder.rb
deleted file mode 100644
index eeb6d7dd..00000000
--- a/lib/active_model/serializer/responder.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module ActiveModel
-  class Serializer
-    class Responder < ::ActionController::Responder #:nodoc:
-
-    protected
-      def display(resource, given_options = {})
-        if format != :json
-          super
-        else
-          json = Serializer.build_json(controller, resource, options)
-
-          if json
-            render given_options.merge(options).merge(:json => json)
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/active_model_serializers.rb b/lib/active_model_serializers.rb
index 0edbef7e..8109b04b 100644
--- a/lib/active_model_serializers.rb
+++ b/lib/active_model_serializers.rb
@@ -86,7 +86,6 @@ begin
   require 'action_controller/serialization'
 
   ActiveSupport.on_load(:action_controller) do
-    require 'active_model/serializer/responder'
     include ::ActionController::Serialization
   end
 rescue LoadError => ex
diff --git a/test/no_serialization_scope_test.rb b/test/no_serialization_scope_test.rb
index b533cc40..719ce4bf 100644
--- a/test/no_serialization_scope_test.rb
+++ b/test/no_serialization_scope_test.rb
@@ -21,7 +21,7 @@ class NoSerializationScopeTest < ActionController::TestCase
     serialization_scope nil
 
     def index
-      respond_with(ScopeSerializable.new)
+      render :json => ScopeSerializable.new
     end
   end
 
diff --git a/test/responder_test.rb b/test/responder_test.rb
deleted file mode 100644
index 07674fd9..00000000
--- a/test/responder_test.rb
+++ /dev/null
@@ -1,392 +0,0 @@
-require 'test_helper'
-require 'pathname'
-
-class ResponderTest < ActionController::TestCase
-  class JsonRenderable
-    def as_json(options={})
-      hash = { :a => :b, :c => :d, :e => :f }
-      hash.except!(*options[:except]) if options[:except]
-      hash
-    end
-
-    def to_json(options = {})
-      super :except => [:c, :e]
-    end
-  end
-
-  class JsonSerializer
-    def initialize(object, options={})
-      @object, @options = object, options
-    end
-
-    def as_json(*)
-      hash = { :object => serializable_hash, :scope => @options[:scope].as_json }
-      hash.merge!(:options => true) if @options[:options]
-      hash.merge!(:check_defaults => true) if @options[:check_defaults]
-      hash
-    end
-
-    def serializable_hash
-      @object.as_json
-    end
-  end
-
-  class JsonSerializable
-    def initialize(skip=false)
-      @skip = skip
-    end
-
-    def active_model_serializer
-      JsonSerializer unless @skip
-    end
-
-    def as_json(*)
-      { :serializable_object => true }
-    end
-  end
-
-  class CustomSerializer
-    def initialize(*)
-    end
-
-    def as_json(*)
-      { :hello => true }
-    end
-  end
-
-  class AnotherCustomSerializer
-    def initialize(*)
-    end
-
-    def as_json(*)
-      { :rails => 'rocks' }
-    end
-  end
-
-  class HypermediaSerializable
-    def active_model_serializer
-      HypermediaSerializer
-    end
-  end
-
-  class HypermediaSerializer < ActiveModel::Serializer
-    def as_json(*)
-      { :link => hypermedia_url }
-    end
-  end
-
-  class CustomArraySerializer < ActiveModel::ArraySerializer
-    self.root = "items"
-  end
-
-  class TestController < ActionController::Base
-    protect_from_forgery
-
-    serialization_scope :current_user
-    attr_reader :current_user
-    before_filter do
-      request.format = :json
-    end
-
-    def self.controller_path
-      'test'
-    end
-
-    def render_json_nil
-      respond_with(nil)
-    end
-
-    def render_json_render_to_string
-      respond_with render_to_string(:json => '[]')
-    end
-
-    def render_json_hello_world
-      respond_with ActiveSupport::JSON.encode(:hello => 'world')
-    end
-
-    def render_json_hello_world_with_status
-      respond_with ActiveSupport::JSON.encode(:hello => 'world'), :status => 401
-    end
-
-    def render_json_hello_world_with_callback
-      respond_with ActiveSupport::JSON.encode(:hello => 'world'), :callback => 'alert'
-    end
-
-    def render_json_with_custom_content_type
-      respond_with ActiveSupport::JSON.encode(:hello => 'world'), :content_type => 'text/javascript'
-    end
-
-    def render_symbol_json
-      respond_with ActiveSupport::JSON.encode(:hello => 'world')
-    end
-
-    def render_json_with_extra_options
-      respond_with JsonRenderable.new, :except => [:c, :e]
-    end
-
-    def render_json_without_options
-      respond_with JsonRenderable.new
-    end
-
-    def render_json_with_serializer
-      @current_user = Struct.new(:as_json).new(:current_user => true)
-      respond_with JsonSerializable.new
-    end
-
-    def render_json_with_serializer_and_implicit_root
-      @current_user = Struct.new(:as_json).new(:current_user => true)
-      respond_with [JsonSerializable.new]
-    end
-
-    def render_json_with_serializer_and_options
-      @current_user = Struct.new(:as_json).new(:current_user => true)
-      respond_with JsonSerializable.new, :options => true
-    end
-
-    def render_json_with_serializer_but_without_location
-      respond_with JsonSerializable.new, :location => nil
-    end
-
-    def render_json_with_serializer_and_scope_option
-      @current_user = Struct.new(:as_json).new(:current_user => true)
-      scope = Struct.new(:as_json).new(:current_user => false)
-      respond_with JsonSerializable.new, :scope => scope
-    end
-
-    def render_json_with_serializer_api_but_without_serializer
-      @current_user = Struct.new(:as_json).new(:current_user => true)
-      respond_with JsonSerializable.new(true)
-    end
-
-    # To specify a custom serializer for an object, use :serializer.
-    def render_json_with_custom_serializer
-      respond_with Object.new, :serializer => CustomSerializer
-    end
-
-    # To specify a custom serializer for each item in the Array, use :each_serializer.
-    def render_json_array_with_custom_serializer
-      respond_with [Object.new], :each_serializer => CustomSerializer
-    end
-
-    def render_json_array_with_wrong_option
-      respond_with [Object.new], :serializer => CustomSerializer
-    end
-
-    def render_json_with_links
-      respond_with HypermediaSerializable.new
-    end
-
-    def render_json_array_with_no_root
-      respond_with [], :root => false
-    end
-
-    def render_json_empty_array
-      respond_with []
-    end
-
-    def render_json_array_with_custom_array_serializer
-      respond_with [], :serializer => CustomArraySerializer
-    end
-
-
-  private
-    def default_serializer_options
-      defaults = {}
-      defaults.merge!(:check_defaults => true) if params[:check_defaults]
-      defaults.merge!(:root => :awesome) if params[:check_default_root]
-      defaults.merge!(:scope => :current_admin) if params[:check_default_scope]
-      defaults.merge!(:serializer => AnotherCustomSerializer) if params[:check_default_serializer]
-      defaults.merge!(:each_serializer => AnotherCustomSerializer) if params[:check_default_each_serializer]
-      defaults
-    end
-  end
-
-  tests TestController
-
-  def setup
-    # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
-    # a more accurate simulation of what happens in "real life".
-    super
-    @controller.logger = Logger.new(nil)
-
-    @request.host = "www.nextangle.com"
-  end
-
-  def test_render_json_nil
-    get :render_json_nil
-    assert_equal 'null', @response.body
-    assert_equal 'application/json', @response.content_type
-  end
-
-  def test_render_json_render_to_string
-    get :render_json_render_to_string
-    assert_equal '[]', @response.body
-  end
-
-  def test_render_json
-    get :render_json_hello_world
-    assert_equal '{"hello":"world"}', @response.body
-    assert_equal 'application/json', @response.content_type
-  end
-
-  def test_render_json_with_status
-    get :render_json_hello_world_with_status
-    assert_equal '{"hello":"world"}', @response.body
-    assert_equal 401, @response.status
-  end
-
-  def test_render_json_with_callback
-    get :render_json_hello_world_with_callback
-    assert_equal 'alert({"hello":"world"})', @response.body
-    # For JSONP, Rails 3 uses application/json, but Rails 4 uses text/javascript
-    assert_match %r(application/json|text/javascript), @response.content_type.to_s
-  end
-
-  def test_render_json_with_custom_content_type
-    get :render_json_with_custom_content_type
-    assert_equal '{"hello":"world"}', @response.body
-    assert_equal 'text/javascript', @response.content_type
-  end
-
-  def test_render_symbol_json
-    get :render_symbol_json
-    assert_equal '{"hello":"world"}', @response.body
-    assert_equal 'application/json', @response.content_type
-  end
-
-  def test_render_json_forwards_extra_options
-    get :render_json_with_extra_options
-    assert_equal '{"a":"b"}', @response.body
-    assert_equal 'application/json', @response.content_type
-  end
-
-  def test_render_json_calls_to_json_from_object
-    get :render_json_without_options
-    assert_equal '{"a":"b"}', @response.body
-  end
-
-  def test_render_json_with_serializer
-    get :render_json_with_serializer
-    assert_match '"scope":{"current_user":true}', @response.body
-    assert_match '"object":{"serializable_object":true}', @response.body
-  end
-
-  def test_render_json_with_serializer_checking_defaults
-    get :render_json_with_serializer, :check_defaults => true
-    assert_match '"scope":{"current_user":true}', @response.body
-    assert_match '"object":{"serializable_object":true}', @response.body
-    assert_match '"check_defaults":true', @response.body
-  end
-
-  def test_render_json_with_serializer_checking_default_serailizer
-    get :render_json_with_serializer, :check_default_serializer => true
-    assert_match '{"rails":"rocks"}', @response.body
-  end
-
-  def test_render_json_with_serializer_checking_default_scope
-    get :render_json_with_serializer, :check_default_scope => true
-    assert_match '"scope":"current_admin"', @response.body
-  end
-
-  def test_render_json_with_serializer_and_implicit_root
-    get :render_json_with_serializer_and_implicit_root
-    assert_match '"test":[{"serializable_object":true}]', @response.body
-  end
-
-  def test_render_json_with_serializer_and_implicit_root_checking_default_each_serailizer
-    get :render_json_with_serializer_and_implicit_root, :check_default_each_serializer => true
-    assert_match '"test":[{"rails":"rocks"}]', @response.body
-  end
-
-  def test_render_json_with_serializer_and_options
-    get :render_json_with_serializer_and_options
-    assert_match '"scope":{"current_user":true}', @response.body
-    assert_match '"object":{"serializable_object":true}', @response.body
-    assert_match '"options":true', @response.body
-  end
-
-  def test_render_json_with_serializer_but_without_location
-    post :render_json_with_serializer_but_without_location
-    assert_equal nil, @response.location
-  end
-
-  def test_render_json_with_serializer_and_scope_option
-    get :render_json_with_serializer_and_scope_option
-    assert_match '"scope":{"current_user":false}', @response.body
-  end
-
-  def test_render_json_with_serializer_and_scope_option_checking_default_scope
-    get :render_json_with_serializer_and_scope_option, :check_default_scope => true
-    assert_match '"scope":{"current_user":false}', @response.body
-  end
-
-  def test_render_json_with_serializer_api_but_without_serializer
-    get :render_json_with_serializer_api_but_without_serializer
-    assert_match '{"serializable_object":true}', @response.body
-  end
-
-  def test_render_json_with_custom_serializer
-    get :render_json_with_custom_serializer
-    assert_match '{"hello":true}', @response.body
-  end
-
-  def test_render_json_with_custom_serializer_checking_default_serailizer
-    get :render_json_with_custom_serializer, :check_default_serializer => true
-    assert_match '{"hello":true}', @response.body
-  end
-
-  def test_render_json_array_with_custom_serializer
-    get :render_json_array_with_custom_serializer
-    assert_match '{"test":[{"hello":true}]}', @response.body
-  end
-
-  def test_render_json_array_with_wrong_option
-    assert_raise ArgumentError do
-      get :render_json_array_with_wrong_option
-    end
-  end
-
-  def test_render_json_array_with_custom_serializer_checking_default_each_serailizer
-    get :render_json_array_with_custom_serializer, :check_default_each_serializer => true
-    assert_match '{"test":[{"hello":true}]}', @response.body
-  end
-
-  def test_render_json_with_links
-    get :render_json_with_links
-    assert_match '{"link":"http://www.nextangle.com/hypermedia"}', @response.body
-  end
-
-  def test_render_json_array_with_no_root
-    get :render_json_array_with_no_root
-    assert_equal '[]', @response.body
-  end
-
-  def test_render_json_array_with_no_root_checking_default_root
-    get :render_json_array_with_no_root, :check_default_root => true
-    assert_equal '[]', @response.body
-  end
-
-  def test_render_json_empty_array
-    get :render_json_empty_array
-    assert_equal '{"test":[]}', @response.body
-  end
-
-  def test_render_json_empty_array_checking_default_root
-    get :render_json_empty_array, :check_default_root => true
-    assert_equal '{"awesome":[]}', @response.body
-  end
-
-  def test_render_json_empty_array_with_array_serializer_root_false
-    ActiveModel::ArraySerializer.root = false
-    get :render_json_empty_array
-    assert_equal '[]', @response.body
-  ensure # teardown
-    ActiveModel::ArraySerializer.root = nil
-  end
-
-  def test_render_json_array_with_custom_array_serializer
-    get :render_json_array_with_custom_array_serializer
-    assert_equal '{"items":[]}', @response.body
-  end
-
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7b4335f4..d340f496 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -15,9 +15,6 @@ require "active_model_serializers"
 require "active_support/json"
 require "test/unit"
 
-# Manually include RenderJsonOverride where needed
-ActiveModel::Serializer.use_default_render_json = true
-
 require 'rails'
 
 module TestHelper
@@ -40,4 +37,4 @@ end
 
 class Object
   undef_method :id if respond_to?(:id)
-end
\ No newline at end of file
+end