Ticket #9935: json_request_parsing.3.diff

test/controller/request_test.rb

@@ -327 +327 @@
-    assert_equal Mime::TEXT, @request.format
-  end
-
+  def test_json_format
+    @request.instance_eval { @parameters = { :format => 'json' } }
+    assert_equal Mime::JSON, @request.format
+  end
+
-  def test_nil_format
-    @request.instance_eval { @parameters = { :format => nil } }
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
@@ -352 +357 @@
-    assert_equal Mime::XML, @request.content_type
-  end
-  
+  def test_content_type_json
+    @request.env["CONTENT_TYPE"] = "application/json"
+    assert_equal Mime::JSON, @request.content_type
+  end
+
-  def test_user_agent
-    assert_not_nil @request.user_agent
-  end
@@ -782 +792 @@
-      ActionController::CgiRequest.new(cgi).request_parameters
-    end
-end
+
+
+class JsonParamsParsingTest < Test::Unit::TestCase
+  def test_json_hash
+    params = parse_body(<<-JSON)
+      { name: "David",
+        url: "http://rubyonrails.org/",
+        count: 1
+        }
+    JSON
+
+    assert_equal 'David', params['person']['name']
+    assert_equal 'http://rubyonrails.org/', params['person']['url']
+    assert_equal 1, params[:person][:count]
+  end
+
+  def test_json_array
+    params = parse_body(<<-JSON)
+      [ { name: "David" },
+        { name: "Allan" } ]
+    JSON
+
+    assert_equal 'David', params['people'].first['name']
+    assert_equal 'Allan', params['people'].last['name']
+  end
+
+  private
+    def parse_body(body, controller = nil)
+      env = { 'CONTENT_TYPE'   => 'application/json',
+              'CONTENT_LENGTH' => body.size.to_s }
+      cgi = ActionController::Integration::Session::MockCGI.new(env, body)
+      request = ActionController::CgiRequest.new(cgi)
+      request.path_parameters = { :controller=>'people' }
+      request.send :prepare_request_parameters
+      request.parameters
+    end
+end

lib/action_controller/dispatcher.rb

@@ -168 +168 @@
-    protected
-      def handle_request
-        @controller = Routing::Routes.recognize(@request)
+        @request.send :prepare_request_parameters
-        @controller.process(@request, @response).out(@output)
-      end
-

lib/action_controller/request.rb

@@ -339 +339 @@
-        @content_type_without_parameters ||= self.class.extract_content_type_without_parameters(content_type_with_parameters)
-      end
-
+      # If the _data parameter was set previously by parsing the request body,
+      # this method will rename it based on the controller name, so ItemsController
+      # sees the :item parameter.
+      def prepare_request_parameters
+        if _data = request_parameters.delete(:_data)
+          name = path_parameters[:controller]
+          name = name.singularize unless _data.is_a?(Array)
+          request_parameters.update(name=>_data)
+        end
+      end
+
-    private
-      def content_type_from_legacy_post_data_format_header
-        if x_post_format = @env['HTTP_X_POST_DATA_FORMAT']
@@ -373 +384 @@
-            self.class.parse_multipart_form_parameters(body, boundary, content_length, env)
-          when :xml_simple, :xml_node
-            body.blank? ? {} : Hash.from_xml(body).with_indifferent_access
+          when :json
+            { :_data => ActiveSupport::JSON.decode(body) }.with_indifferent_access
-          when :yaml
-            YAML.load(body)
-          else

lib/action_controller/base.rb

@@ -306 +306 @@
-    #   ActionController::Base.param_parsers[Mime::YAML] = :yaml
-    @@param_parsers = { Mime::MULTIPART_FORM => :multipart_form,
-                        Mime::URL_ENCODED_FORM => :url_encoded_form,
-
+
+
-    cattr_accessor :param_parsers
-
-    # Controls the default charset for all renders.