committee 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c978ba3ca98ab6a684b1555ebc3e3575ee5fb20ae11c17bc7b8c2baebd71eb86
-  data.tar.gz: 0424b819be1a1b0872894d8c0b897e325868347e54d19b443a351f1270d3b097
+  metadata.gz: 2af076998ef23743c239df64c5517e3e334422a3523f09e6f8baa4f1a9f1ef77
+  data.tar.gz: a5ae6eca5d34310a69e1c33ca6f11a807e19316c8fad9123521ecf835cfe091c
 SHA512:
-  metadata.gz: 306d7ebf406280f3ad9279543e010046a691bed7b6ba89c61b20663e256e6e7efacd7a4c2a0a2b021d405ab603519c887319ec3963204de09fb9405a66144032
-  data.tar.gz: d0043bd37f971a053843acc791bb9f9216ef8b2aa58946e5ab6a7d0ddcb9f4190deec402fc5424d4a2c14fe074f581576663f69252319d7c7085b9355ec48355
+  metadata.gz: 65e65734251a25cb3a3735081c8a3e2e6973b93d1e14b66261d3978e7dac3ea5a9081fe7a530625cf9407d3ac25bc8941d6bea064d07f546186b6a2ebd043fa6
+  data.tar.gz: 7dee370a2748aa7b67d1e360e86aacb204d16a5a68d18ac879ececc3633d6d92f5ad9b49ba36ac8851e1a04f2322fec2269b8926f30f061d1524bf284af90848

data/lib/committee/schema_validator/open_api_3/operation_wrapper.rb

@@ -116,7 +116,9 @@ module Committee
           content_type = headers['Content-Type'].to_s.split(";").first.to_s
 
           # bad performance because when we coerce value, same check
-          return request_operation.validate_request_body(content_type, params, build_openapi_parser_post_option(validator_option))
+          schema_validator_options = build_openapi_parser_post_option(validator_option)
+          request_operation.validate_request_parameter(params, headers, schema_validator_options)
+          request_operation.validate_request_body(content_type, params, schema_validator_options)
         rescue => e
           raise Committee::InvalidRequest.new(e.message)
         end

data/lib/committee/schema_validator/open_api_3/response_validator.rb

@@ -17,7 +17,6 @@ module Committee
         def call(status, headers, response_data, strict)
           return unless Committee::Middleware::ResponseValidation.validate?(status, validate_success_only)
 
-          #content_type = headers['Content-Type'].to_s.split(";").first.to_s
           operation_wrapper.validate_response_params(status, headers, response_data, strict, check_header)
         end
 

data/test/middleware/request_validation_open_api_3_test.rb

@@ -250,7 +250,7 @@ describe Committee::Middleware::RequestValidation do
     post "/characters", JSON.generate(params)
     assert_equal 400, last_response.status
     # FIXME: when ruby 2.3 dropped, fix because ruby 2.3 return Fixnum, ruby 2.4 or later return Integer
-    assert_match(/1 class is #{1.class}/i, last_response.body)
+    assert_match(/expected string, but received #{1.class}:/i, last_response.body)
   end
 
   it "rescues JSON errors" do
@@ -279,7 +279,8 @@ describe Committee::Middleware::RequestValidation do
     header "Content-Type", "application/json"
     post "/v1/characters", JSON.generate(params)
     assert_equal 400, last_response.status
-    assert_match(/1 class is/i, last_response.body)
+    # FIXME: when ruby 2.3 dropped, fix because ruby 2.3 return Fixnum, ruby 2.4 or later return Integer
+    assert_match(/expected string, but received #{1.class}: /i, last_response.body)
   end
 
   it "ignores paths outside the prefix" do
@@ -321,7 +322,7 @@ describe Committee::Middleware::RequestValidation do
       get "/validate", nil
     end
 
-    assert_match(/required parameters query_string not exist in/i, e.message)
+    assert_match(/missing required parameters: query_string/i, e.message)
   end
 
   it "raises error when required path parameter is invalid" do
@@ -332,7 +333,7 @@ describe Committee::Middleware::RequestValidation do
       get "/coerce_path_params/#{not_an_integer}", nil
     end
 
-    assert_match(/is String but it's not valid integer in/i, e.message)
+    assert_match(/expected integer, but received String: abc/i, e.message)
   end
 
   it "optionally raises an error" do
@@ -356,7 +357,7 @@ describe Committee::Middleware::RequestValidation do
     get "/string_params_coercer", {"integer_1" => "1"}
 
     assert_equal 400, last_response.status
-    assert_match(/1 class/i, last_response.body)
+    assert_match(/expected integer, but received String:/i, last_response.body)
   end
 
   it "passes through a valid request for OpenAPI3" do
@@ -375,7 +376,7 @@ describe Committee::Middleware::RequestValidation do
     get "/characters?limit=foo"
 
     assert_equal 400, last_response.status
-    assert_match(/foo class/i, last_response.body)
+    assert_match(/expected integer, but received String: foo/i, last_response.body)
   end
 
   it "coerce string to integer" do
@@ -399,21 +400,32 @@ describe Committee::Middleware::RequestValidation do
   end
 
   describe 'check header' do
-    it 'no required header' do
-      @app = new_rack_app(schema: open_api_3_schema, check_header: true)
-
-      get "/header"
-
-      assert_equal 400, last_response.status
-      assert_match(/required parameters integer not exist/i, last_response.body)
-    end
-
-    it 'no required header but not check' do
-      @app = new_rack_app(schema: open_api_3_schema, check_header: false)
-
-      get "/header"
-
-      assert_equal 200, last_response.status
+    [
+      { check_header: true, description: 'valid value', value: 1, expected: { status: 200 } },
+      { check_header: true, description: 'missing value', value: nil, expected: { status: 400, error: 'missing required parameters: integer' } },
+      { check_header: true, description: 'invalid value', value: 'x', expected: { status: 400, error: 'expected integer, but received String: x' } },
+
+      { check_header: false, description: 'valid value', value: 1, expected: { status: 200 } },
+      { check_header: false, description: 'missing value', value: nil, expected: { status: 200 } },
+      { check_header: false, description: 'invalid value', value: 'x', expected: { status: 200 } },
+    ].each do |check_header:, description:, value:, expected:|
+      describe "when #{check_header}" do
+        %w(get post put patch delete).each do |method|
+          describe method do
+            describe description do
+              it (expected[:error].nil? ? 'should pass' : 'should fail') do
+                @app = new_rack_app(schema: open_api_3_schema, check_header: check_header)
+
+                header 'integer', value
+                send(method, "/header")
+
+                assert_equal expected[:status], last_response.status
+                assert_match(expected[:error], last_response.body) if expected[:error]
+              end
+            end
+          end
+        end
+      end
     end
   end
 

data/test/middleware/response_validation_open_api_3_test.rb

@@ -47,7 +47,7 @@ describe Committee::Middleware::ResponseValidation do
       get "/characters"
     }
 
-    assert_match(/class is Array but it's not valid object/i, e.message)
+    assert_match(/expected object, but received Array: /i, e.message)
   end
 
   it "passes through a 204 (no content) response" do
@@ -138,7 +138,8 @@ describe Committee::Middleware::ResponseValidation do
       e = assert_raises(Committee::InvalidResponse) do
         get "/characters"
       end
-      assert_match(/1 class is String/i, e.message)
+
+      assert_match(/but received String: 1/i, e.message)
     end
 
     it "detects an invalid response status code with validate_success_only=true" do

data/test/schema_validator/open_api_3/operation_wrapper_test.rb

@@ -53,7 +53,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
       }
 
       # FIXME: when ruby 2.3 dropped, fix because ruby 2.3 return Fixnum, ruby 2.4 or later return Integer
-      assert e.message.start_with?("1 class is #{1.class} but it's not valid")
+      assert_match(/expected string, but received #{1.class}: 1/i, e.message)
     end
 
     it 'support put method' do
@@ -65,7 +65,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
       }
 
       # FIXME: when ruby 2.3 dropped, fix because ruby 2.3 return Fixnum, ruby 2.4 or later return Integer
-      assert e.message.start_with?("1 class is #{1.class} but it's not valid")
+      assert_match(/expected string, but received #{1.class}: 1/i, e.message)
     end
 
     it 'support patch method' do
@@ -76,7 +76,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
         operation_object.validate_request_params({"integer" => "str"}, HEADER, @validator_option)
       }
 
-      assert e.message.start_with?("str class is String but it's not valid")
+      assert_match(/expected integer, but received String: str/i, e.message)
     end
 
     it 'unknown param' do
@@ -109,7 +109,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
           operation_object.validate_request_params({"query_integer_list" => [1, 2]}, HEADER, @validator_option)
         }
 
-        assert e.message.start_with?("required parameters query_string not exist in")
+        assert_match(/missing required parameters: query_string/i, e.message)
       end
 
       it 'invalid type' do
@@ -122,7 +122,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
         }
 
         # FIXME: when ruby 2.3 dropped, fix because ruby 2.3 return Fixnum, ruby 2.4 or later return Integer
-        assert e.message.start_with?("1 class is #{1.class} but")
+        assert_match(/expected string, but received #{1.class}: 1/i, e.message)
       end
     end
 
@@ -143,7 +143,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
           operation_object.validate_request_params({"limit" => "a"}, HEADER, @validator_option)
         }
 
-        assert e.message.start_with?("a class is String but")
+        assert_match(/expected integer, but received String: a/i, e.message)
       end
     end
 

data/test/test/methods_test.rb

@@ -138,7 +138,7 @@ describe Committee::Test::Methods do
         e = assert_raises(Committee::InvalidResponse) do
           assert_schema_conform
         end
-        assert_match(/don't exist response definition/i, e.message)
+        assert_match(/response definition does not exist/i, e.message)
       end
 
       it "detects an invalid response status code" do
@@ -149,7 +149,7 @@ describe Committee::Test::Methods do
         e = assert_raises(Committee::InvalidResponse) do
           assert_schema_conform
         end
-        assert_match(/don't exist status code definition/i, e.message)
+        assert_match(/status code definition does not exist/i, e.message)
       end
 
       it "outputs deprecation warning" do
@@ -175,7 +175,8 @@ describe Committee::Test::Methods do
         e = assert_raises(Committee::InvalidRequest) do
           assert_request_schema_confirm
         end
-        assert_match(/required parameters query_string not exist in #\/paths/i, e.message)
+
+        assert_match(/missing required parameters: query_string/i, e.message)
       end
 
       it "path undefined in schema" do
@@ -201,7 +202,7 @@ describe Committee::Test::Methods do
         e = assert_raises(Committee::InvalidResponse) do
           assert_response_schema_confirm
         end
-        assert_match(/don't exist response definition/i, e.message)
+        assert_match(/response definition does not exist/i, e.message)
       end
 
       it "detects an invalid response status code" do
@@ -212,7 +213,7 @@ describe Committee::Test::Methods do
         e = assert_raises(Committee::InvalidResponse) do
           assert_response_schema_confirm
         end
-        assert_match(/don't exist status code definition/i, e.message)
+        assert_match(/status code definition does not exist/i, e.message)
       end
 
       it "path undefined in schema" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Brandur
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-28 00:00:00.000000000 Z
+date: 2019-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -52,14 +52,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement