Adds accept header detection to formatter.

Author: Michael Bleigh

Gemfile

@@ -10,7 +10,7 @@ group :development do
 end
 
 group :test do
-  gem 'rspec', '>= 2.0.0.beta.19'
+  gem 'rspec', '>= 2.0.0.beta.20'
   gem 'rack-test'
   gem 'cucumber', '>= 0.8.5'
 end

Gemfile.lock

@@ -25,14 +25,14 @@ GEM
     rack-test (0.5.4)
       rack (>= 1.0)
     rake (0.8.7)
-    rspec (2.0.0.beta.19)
-      rspec-core (= 2.0.0.beta.19)
-      rspec-expectations (= 2.0.0.beta.19)
-      rspec-mocks (= 2.0.0.beta.19)
-    rspec-core (2.0.0.beta.19)
-    rspec-expectations (2.0.0.beta.19)
+    rspec (2.0.0.beta.20)
+      rspec-core (= 2.0.0.beta.20)
+      rspec-expectations (= 2.0.0.beta.20)
+      rspec-mocks (= 2.0.0.beta.20)
+    rspec-core (2.0.0.beta.20)
+    rspec-expectations (2.0.0.beta.20)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.19)
+    rspec-mocks (2.0.0.beta.20)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     term-ansicolor (1.0.5)
@@ -50,4 +50,4 @@ DEPENDENCIES
   rack-mount
   rack-test
   rake
-  rspec (>= 2.0.0.beta.19)
+  rspec (>= 2.0.0.beta.20)

lib/grape/middleware/formatter.rb

@@ -22,9 +22,17 @@ def content_types
         CONTENT_TYPES.merge(options[:content_types])
       end
 
+      def mime_types
+        CONTENT_TYPES.invert
+      end
+      
+      def headers
+        env.dup.inject({}){|h,(k,v)| h[k.downcase] = v; h}
+      end
+      
       def before
         fmt = format_from_extension || format_from_header || options[:default_format]
-        
+                
         if content_types.key?(fmt)
           env['api.format'] = fmt          
         else
@@ -44,7 +52,24 @@ def format_from_extension
       end
 
       def format_from_header
-        # TODO: Implement Accept header parsing.
+        mime_array.each do |t| 
+          if mime_types.key?(t)
+            return mime_types[t]
+          end
+        end
+        nil
+      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
       end
 
       def after

lib/grape/middleware/versioner.rb

@@ -13,6 +13,10 @@ def before
         pieces = env['PATH_INFO'].split('/')
         potential_version = pieces[1]
         if potential_version =~ options[:pattern]
+          if options[:versions] && !options[:versions].include?(potential_version)
+            throw :error, :status => 404, :message => "The specified version of the API does not exist."
+          end
+          
           truncated_path = "/#{pieces[2..-1].join('/')}"
           env['api.version'] = potential_version
           env['PATH_INFO'] = truncated_path

spec/grape/middleware/formatter_spec.rb

@@ -32,4 +32,33 @@
       err.should == {:status => 406, :message => "The requested format is not supported."}
     end
   end
+  
+  context 'Accept header detection' do
+    it 'should detect from the Accept header' do
+      subject.call({'PATH_INFO' => '/info', 'Accept' => 'application/xml'})
+      subject.env['api.format'].should == :xml
+    end
+    
+    it 'should look for case-indifferent headers' do
+      subject.call({'PATH_INFO' => '/info', 'accept' => 'application/xml'})
+      subject.env['api.format'].should == :xml
+    end
+    
+    it 'should use quality rankings to determine formats' do
+      subject.call({'PATH_INFO' => '/info', 'Accept' => 'application/json; q=0.3,application/xml; q=1.0'})
+      subject.env['api.format'].should == :xml
+      subject.call({'PATH_INFO' => '/info', 'Accept' => 'application/json; q=1.0,application/xml; q=0.3'})
+      subject.env['api.format'].should == :json
+    end
+    
+    it 'should handle quality rankings mixed with nothing' do
+      subject.call({'PATH_INFO' => '/info', 'Accept' => 'application/json,application/xml; q=1.0'})
+      subject.env['api.format'].should == :xml
+    end
+    
+    it 'should properly parse headers with other attributes' do
+      subject.call({'PATH_INFO' => '/info', 'Accept' => 'application/json; abc=2.3; q=1.0,application/xml; q=0.7'})
+      subject.env['api.format'].should == :json
+    end
+  end
 end

spec/grape/middleware/versioner_spec.rb

@@ -26,4 +26,15 @@
       subject.call('PATH_INFO' => '/awesome/radical').last.should be_nil
     end
   end
+  
+  context 'with specified versions' do
+    before{ @options = {:versions => ['v1', 'v2']}}
+    it 'should throw an error if a non-allowed version is specified' do
+      catch(:error){subject.call('PATH_INFO' => '/v3/awesome')}[:status].should == 404
+    end
+    
+    it 'should allow versions that have been specified' do
+      subject.call('PATH_INFO' => '/v1/asoasd').last.should == 'v1'
+    end
+  end
 end