sinatra-rest-addons 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/sinatra/rest/routes.rb

@@ -36,12 +36,14 @@ module Sinatra
           accepted_formats = request.accept.map do |f| 
             generate_type_hash.call(f)
           end
-          selected_format = supported_formats.detect{ |supported_format| 
-            !accepted_formats.detect{ |accepted_format| 
+          selected_format = nil
+          accepted_formats.each{ |accepted_format| 
+            selected_format = supported_formats.detect{ |supported_format| 
               Regexp.new(Regexp.escape(accepted_format["type"]).gsub("\\*", ".*?"), Regexp::IGNORECASE) =~ supported_format["type"] &&
                 (accepted_format["level"] || INFINITY).to_f >= (supported_format["level"] || 0).to_f
-            }.nil?
-          }      
+            }
+            break unless selected_format.nil?
+          } 
           if selected_format.nil?
             content_type :txt
             halt 406, supported_formats.map{|f| 

data/sinatra-rest-addons.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-rest-addons}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril Rohr"]
-  s.date = %q{2009-11-13}
+  s.date = %q{2009-11-16}
   s.description = %q{A set of helpers and extensions for sinatra apps that expose REST resources.}
   s.email = %q{cyril.rohr@gmail.com}
   s.extra_rdoc_files = [

data/test/test_routes.rb

@@ -20,7 +20,6 @@ class RoutesTest < Test::Unit::TestCase
   end
   
   context "route option :provides" do
-
   
     test "should return 406 and the list of supported types, if the server does not support the types accepted by the client [simple matching]" do
       mock_app {
@@ -58,6 +57,18 @@ class RoutesTest < Test::Unit::TestCase
       assert_equal 'application/*', last_response.body
       assert_equal 'application/xml', last_response.headers['Content-Type']
     end
+    test "should respect the order in which the accepted formats are declared when looking for the format to select" do
+      mock_app {
+        register Sinatra::REST::Routes
+        get '/', :provides => ["application/json", "application/xml", "application/vnd.x.y.z+xml"] do
+          request.env['HTTP_ACCEPT']
+        end
+      }
+      get '/', {}, { 'HTTP_ACCEPT' => 'application/xml, */*' }
+      assert_equal 200, last_response.status
+      assert_equal 'application/xml, */*', last_response.body
+      assert_equal 'application/xml', last_response.headers['Content-Type']
+    end
     test "should be successful if the accepted type does not require a specific level" do
       mock_app {
         register Sinatra::REST::Routes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-rest-addons
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 +01:00
+date: 2009-11-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency