openapi_first 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9458fb5b815dcc64722a1829dc2082f60a92b36ce7af9fa8529c041544b190d4
-  data.tar.gz: 5f5982e1e71f5f1a150860be23291863ff3c431b3bce332899b01150e2c9fc11
+  metadata.gz: 543c0103c059d292d91db5a177e4a2fec307473b0438b2b851d96f2818920a9c
+  data.tar.gz: b98142de184e58931bc544aa867cf4700605164fbfe2b426e074732dd37f293e
 SHA512:
-  metadata.gz: c92c5cbda9bcd884299a265fcc713c0370e0766670e2b3199af9169dfe29855ed78ae5ad1a70fd98326a4f764403e0b9429132b97ee9f3b887d5d9af772acd69
-  data.tar.gz: '05083e92a954621b54667d8f99c133b2489e70eaa2b7332885c867053c81667a0eba0779ad210c150c8402814dff6d144044349271e8fe06808bafe0e5ad94ca'
+  metadata.gz: 19cec612f7336c745bbccff2a518f65ce9785d9b4f4b237adb3b4bf6b5198eaa2e52c6eefce79eec748a627e99a6d58c41a648f95e66065b9bb9c01ed188fd58
+  data.tar.gz: 7350acd1b0a7e4b7ca34c9c0ad2e7e18096b344c2bec42af12c140271eb55765ea73d9fbd39808d919c6a6d061b4759a0323c647bd5b7a42f104efa72d0638f8

data/CHANGELOG.md

@@ -2,10 +2,18 @@
 
 ## Unreleased
 
+## 2.2.3
+
+- Respect global JSONSchemer configuration (https://github.com/ahx/openapi_first/pull/318)
+
+## 2.2.2
+
+- Fix parsing parameters with referenced schemas (https://github.com/ahx/openapi_first/issues/316)
+
 ## 2.2.1
 
 - Fix issue with $ref resolving paths poiting outside directories `$ref: '../a/b.yaml'` (https://github.com/ahx/openapi_first/issues/313)
-- Remove warning about missing assertions when using assert_api_conform (https://github.com/ahx/openapi_first/issues/313)
+- Remove warning about missing assertions when using assert_api_conform ([https://github.com/ahx/openapi_first/issues/313](https://github.com/ahx/openapi_first/issues/312))
 
 ## 2.2.0
 

data/lib/openapi_first/builder.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'json_schemer'
-require_relative 'json_pointer'
 require_relative 'ref_resolver'
 
 module OpenapiFirst
@@ -18,10 +17,10 @@ module OpenapiFirst
     end
 
     def initialize(contents, filepath:, config:)
-      @schemer_configuration = JSONSchemer::Configuration.new(
-        meta_schema: detect_meta_schema(contents, filepath),
-        insert_property_defaults: true
-      )
+      @schemer_configuration = JSONSchemer.configuration.clone
+      @schemer_configuration.meta_schema = detect_meta_schema(contents, filepath)
+      @schemer_configuration.insert_property_defaults = true
+
       @config = config
       @contents = RefResolver.for(contents, dir: filepath && File.dirname(filepath))
     end
@@ -47,10 +46,11 @@ module OpenapiFirst
     def router # rubocop:disable Metrics/MethodLength
       router = OpenapiFirst::Router.new
       @contents.fetch('paths').each do |path, path_item_object|
+        path_parameters = resolve_parameters(path_item_object['parameters'])
         path_item_object.resolved.keys.intersection(REQUEST_METHODS).map do |request_method|
           operation_object = path_item_object[request_method]
-          parameters = operation_object['parameters']&.resolved.to_a.chain(path_item_object['parameters']&.resolved.to_a)
-          parameters = parse_parameters(parameters)
+          operation_parameters = resolve_parameters(operation_object['parameters'])
+          parameters = parse_parameters(operation_parameters.chain(path_parameters))
 
           build_requests(path:, request_method:, operation_object:,
                          parameters:).each do |request|
@@ -89,6 +89,14 @@ module OpenapiFirst
       )
     end
 
+    def resolve_parameters(parameters)
+      parameters&.map do |parameter|
+        result = parameter.resolved
+        result['schema'] = parameter['schema'].resolved
+        result
+      end.to_a
+    end
+
     def build_parameter_schema(parameters)
       schema = build_parameters_schema(parameters)
 

data/lib/openapi_first/ref_resolver.rb

@@ -118,6 +118,7 @@ module OpenapiFirst
 
     # @visibility private
     class Array
+      include Enumerable
       include Resolvable
       include Diggable
 
@@ -128,6 +129,12 @@ module OpenapiFirst
         RefResolver.for(item, dir:, context:)
       end
 
+      def each
+        resolved.each do |item|
+          yield RefResolver.for(item, dir:, context:)
+        end
+      end
+
       def resolved
         value.map do |item|
           if item.respond_to?(:key?) && item.key?('$ref')

data/lib/openapi_first/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: openapi_first
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Andreas Haller
 bindir: bin
 cert_chain: []
-date: 2025-01-16 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hana
@@ -104,7 +104,6 @@ files:
 - lib/openapi_first/failure.rb
 - lib/openapi_first/file_loader.rb
 - lib/openapi_first/json.rb
-- lib/openapi_first/json_pointer.rb
 - lib/openapi_first/middlewares/request_validation.rb
 - lib/openapi_first/middlewares/response_validation.rb
 - lib/openapi_first/ref_resolver.rb

data/lib/openapi_first/json_pointer.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module OpenapiFirst
-  # Functions to handle JSON Pointers
-  # @!visibility private
-  module JsonPointer
-    ESCAPE_CHARS = { '~' => '~0', '/' => '~1', '+' => '%2B' }.freeze
-    ESCAPE_REGEX = Regexp.union(ESCAPE_CHARS.keys)
-
-    module_function
-
-    def append(root, *tokens)
-      "#{root}/" + tokens.map do |token|
-        escape_json_pointer_token(token)
-      end.join('/')
-    end
-
-    def escape_json_pointer_token(token)
-      token.to_s.gsub(ESCAPE_REGEX, ESCAPE_CHARS)
-    end
-  end
-end