Added consideration of vendors when using header based version selection

class MyAPI < Grape::API
vendor 'v1', :using => :header, :vendor => 'twitter', :format => :json

get '/' do
'hello world'
end
end

and let it still return the '/' even when the accept-header
"application/vnd.some_other_vendor-v1+json" was given. This commit will
let it return a 404, and sets the X-Cascade pass as well.

I've added this because although the version is right, part of the
Accept header (the vendor part) is not correct.

Author: jwkoelewijn

lib/grape/middleware/versioner/header.rb

@@ -35,7 +35,10 @@ def before
             env['api.subtype'] = subtype
 
             subtype.scan(/vnd\.(.+)?-(.+)?\+(.*)?/) do |vendor, version, format|
-              if options[:versions] && !options[:versions].include?(version)
+              is_vendored = options[:version_options] && options[:version_options][:vendor]
+              correctly_vendored = is_vendored ? options[:version_options][:vendor] == vendor : true
+
+              if (options[:versions] && !options[:versions].include?(version)) || !correctly_vendored
                 throw :error, :status => 404, :headers => {'X-Cascade' => 'pass'}, :message => "404 API Version Not Found"
               end
 

spec/grape/middleware/versioner/header_spec.rb

@@ -80,6 +80,26 @@
     end
   end
 
+  context 'vendors' do
+    before do
+      @options = {
+        :version => ['v1'],
+        :version_options => {:using => :header, :vendor => 'vendor'}
+      }
+    end
+
+    it 'should match with correct vendor' do
+      status = subject.call('HTTP_ACCEPT' => accept).first
+      status.should == 200
+    end
+
+    it 'should not match with an incorrect vendor' do
+      expect {
+        env = subject.call('HTTP_ACCEPT' => 'application/vnd.othervendor-v1+json').last
+      }.to throw_symbol(:error, :status => 404, :headers => {'X-Cascade' => 'pass'}, :message => "404 API Version Not Found")
+    end
+  end
+
   context 'no matched version' do
     before do
       @options = {