committee 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b9b7fded711273c72d2e35628376206b082f115
-  data.tar.gz: f89a74a16ed6d15b2a6f8f363182776675e7418d
+  metadata.gz: 7cf658ad230d67fb6c13503bf5837e25b26d0b4c
+  data.tar.gz: b14e13fbb725f67962327c6c6bdcd181371092d3
 SHA512:
-  metadata.gz: 7e356500e91bf48bde973b1cfa352e1fafa788d0be4b8d1f4303b338a29b2b49f0f7688b0caa84ac28f33eddadef762ed04c9bd60a8f01c5c9fac185a85fc5d3
-  data.tar.gz: ec9773029e7b1052b634f78e64370cbe1f265d94c89fd4893069d1854f9e8bb336c6d0de0049a71fcbca5c83479907ccb89c8bb25382145db87cc9b3c7a51197
+  metadata.gz: dfb150d3c57ab70d774fa19ca3e0185d504337dbcfc00e228542b42a57ce4bcb5245782072eea85260534eb0f1daf0c54eb16ff9f3e70c125d3602d939c28b78
+  data.tar.gz: 25361aec8a3976712649e857bd25616af8ebb1e87844e79aa69db12030d235527a035356a74fbfa584566a7f98f8081b904dc96bf62dd1e2256cda52f9371d6a

data/lib/committee/request_unpacker.rb

@@ -25,7 +25,7 @@ module Committee
 
       params = if params
         params
-      elsif @allow_form_params && @request.media_type == "application/x-www-form-urlencoded"
+      elsif @allow_form_params && %w[application/x-www-form-urlencoded multipart/form-data].include?(@request.media_type)
         # Actually, POST means anything in the request body, could be from
         # PUT or PATCH too. Silly Rack.
         p = @request.POST

data/test/bin_test.rb

@@ -16,6 +16,8 @@ describe "executables in bin/" do
   end
 
   it "has roughly valid Ruby structure for committee-stub" do
-    load File.join(@bin_dir, "committee-stub")
+    assert_output(%r{Usage: rackup \[options\] \[JSON Schema file\]}) do
+      load File.join(@bin_dir, "committee-stub")
+    end
   end
 end

data/test/middleware/request_validation_test.rb

@@ -249,7 +249,7 @@ describe Committee::Middleware::RequestValidation do
     header "Content-Type", "application/json"
     post "/apps", JSON.generate(params)
     assert_equal 400, last_response.status
-    assert_match /invalid request/i, last_response.body
+    assert_match(/invalid request/i, last_response.body)
   end
 
   it "passes with coerce_date_times enabled and without a schema for a link" do
@@ -267,7 +267,7 @@ describe Committee::Middleware::RequestValidation do
     }
     post "/apps", JSON.generate(params)
     assert_equal 400, last_response.status
-    assert_match /invalid request/i, last_response.body
+    assert_match(/invalid request/i, last_response.body)
   end
 
   it "rescues JSON errors" do
@@ -275,7 +275,7 @@ describe Committee::Middleware::RequestValidation do
     header "Content-Type", "application/json"
     post "/apps", "{x:y}"
     assert_equal 400, last_response.status
-    assert_match /valid json/i, last_response.body
+    assert_match(/valid json/i, last_response.body)
   end
 
   it "takes a prefix" do
@@ -337,7 +337,7 @@ describe Committee::Middleware::RequestValidation do
     header "Content-Type", "application/json"
     get "/search/apps", {"per_page" => "foo", "query" => "cloudnasium"}
     assert_equal 400, last_response.status
-    assert_match /invalid request/i, last_response.body
+    assert_match(/invalid request/i, last_response.body)
   end
 
   it "passes through a valid request for OpenAPI" do
@@ -355,7 +355,7 @@ describe Committee::Middleware::RequestValidation do
     @app = new_rack_app(schema: open_api_2_schema)
     get "/api/pets?limit=foo", nil, { "HTTP_AUTH_TOKEN" => "xxx" }
     assert_equal 400, last_response.status
-    assert_match /invalid request/i, last_response.body
+    assert_match(/invalid request/i, last_response.body)
   end
 
   it "passes through a valid request for OpenAPI including path parameters" do
@@ -370,7 +370,7 @@ describe Committee::Middleware::RequestValidation do
     # not that ID is expect to be an integer
     get "/api/pets/not-integer"
     assert_equal 400, last_response.status
-    assert_match /invalid request/i, last_response.body
+    assert_match(/invalid request/i, last_response.body)
   end
 
   private

data/test/middleware/response_validation_test.rb

@@ -17,14 +17,14 @@ describe Committee::Middleware::ResponseValidation do
     @app = new_rack_app("{}", {}, schema: hyper_schema)
     get "/apps"
     assert_equal 500, last_response.status
-    assert_match /{} is not an array/i, last_response.body
+    assert_match(/{} is not an array/i, last_response.body)
   end
 
   it "detects a response invalid due to not being JSON" do
     @app = new_rack_app("", {}, schema: hyper_schema)
     get "/apps"
     assert_equal 500, last_response.status
-    assert_match /valid JSON/i, last_response.body
+    assert_match(/valid JSON/i, last_response.body)
   end
 
   it "ignores a non-2xx invalid response" do
@@ -39,7 +39,7 @@ describe Committee::Middleware::ResponseValidation do
 
     get "/apps"
     assert_equal 500, last_response.status
-    assert_match /valid JSON/i, last_response.body
+    assert_match(/valid JSON/i, last_response.body)
   end
 
   it "passes through a 204 (no content) response" do
@@ -52,7 +52,7 @@ describe Committee::Middleware::ResponseValidation do
     @app = new_rack_app("[{x:y}]", {}, schema: hyper_schema)
     get "/apps"
     assert_equal 500, last_response.status
-    assert_match /valid json/i, last_response.body
+    assert_match(/valid json/i, last_response.body)
   end
 
   it "takes a prefix" do
@@ -80,7 +80,7 @@ describe Committee::Middleware::ResponseValidation do
     @app = new_rack_app("", {}, schema: open_api_2_schema)
     get "/api/pets"
     assert_equal 500, last_response.status
-    assert_match /valid JSON/i, last_response.body
+    assert_match(/valid JSON/i, last_response.body)
   end
 
   private

data/test/request_unpacker_test.rb

@@ -23,33 +23,39 @@ describe Committee::RequestUnpacker do
   end
 
   it "doesn't unpack JSON under other Content-Types" do
-    env = {
-      "CONTENT_TYPE" => "application/x-www-form-urlencoded",
-      "rack.input"   => StringIO.new('{"x":"y"}'),
-    }
-    request = Rack::Request.new(env)
-    params, _ = Committee::RequestUnpacker.new(request).call
-    assert_equal({}, params)
+    %w[application/x-www-form-urlencoded multipart/form-data].each do |content_type|
+      env = {
+        "CONTENT_TYPE" => content_type,
+        "rack.input"   => StringIO.new('{"x":"y"}'),
+      }
+      request = Rack::Request.new(env)
+      params, _ = Committee::RequestUnpacker.new(request).call
+      assert_equal({}, params)
+    end
   end
 
   it "unpacks JSON under other Content-Types with optimistic_json" do
-    env = {
-      "CONTENT_TYPE" => "application/x-www-form-urlencoded",
-      "rack.input"   => StringIO.new('{"x":"y"}'),
-    }
-    request = Rack::Request.new(env)
-    params, _ = Committee::RequestUnpacker.new(request, optimistic_json: true).call
-    assert_equal({ "x" => "y" }, params)
+    %w[application/x-www-form-urlencoded multipart/form-data].each do |content_type|
+      env = {
+        "CONTENT_TYPE" => content_type,
+        "rack.input"   => StringIO.new('{"x":"y"}'),
+      }
+      request = Rack::Request.new(env)
+      params, _ = Committee::RequestUnpacker.new(request, optimistic_json: true).call
+      assert_equal({ "x" => "y" }, params)
+    end
   end
 
   it "returns {} when unpacking non-JSON with optimistic_json" do
-    env = {
-      "CONTENT_TYPE" => "application/x-www-form-urlencoded",
-      "rack.input"   => StringIO.new('x=y&foo=42'),
-    }
-    request = Rack::Request.new(env)
-    params, _ = Committee::RequestUnpacker.new(request, optimistic_json: true).call
-    assert_equal({}, params)
+    %w[application/x-www-form-urlencoded multipart/form-data].each do |content_type|
+      env = {
+        "CONTENT_TYPE" => content_type,
+        "rack.input"   => StringIO.new('x=y&foo=42'),
+      }
+      request = Rack::Request.new(env)
+      params, _ = Committee::RequestUnpacker.new(request, optimistic_json: true).call
+      assert_equal({}, params)
+    end
   end
 
   it "unpacks an empty hash on an empty request body" do
@@ -63,53 +69,61 @@ describe Committee::RequestUnpacker do
   end
 
   it "doesn't unpack form params" do
-    env = {
-      "CONTENT_TYPE" => "application/x-www-form-urlencoded",
-      "rack.input"   => StringIO.new("x=y"),
-    }
-    request = Rack::Request.new(env)
-    params, _ = Committee::RequestUnpacker.new(request).call
-    assert_equal({}, params)
+    %w[application/x-www-form-urlencoded multipart/form-data].each do |content_type|
+      env = {
+        "CONTENT_TYPE" => content_type,
+        "rack.input"   => StringIO.new("x=y"),
+      }
+      request = Rack::Request.new(env)
+      params, _ = Committee::RequestUnpacker.new(request).call
+      assert_equal({}, params)
+    end
   end
 
   it "unpacks form params with allow_form_params" do
-    env = {
-      "CONTENT_TYPE" => "application/x-www-form-urlencoded",
-      "rack.input"   => StringIO.new("x=y"),
-    }
-    request = Rack::Request.new(env)
-    params, _ = Committee::RequestUnpacker.new(request, allow_form_params: true).call
-    assert_equal({ "x" => "y" }, params)
+    %w[application/x-www-form-urlencoded multipart/form-data].each do |content_type|
+      env = {
+        "CONTENT_TYPE" => content_type,
+        "rack.input"   => StringIO.new("x=y"),
+      }
+      request = Rack::Request.new(env)
+      params, _ = Committee::RequestUnpacker.new(request, allow_form_params: true).call
+      assert_equal({ "x" => "y" }, params)
+    end
   end
 
   it "coerces form params with coerce_form_params and a schema" do
-    schema = JsonSchema::Schema.new
-    schema.properties = { "x" => JsonSchema::Schema.new }
-    schema.properties["x"].type = ["integer"]
-
-    env = {
-      "CONTENT_TYPE" => "application/x-www-form-urlencoded",
-      "rack.input"   => StringIO.new("x=1"),
-    }
-    request = Rack::Request.new(env)
-    params, _ = Committee::RequestUnpacker.new(
-      request,
-      allow_form_params: true,
-      coerce_form_params: true,
-      schema: schema
-    ).call
-    assert_equal({ "x" => 1 }, params)
+    %w[application/x-www-form-urlencoded multipart/form-data].each do |content_type|
+      schema = JsonSchema::Schema.new
+      schema.properties = { "x" => JsonSchema::Schema.new }
+      schema.properties["x"].type = ["integer"]
+
+      env = {
+        "CONTENT_TYPE" => content_type,
+        "rack.input"   => StringIO.new("x=1"),
+      }
+      request = Rack::Request.new(env)
+      params, _ = Committee::RequestUnpacker.new(
+        request,
+        allow_form_params: true,
+        coerce_form_params: true,
+        schema: schema
+      ).call
+      assert_equal({ "x" => 1 }, params)
+    end
   end
 
   it "unpacks form & query params with allow_form_params and allow_query_params" do
-    env = {
-      "CONTENT_TYPE" => "application/x-www-form-urlencoded",
-      "rack.input"   => StringIO.new("x=y"),
-      "QUERY_STRING" => "a=b"
-    }
-    request = Rack::Request.new(env)
-    params, _ = Committee::RequestUnpacker.new(request, allow_form_params: true, allow_query_params: true).call
-    assert_equal({ "x" => "y", "a" => "b" }, params)
+    %w[application/x-www-form-urlencoded multipart/form-data].each do |content_type|
+      env = {
+        "CONTENT_TYPE" => content_type,
+        "rack.input"   => StringIO.new("x=y"),
+        "QUERY_STRING" => "a=b"
+      }
+      request = Rack::Request.new(env)
+      params, _ = Committee::RequestUnpacker.new(request, allow_form_params: true, allow_query_params: true).call
+      assert_equal({ "x" => "y", "a" => "b" }, params)
+    end
   end
 
   it "unpacks query params with allow_query_params" do

data/test/test/methods_test.rb

@@ -40,7 +40,7 @@ describe Committee::Test::Methods do
       e = assert_raises(Committee::InvalidResponse) do
         assert_schema_conform
       end
-      assert_match /response header must be set to/i, e.message
+      assert_match(/response header must be set to/i, e.message)
     end
 
     it "accepts schema string (legacy behavior)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-04 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -79,14 +79,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="