reynard 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df788fc69d73d417d6b9490299d2552befb4fa4764ebc4621e9d20cd27cab49
-  data.tar.gz: 053775ac81400f50ad28436a122fc0316c3b6037afb1fe41b4c1638a80912509
+  metadata.gz: d85681365ddb46b06c062b39bdea10bf46810d80d813c9737df0ee3aeb38e843
+  data.tar.gz: '007908692ed0a3c437befba30a29d0f694429033097b7ae47ca2aaf7050c05ea'
 SHA512:
-  metadata.gz: 5d2bee0211247407c99e0d5fd180bca0738230c89024cdddaae96de8eaa3afdf1b41fd2e11d95ef4c8c2210ff8f269ad7b4070959065ac48063f1ba8355056c0
-  data.tar.gz: f81ba585b5db0cea43659269ebdffc73ac4e234353f902a663e43203985a576e55874ccf2a6524eba9e029c04bf3174cf53f6ea3a35f44393ed036a37e66adc9
+  metadata.gz: 1e23bf2702660623a61039bb8444ea3e0f4bdd7eaceab42d22dbca2ea157e705a54af69558ce84812d4ef2f13c1330071781e8da61d3ed44c8b0d2a944816752
+  data.tar.gz: 9e973c551d30a6b7e6ab8ef494d270b5dac05dfd96de86c49448c5889b070a07ee8d8aa486de1f80c3d372c73ed7b11e37da49625fdeb64d21e84352130e55f3

data/lib/reynard/external.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'rack'
+
+class Reynard
+  # Loads external references.
+  class External
+    def initialize(path:, ref:)
+      @path = path
+      @relative_path, @anchor = ref.split('#', 2)
+    end
+
+    def path
+      return [] unless @anchor
+
+      @anchor.split('/')[1..]
+    end
+
+    def data
+      File.open(filename, encoding: 'UTF-8') do |file|
+        YAML.safe_load(file, aliases: true)
+      end
+    end
+
+    private
+
+    def filename
+      filename = File.expand_path(@relative_path, @path)
+      return filename if filename.start_with?(@path)
+
+      raise 'You are only allowed to reference files relative to the specification file.'
+    end
+  end
+end

data/lib/reynard/object_builder.rb

@@ -46,7 +46,7 @@ class Reynard
     end
 
     def self.model_class_get(name)
-      Reynard::Models.const_get(name)
+      Kernel.const_get("::Reynard::Models::#{name}")
     rescue NameError
       nil
     end

data/lib/reynard/specification.rb

@@ -102,11 +102,14 @@ class Reynard
 
     def self.normalize_model_name(name)
       # 1. Unescape encoded characters to create an UTF-8 string
-      # 2. Replace all non-alphabetic characters with a space (not allowed in Ruby constant)
-      # 3. Camelcase
+      # 2. Remove extensions for regularly used external schema files
+      # 3. Replace all non-alphabetic characters with a space (not allowed in Ruby constant)
+      # 4. Camelcase
       Rack::Utils.unescape_path(name)
+                 .gsub(/(.yml|.yaml|.json)\Z/, '')
                  .gsub(/[^[:alpha:]]/, ' ')
                  .gsub(/(\s+)([[:alpha:]])/) { Regexp.last_match(2).upcase }
+                 .gsub(/\A(.)/) { Regexp.last_match(1).upcase }
     end
 
     private
@@ -117,6 +120,9 @@ class Reynard
       end
     end
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/MethodLength
     def dig_into(data, cursor, path)
       while path.length.positive?
         cursor = cursor[path.first]
@@ -125,12 +131,23 @@ class Reynard
         path.shift
         next unless cursor.respond_to?(:key?) && cursor&.key?('$ref')
 
-        # We currenly only supply references inside the document starting with #/.
-        path = Rack::Utils.unescape_path(cursor['$ref'][2..]).split('/') + path
-        cursor = data
+        case cursor['$ref']
+        # References another element in the current specification.
+        when %r{\A#/}
+          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: File.dirname(@filename), ref: cursor['$ref'])
+          path = external.path + path
+          cursor = external.data
+        end
       end
       cursor
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength
 
     def schema_name(response)
       ref = response.dig('schema', '$ref')

data/lib/reynard/version.rb

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

data/lib/reynard.rb

@@ -15,6 +15,7 @@ class Reynard
   def_delegators :@specification, :servers
 
   autoload :Context, 'reynard/context'
+  autoload :External, 'reynard/external'
   autoload :GroupedParameters, 'reynard/grouped_parameters'
   autoload :Http, 'reynard/http'
   autoload :Logger, 'reynard/logger'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reynard
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Manfred Stienstra
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -121,6 +121,7 @@ files:
 - README.md
 - lib/reynard.rb
 - lib/reynard/context.rb
+- lib/reynard/external.rb
 - lib/reynard/grouped_parameters.rb
 - lib/reynard/http.rb
 - lib/reynard/http/request.rb
@@ -142,7 +143,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -158,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Minimal OpenAPI client.
 test_files: []