openapi_contracts 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56248ce2cb1b1a67d4cf1d7390a9815bb9f20a3b9b488e0dd116aa994f8bd9a0
-  data.tar.gz: a6a8df4841e768c0905bad6699ef0d9295221dad637e5ef8a01c35bb9442a8f0
+  metadata.gz: e6c02afb8cd5c3ad005ff169eb4c1294b8de98dd97c4cd643609a8f3a5cc66d5
+  data.tar.gz: e8808416c903da9662789d67da35fa6b2f44e9ba7659b7baa675ef5cdabbcd8a
 SHA512:
-  metadata.gz: 578b3ef8c71e5a19667e34e2791be7051693d198bf62dfcdaa8b9fc09403cbe54bc12af266c61103eb743a32a8ea0f88552d6eefeecba7ca14d55a3868f0deb8
-  data.tar.gz: 07c76b46bd842bfb5aa60e9af6cf30a2a45185b682e841183624c222580b3022c7b19239bb2b081a0ae9eedbab365ce78ec55bd4a76e5ba02b9d120fd2a6d853
+  metadata.gz: 199fa68a93326277251d413ff5e6c3d2b4718b3345a74cb79f227252a4e741f4cb179f05eaa304b2807b29e64f5510a0c9f5bec817c9373337c68a7f8a1ba8d1
+  data.tar.gz: 81c16071342cf8203380e85ced5bf52974231371d269c72ea4d182b472148b4e801c12cc3ca699237643559c1a52dd935f9b984f73c974e51002061da8b3dfa3

data/lib/openapi_contracts/doc/file_parser.rb

@@ -10,13 +10,14 @@ module OpenapiContracts
       end
     end
 
-    def self.parse(root, pathname)
-      new(root, pathname).call
+    def self.parse(rootfile, pathname)
+      new(rootfile, pathname).call
     end
 
-    def initialize(root, pathname)
-      @root = root
-      @pathname = pathname.relative? ? root.join(pathname) : pathname
+    def initialize(rootfile, pathname)
+      @root = rootfile.parent
+      @rootfile = rootfile
+      @pathname = pathname.relative? ? @root.join(pathname) : pathname
     end
 
     def call
@@ -57,11 +58,11 @@ module OpenapiContracts
     def transform_pointer(key, target)
       if %r{^#/(?<pointer>.*)} =~ target
         # A JSON Pointer
-        {key => "#/#{@pathname.relative_path_from(@root).sub_ext('').join(pointer)}"}
+        {key => generate_absolute_pointer(pointer)}
       elsif %r{^(?<relpath>[^#]+)(?:#/(?<pointer>.*))?} =~ target
         if relpath.start_with?('paths') # path description file pointer
           # Inline the file contents
-          self.class.parse(@root, Pathname(relpath)).data
+          self.class.parse(@rootfile, Pathname(relpath)).data
         else # A file pointer with potential JSON sub-pointer
           tgt = @pathname.parent.relative_path_from(@root).join(relpath).sub_ext('')
           tgt = tgt.join(pointer) if pointer
@@ -71,5 +72,14 @@ module OpenapiContracts
         {key => target}
       end
     end
+
+    # A JSON pointer to the currently parsed file as seen from the root openapi file
+    def generate_absolute_pointer(json_pointer)
+      if @rootfile == @pathname
+        "#/#{json_pointer}"
+      else
+        "#/#{@pathname.relative_path_from(@root).sub_ext('').join(json_pointer)}"
+      end
+    end
   end
 end

data/lib/openapi_contracts/doc/parser.rb

@@ -1,27 +1,27 @@
 module OpenapiContracts
   class Doc::Parser
     def self.call(dir, filename)
-      new(dir).parse(filename)
+      new(dir.join(filename)).parse
     end
 
-    def initialize(dir)
-      @dir = dir
+    def initialize(rootfile)
+      @rootfile = rootfile
     end
 
-    def parse(path)
-      abs_path = @dir.join(path)
-      file = Doc::FileParser.parse(@dir, abs_path)
+    def parse
+      file = Doc::FileParser.parse(@rootfile, @rootfile)
       data = file.data
       data.deep_merge! merge_components
       nullable_to_type!(data)
+      # debugger
     end
 
     private
 
     def merge_components
       data = {}
-      Dir[File.expand_path('components/**/*.yaml', @dir)].each do |file|
-        result = Doc::FileParser.parse(@dir, Pathname(file))
+      Dir[File.expand_path('components/**/*.yaml', @rootfile.parent)].each do |file|
+        result = Doc::FileParser.parse(@rootfile, Pathname(file))
         data.deep_merge!(result.to_mergable_hash)
       end
       data

data/lib/openapi_contracts/doc/path.rb

@@ -2,7 +2,8 @@ module OpenapiContracts
   class Doc::Path
     def initialize(schema)
       @schema = schema
-      @methods = @schema.to_h do |method, _|
+
+      @methods = (known_http_methods & @schema.keys).to_h do |method|
         [method, Doc::Method.new(@schema.navigate(method))]
       end
     end
@@ -14,5 +15,12 @@ module OpenapiContracts
     def with_method(method)
       @methods[method]
     end
+
+    private
+
+    def known_http_methods
+      # https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
+      %w(get head post put delete connect options trace patch).freeze
+    end
   end
 end

data/lib/openapi_contracts/doc/schema.rb

@@ -26,7 +26,7 @@ module OpenapiContracts
       pointer.map { |p| p.gsub('/', '~1') }.join('/').then { |s| "#/#{s}" }
     end
 
-    delegate :dig, :fetch, :key?, :[], :to_h, to: :as_h
+    delegate :dig, :fetch, :keys, :key?, :[], :to_h, to: :as_h
 
     def at_pointer(pointer)
       self.class.new(raw, pointer)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_contracts
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - mkon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.51.0
+        version: 1.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.51.0
+        version: 1.52.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement