Merge pull request rails#52984 from jhawthorn/json_format_options

Avoid passing extraneous options to Renderers like `render json:`

Author: jhawthorn

actionpack/lib/action_controller/metal/renderers.rb

@@ -154,7 +154,8 @@ def _render_to_body_with_renderer(options)
     end
 
     add :json do |json, options|
-      json = json.to_json(options) unless json.kind_of?(String)
+      json_options = options.except(:callback, :content_type, :status)
+      json = json.to_json(json_options) unless json.kind_of?(String)
 
       if options[:callback].present?
         if media_type.nil? || media_type == Mime[:json]

actionpack/test/controller/render_json_test.rb

@@ -17,6 +17,12 @@ def to_json(options = {})
     end
   end
 
+  class InspectOptions
+    def as_json(options = {})
+      { options: options }
+    end
+  end
+
   class TestController < ActionController::Base
     protect_from_forgery
 
@@ -59,6 +65,10 @@ def render_json_with_extra_options
     def render_json_without_options
       render json: JsonRenderable.new
     end
+
+    def render_json_inspect_options
+      render json: InspectOptions.new
+    end
   end
 
   tests TestController
@@ -124,4 +134,9 @@ 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_avoids_view_options
+    get :render_json_inspect_options
+    assert_equal '{"options":{}}', @response.body
+  end
 end

actionview/lib/action_view/layouts.rb

@@ -347,7 +347,7 @@ def _implied_layout_name
         end
     end
 
-    def _normalize_options(options) # :nodoc:
+    def _process_render_template_options(options) # :nodoc:
       super
 
       if _include_layout?(options)

actionview/lib/action_view/rendering.rb

@@ -118,6 +118,7 @@ def view_renderer # :nodoc:
 
     def render_to_body(options = {})
       _process_options(options)
+      _process_render_template_options(options)
       _render_template(options)
     end
 
@@ -173,8 +174,7 @@ def _normalize_args(action = nil, options = {})
       end
 
       # Normalize options.
-      def _normalize_options(options)
-        options = super(options)
+      def _process_render_template_options(options)
         if options[:partial] == true
           options[:partial] = action_name
         end
@@ -184,7 +184,6 @@ def _normalize_options(options)
         end
 
         options[:template] ||= (options[:action] || action_name).to_s
-        options
       end
   end
 end

actionview/test/actionpack/abstract/abstract_controller_test.rb

@@ -212,7 +212,6 @@ def self.layout(formats)
         end
 
         def render_to_body(options = {})
-          options[:_layout] = options[:layout] || _default_layout({})
           super
         end
     end