committee 5.3.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec0b5b55c4e5f1be93511f36d4ae210f7318232ab1aa421bbac14f3f172f2ef
-  data.tar.gz: 96ecf2cdc5e4053c1eec56c0ea5d27ec5c4353230b508385fd84f39f486a4baf
+  metadata.gz: 426a690ac272e53e30d9572a33564ea8cb7f2e92617e9dcd11b8061e32936b2f
+  data.tar.gz: c335a7d5bb6fe299d6584bf5838ac7972f9be312f431d15db8942cdd3c473cf4
 SHA512:
-  metadata.gz: a5d0d3daa686424b1dbab55e684ca483aff5a060c423c1bdc6796fcf1bbf4de918595d94f8df579918067778c8ab311fb7ba0c4ed34c5d4246ef21600c35d2af
-  data.tar.gz: 90a8511576aae0756b4e817b3dc61e4b55b5e2fdb744b1125f5892e09b544a7b7e01c746b5b510d986031d6ecf072ed5f246e125745790e0eb0384d4fdee7f16
+  metadata.gz: 2e83410d227c6704e208c0bbac5e452a34887921fee1b3f9dbe5c082bbc5861533e49882428e94bb78140d647550047f57b990e7896583a6f18d8ee76d6fdb17
+  data.tar.gz: 610c2002488ee37be624df996fbfbfb9609c416a911583ed3177a0917061908c0efa71324d56b7b90e77ea538b8f6e00c8785c210bd2d8e67c8398177e3269fd

data/lib/committee/middleware/request_validation.rb

@@ -20,6 +20,7 @@ module Committee
           raise if @raise
           return @error_class.new(400, :bad_request, $!.message, request).render unless @ignore_error
         rescue Committee::NotFound => e
+          handle_exception($!, request.env)
           raise if @raise
           return @error_class.new(404, :not_found, e.message, request).render unless @ignore_error
         rescue JSON::ParserError

data/lib/committee/request_unpacker.rb

@@ -46,7 +46,11 @@ module Committee
       if @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.
-        return [request.POST, true] if request.POST
+        begin
+          return [request.POST, true] if request.POST
+        ensure
+          request.body.rewind
+        end
       end
 
       [{}, false]
@@ -73,6 +77,7 @@ module Committee
     def parse_json(request)
       return nil if request.request_method == "GET" && !@allow_get_body
 
+      return nil if request.body.nil?
       body = request.body.read
       # if request body is empty, we just have empty params
       return nil if body.length == 0

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

@@ -21,8 +21,8 @@ module Committee
         private
 
         def check_content_type(request, content_type)
-          # support post, put, patch only
-          return true unless request.post? || request.put? || request.patch?
+          # support post, put, patch, options only
+          return true unless request.post? || request.put? || request.patch? || request.options?
           return true if @operation_object.valid_request_content_type?(content_type)
           return true if @operation_object.optional_body? && empty_request?(request)
 

data/lib/committee/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Committee
-    VERSION = '5.3.0'.freeze
+    VERSION = '5.5.0'.freeze
 end

data/test/schema_validator/open_api_3/request_validator_test.rb

@@ -95,6 +95,13 @@ describe Committee::SchemaValidator::OpenAPI3::RequestValidator do
       assert_equal 400, last_response.status
     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 {
         use Committee::Middleware::RequestValidation, options

data/test/test/methods_test.rb

@@ -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
@@ -146,13 +146,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 "/characters"
         assert_request_schema_confirm
       end
 
       it "not exist required" do
-        @app = new_rack_app([])
+        @app = new_rack_app
         get "/validate", {"query_string" => "query", "query_integer_list" => [1, 2]}
         e = assert_raises(Committee::InvalidRequest) do
           assert_request_schema_confirm
@@ -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
@@ -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]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Brandur
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -39,6 +39,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,6 +49,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: openapi_parser
   requirement: !ruby/object:Gem::Requirement
@@ -78,16 +84,16 @@ dependencies:
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +289,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.