described_routes 0.8.1 → 0.8.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.8.2 2009-08-03
+
+* Better content negotiation
+
 == 0.8.1 2009-08-03
 
 * Link headers on the described_routes ResourceTemplate(s) metadata served by the middleware

data/lib/described_routes.rb

@@ -2,5 +2,5 @@ require 'resource_template'
 
 module DescribedRoutes
   # rubygem version
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/described_routes/middleware/base.rb

@@ -100,15 +100,23 @@ module DescribedRoutes
         else
           rel = "self"  # this is the site ResourceTemplates description
           target = @resource_templates
-        end        
+        end
         expanded = target.partial_expand(req.GET)
+        
         Rack::RespondTo.env = req.env
         if format
           # Format extension overrides any accept header
           Rack::RespondTo.media_types = [Rack::Mime::MIME_TYPES[format]]
         else
           # Supported formats, .text preferred.  No html yet!
-          Rack::RespondTo.media_types = %w(.text .json .yaml .xml).map{|format| Rack::Mime::MIME_TYPES[format]}
+          supported_media_types = %w(.text .json .yaml .xml).map{|format| Rack::Mime::MIME_TYPES[format]}
+          # not sure why this is needed - thought Rack::RespondTo would choose for us
+          http_accept = req.env['HTTP_ACCEPT']
+          if supported_media_types.grep(http_accept).empty?
+            Rack::RespondTo.media_types = supported_media_types
+          else
+            Rack::RespondTo.media_types = [http_accept]
+          end
         end
 
         body = respond_to do |format|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: described_routes
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Mike Burrows