Fix: symbol memory leak in formatter middleware.

Author: dblock

lib/grape/error_formatter/base.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/indifferent_access'
+
 module Grape
   module ErrorFormatter
     module Base
@@ -12,7 +14,9 @@ class << self
         }
 
         def formatters(options)
-          FORMATTERS.merge(options[:error_formatters] || {})
+          HashWithIndifferentAccess.new(
+            FORMATTERS.merge(options[:error_formatters] || {})
+          )
         end
 
         def formatter_for(api_format, options = {})

lib/grape/formatter/base.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/indifferent_access'
+
 module Grape
   module Formatter
     module Base
@@ -12,7 +14,9 @@ class << self
         }
 
         def formatters(options)
-          FORMATTERS.merge(options[:formatters] || {})
+          HashWithIndifferentAccess.new(
+            FORMATTERS.merge(options[:formatters] || {})
+          )
         end
 
         def formatter_for(api_format, options = {})

lib/grape/middleware/base.rb

@@ -1,4 +1,5 @@
 require 'active_support/ordered_hash'
+require 'active_support/core_ext/hash/indifferent_access'
 require 'multi_json'
 require 'multi_xml'
 
@@ -55,12 +56,16 @@ def response
         Rack::Response.new(@app_response)
       end
 
+      def content_type_for(format)
+        HashWithIndifferentAccess.new(content_types)[format]
+      end
+
       def content_types
         options[:content_types] || CONTENT_TYPES
       end
 
       def content_type
-        content_types[env['api.format'] || options[:format]] || 'text/html'
+        content_type_for(env['api.format'] || options[:format]) || 'text/html'
       end
 
       def mime_types

lib/grape/middleware/formatter.rb

@@ -18,7 +18,7 @@ def headers
 
       def before
         fmt = format_from_extension || format_from_params || options[:format] || format_from_header || options[:default_format]
-        if content_types.key?(fmt)
+        if content_type_for(fmt)
           if !env['rack.input'].nil? and (body = env['rack.input'].read).strip.length != 0
             parser = Grape::Parser::Base.parser_for fmt, options
             unless parser.nil?
@@ -42,15 +42,18 @@ def format_from_extension
         parts = request.path.split('.')
 
         if parts.size > 1
-          extension = parts.last.to_sym
-          return extension if content_types.key?(extension)
+          extension = parts.last
+          # avoid symbol memory leak on an unknown format
+          return extension.to_sym if content_type_for(extension)
         end
         nil
       end
 
       def format_from_params
         fmt = Rack::Utils.parse_nested_query(env['QUERY_STRING'])["format"]
-        fmt ? fmt.to_sym : nil
+        # avoid symbol memory leak on an unknown format
+        return fmt.to_sym if content_type_for(fmt)
+        fmt
       end
 
       def format_from_header
@@ -76,7 +79,7 @@ def after
         bodymap = bodies.collect do |body|
           formatter.call body, env
         end
-        headers['Content-Type'] = content_types[env['api.format']] unless headers['Content-Type']
+        headers['Content-Type'] = content_type_for(env['api.format']) unless headers['Content-Type']
         Rack::Response.new(bodymap, status, headers).to_a
       end
 

lib/grape/parser/base.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/indifferent_access'
+
 module Grape
   module Parser
     module Base
@@ -10,7 +12,9 @@ class << self
         }
 
         def parsers(options)
-          PARSERS.merge(options[:parsers] || {})
+          HashWithIndifferentAccess.new(
+            PARSERS.merge(options[:parsers] || {})
+          )
         end
 
         def parser_for(api_format, options = {})