Updated patch to test cleanly against master

Author: Ted Kulp

lib/grape/middleware/base.rb

@@ -1,3 +1,5 @@
+require 'multi_json'
+
 module Grape
   module Middleware
     class Base
@@ -53,11 +55,18 @@ module Formats
           :json => :encode_json,
           :txt => :encode_txt,
         }
+        PARSERS = {
+          :json => :decode_json
+        }
 
         def formatters
           FORMATTERS.merge(options[:formatters] || {})
         end
 
+        def parsers
+          PARSERS.merge(options[:parsers] || {})
+        end
+
         def content_types
           CONTENT_TYPES.merge(options[:content_types] || {})
         end
@@ -82,6 +91,35 @@ def formatter_for(api_format)
           end
         end
 
+        def parser_for(api_format)
+          spec = parsers[api_format]
+          case spec
+          when nil
+            nil
+          when Symbol
+            method(spec)
+          else
+            spec
+          end
+        end
+
+        def decode_json(object)
+          MultiJson.decode(object)
+        end
+
+        def encode_json(object)
+          if object.respond_to? :serializable_hash
+            MultiJson.encode(object.serializable_hash)
+          elsif object.respond_to? :to_json
+            object.to_json
+          else
+            MultiJson.encode(object)
+          end
+        end
+
+        def encode_txt(object)
+          object.respond_to?(:to_txt) ? object.to_txt : object.to_s
+        end
       end
 
     end

lib/grape/middleware/formatter.rb

@@ -1,5 +1,4 @@
 require 'grape/middleware/base'
-require 'multi_json'
 
 module Grape
   module Middleware
@@ -83,20 +82,6 @@ def after
         headers['Content-Type'] = content_types[env['api.format']]
         Rack::Response.new(bodymap, status, headers).to_a
       end
-
-      def encode_json(object)
-        if object.respond_to? :serializable_hash
-          MultiJson.encode(object.serializable_hash)
-        elsif object.respond_to? :to_json
-          object.to_json
-        else
-          MultiJson.encode(object)
-        end
-      end
-      
-      def encode_txt(object)
-        object.respond_to?(:to_txt) ? object.to_txt : object.to_s
-      end
     end
   end
 end