committee 5.4.0 → 5.5.1

data/test/schema_validator/open_api_3/operation_wrapper_test.rb

@@ -52,7 +52,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
 
     it 'invalid params' do
       e = assert_raises(Committee::InvalidRequest) {
-        operation_object.validate_request_params({}, {}, {"string" => 1}, HEADER, @validator_option)
+        operation_object.validate_request_params({}, {}, { "string" => 1 }, HEADER, @validator_option)
       }
 
       assert_match(/expected string, but received Integer: 1/i, e.message)
@@ -61,10 +61,10 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
 
     it 'support put method' do
       @method = "put"
-      operation_object.validate_request_params({}, {}, {"string" => "str"}, HEADER, @validator_option)
+      operation_object.validate_request_params({}, {}, { "string" => "str" }, HEADER, @validator_option)
 
       e = assert_raises(Committee::InvalidRequest) {
-        operation_object.validate_request_params({}, {}, {"string" => 1}, HEADER, @validator_option)
+        operation_object.validate_request_params({}, {}, { "string" => 1 }, HEADER, @validator_option)
       }
 
       assert_match(/expected string, but received Integer: 1/i, e.message)
@@ -73,10 +73,10 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
 
     it 'support patch method' do
       @method = "patch"
-      operation_object.validate_request_params({}, {}, {"integer" => 1}, HEADER, @validator_option)
+      operation_object.validate_request_params({}, {}, { "integer" => 1 }, HEADER, @validator_option)
 
       e = assert_raises(Committee::InvalidRequest) {
-        operation_object.validate_request_params({}, {}, {"integer" => "str"}, HEADER, @validator_option)
+        operation_object.validate_request_params({}, {}, { "integer" => "str" }, HEADER, @validator_option)
       }
 
       assert_match(/expected integer, but received String: "str"/i, e.message)
@@ -84,7 +84,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
     end
 
     it 'unknown param' do
-      operation_object.validate_request_params({}, {}, {"unknown" => 1}, HEADER, @validator_option)
+      operation_object.validate_request_params({}, {}, { "unknown" => 1 }, HEADER, @validator_option)
     end
 
     describe 'support get method' do
@@ -95,7 +95,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
       it 'correct' do
         operation_object.validate_request_params(
             {},
-            {"query_string" => "query", "query_integer_list" => [1, 2]},
+            { "query_string" => "query", "query_integer_list" => [1, 2] },
             {},
             HEADER,
             @validator_option
@@ -103,7 +103,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
 
         operation_object.validate_request_params(
             {},
-            {"query_string" => "query", "query_integer_list" => [1, 2], "optional_integer" => 1},
+            { "query_string" => "query", "query_integer_list" => [1, 2], "optional_integer" => 1 },
             {},
             HEADER,
             @validator_option
@@ -114,7 +114,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
 
       it 'not exist required' do
         e = assert_raises(Committee::InvalidRequest) {
-          operation_object.validate_request_params({}, {"query_integer_list" => [1, 2]}, {}, HEADER, @validator_option)
+          operation_object.validate_request_params({}, { "query_integer_list" => [1, 2] }, {}, HEADER, @validator_option)
         }
 
         assert_match(/missing required parameters: query_string/i, e.message)
@@ -125,7 +125,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
         e = assert_raises(Committee::InvalidRequest) {
           operation_object.validate_request_params(
               {},
-              {"query_string" => 1, "query_integer_list" => [1, 2], "optional_integer" => 1},
+              { "query_string" => 1, "query_integer_list" => [1, 2], "optional_integer" => 1 },
               {},
               HEADER,
               @validator_option
@@ -144,14 +144,14 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
       end
 
       it 'correct' do
-        operation_object.validate_request_params({}, {"limit" => "1"}, {}, HEADER, @validator_option)
+        operation_object.validate_request_params({}, { "limit" => "1" }, {}, HEADER, @validator_option)
 
         assert true
       end
 
       it 'invalid type' do
         e = assert_raises(Committee::InvalidRequest) {
-          operation_object.validate_request_params({}, {"limit" => "a"}, {}, HEADER, @validator_option)
+          operation_object.validate_request_params({}, { "limit" => "a" }, {}, HEADER, @validator_option)
         }
 
         assert_match(/expected integer, but received String: "a"/i, e.message)
@@ -166,14 +166,14 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
       end
 
       it 'correct' do
-        operation_object.validate_request_params({}, {"limit" => "1"}, {}, HEADER, @validator_option)
+        operation_object.validate_request_params({}, { "limit" => "1" }, {}, HEADER, @validator_option)
 
         assert true
       end
 
       it 'invalid type' do
         e = assert_raises(Committee::InvalidRequest) {
-          operation_object.validate_request_params({}, {"limit" => "a"}, {}, HEADER, @validator_option)
+          operation_object.validate_request_params({}, { "limit" => "a" }, {}, HEADER, @validator_option)
         }
 
         assert_match(/expected integer, but received String: "a"/i, e.message)
@@ -183,17 +183,16 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
 
     it 'support options method' do
       @method = "options"
-      operation_object.validate_request_params({}, {}, {"integer" => 1}, HEADER, @validator_option)
+      operation_object.validate_request_params({}, {}, { "integer" => 1 }, HEADER, @validator_option)
 
       e = assert_raises(Committee::InvalidRequest) {
-        operation_object.validate_request_params({}, {}, {"integer" => "str"}, HEADER, @validator_option)
+        operation_object.validate_request_params({}, {}, { "integer" => "str" }, HEADER, @validator_option)
       }
 
       assert_match(/expected integer, but received String: "str"/i, e.message)
       assert_kind_of(OpenAPIParser::OpenAPIError, e.original_error)
     end
 
-
     describe '#content_types' do
       it 'returns supported content types' do
         @path = '/validate_content_types'

data/test/schema_validator/open_api_3/request_validator_test.rb

@@ -20,16 +20,13 @@ describe Committee::SchemaValidator::OpenAPI3::RequestValidator do
 
     it "optionally content_type check" do
       @app = new_rack_app(check_content_type: true, schema: open_api_3_schema)
-      params = {
-        "string_post_1" => "cloudnasium"
-      }
+      params = { "string_post_1" => "cloudnasium" }
       header "Content-Type", "text/html"
       post "/characters", JSON.generate(params)
       assert_equal 400, last_response.status
 
       body = JSON.parse(last_response.body)
-      message =
-          %{"Content-Type" request header must be set to "application/json".}
+      message = %{"Content-Type" request header must be set to "application/json".}
 
       assert_equal "bad_request", body['id']
       assert_equal message, body['message']
@@ -37,9 +34,7 @@ describe Committee::SchemaValidator::OpenAPI3::RequestValidator do
 
     it "validates content_type" do
       @app = new_rack_app(check_content_type: true, schema: open_api_3_schema)
-      params = {
-        "string_post_1" => "cloudnasium"
-      }
+      params = { "string_post_1" => "cloudnasium" }
       header "Content-Type", "text/html"
       post "/validate_content_types", JSON.generate(params)
       assert_equal 400, last_response.status
@@ -53,9 +48,7 @@ describe Committee::SchemaValidator::OpenAPI3::RequestValidator do
 
     it "optionally skip content_type check" do
       @app = new_rack_app(check_content_type: false, schema: open_api_3_schema)
-      params = {
-          "string_post_1" => "cloudnasium"
-      }
+      params = { "string_post_1" => "cloudnasium" }
       header "Content-Type", "text/html"
       post "/characters", JSON.generate(params)
       assert_equal 200, last_response.status
@@ -63,9 +56,7 @@ describe Committee::SchemaValidator::OpenAPI3::RequestValidator do
 
     it "if not exist requestBody definition, skip content_type check" do
       @app = new_rack_app(check_content_type: true, schema: open_api_3_schema)
-      params = {
-          "string_post_1" => "cloudnasium"
-      }
+      params = { "string_post_1" => "cloudnasium" }
       header "Content-Type", "application/json"
       patch "/validate_no_parameter", JSON.generate(params)
       assert_equal 200, last_response.status
@@ -77,12 +68,10 @@ describe Committee::SchemaValidator::OpenAPI3::RequestValidator do
       patch "/validate_empty_optional_body"
       assert_equal 200, last_response.status
     end
-    
+
     it "does not mix up parameters and requestBody" do
       @app = new_rack_app(check_content_type: true, schema: open_api_3_schema)
-      params = {
-          "last_name" => "Skywalker"
-      }
+      params = { "last_name" => "Skywalker" }
       header "Content-Type", "application/json"
       post "/additional_properties?first_name=Luke", JSON.generate(params)
       assert_equal 200, last_response.status
@@ -93,7 +82,14 @@ describe Committee::SchemaValidator::OpenAPI3::RequestValidator do
       header "Content-Type", "application/x-www-form-urlencoded"
       patch "/validate_empty_optional_body", "{}"
       assert_equal 400, last_response.status
-    end    
+    end
+
+    it "validates content_type for option request" do
+      @app = new_rack_app(check_content_type: true, schema: open_api_3_schema)
+      header "Content-Type", "text/html"
+      options "/validate", "{}"
+      assert_equal 400, last_response.status
+    end
 
     def new_rack_app(options = {})
       Rack::Builder.new {

data/test/schema_validator/open_api_3/response_validator_test.rb

@@ -5,10 +5,8 @@ require "test_helper"
 describe Committee::SchemaValidator::OpenAPI3::ResponseValidator do
   before do
     @status = 200
-    @headers = {
-      "Content-Type" => "application/json"
-    }
-    @data = {"string" => "Honoka.Kousaka"}
+    @headers = { "Content-Type" => "application/json" }
+    @data = { "string" => "Honoka.Kousaka" }
 
     @path = '/validate'
     @method = 'post'

data/test/test/methods_new_version_test.rb

@@ -29,7 +29,7 @@ describe Committee::Test::Methods do
     @committee_router = nil
     @committee_schema = nil
 
-    @committee_options = {schema: hyper_schema}
+    @committee_options = { schema: hyper_schema }
   end
 
   describe "#assert_schema_conform" do
@@ -84,7 +84,7 @@ describe Committee::Test::Methods do
 
   private
 
-  def new_rack_app(response, status=200, headers={ "Content-Type" => "application/json" })
+  def new_rack_app(response, status = 200, headers = { "Content-Type" => "application/json" })
     Rack::Builder.new {
       run lambda { |_|
         [status, headers, [response]]

data/test/test/methods_test.rb

@@ -36,7 +36,7 @@ describe Committee::Test::Methods do
       sc = JsonSchema.parse!(hyper_schema_data)
       sc.expand_references!
       s = Committee::Drivers::HyperSchema::Driver.new.parse(sc)
-      @committee_options.merge!({schema: s})
+      @committee_options.merge!({ schema: s })
     end
 
     describe "#assert_schema_conform" do
@@ -58,13 +58,13 @@ describe Committee::Test::Methods do
 
     describe "assert_request_schema_confirm" do
       it "passes through a valid request" do
-        @app = new_rack_app([])
+        @app = new_rack_app
         get "/apps"
         assert_request_schema_confirm
       end
 
       it "not exist required" do
-        @app = new_rack_app([])
+        @app = new_rack_app
         get "/search/apps", {}
         e = assert_raises(Committee::InvalidRequest) do
           assert_request_schema_confirm
@@ -73,7 +73,7 @@ describe Committee::Test::Methods do
       end
 
       it "path undefined in schema" do
-        @app = new_rack_app([])
+        @app = new_rack_app
         get "/undefined"
         e = assert_raises(Committee::InvalidRequest) do
           assert_request_schema_confirm
@@ -111,7 +111,7 @@ describe Committee::Test::Methods do
 
   describe "OpenAPI3" do
     before do
-      @committee_options.merge!({schema: open_api_3_schema})
+      @committee_options.merge!({ schema: open_api_3_schema })
 
       @correct_response = { string_1: :honoka }
     end
@@ -146,14 +146,14 @@ describe Committee::Test::Methods do
 
     describe "assert_request_schema_confirm" do
       it "passes through a valid request" do
-        @app = new_rack_app([])
+        @app = new_rack_app
         get "/characters"
         assert_request_schema_confirm
       end
 
       it "not exist required" do
-        @app = new_rack_app([])
-        get "/validate", {"query_string" => "query", "query_integer_list" => [1, 2]}
+        @app = new_rack_app
+        get "/validate", { "query_string" => "query", "query_integer_list" => [1, 2] }
         e = assert_raises(Committee::InvalidRequest) do
           assert_request_schema_confirm
         end
@@ -162,7 +162,7 @@ describe Committee::Test::Methods do
       end
 
       it "path undefined in schema" do
-        @app = new_rack_app([])
+        @app = new_rack_app
         get "/undefined"
         e = assert_raises(Committee::InvalidRequest) do
           assert_request_schema_confirm
@@ -208,7 +208,7 @@ describe Committee::Test::Methods do
       end
 
       it "raises error when path does not match prefix" do
-        @committee_options.merge!({prefix: '/api'})
+        @committee_options.merge!({ prefix: '/api' })
         @app = new_rack_app(JSON.generate(@correct_response))
         get "/characters"
         e = assert_raises(Committee::InvalidResponse) do
@@ -350,7 +350,7 @@ describe Committee::Test::Methods do
 
   private
 
-  def new_rack_app(response, headers={ "Content-Type" => "application/json" }, status_code = 200)
+  def new_rack_app(response = nil, headers = { "Content-Type" => "application/json" }, status_code = 200)
     Rack::Builder.new {
       run lambda { |_|
         [status_code, headers, [response]]

data/test/test/schema_coverage_test.rb

@@ -21,9 +21,7 @@ describe Committee::Test::SchemaCoverage do
     end
     it 'can record and report coverage properly' do
       @schema_coverage.update_response_coverage!('/posts', 'get', '200')
-      assert_equal([
-        '/posts get 200',
-      ], covered_responses)
+      assert_equal(['/posts get 200',], covered_responses)
       assert_equal([
         '/threads/{id} get 200',
         '/posts get 404',
@@ -34,10 +32,7 @@ describe Committee::Test::SchemaCoverage do
       ], uncovered_responses)
 
       @schema_coverage.update_response_coverage!('/likes', 'post', '200')
-      assert_equal([
-        '/posts get 200',
-        '/likes post 200',
-      ], covered_responses)
+      assert_equal(['/posts get 200', '/likes post 200',], covered_responses)
       assert_equal([
         '/threads/{id} get 200',
         '/posts get 404',
@@ -47,11 +42,7 @@ describe Committee::Test::SchemaCoverage do
       ], uncovered_responses)
 
       @schema_coverage.update_response_coverage!('/likes', 'delete', '200')
-      assert_equal([
-        '/posts get 200',
-        '/likes post 200',
-        '/likes delete 200',
-      ], covered_responses)
+      assert_equal(['/posts get 200', '/likes post 200', '/likes delete 200',], covered_responses)
       assert_equal([
         '/threads/{id} get 200',
         '/posts get 404',
@@ -66,11 +57,7 @@ describe Committee::Test::SchemaCoverage do
         '/likes post 200',
         '/likes delete 200',
       ], covered_responses)
-      assert_equal([
-        '/threads/{id} get 200',
-        '/posts get 404',
-        '/posts post 200',
-      ], uncovered_responses)
+      assert_equal(['/threads/{id} get 200', '/posts get 404', '/posts post 200',], uncovered_responses)
 
       assert_equal({
         '/threads/{id}' => {

data/test/test_helper.rb

@@ -21,7 +21,7 @@ require "minitest"
 require "minitest/spec"
 require "minitest/autorun"
 require "rack/test"
-require "pry"
+require "debug"
 require "stringio"
 
 require_relative "../lib/committee"
@@ -36,17 +36,10 @@ JsonSchema.configure do |c|
 end
 
 # For our hyper-schema example.
-ValidApp = {
-  "maintenance" => false,
-  "name"        => "example",
-}.freeze
+ValidApp = { "maintenance" => false, "name" => "example", }.freeze
 
 # For our OpenAPI example.
-ValidPet = {
-  "id"   => 123,
-  "name" => "example",
-  "tag"  => "tag-123",
-}.freeze
+ValidPet = { "id" => 123, "name" => "example", "tag" => "tag-123", }.freeze
 
 def hyper_schema
   @hyper_schema ||= Committee::Drivers.load_from_json(hyper_schema_schema_path)
@@ -61,11 +54,11 @@ def open_api_2_form_schema
 end
 
 def open_api_3_schema
-  @open_api_3_schema ||= Committee::Drivers.load_from_file(open_api_3_schema_path, parser_options:{strict_reference_validation: true})
+  @open_api_3_schema ||= Committee::Drivers.load_from_file(open_api_3_schema_path, parser_options: { strict_reference_validation: true })
 end
 
 def open_api_3_coverage_schema
-  @open_api_3_coverage_schema ||= Committee::Drivers.load_from_file(open_api_3_coverage_schema_path, parser_options:{strict_reference_validation: true})
+  @open_api_3_coverage_schema ||= Committee::Drivers.load_from_file(open_api_3_coverage_schema_path, parser_options: { strict_reference_validation: true })
 end
 
 # Don't cache this because we'll often manipulate the created hash in tests.
@@ -128,4 +121,4 @@ end
 
 def open_api_3_invalid_reference_path
   "./test/data/openapi3/invalid_reference.yaml"
-end
+end

data/test/validation_error_test.rb

@@ -14,11 +14,7 @@ describe Committee::ValidationError do
   it "creates a Rack response object to render" do
     body = { id: :bad_request, message: "Error" }
 
-    response = [
-      400,
-      { "Content-Type" => "application/json" },
-      [JSON.generate(body)]
-    ]
+    response = [400, { "Content-Type" => "application/json" }, [JSON.generate(body)]]
 
     assert_equal @error.render, response
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.1
 platform: ruby
 authors:
 - Brandur
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2025-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -41,7 +41,7 @@ dependencies:
         version: '1.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: '1.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: openapi_parser
   requirement: !ruby/object:Gem::Requirement
@@ -109,21 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.1'
 - !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -289,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: A collection of Rack middleware to support JSON Schema.