lib/grape/middleware/base.rb in grape-1.5.3 vs lib/grape/middleware/base.rb in grape-1.6.0

@@ -57,10 +57,11 @@
       # @return [Response, nil] a Rack SPEC response or nil to call the application afterwards.
       def after; end
 
       def response
         return @app_response if @app_response.is_a?(Rack::Response)
+
         Rack::Response.new(@app_response[2], @app_response[0], @app_response[1])
       end
 
       def content_type_for(format)
         HashWithIndifferentAccess.new(content_types)[format]
@@ -82,9 +83,10 @@
 
       private
 
       def merge_headers(response)
         return unless headers.is_a?(Hash)
+
         case response
         when Rack::Response then response.headers.merge!(headers)
         when Array          then response[1].merge!(headers)
         end
       end