Parse JSON when lower-case content-type is given (#440)

* Parse JSON when lower-case content-type is given

* Use casecmp?

* Fix format based on the lint result

* Remove puts for debug in the test

Author: mopp

lib/committee/schema_validator/hyper_schema.rb

@@ -28,8 +28,13 @@ def response_validate(status, headers, response, _test_method = false)
 
         data = {}
         unless full_body.empty?
-          parse_to_json = !validator_option.parse_response_by_content_type ||
-                          headers.fetch('Content-Type', nil)&.start_with?('application/json')
+          parse_to_json = if validator_option.parse_response_by_content_type
+                            content_type_key = headers.keys.detect { |k| k.casecmp?('Content-Type') }
+            headers.fetch(content_type_key, nil)&.start_with?('application/json')
+          else
+            true
+          end
+
           data = JSON.parse(full_body) if parse_to_json
         end
 
@@ -101,11 +106,11 @@ def parameter_coerce!(request, link, coerce_key)
         return unless link_exist?
 
         Committee::SchemaValidator::HyperSchema::ParameterCoercer.
-            new(request.env[coerce_key],
-                link.schema,
-                coerce_date_times: validator_option.coerce_date_times,
-                coerce_recursive: validator_option.coerce_recursive).
-            call!
+          new(request.env[coerce_key],
+            link.schema,
+            coerce_date_times: validator_option.coerce_date_times,
+            coerce_recursive: validator_option.coerce_recursive).
+          call!
       end
     end
   end

lib/committee/schema_validator/open_api_3.rb

@@ -26,8 +26,13 @@ def response_validate(status, headers, response, test_method = false)
           full_body << chunk
         end
 
-        parse_to_json = !validator_option.parse_response_by_content_type ||
-                        headers.fetch('Content-Type', nil)&.start_with?('application/json')
+        parse_to_json = if validator_option.parse_response_by_content_type
+                          content_type_key = headers.keys.detect { |k| k.casecmp?('Content-Type') }
+          headers.fetch(content_type_key, nil)&.start_with?('application/json')
+        else
+          true
+        end
+
         data = if parse_to_json
                  full_body.empty? ? {} : JSON.parse(full_body)
         else

test/middleware/response_validation_open_api_3_test.rb

@@ -17,6 +17,22 @@ def app
     assert_equal 200, last_response.status
   end
 
+  it "passes through a valid response with content-type (lower-case)" do
+    status = 200
+    headers = { "content-type" => "application/json" }
+    response = JSON.generate(CHARACTERS_RESPONSE)
+
+    @app = Rack::Builder.new {
+      use Committee::Middleware::ResponseValidation, { schema: open_api_3_schema }
+      run lambda { |_|
+        [status, headers, [response]]
+      }
+    }
+
+    get "/characters"
+    assert_equal 200, last_response.status
+  end
+
   it "passes through a invalid json" do
     @app = new_response_rack("not_json", {}, schema: open_api_3_schema)
 

test/middleware/response_validation_test.rb

@@ -15,6 +15,22 @@ def app
     assert_equal 200, last_response.status
   end
 
+  it "passes through a valid response with content-type (lower-case)" do
+    options = { schema: hyper_schema }
+    status = 200
+    headers = { 'content-type' => 'application/json' }
+    response = JSON.generate([ValidApp])
+    @app = Rack::Builder.new {
+      use Committee::Middleware::ResponseValidation, options
+      run lambda { |_|
+        [status, headers, [response]]
+      }
+    }
+
+    get "/apps"
+    assert_equal 200, last_response.status
+  end
+
   it "doesn't call error_handler (has a arg) when response is valid" do
     called = false
     pr = ->(_e) { called = true }