1 files changed, 29 insertions, 24 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index 29d43faeed..9cde9c9b98 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -1,9 +1,14 @@
-require 'active_support/core_ext/hash/conversions'
 require 'action_dispatch/http/request'
-require 'active_support/core_ext/hash/indifferent_access'
 
 module ActionDispatch
+  # ActionDispatch::ParamsParser works for all the requests having any Content-Length
+  # (like POST). It takes raw data from the request and puts it through the parser
+  # that is picked based on Content-Type header.
+  #
+  # In case of any error while parsing data ParamsParser::ParseError is raised.
   class ParamsParser
+    # Raised when raw data from the request cannot be parsed by the parser
+    # defined for request's content mime type.
     class ParseError < StandardError
       attr_reader :original_exception
 
@@ -13,48 +18,48 @@ module ActionDispatch
       end
     end
 
-    DEFAULT_PARSERS = { Mime::JSON => :json }
+    DEFAULT_PARSERS = {
+      Mime::JSON => lambda { |raw_post|
+        data = ActiveSupport::JSON.decode(raw_post)
+        data = {:_json => data} unless data.is_a?(Hash)
+        Request::Utils.normalize_encode_params(data)
+      }
+    }
 
+    # Create a new +ParamsParser+ middleware instance.
+    #
+    # The +parsers+ argument can take Hash of parsers where key is identifying
+    # content mime type, and value is a lambda that is going to process data.
     def initialize(app, parsers = {})
       @app, @parsers = app, DEFAULT_PARSERS.merge(parsers)
     end
 
     def call(env)
-      if params = parse_formatted_parameters(env)
-        env["action_dispatch.request.request_parameters"] = params
+      request = Request.new(env)
+
+      parse_formatted_parameters(request, @parsers) do |params|
+        request.request_parameters = params
       end
 
       @app.call(env)
     end
 
     private
-      def parse_formatted_parameters(env)
-        request = Request.new(env)
-
-        return false if request.content_length.zero?
+      def parse_formatted_parameters(request, parsers)
+        return if request.content_length.zero?
 
-        strategy = @parsers[request.content_mime_type]
+        strategy = parsers.fetch(request.content_mime_type) { return nil }
 
-        return false unless strategy
+        yield strategy.call(request.raw_post)
 
-        case strategy
-        when Proc
-          strategy.call(request.raw_post)
-        when :json
-          data = ActiveSupport::JSON.decode(request.raw_post)
-          data = {:_json => data} unless data.is_a?(Hash)
-          Request::Utils.deep_munge(data).with_indifferent_access
-        else
-          false
-        end
       rescue => e # JSON or Ruby code block errors
-        logger(env).debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
+        logger(request).debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
 
         raise ParseError.new(e.message, e)
       end
 
-      def logger(env)
-        env['action_dispatch.logger'] || ActiveSupport::Logger.new($stderr)
+      def logger(request)
+        request.logger || ActiveSupport::Logger.new($stderr)
       end
   end
 end