More strict behaviour in versioner

Author: Marcin Olichwirowicz

lib/grape/middleware/versioner/header.rb

@@ -26,7 +26,7 @@ def before
           accept = env['HTTP_ACCEPT'] || ""
 
           if options[:version_options] && options[:version_options].keys.include?(:strict) && options[:version_options][:strict]
-            if (accept.nil? || accept.empty?) && options[:versions] && options[:version_options][:using] == :header
+            if (incorrect_header?(accept)) && options[:versions] && options[:version_options][:using] == :header
               throw :error, :status => 404, :headers => {'X-Cascade' => 'pass'}, :message => "404 API Version Not Found"
             end
           end
@@ -48,6 +48,11 @@ def before
             end
           end
         end
+
+        protected
+        def incorrect_header?(header)
+          (header.strip =~ /application\/vnd\.(.+?)-(.+?)\+(.+?)/).nil?
+        end
       end
     end
   end

spec/grape/middleware/versioner/header_spec.rb

@@ -69,15 +69,46 @@
       subject.call({}).first.should == 200
     end
 
-    it 'should return a 404 when no header is set but strict header based versioning is used' do
-      @options = {
-        :versions => ['v1'],
-        :version_options => {:using => :header, :strict => true}
-      }
-      expect {
-        env = subject.call('HTTP_ACCEPT' => '').last
-      }.to throw_symbol(:error, :status => 404, :headers => {'X-Cascade' => 'pass'}, :message => "404 API Version Not Found")
+    context 'when strict header versioning is used' do
+      it 'should return a 404 when no header' do
+        @options = {
+          :versions => ['v1'],
+          :version_options => {:using => :header, :strict => true}
+        }
+        expect {
+          env = subject.call('HTTP_ACCEPT' => '').last
+        }.to throw_symbol(
+          :error,
+          :status => 404,
+          :headers => {'X-Cascade' => 'pass'},
+          :message => "404 API Version Not Found"
+        )
+      end
+
+      it 'should return a 404 when incorrect header format is used' do
+        @options = {
+          :versions => ['v1'],
+          :version_options => {:using => :header, :strict => true}
+        }
+        expect {
+          env = subject.call('HTTP_ACCEPT' => '*/*').last
+        }.to throw_symbol(
+          :error,
+          :status => 404,
+          :headers => {'X-Cascade' => 'pass'},
+          :message => "404 API Version Not Found"
+        )
+      end
+
+      it 'should return a 200 when proper header is set' do
+        @options = {
+          :versions => ['v1'],
+          :version_options => {:using => :header, :strict => true}
+        }
+        subject.call('HTTP_ACCEPT' => 'application/vnd.testing-v1+json').first.should == 200
+      end
     end
+
   end
 
   context 'vendors' do