reynard 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d2a2059bfff7777ad1d0b122d83afff99bc6af883a35f8970091fa3197fd541
-  data.tar.gz: 05d9297e7d4d86e43f733f5c385ac2ea93a16b681d4f51e09bea9e20e97a00bc
+  metadata.gz: c3c34bb5538fc723eb3089aed2fcc9297caecd7c12802081fb1c0ffd5b930885
+  data.tar.gz: fd266bc7821ef67989261e66923605b3ea0b249f19c028ada40815928c070b7b
 SHA512:
-  metadata.gz: 8b0ccb3d8e187780cdca33e65588b4da8d835910f247f618e5b67114e58cda744745826ff9e8c223742be55c003ea6df904b18a6fee9bc7e2b7b466c9739f751
-  data.tar.gz: dd5bf8691ae5c72ea7462e313992671ad82125fb0de3228d09d6a26fa367734cd14498de7bc02dda73684b255774b40e5991464c606609bc16517528f75b4219
+  metadata.gz: edd450cc95fc83f6f16c8e8a77d7600f98d8524fe75a1abc78b383cd6442458acf3351e7ea0513cb539a00870bea79729a57120a4c0b556e54c937dcc0275e63
+  data.tar.gz: b00d56c46b6c29f5ccf01a83a6fc8f62e53a44953787441bb13af36a7025a0712f75ad537507f917644acff2f134edf71502461cb930e0bbe1c5a4a1b0ff9f6f

data/lib/reynard/context.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'ostruct'
-
 class Reynard
   # Exposes a public interface to build a request context.
   class Context

data/lib/reynard/external.rb

@@ -3,9 +3,16 @@
 require 'rack'
 
 class Reynard
-  # Loads external references.
+  # Loads data for external references from disk.
   class External
-    def initialize(path:, ref:)
+    # Build a new external reference loader.
+    #
+    # @param basepath [String] base path of the OpenAPI specification, we never load any files
+    #        higher in the directory tree
+    # @param path [String] base path of the current file, used to resolve relative paths
+    # @param ref [String] the $ref value we actually resolve
+    def initialize(basepath:, path:, ref:)
+      @basepath = basepath
       @path = path
       @relative_path, @anchor = ref.split('#', 2)
       @filename = File.expand_path(@relative_path, @path)
@@ -14,7 +21,10 @@ class Reynard
     def path
       return [] unless @anchor
 
-      @anchor.split('/')[1..]
+      # Remove explicit absolute (ie. /) and explicitly relative (ie. ./) instructions from the
+      # path expression because we're starting at the root of an external file. We currently don't
+      # support the // syntax.
+      @anchor.to_s.gsub(%r{\A\.?/}, '').split('/')
     end
 
     def data
@@ -30,7 +40,7 @@ class Reynard
     private
 
     def filename
-      return @filename if @filename.start_with?(@path)
+      return @filename if @filename.start_with?(@basepath)
 
       raise 'You are only allowed to reference files relative to the specification file.'
     end

data/lib/reynard/grouped_parameters.rb

@@ -3,14 +3,21 @@
 class Reynard
   # Groups parameters based on the parameters specification.
   class GroupedParameters
-    def initialize(specification, params)
-      @specification = pivot(specification)
+    def initialize(specification:, node:, params:)
+      @specification = specification
+      @node = node
       @params = params
     end
 
+    def constraints
+      return @constraints if defined?(@constraints)
+
+      @constraints = actualize(*@node, 'parameters') || actualize(*@node[..-2], 'parameters') || {}
+    end
+
     def to_h
       @params.each_with_object({}) do |(name, value), grouped|
-        group_name = @specification.dig(name, 'in') || 'query'
+        group_name = constraints.dig(name, 'in') || 'query'
         grouped[group_name] ||= {}
         grouped[group_name].merge!({ name => value })
       end
@@ -18,12 +25,16 @@ class Reynard
 
     private
 
-    def pivot(specification)
-      return {} unless specification
+    def actualize(*node)
+      parameters = @specification.dig(*node)
+      return unless parameters
 
-      specification.each_with_object({}) do |attribute, pivot|
-        pivot[attribute['name']] = attribute
+      pivot = {}
+      parameters.each.with_index do |attributes, index|
+        attributes = @specification.dig(*node, index) if attributes.key?('$ref')
+        pivot[attributes['name']] = attributes
       end
+      pivot
     end
   end
 end

data/lib/reynard/object_builder.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'ostruct'
-
 class Reynard
   # Defines dynamic classes based on schema and instantiates them for a response.
   class ObjectBuilder

data/lib/reynard/specification/finder.rb

@@ -18,7 +18,7 @@ class Reynard
       def find_into(path, &block)
         data = @specification.dig(*path)
 
-        yield path if data.respond_to?(:key?) && (data.key?('type') && (@query.type == data['type']))
+        yield path if data.respond_to?(:key?) && data.key?('type') && (@query.type == data['type'])
 
         return unless data.respond_to?(:each_key)
 

data/lib/reynard/specification.rb

@@ -47,13 +47,9 @@ class Reynard
       return {} unless params
 
       GroupedParameters.new(
-        [
-          # Parameters can be shared between methods on a path or be specific to an operation. The
-          # parameters on the operation level override those at the path level.
-          dig(*operation_node, 'parameters'),
-          dig(*operation_node[..-2], 'parameters')
-        ].compact.flatten,
-        params
+        specification: self,
+        node: operation_node,
+        params:
       ).to_h
     end
 
@@ -64,7 +60,8 @@ class Reynard
     end
 
     def operation(operation_name)
-      dig('paths').each do |path, operations|
+      dig('paths').each_key do |path|
+        operations = dig('paths', path)
         operations.slice(*VERBS).each do |verb, operation|
           return Operation.new(node: ['paths', path, verb]) if operation_name == operation['operationId']
         end
@@ -113,7 +110,6 @@ class Reynard
     end
 
     # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/CyclomaticComplexity
     # rubocop:disable Metrics/MethodLength
     def dig_into(data, cursor, path, filesystem_path)
       while path.length.positive?
@@ -129,8 +125,8 @@ class Reynard
           path = Rack::Utils.unescape_path(cursor['$ref'][2..]).split('/') + path
           cursor = data
         # References another file, with an optional anchor to an element in the data.
-        when %r{\A\./}
-          external = External.new(path: filesystem_path, ref: cursor['$ref'])
+        else
+          external = External.new(basepath:, path: filesystem_path, ref: cursor['$ref'])
           filesystem_path = external.filesystem_path
           path = external.path + path
           cursor = external.data
@@ -139,7 +135,10 @@ class Reynard
       cursor
     end
     # rubocop:enable Metrics/AbcSize
-    # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/MethodLength
+
+    def basepath
+      File.dirname(File.expand_path(@filename))
+    end
   end
 end

data/lib/reynard/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Reynard
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: reynard
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Manfred Stienstra
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -91,7 +90,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Minimal OpenAPI client.
 test_files: []