openapi_first 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87fceda33e397fa75a8268144e5cbacfb802333a5ef1c315676d14458312b01b
-  data.tar.gz: a734ee73e2dce89fea8d2fc93c713b0505923b2b2098b560a2b44ef3e5753c84
+  metadata.gz: a500abac816ab74de8b74c3d72793f31865d8c0c4863b7af769d748b99a85790
+  data.tar.gz: cf0394ab100eea73f66ff5275ff81bc1fb7cb06d63ed69f62cb961db48966f61
 SHA512:
-  metadata.gz: 63d51c543d3d689ced06170e1e53f6d0a20056af2643e1f1fccfbf966b14352c55ad9c0dfd92478ceb7e5aaac0b6f7c7563e17d9e69ab2f924f6a9d4846c45ff
-  data.tar.gz: 8649d5737439a2414802e17ed562a0efdf294f29e7515b0e248e5736cd59235eba876baf52aad8e5d602ff90ba5afc8902ed1609d902dfe03c65d4136afc1042
+  metadata.gz: eb03e7141b82b6ae39d59948e5a3ce90a67c8ec2744b257ca18ed95cf537796200923e4bbc1bccfca5a2359995405f5015df29a01947e0add2ec653dfa44b778
+  data.tar.gz: 16458594f9cfef02f7faa3bd207487d74c8eaf400704c1631d80edca3ab1ae6d5820213c8efb85145be3f1dc3a1f91020cfb5b7c9330bd52c6acfca601fc7eb5

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 2.0.4
+
+- Fix issue with parsing reponse body when using Rails https://github.com/ahx/openapi_first/issues/281
+
+## 2.0.3
+
+- Fix `OpenapiFirst::Test.register` https://github.com/ahx/openapi_first/issues/276
+
+- Request validation middleware now accepts `error_response: false` do disable rendering a response. This is useful if you just want to collect metrics (via hooks) during a migration phase.
+
 ## 2.0.2
 
 - Fix setting custom error response (thanks @gobijan)

data/README.md

@@ -2,17 +2,20 @@
 
 OpenapiFirst helps to implement HTTP APIs based on an [OpenAPI](https://www.openapis.org/) API description. It supports OpenAPI 3.0 and 3.1. It offers request and response validation and it ensures that your implementation follows exactly the API description.
 
+[![Tests](https://github.com/ahx/openapi_first/actions/workflows/ruby.yml/badge.svg)](https://github.com/ahx/openapi_first/actions/workflows/ruby.yml)
+[![CodeQL](https://github.com/ahx/openapi_first/actions/workflows/codeql.yml/badge.svg)](https://github.com/ahx/openapi_first/blob/codeql/.github/workflows/codeql.yml)
+
 ## Contents
 
 <!-- TOC -->
 
+- [Manual use](#manual-use)
+  - [Validate request](#validate-request)
+  - [Validate response](#validate-response)
 - [Rack Middlewares](#rack-middlewares)
   - [Request validation](#request-validation)
   - [Response validation](#response-validation)
 - [Test assertions](#test-assertions)
-- [Manual use](#manual-use)
-  - [Validate request](#validate-request)
-  - [Validate response](#validate-response)
 - [Framework integration](#framework-integration)
 - [Configuration](#configuration)
 - [Hooks](#hooks)
@@ -23,6 +26,61 @@ OpenapiFirst helps to implement HTTP APIs based on an [OpenAPI](https://www.open
 
 <!-- /TOC -->
 
+## Manual use
+
+Load the API description:
+
+```ruby
+require 'openapi_first'
+
+definition = OpenapiFirst.load('openapi.yaml')
+```
+
+### Validate request
+
+```ruby
+validated_request = definition.validate_request(rack_request)
+
+# Inspect the request and access parsed parameters
+validated_request.valid?
+validated_request.invalid?
+validated_request.error # => Failure object or nil
+validated_request.parsed_body # => The parsed request body (Hash)
+validated_request.parsed_query # A Hash of query parameters that are defined in the API description, parsed exactly as described.
+validated_request.parsed_path_parameters
+validated_request.parsed_headers
+validated_request.parsed_cookies
+validated_request.parsed_params # Merged parsed path, query parameters and request body
+# Access the Openapi 3 Operation Object Hash
+validated_request.operation['x-foo']
+validated_request.operation['operationId'] => "getStuff"
+# or the whole request definition
+validated_request.request_definition.path # => "/pets/{petId}"
+validated_request.request_definition.operation_id # => "showPetById"
+
+# Or you can raise an exception if validation fails:
+definition.validate_request(rack_request, raise_error: true) # Raises OpenapiFirst::RequestInvalidError or OpenapiFirst::NotFoundError if request is invalid
+```
+
+### Validate response
+
+```ruby
+validated_response = definition.validate_response(rack_request, rack_response)
+
+# Inspect the response and access parsed parameters and
+validated_response.valid?
+validated_response.invalid?
+validated_response.error # => Failure object or nil
+validated_response.status # => 200
+validated_response.parsed_body
+validated_response.parsed_headers
+
+# Or you can raise an exception if validation fails:
+definition.validate_response(rack_request,rack_response, raise_error: true) # Raises OpenapiFirst::ResponseInvalidError or OpenapiFirst::ResponseNotFoundError
+```
+
+OpenapiFirst uses [`multi_json`](https://rubygems.org/gems/multi_json).
+
 ## Rack Middlewares
 
 ### Request validation
@@ -39,7 +97,7 @@ use OpenapiFirst::Middlewares::RequestValidation, spec: 'openapi.yaml'
 | :---------------- | ------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------- |
 | `spec:`           |                                                                          | The path to the spec file or spec loaded via `OpenapiFirst.load`                                                                    |
 | `raise_error:`    | `false` (default), `true`                                                | If set to true the middleware raises `OpenapiFirst::RequestInvalidError` or `OpenapiFirst::NotFoundError` instead of returning 4xx. |
-| `error_response:` | `:default` (default), `:jsonapi`, Your implementation of `ErrorResponse` |
+| `error_response:` | `:default` (default), `:jsonapi`, Your implementation of `ErrorResponse` or `false` to disable responding  |
 
 #### Error responses
 
@@ -174,67 +232,6 @@ class TripsApiTest < ActionDispatch::IntegrationTest
 end
 ```
 
-## Manual use
-
-Load the API description:
-
-```ruby
-require 'openapi_first'
-
-definition = OpenapiFirst.load('openapi.yaml')
-```
-
-### Validate request
-
-```ruby
-# Find and validate request
-rack_request = Rack::Request.new(env)
-validated_request = definition.validate_request(rack_request)
-# Or raise an exception if validation fails:
-definition.validate_request(rack_request, raise_error: true) # Raises OpenapiFirst::RequestInvalidError or OpenapiFirst::NotFoundError if request is invalid
-
-# Inspect the request and access parsed parameters
-validated_request.known? # Is the request defined in the API description?
-validated_request.valid? # => true / false
-validated_request.invalid? # => true / false
-validated_request.error # => Failure object if request is invalid
-validated_request.parsed_params # Merged parsed path, query parameters and request body
-validated_request.parsed_body
-validated_request.parsed_path_parameters # => { "pet_id" => 42 }
-validated_request.parsed_headers
-validated_request.parsed_cookies
-validated_request.parsed_query
-
-# Access the Openapi 3 Operation Object Hash
-validated_request.operation['x-foo']
-validated_request.operation['operationId']
-# or the whole request definition
-validated_request.request_definition.path # => "/pets/{petId}"
-validated_request.request_definition.operation_id # => "showPetById"
-```
-
-### Validate response
-
-```ruby
-# Find and validate the response
-rack_response = Rack::Response[*app.call(env)]
-validated_response = definition.validate_response(rack_request, rack_response)
-
-# Raise an exception if validation fails:
-definition.validate_response(rack_request,rack_response, raise_error: true) # Raises OpenapiFirst::ResponseInvalidError or OpenapiFirst::ResponseNotFoundError
-
-# Inspect the response and access parsed parameters and
-response.known? # Is the response defined in the API description?
-response.valid? # => true / false
-response.invalid? # => true / false
-response.error # => Failure object if response is invalid
-response.status # => 200
-response.parsed_body
-response.parsed_headers
-```
-
-OpenapiFirst uses [`multi_json`](https://rubygems.org/gems/multi_json).
-
 ## Configuration
 
 You can configure default options globally:

data/lib/openapi_first/middlewares/request_validation.rb

@@ -10,11 +10,13 @@ module OpenapiFirst
       #   :raise_error    A Boolean indicating whether to raise an error if validation fails.
       #                   default: false
       #   :error_response The Class to use for error responses.
+      #                   This can be a Symbol-name of an registered error response (:default, :jsonapi)
+      #                   or it can be set to false to disable returning a response.
       #                   default: OpenapiFirst::Plugins::Default::ErrorResponse (Config.default_options.error_response)
       def initialize(app, options = {})
         @app = app
         @raise = options.fetch(:raise_error, OpenapiFirst.configuration.request_validation_raise_error)
-        @error_response_class = error_response(options[:error_response])
+        @error_response_class = error_response_option(options[:error_response])
 
         spec = options.fetch(:spec)
         raise "You have to pass spec: when initializing #{self.class}" unless spec
@@ -29,17 +31,18 @@ module OpenapiFirst
         validated = @definition.validate_request(Rack::Request.new(env), raise_error: @raise)
         env[REQUEST] = validated
         failure = validated.error
-        return @error_response_class.new(failure:).render if failure
+        return @error_response_class.new(failure:).render if failure && @error_response_class
 
         @app.call(env)
       end
 
       private
 
-      def error_response(mod)
-        return OpenapiFirst.find_error_response(mod) if mod.is_a?(Symbol)
+      def error_response_option(value)
+        return if value == false
+        return OpenapiFirst.find_error_response(value) if value.is_a?(Symbol)
 
-        mod || OpenapiFirst.configuration.request_validation_error_response
+        value || OpenapiFirst.configuration.request_validation_error_response
       end
     end
   end

data/lib/openapi_first/middlewares/response_validation.rb

@@ -25,20 +25,9 @@ module OpenapiFirst
 
       def call(env)
         status, headers, body = @app.call(env)
-        body = read_body(body)
         @definition.validate_response(Rack::Request.new(env), Rack::Response[status, headers, body], raise_error: @raise)
         [status, headers, body]
       end
-
-      private
-
-      def read_body(body)
-        return body.to_ary if body.respond_to?(:to_ary)
-
-        result = []
-        body.each { |part| result << part }
-        result
-      end
     end
   end
 end

data/lib/openapi_first/router/path_template.rb

@@ -5,8 +5,8 @@ module OpenapiFirst
     # @visibility private
     class PathTemplate
       # See also https://spec.openapis.org/oas/v3.1.0#path-templating
-      TEMPLATE_EXPRESSION = /(\{[^}]+\})/
-      TEMPLATE_EXPRESSION_NAME = /\{([^}]+)\}/
+      TEMPLATE_EXPRESSION = /(\{[^{}]+\})/
+      TEMPLATE_EXPRESSION_NAME = /\{([^{}]+)\}/
       ALLOWED_PARAMETER_CHARACTERS = %r{([^/?#]+)}
 
       def self.template?(string)

data/lib/openapi_first/test.rb

@@ -7,7 +7,8 @@ module OpenapiFirst
   module Test
     class NotRegisteredError < StandardError; end
 
-    DEFINITIONS = {}.freeze
+    DEFINITIONS = {} # rubocop:disable Style/MutableConstant
+
     def self.definitions = DEFINITIONS
 
     def self.register(path, as: :default)

data/lib/openapi_first/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_first
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Andreas Haller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hana