rack-content_type_validator 0.0.3 → 0.1.0

data/lib/rack/content_type_validator.rb

@@ -13,9 +13,8 @@ module Rack
 
     def call(env)
       if match_path?(env['PATH_INFO']) && match_method?(env['REQUEST_METHOD'])
-        content_type = env['CONTENT_TYPE']
-        
-        unless valid_content_type?(content_type) && valid_charset?(content_type)
+
+        unless valid_content_type?(env['CONTENT_TYPE'])
           response = Response.new
           response.status = 415
           response.write(error_message)
@@ -43,18 +42,27 @@ module Rack
       end
       
       def valid_content_type?(content_type)
-        return true unless @expected_params[:mime_type]
+        valid_mime_type?(@expected_params[:mime_type], content_type) &&
+        valid_params?(@expected_params, content_type)
+      end
+      
+      def valid_mime_type?(expected_mime_type, content_type)
+        return true unless expected_mime_type
         
-        type_and_subtype = content_type ? content_type[/^([\w\/]+)\b/, 1] : nil
-        type_and_subtype == @expected_params[:mime_type]
+        mime_type = content_type ? content_type[/^([\w\/]+)\b/, 1] : nil
+        mime_type == expected_mime_type
       end
       
-      def valid_charset?(content_type)
-        return true unless @expected_params[:charset]
+      def valid_params?(expected_params, content_type)
+        expected_params = expected_params.dup
+        expected_params.delete(:mime_type)
+        return true unless expected_params
         
-        charset = content_type ? content_type[/\bcharset=([^;\s]*)/, 1] : nil
-        charset.gsub!('"', '') if charset
-        charset == @expected_params[:charset]
+        expected_params.all? do |key, value|
+          param = content_type ? content_type[/\b#{key}=([^;\s]*)/, 1] : nil
+          param.gsub!('"', '') if param
+          param == value
+        end
       end
       
       def error_message

data/test/rack/content_type_validator_test.rb

@@ -21,7 +21,7 @@ class ContentTypeValidatorTest < Test::Unit::TestCase
     env = build_env("PUT", "/request_path", 'application/json')
     status, headers, body = middleware.call(env)
 
-    assert_equal status, 200
+    assert_equal 200, status
   end
 
   def test_incorrect_content_type
@@ -33,7 +33,7 @@ class ContentTypeValidatorTest < Test::Unit::TestCase
     env = build_env("PUT", path, 'application/json')
     status, headers, body = middleware.call(env)
 
-    assert_equal status, 415
+    assert_equal 415, status
   end
   
   def test_correct_content_type
@@ -45,7 +45,7 @@ class ContentTypeValidatorTest < Test::Unit::TestCase
     env = build_env("POST", path, 'application/json')
     status, headers, body = middleware.call(env)
 
-    assert_equal status, 200
+    assert_equal 200, status
   end
   
   def test_correct_content_type_and_incorrect_charset
@@ -57,7 +57,7 @@ class ContentTypeValidatorTest < Test::Unit::TestCase
     env = build_env("POST", path, 'text/plain; charset=us-ascii')
     status, headers, body = middleware.call(env)
 
-    assert_equal status, 415
+    assert_equal 415, status
   end
   
   def test_correct_content_type_and_charset
@@ -69,7 +69,7 @@ class ContentTypeValidatorTest < Test::Unit::TestCase
     env = build_env("POST", path, 'application/json; charset=UTF-8')
     status, headers, body = middleware.call(env)
 
-    assert_equal status, 200
+    assert_equal 200, status
   end
   
   def test_correct_content_type_and_charset_not_given
@@ -81,7 +81,7 @@ class ContentTypeValidatorTest < Test::Unit::TestCase
     env = build_env("POST", path, 'application/json; charset=UTF-8')
     status, headers, body = middleware.call(env)
 
-    assert_equal status, 200
+    assert_equal 200, status
   end
   
   def test_regexp_on_path
@@ -91,7 +91,7 @@ class ContentTypeValidatorTest < Test::Unit::TestCase
     env = build_env("POST", "/content/1/comments", 'application/json; charset=UTF-8')
     status, headers, body = middleware.call(env)
 
-    assert_equal status, 200
+    assert_equal 200, status
   end
   
   def test_charset_with_quotes
@@ -101,7 +101,20 @@ class ContentTypeValidatorTest < Test::Unit::TestCase
     env = build_env("POST", "/content/1/comments", 'application/xml; charset="UTF-8"')
     status, headers, body = middleware.call(env)
 
-    assert_equal status, 200
+    assert_equal 200, status
+  end
+  
+  def test_others_params_like_type
+    expected_params = {:type => "application/xml"}
+    middleware = build_middleware(:post, /comments/, expected_params)
+    
+    env = build_env("POST", "/content/1/comments", 'multipart/related; type="application/json"')
+    status, headers, body = middleware.call(env)
+
+    assert_equal 415, status
+  end
+  
+  def test_multi
     
   end
   

metadata

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