open_api_parser 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e29cb55b6c982a638d0a344591e7e0b491770ec
-  data.tar.gz: 4138d2987f1be3dddf22b3431ca7e56c0e6a2e23
+  metadata.gz: bb1e58a744378c59f9ee81c24d755d8646bf9541
+  data.tar.gz: 76272f7d191a2e31bfccfcb408909fa5df624574
 SHA512:
-  metadata.gz: 4da0a3bee64fe0b9f4d0cf77fd48f8b406ff84fc01a50c3ea0a545c5577f103b795f1cf5c3b7527656def4f499f4d1c5832c3836575556c19adadd5bb073d9ea
-  data.tar.gz: ee83943fee6d5b95faaf6f52ccce0c61bb2a76d0e91214dcca07b9f0cdae761977b7a4ae7a5daca10fe938daaad9de2f7ac917ebfca9051ef24f2d0747ea2d96
+  metadata.gz: 74196435e01d89cf94061e50606d0245c6d27de84778da4172289882ccf48317bd7ebdd8b75e7b7231bd6dfb13da9644da87e8420bbd16115fae4ae9ccab95cb
+  data.tar.gz: 97151dab417f912d4180ce34c00ed8f9d0552a7c7b6753db3c073455d172de0d1c9406e83d44aeeebd6442c493c3113c7931cc3916132de0e5735e99c14f12da

data/.gitignore

@@ -11,3 +11,4 @@
 /.ruby-version
 /vendor/bundle
 /open_api_parser*.gem
+/bin

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.3
+
+* Handle circular references during resolution
+
 ## 1.2.2
 
 * Use `json-schema` to validate meta schema

data/lib/open_api_parser/document.rb

@@ -1,6 +1,6 @@
 module OpenApiParser
   class Document
-    def self.resolve(path, file_cache=OpenApiParser::FileCache.new)
+    def self.resolve(path, file_cache = OpenApiParser::FileCache.new)
       file_cache.get(path) do
         content = YAML.load_file(path)
         Document.new(path, content, file_cache).resolve
@@ -14,36 +14,36 @@ module OpenApiParser
     end
 
     def resolve
-      deeply_expand_refs(@content)
+      deeply_expand_refs(@content, nil)
     end
 
     private
 
-    def deeply_expand_refs(fragment)
-      fragment = expand_refs(fragment)
+    def deeply_expand_refs(fragment, cur_path)
+      fragment, cur_path = expand_refs(fragment, cur_path)
 
       if fragment.is_a?(Hash)
         fragment.reduce({}) do |hash, (k, v)|
-          hash.merge(k => deeply_expand_refs(v))
+          hash.merge(k => deeply_expand_refs(v, "#{cur_path}/#{k}"))
         end
       elsif fragment.is_a?(Array)
-        fragment.map { |e| deeply_expand_refs(e) }
+        fragment.map { |e| deeply_expand_refs(e, cur_path) }
       else
         fragment
       end
     end
 
-    def expand_refs(fragment)
-      if fragment.is_a?(Hash) && fragment.has_key?("$ref")
+    def expand_refs(fragment, cur_path)
+      if fragment.is_a?(Hash) && fragment.key?("$ref")
         ref = fragment["$ref"]
 
-        if ref =~ /\Afile:/
+        if ref.start_with?("file:")
           expand_file(ref)
         else
-          expand_pointer(ref)
+          expand_pointer(ref, cur_path)
         end
       else
-        fragment
+        [fragment, cur_path]
       end
     end
 
@@ -54,11 +54,15 @@ module OpenApiParser
       Document.resolve(absolute_path, @file_cache)
     end
 
-    def expand_pointer(ref)
+    def expand_pointer(ref, cur_path)
       pointer = OpenApiParser::Pointer.new(ref)
-      fragment = pointer.resolve(@content)
 
-      expand_refs(fragment)
+      if pointer.exists_in_path?(cur_path)
+        { "$ref" => ref }
+      else
+        fragment = pointer.resolve(@content)
+        expand_refs(fragment, cur_path + pointer.escaped_pointer)
+      end
     end
   end
 end

data/lib/open_api_parser/pointer.rb

@@ -12,7 +12,9 @@ module OpenApiParser
       end
     end
 
-    private
+    def exists_in_path?(path)
+      path.include?(escaped_pointer)
+    end
 
     def escaped_pointer
       if @raw_pointer.start_with?("#")
@@ -22,6 +24,8 @@ module OpenApiParser
       end
     end
 
+    private
+
     def parse_token(token)
       if token =~ /\A\d+\z/
         token.to_i
@@ -32,11 +36,7 @@ module OpenApiParser
 
     def tokens
       tokens = escaped_pointer[1..-1].split("/")
-
-      if @raw_pointer.end_with?("/")
-        tokens << ""
-      end
-
+      tokens << "" if @raw_pointer.end_with?("/")
       tokens.map do |token|
         parse_token(token)
       end

data/lib/open_api_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenApiParser
-  VERSION = "1.2.2".freeze
+  VERSION = "1.2.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api_parser
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A parser for Open API specifications