mynyml-rack-supported-media-types 0.9 → 0.9.2

data/README

@@ -1,7 +1,7 @@
 ===== Summary
 
 Rack middleware to specify an app's supported media types.
-Returns '415 Unsuported Media Type' status when unsuported type is requested.
+Returns '406 Not Acceptable' status when unsuported type is requested.
 
 The requested type is assumed to be the first content-type in the Accept header's list.
 
@@ -17,7 +17,7 @@ will give you:
 
   GET /foo
   Accept: text/html,text/plain
-  #=> 415 Unsupported Media Type
+  #=> 406 Not Acceptable
 
   GET /foo
   Accept: application/xml,text/html
@@ -46,7 +46,7 @@ Rack::SupportedMediaTypes.
 will result in:
 
   GET /foo.html
-  #=> 415 Unsupported Media Type
+  #=> 406 Not Acceptable
 
   GET /foo.xml
   #=> 200 OK
@@ -58,3 +58,8 @@ will result in:
 Accept header)
 
 see examples/recommended.ru for example code.
+
+===== Links
+
+source:: http://github.com/mynyml/rack-supported-media-types
+rdocs::  http://docs.github.com/mynyml/rack-supported-media-types

data/Rakefile

@@ -22,9 +22,9 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name            = 'rack-supported-media-types'
-  s.version         = '0.9'
+  s.version         = '0.9.2'
   s.summary         = "Rack middleware to specify an app's supported media types."
-  s.description     = "Rack middleware to specify an app's supported media types. Returns '415 Unsuported Media Type' status when unsuported type is requested."
+  s.description     = "Rack middleware to specify an app's supported media types. Returns '406 Not Acceptable' status when unsuported type is requested."
   s.author          = "Martin Aumont"
   s.email           = 'mynyml@gmail.com'
   s.homepage        = ''

data/examples/recommended.ru

@@ -21,7 +21,7 @@ try using extensions:
   - /foo.txt
   - ...
 
-app will only accept .html and .xml requests. others will return 415
+app will only accept .html and .xml requests. others will return 406
 (check server's output in console to see it)
 </pre>
     BODY

data/examples/simple.ru

@@ -17,7 +17,7 @@ require root + 'lib/rack/supported_media_types'
 
 class App
   def call(env)
-    [200, {'Content-Type' => 'text/html'}, ['now try <strong>/foo</strong> (will return 415)']]
+    [200, {'Content-Type' => 'text/html'}, ['now try <strong>/foo</strong> (will return 406)']]
   end
 end
 
@@ -31,7 +31,7 @@ map '/' do
 end
 
 map '/foo' do
-  # ... this will abort the request and return 415 Unsupported Media Type
+  # ... this will abort the request and return 406 Not Acceptable
   use Rack::SupportedMediaTypes, %w( application/xml application/json )
   run App.new
 end

data/lib/rack/supported_media_types.rb

@@ -1,25 +1,36 @@
 module Rack
   class SupportedMediaTypes
 
+    #--
+    # NOTE
+    # Ths reason for adding nil to the list of accepted mime types:
+    #
+    #   "If no Accept header field is present, then it is assumed that the client accepts all media types"
+    #    http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
+    #
+    # Counter intuitive?
+    #
     def initialize(app, mime_types)
-      @app, @mime_types = app, mime_types
+      @app, @mime_types = app, mime_types.push(nil)
     end
 
     #--
-    # return any headers with 415?
+    # return any headers with 406?
     def call(env)
       @mime_types.include?(accept(env)) ?
         @app.call(env) :
-        Rack::Response.new([], 415).finish
+        Rack::Response.new([], 406).finish
     end
 
     private
       #--
       # First content-type in Accept header's list, without params
       def accept(env)
-        if env['HTTP_ACCEPT'] && !env['HTTP_ACCEPT'].empty?
-           env['HTTP_ACCEPT'].split(',').first.split(';').first
-        end
+        header = env['HTTP_ACCEPT']
+
+        (header.nil? || header.empty?) ?
+          header :
+          header.split(',').first.split(';').first
       end
   end
 end

data/rack-supported-media-types.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-supported-media-types
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  version: 0.9.2
 platform: ruby
 authors: 
 - Martin Aumont
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -04:00
+date: 2009-06-05 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: Rack middleware to specify an app's supported media types. Returns '415 Unsuported Media Type' status when unsuported type is requested.
+description: Rack middleware to specify an app's supported media types. Returns '406 Not Acceptable' status when unsuported type is requested.
 email: mynyml@gmail.com
 executables: []
 

data/test/test_supported_media_types.rb

@@ -5,11 +5,11 @@ SMT = Rack::SupportedMediaTypes
 
 class SupportedMediaTypesTest < Test::Unit::TestCase
 
-  test "returns 415 Unsuported Media Type" do
+  test "returns 406 Not Acceptable" do
     app = SMT.new(App, %w( application/xml application/json ))
 
     response = Rack::MockRequest.new(app).get('/', 'HTTP_ACCEPT' => 'text/html')
-    assert_equal 415, response.status
+    assert_equal 406, response.status
     assert response.body.empty?
   end
 
@@ -28,7 +28,7 @@ class SupportedMediaTypesTest < Test::Unit::TestCase
     assert_equal 200, response.status
 
     response = client.get('/', 'HTTP_ACCEPT' => 'application/xml,text/html')
-    assert_equal 415, response.status
+    assert_equal 406, response.status
   end
 
   test "ignores content-type params" do
@@ -38,12 +38,12 @@ class SupportedMediaTypesTest < Test::Unit::TestCase
     assert_equal 200, response.status
   end
 
-  test "nil Accept header" do
+  test "nil Accept header means all types accepted" do
     app = SMT.new(App, %w( application/xml application/json ))
 
     assert_nothing_raised do
       response = Rack::MockRequest.new(app).get('/', 'HTTP_ACCEPT' => nil)
-      assert_equal 415, response.status
+      assert_equal 200, response.status
     end
   end
 
@@ -52,7 +52,7 @@ class SupportedMediaTypesTest < Test::Unit::TestCase
 
     assert_nothing_raised do
       response = Rack::MockRequest.new(app).get('/', 'HTTP_ACCEPT' => '')
-      assert_equal 415, response.status
+      assert_equal 406, response.status
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mynyml-rack-supported-media-types
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  version: 0.9.2
 platform: ruby
 authors: 
 - Martin Aumont
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-03 21:00:00 -07:00
+date: 2009-06-04 21:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Rack middleware to specify an app's supported media types. Returns '415 Unsuported Media Type' status when unsuported type is requested.
+description: Rack middleware to specify an app's supported media types. Returns '406 Not Acceptable' status when unsuported type is requested.
 email: mynyml@gmail.com
 executables: []