committee 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: becdf8694f016697cfe01ac64b851bf45c90c64e
-  data.tar.gz: 88e687a7af19cf547342bacce32b5fb72212f0b5
+  metadata.gz: 6b05a8a59c6673176acda0f5ec37736b2292ac6d
+  data.tar.gz: a293f3f5cf8412f4dd0c40ee97fc3c571f8d4f9f
 SHA512:
-  metadata.gz: 7b618b8007da0078eeba04958a12e11f4fd1d87f55e631f1d2585c483a762b513ffc58e4f41e89f9b6b6f63f6ae984e425bff59070e8fba13603ef3a95295ce2
-  data.tar.gz: 45007433833b8e24b943662060c9f156dc951b41107859686639352b4d99a8956f9ec705d176f493583d9013dcdca5e63eba2a9c90456347404284590dfefc6c
+  metadata.gz: a3f7d92b542ca2cfc9e60fb69d5c3d71f4d24b4a2d3ba14200e815812116f097a34756314e359b1674c7003b0796e111d405d08f9dea03000720b7e027302b79
+  data.tar.gz: 3337cdc111ea2d368b39d433e88b3a0f28b4f064b595ea4c849b8c217e724af13fde1a7327f14bce55bb22ec0a6250acd0a24bc2d2802894265ff0792f02c243

data/lib/committee/request_validator.rb

@@ -5,7 +5,7 @@ module Committee
     end
 
     def call(request, data)
-      check_content_type!(request)
+      check_content_type!(request, data)
       if @link.schema
         valid, errors = @link.schema.validate(data)
         if !valid
@@ -17,13 +17,22 @@ module Committee
 
     private
 
-    def check_content_type!(request)
-      if request.content_type
+    def check_content_type!(request, data)
+      if request.content_type && !empty_request?(request)
         unless Rack::Mime.match?(@link.enc_type, request.content_type)
           raise Committee::InvalidRequest,
             %{"Content-Type" request header must be set to "#{@link.enc_type}".}
         end
       end
     end
+
+    def empty_request?(request)
+      # small optimization: assume GET and DELETE don't have bodies
+      return true if request.get? || request.delete?
+
+      data = request.body.read
+      request.body.rewind
+      data.empty?
+    end
   end
 end

data/test/request_validator_test.rb

@@ -10,7 +10,9 @@ describe Committee::RequestValidator do
     # POST /apps/:id
     @link = @link = @schema.properties["app"].links[0]
     @request = Rack::Request.new({
-      "CONTENT_TYPE" => "application/json",
+      "CONTENT_TYPE"   => "application/json",
+      "rack.input"     => StringIO.new("{}"),
+      "REQUEST_METHOD" => "POST"
     })
   end
 
@@ -24,7 +26,10 @@ describe Committee::RequestValidator do
   it "detects an invalid request Content-Type" do
     e = assert_raises(Committee::InvalidRequest) {
       @request =
-        Rack::Request.new("CONTENT_TYPE" => "application/x-www-form-urlencoded")
+        Rack::Request.new({
+          "CONTENT_TYPE" => "application/x-www-form-urlencoded",
+          "rack.input"   => StringIO.new("{}"),
+        })
       call({})
     }
     message =
@@ -32,6 +37,15 @@ describe Committee::RequestValidator do
     assert_equal message, e.message
   end
 
+  it "allows an invalid Content-Type with an empty body" do
+    @request =
+      Rack::Request.new({
+        "CONTENT_TYPE" => "application/x-www-form-urlencoded",
+        "rack.input"   => StringIO.new(""),
+      })
+    call({})
+  end
+
   it "detects a parameter of the wrong pattern" do
     data = {
       "name" => "%@!"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema