openapi_first 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a462473bc1c585914983760dc3023fda2a375276f2703712ec1f8e7d8ef4950
-  data.tar.gz: 46c6cb68fc175a55525595ed90a4cf599af36d117a80dff8078fecf24aca79d7
+  metadata.gz: 2b4f5fd99c7b1911b3e1aa17d11a7fe0997266e1047ce7f1c0cf2bb560ce8663
+  data.tar.gz: 459eab2ea15a0b6b247ac16ded90443a9ecd15b663cfdf6c22aab721342ad627
 SHA512:
-  metadata.gz: c51b30bf959533eeee109cea59fdce2c1f0057e1c40eec6a961b0360000665e940ff1366125db655b1d2026f7bf8767ba62cd8358b6a31b9ac7128f4f129c497
-  data.tar.gz: d639e00db05a01a1e2f8bdb57c1e95c72ee71c5bcc317d53b1130a915124075d0b8e922cb0c3340ba02b709a1c7e06142024f64d1de264abaa631caf7522b563
+  metadata.gz: c095aae9904ed9209a321700e356cc896791942ce691fd016c266fd34e6220886ab294e2d8b98b893c0d9572084653515ed143ca38824fe7423b2a62b23fc9e0
+  data.tar.gz: 277b96090ff60cc6b06da02762d27265393aec7b66f8a0132642a644232249514c8e8eb76d5c2a92a393c435f5f0973cf1162c6e28ced0da07eff2aac48791b8

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 1.4.2
+
+- Fix Rack 2 compatibility
+
+## 1.4.1
+
+- Fixed: Don't call deprecated methods in middlewares
+
 ## 1.4.0
 
 ### Changed
@@ -15,7 +23,7 @@ Some redundant methods to validate or inspect requests/responses will be removed
 
 ## 1.3.6
 
-- FIx Rack 2 / Rails 6 compatibility ([#246](https://github.com/ahx/openapi_first/issues/246)
+- Fix Rack 2 / Rails 6 compatibility ([#246](https://github.com/ahx/openapi_first/issues/246)
 
 ## 1.3.5
 

data/lib/openapi_first/definition.rb

@@ -24,9 +24,12 @@ module OpenapiFirst
     # @param raise_error [Boolean] Whether to raise an error if validation fails.
     # @return [RuntimeRequest] The validated request object.
     def validate_request(rack_request, raise_error: false)
-      validated = request(rack_request).tap(&:validate)
-      validated.error&.raise! if raise_error
-      validated
+      runtime_request = request(rack_request)
+      validator = RequestValidation::Validator.new(runtime_request.operation)
+      validation_error = validator.validate(runtime_request)
+      validation_error.raise! if validation_error && raise_error
+      runtime_request.error = validation_error
+      runtime_request
     end
 
     # Validates the response against the API description.
@@ -35,7 +38,12 @@ module OpenapiFirst
     # @param raise_error [Boolean] Whether to raise an error if validation fails.
     # @return [RuntimeResponse] The validated response object.
     def validate_response(rack_request, rack_response, raise_error: false)
-      request(rack_request).validate_response(rack_response, raise_error:)
+      runtime_response = response(rack_request, rack_response)
+      validator = ResponseValidation::Validator.new(runtime_response.operation)
+      validation_error = validator.validate(runtime_response)
+      validation_error.raise! if validation_error && raise_error
+      runtime_response.error = validation_error
+      runtime_response
     end
 
     # Builds a RuntimeRequest object based on the Rack request.
@@ -57,7 +65,8 @@ module OpenapiFirst
     # @param rack_response [Rack::Response] The Rack response object.
     # @return [RuntimeResponse] The RuntimeResponse object.
     def response(rack_request, rack_response)
-      request(rack_request).response(rack_response)
+      runtime_request = request(rack_request)
+      RuntimeResponse.new(runtime_request.operation, rack_response)
     end
 
     # Gets all the operations defined in the API description.

data/lib/openapi_first/runtime_request.rb

@@ -16,7 +16,6 @@ module OpenapiFirst
       @path_item = path_item
       @operation = operation
       @original_path_params = path_params
-      @error = nil
       @validated = false
     end
 
@@ -34,12 +33,12 @@ module OpenapiFirst
 
     # Returns the error object if validation failed.
     # @return [Failure, nil]
-    attr_reader :error
+    attr_accessor :error
 
     # Checks if the request is valid.
     # @return [Boolean] true if the request is valid, false otherwise.
     def valid?
-      validate unless @validated
+      validate unless validated?
       error.nil?
     end
 
@@ -124,7 +123,6 @@ module OpenapiFirst
     def validate
       warn '[DEPRECATION] `validate` is deprecated. Please use ' \
            "`OpenapiFirst.load('openapi.yaml').validate_request(rack_request)` instead."
-      @validated = true
       @error = RequestValidation::Validator.new(operation).validate(self)
     end
 
@@ -159,6 +157,10 @@ module OpenapiFirst
 
     private
 
+    def validated?
+      defined?(@error)
+    end
+
     attr_reader :request
   end
 end

data/lib/openapi_first/runtime_response.rb

@@ -12,11 +12,13 @@ module OpenapiFirst
     def initialize(operation, rack_response)
       @operation = operation
       @rack_response = rack_response
-      @error = nil
     end
 
     # @return [Failure, nil] Error object if validation failed.
-    attr_reader :error
+    attr_accessor :error
+
+    # @visibility private
+    attr_accessor :operation
 
     # @attr_reader [Integer] status The HTTP status code of this response.
     # @attr_reader [String] content_type The content_type of the Rack::Response.
@@ -30,7 +32,7 @@ module OpenapiFirst
     # Checks if the response is valid. Runs the validation unless it has been run before.
     # @return [Boolean]
     def valid?
-      validate unless @validated
+      validate unless validated?
       @error.nil?
     end
 
@@ -71,7 +73,6 @@ module OpenapiFirst
     def validate
       warn '[DEPRECATION] `validate` is deprecated. ' \
            "Please use `OpenapiFirst.load('openapi.yaml').validate_response(rack_request, rack_response)` instead."
-      @validated = true
       @error = ResponseValidation::Validator.new(@operation).validate(self)
     end
 
@@ -90,6 +91,10 @@ module OpenapiFirst
 
     private
 
+    def validated?
+      defined?(@error)
+    end
+
     # Usually the body responds to #each, but when using manual response validation without the middleware
     # in Rails request specs the body is a String. So this code handles both cases.
     def original_body

data/lib/openapi_first/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_first
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Andreas Haller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-07 00:00:00.000000000 Z
+date: 2024-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hana
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'