Use correct content-type.

Author: spraints

lib/grape/middleware/formatter.rb

@@ -84,7 +84,7 @@ def after
               encode_txt(body)
           end
         end
-        headers['Content-Type'] = 'application/json'
+        headers['Content-Type'] = content_types[env['api.format']]
         Rack::Response.new(bodymap, status, headers).to_a
       end
 
@@ -103,4 +103,4 @@ def encode_txt(object)
       end
     end
   end
-end
+end

spec/grape/middleware/formatter_spec.rb

@@ -84,4 +84,24 @@ def serializable_hash
       subject.env['api.format'].should == :json
     end
   end
-end
+
+  context 'Content-type' do
+    it 'should be set for json' do
+      _, headers, _ = subject.call({'PATH_INFO' => '/info.json'})
+      headers['Content-type'].should == 'application/json'
+    end
+    it 'should be set for xml' do
+      _, headers, _ = subject.call({'PATH_INFO' => '/info.xml'})
+      headers['Content-type'].should == 'application/xml'
+    end
+    it 'should be set for txt' do
+      _, headers, _ = subject.call({'PATH_INFO' => '/info.txt'})
+      headers['Content-type'].should == 'text/plain'
+    end
+    it 'should be set for custom' do
+      subject.options[:content_types][:custom] = 'application/x-custom'
+      _, headers, _ = subject.call({'PATH_INFO' => '/info.custom'})
+      headers['Content-type'].should == 'application/x-custom'
+    end
+  end
+end