openapi_first 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c1cc903f3a064f2f386503959e1b437729ab8a668ffbf0dd5aac19c38b4faf4
-  data.tar.gz: 0ee337872917f9009c9e9b9d57da4382e7b34248cf7df51a2926b3c589bc2f46
+  metadata.gz: 6ceb641d45921bafb376d7fe7ea3a2f42b76c8900a5d8598e6ef018afca0304e
+  data.tar.gz: 123c15a5a4a149e69a40773b0a62543257f3145fbc06c788207e65757ba3c404
 SHA512:
-  metadata.gz: 30636bed981564cfe21696a46eb92d51ccb7680531b754dbfa37a6f52e37420f4e9611437e93ee54aada8eb6062db92ffd7fbce32eb1c76e8d856c5777b64444
-  data.tar.gz: 769c0821eca57bf60d8554ffd231b042511f57627f55c6083f2a9d054b35d08f0451d20f2411eaae035d7b3a591a046c57d732bf086143ac3d16162bf25b7c69
+  metadata.gz: 3e279fa5f4239b1f41020b788370377535ef5cf959d2f2a23df61240310d4b729484e0a1154ff11250e21164c15b1ab285b3173fc2f2e3ac84603a5722e60ec7
+  data.tar.gz: f96790f87324ea1ce7f78b6d3b41f86de709f990edf26a97ce1ad01b7929229198f9114ceb33d1aad94912211253ddc26dce6acae5566b386c805bb1219d886d

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 2.1.1
+
+- Fix issue with non file downloads / JSON responses https://github.com/ahx/openapi_first/issues/281
+
 ## 2.1.0
 
 - Added `OpenapiFirst::Definition#[]` to access the raw Hash representation of the OAS document. Example: `api['components'].fetch('schemas', 'Stations')`

data/lib/openapi_first/definition.rb

@@ -40,10 +40,9 @@ module OpenapiFirst
     def_delegators :@resolved, :[]
 
     # Returns an Enumerable of available Routes for this API description.
+    # @!method routes
     # @return [Enumerable[Router::Route]]
-    def routes
-      @router.routes
-    end
+    def_delegators :@router, :routes
 
     # Validates the request against the API description.
     # @param [Rack::Request] request The Rack request object.
@@ -51,15 +50,14 @@ module OpenapiFirst
     # @return [ValidatedRequest] The validated request object.
     def validate_request(request, raise_error: false)
       route = @router.match(request.request_method, request.path, content_type: request.content_type)
-      validated = if route.error
-                    ValidatedRequest.new(request, error: route.error)
-                  else
-                    route.request_definition.validate(request, route_params: route.params)
-                  end
-      @config.hooks[:after_request_validation].each { |hook| hook.call(validated, self) }
-      raise validated.error.exception(validated) if validated.error && raise_error
-
-      validated
+      if route.error
+        ValidatedRequest.new(request, error: route.error)
+      else
+        route.request_definition.validate(request, route_params: route.params)
+      end.tap do |validated|
+        @config.hooks[:after_request_validation].each { |hook| hook.call(validated, self) }
+        raise validated.error.exception(validated) if validated.error && raise_error
+      end
     end
 
     # Validates the response against the API description.
@@ -73,15 +71,14 @@ module OpenapiFirst
 
       response_match = route.match_response(status: rack_response.status, content_type: rack_response.content_type)
       error = response_match.error
-      validated = if error
-                    ValidatedResponse.new(rack_response, error:)
-                  else
-                    response_match.response.validate(rack_response)
-                  end
-      @config.hooks[:after_response_validation]&.each { |hook| hook.call(validated, rack_request, self) }
-      raise validated.error.exception(validated) if raise_error && validated.invalid?
-
-      validated
+      if error
+        ValidatedResponse.new(rack_response, error:)
+      else
+        response_match.response.validate(rack_response)
+      end.tap do |validated|
+        @config.hooks[:after_response_validation]&.each { |hook| hook.call(validated, rack_request, self) }
+        raise validated.error.exception(validated) if raise_error && validated.invalid?
+      end
     end
   end
 end

data/lib/openapi_first/response_parser.rb

@@ -7,22 +7,30 @@ module OpenapiFirst
   class ResponseParser
     def initialize(headers:, content_type:)
       @headers = headers
-      @content_type = content_type
+      @json = /json/i.match?(content_type)
     end
 
-    attr_reader :headers, :content_type
-
     def parse(rack_response)
       ParsedResponse.new(
-        body: parse_body(rack_response),
+        body: parse_body(read_body(rack_response)),
         headers: parse_headers(rack_response)
       )
     end
 
     private
 
-    def parse_body(rack_response)
-      MultiJson.load(read_body(rack_response)) if /json/i.match?(content_type)
+    attr_reader :headers
+
+    def json? = @json
+
+    def parse_body(body)
+      return parse_json(body) if json?
+
+      body
+    end
+
+    def parse_json(body)
+      MultiJson.load(body)
     rescue MultiJson::ParseError
       Failure.fail!(:invalid_response_body, message: 'Response body is invalid: Failed to parse response body as JSON')
     end

data/lib/openapi_first/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenapiFirst
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_first
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Andreas Haller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hana
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.19
 signing_key:
 specification_version: 4
 summary: Implement HTTP APIs based on OpenApi 3.x