committee 5.5.5 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5ca2d98a65682acdd759d0fdbb8de493cec34b96889fec3cfd18bf4928b50cc
-  data.tar.gz: f2c50536c4bd4840dae6dc1a3da96c4a85dd2ec25ee69e55c944a90f3a514d00
+  metadata.gz: 07fd25d2379c9e5d324556185a1071995f394712a778f4d8ee2afda016601645
+  data.tar.gz: dd86ac014d3b34fc1f2d03456fe74190756084c8432858d20e01717562ff7c49
 SHA512:
-  metadata.gz: b3f35d67aab36148b9085b0a129ee315ea41e27ed6fde96c2038830c2046a3d1d5e212feeae849cd3d4571d69b01349911826711a699d326d6e799ca725a9391
-  data.tar.gz: 411bb7a8a21de88b9c978cb848480a2a40ebd9aab2e9819648d066d301db47420e9ccf9820c292e441c90b546d9c42ff42b0363c852e7db78e7eb902415adf6c
+  metadata.gz: 2226c6247449ba57f98ec7fdf69c287d797ff7aabf92de710e91d7d080e3bc8ec65b9b88a5304e549d13f023c6238343c1971f801784f8b4fc2dce6587841e49
+  data.tar.gz: 589bf4caf9cdd2ded55739c90de5db53ebd21e52b66f30d4d883289349af9553fd619fd5d4b7328c0c85e5402f274018b00d6a7ed55e2fcc608157c99d87b2ec

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

@@ -11,13 +11,14 @@ module Committee
           @validate_success_only = options[:validate_success_only]
           @allow_blank_structures = options[:allow_blank_structures]
 
+          @validator = nil
           @validators = {}
           if link.is_a? Drivers::OpenAPI2::Link
             link.target_schemas.each do |status, schema|
               @validators[status] = JsonSchema::Validator.new(target_schema(link))
             end
           else
-            @validators[link.status_success] = JsonSchema::Validator.new(target_schema(link))
+            @validator = JsonSchema::Validator.new(target_schema(link))
           end
         end
 
@@ -53,10 +54,17 @@ module Committee
 
           begin
             if Committee::Middleware::ResponseValidation.validate?(status, validate_success_only)
-              raise InvalidResponse, "Invalid response.#{@link.href} status code #{status} definition does not exist" if @validators[status].nil?
-              if !@validators[status].validate(data)
-                errors = JsonSchema::SchemaError.aggregate(@validators[status].errors).join("\n")
-                raise InvalidResponse, "Invalid response.\n\n#{errors}"
+              if @link.is_a?(Drivers::OpenAPI2::Link)
+                raise InvalidResponse, "Invalid response.#{@link.href} status code #{status} definition does not exist" if @validators[status].nil?
+                if !@validators[status].validate(data)
+                  errors = JsonSchema::SchemaError.aggregate(@validators[status].errors).join("\n")
+                  raise InvalidResponse, "Invalid response.\n\n#{errors}"
+                end
+              else
+                if !@validator.validate(data)
+                  errors = JsonSchema::SchemaError.aggregate(@validator.errors).join("\n")
+                  raise InvalidResponse, "Invalid response.\n\n#{errors}"
+                end
               end
             end
           rescue => e

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

@@ -111,7 +111,7 @@ module Committee
 
         def validate_post_request_params(path_params, query_params, body_params, headers, validator_option)
           content_type_key = headers.keys.detect { |k| k.casecmp?('Content-Type') }
-          content_type = headers[content_type_key].to_s.split(';').first.to_s
+          content_type = Rack::MediaType.type(headers[content_type_key])
 
           # bad performance because when we coerce value, same check
           validate_path_and_query_params(path_params, query_params, headers, validator_option)

data/lib/committee/schema_validator.rb

@@ -4,7 +4,7 @@ module Committee
   module SchemaValidator
     class << self
       def request_media_type(request)
-        request.media_type.to_s
+        Rack::MediaType.type(request.env['CONTENT_TYPE'])
       end
 
       # @param [String] prefix

data/lib/committee/version.rb

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

data/test/schema_validator/hyper_schema/response_validator_test.rb

@@ -9,6 +9,8 @@ describe Committee::SchemaValidator::HyperSchema::ResponseValidator do
     @data = ValidApp.dup
     @schema = JsonSchema.parse!(hyper_schema_data)
     @schema.expand_references!
+    # POST /apps
+    @create_link = @schema.properties["app"].links[0]
     # GET /apps/:id
     @get_link = @link = @schema.properties["app"].links[2]
     # GET /apps
@@ -41,6 +43,12 @@ describe Committee::SchemaValidator::HyperSchema::ResponseValidator do
     call
   end
 
+  it "allows non-201 on create" do
+    @link = @create_link
+    @status = 200
+    call
+  end
+
   it "passes through a valid list response for for rel instances links" do
     @link = @list_link
 

data/test/schema_validator_test.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+describe Committee::SchemaValidator do
+  it "parses simple content types" do
+    request = Rack::Request.new({ "CONTENT_TYPE" => "application/json" })
+    media_type = Committee::SchemaValidator.request_media_type(request)
+    assert_equal 'application/json', media_type
+  end
+
+  it "parses comma-delineated content types" do
+    request = Rack::Request.new({ "CONTENT_TYPE" => "multipart/form-data, application/json" })
+    media_type = Committee::SchemaValidator.request_media_type(request)
+    assert_equal 'multipart/form-data', media_type
+  end
+
+  it "parses semicolon-delineated content types" do
+    request = Rack::Request.new({ "CONTENT_TYPE" => "multipart/form-data; application/json" })
+    media_type = Committee::SchemaValidator.request_media_type(request)
+    assert_equal 'multipart/form-data', media_type
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 5.5.5
+  version: 5.6.1
 platform: ruby
 authors:
 - Brandur
@@ -239,6 +239,7 @@ files:
 - test/schema_validator/open_api_3/operation_wrapper_test.rb
 - test/schema_validator/open_api_3/request_validator_test.rb
 - test/schema_validator/open_api_3/response_validator_test.rb
+- test/schema_validator_test.rb
 - test/test/methods_new_version_test.rb
 - test/test/methods_test.rb
 - test/test/schema_coverage_test.rb