Merge branch 'master' of github.com:intridea/grape into frontier-merged-from-master

Author: dblock

lib/grape/middleware/formatter.rb

@@ -61,15 +61,11 @@ def format_from_header
       end
 
       def mime_array
-        accept = headers['accept']
-        if accept
-          accept.gsub(/\b/,'').
-            scan(/(\w+\/[\w+]+)(?:;[^,]*q=([0-9.]+)[^,]*)?/i).
-            sort_by{|a| -a[1].to_f}.
-            map{|a| a[0]}
-        else
-          []
-        end
+        accept = headers['accept'] or return []
+
+        accept.gsub(/\b/,'').scan(%r((\w+/[\w+.-]+)(?:(?:;[^,]*?)?;\s*q=([\d.]+))?)).sort_by { |_, q| -q.to_f }.map {|mime, _|
+          mime.sub(%r(vnd\.[^+]+\+), '')
+        }
       end
 
       def after

spec/grape/middleware/formatter_spec.rb

@@ -106,6 +106,11 @@ def to_xml
       subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/json; abc=2.3; q=1.0,application/xml; q=0.7'})
       subject.env['api.format'].should == :json
     end
+
+    it 'should properly parse headers with vendor and api version' do
+      subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/vnd.test-v1+xml'})
+      subject.env['api.format'].should == :xml
+    end
   end
 
   context 'Content-type' do