rack-content_type_validator 0.1.0 → 0.2.0

data/lib/rack/content_type_validator.rb

@@ -9,6 +9,7 @@ module Rack
       @methods = handle_methods(methods)
       @path = path
       @expected_params = expected_params
+      @expected_params[:mime_type] = [@expected_params[:mime_type]] if @expected_params[:mime_type].is_a?(String)
     end
 
     def call(env)
@@ -50,7 +51,7 @@ module Rack
         return true unless expected_mime_type
         
         mime_type = content_type ? content_type[/^([\w\/]+)\b/, 1] : nil
-        mime_type == expected_mime_type
+        expected_mime_type.include?(mime_type)
       end
       
       def valid_params?(expected_params, content_type)

data/test/rack/content_type_validator_test.rb

@@ -47,6 +47,21 @@ class ContentTypeValidatorTest < Test::Unit::TestCase
 
     assert_equal 200, status
   end
+
+  def test_correct_content_type_scope
+    path = "/posts"
+
+    expected_params = {:mime_type => ["application/json", "application/xml"]}
+    middleware = build_middleware(:post, path, expected_params)
+
+    env = build_env("POST", path, 'application/json')
+    status, headers, body = middleware.call(env)
+    assert_equal 200, status
+
+    env = build_env("POST", path, 'application/xml')
+    status, headers, body = middleware.call(env)
+    assert_equal 200, status
+  end
   
   def test_correct_content_type_and_incorrect_charset
     path = "/comments"
@@ -114,8 +129,4 @@ class ContentTypeValidatorTest < Test::Unit::TestCase
     assert_equal 415, status
   end
   
-  def test_multi
-    
-  end
-  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-content_type_validator
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Lucas Fais
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 -02:00
+date: 2011-01-10 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency