Allow nil HTTP_ACCEPT header in header strategy.

Michael Bleigh · Michael Bleigh · commit e159056a355d · 2011-12-02T22:34:58.000-05:00
diff --git a/lib/grape/middleware/versioner/header.rb b/lib/grape/middleware/versioner/header.rb
@@ -23,7 +23,7 @@ module Versioner
       # route.
       class Header < Base
         def before
-          accept = env['HTTP_ACCEPT']
+          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
diff --git a/spec/grape/middleware/versioner/header_spec.rb b/spec/grape/middleware/versioner/header_spec.rb
@@ -57,6 +57,7 @@
         :version_options => {:using => :header}
       }
       subject.call('HTTP_ACCEPT' => '').first.should == 200
+      subject.call({}).first.should == 200
     end
 
     it 'should return a 200 when no header is set but strict header based versioning is disabled' do
@@ -65,6 +66,7 @@
         :version_options => {:using => :header, :strict => false}
       }
       subject.call('HTTP_ACCEPT' => '').first.should == 200
+      subject.call({}).first.should == 200
     end
 
     it 'should return a 404 when no header is set but strict header based versioning is used' do

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@`
`57`	`57`	`:version_options => {:using => :header}`
`58`	`58`	`}`
`59`	`59`	`subject.call('HTTP_ACCEPT' => '').first.should == 200`
	`60`	`+ subject.call({}).first.should == 200`
`60`	`61`	`end`
`61`	`62`
`62`	`63`	`it 'should return a 200 when no header is set but strict header based versioning is disabled' do`
`@@ -65,6 +66,7 @@`
`65`	`66`	`:version_options => {:using => :header, :strict => false}`
`66`	`67`	`}`
`67`	`68`	`subject.call('HTTP_ACCEPT' => '').first.should == 200`
	`69`	`+ subject.call({}).first.should == 200`
`68`	`70`	`end`
`69`	`71`
`70`	`72`	`it 'should return a 404 when no header is set but strict header based versioning is used' do`