oas_parser 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af21e3945bcd537a9606bff192aed9cf48d8b0b18ff878f268bc416af4a3480d
-  data.tar.gz: 0a200ba60fbd11885a4bd6bc50daa6a970222da2eaac9253f5f1225e37beec27
+  metadata.gz: cf608da9a7c2b6fa14bd6bc2c11f087a20ee378863c126d64962f361c752abbe
+  data.tar.gz: 894cee81f1a47c1a41057a4511bca9bca6cd5a83ce51ac7ef931aed47985ed0a
 SHA512:
-  metadata.gz: e135ca6bf6a65fddf2c5bef4d0f802350fec90385af5d39b4e551b316a26f03362cad6c3a2fdcd9d0f63121f1367550b129cc385c1115f3c0b0dc45fcf149f36
-  data.tar.gz: 8c5b6cd7ba282839ff8e62125cee6ad16371c80849c29e3dbd6e781e123e1d1f057aef81293f00086acbbaafb0499d592835960f42175e92706760d2b1d5f2e7
+  metadata.gz: 8984dab1cfa049034c1ef4c149bc3f392dcb7dd7618df32cd145498f0d4a43833e0b8f1bd9f4dffcbd72025a727d42cebf4861f9a28e1ef288d5dafdb57d380c
+  data.tar.gz: 2f8fbf593b4f15b00c8dd74f19a187ddec6af950c24feb2a463e7beff5912c1d4c88d5bae3b8eec5610fdea8c95c1faa62ec8d158b879815200c60709154939c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oas_parser (0.18.0)
+    oas_parser (0.18.1)
       activesupport (>= 4.0.0)
       addressable (~> 2.3)
       builder (~> 3.2.3)

data/lib/oas_parser/parser.rb

@@ -49,21 +49,14 @@ module OasParser
     def expand_file(ref)
       absolute_path = File.expand_path(File.join("..", ref), @path)
       absolute_path, local_reference = absolute_path.split('#')
-      if local_reference
-        # skip first item in the split array, it is blank
-        local_reference_path = local_reference.split('/')[1..-1]
-        resolved_remote_reference = Parser.resolve(absolute_path)
+      resolved_remote_reference = Parser.resolve(absolute_path)
 
-        # expand the pointer included as part of the remote reference 
-        # within the context of the remote reference
-        expanded_pointer = expand_pointer('#' + local_reference, resolved_remote_reference)
-        
-        # extract the local reference data from the remote remote reference
-        # and include the expanded pointer
-        resolved_remote_reference.dig(*local_reference_path).merge(expanded_pointer)
-      else
-        Parser.resolve(absolute_path)
+      if local_reference
+        pointer = OasParser::Pointer.new(local_reference)
+        return pointer.resolve(resolved_remote_reference)
       end
+
+      resolved_remote_reference
     end
 
     def expand_pointer(ref, content=nil)

data/lib/oas_parser/version.rb

@@ -1,3 +1,3 @@
 module OasParser
-  VERSION = '0.18.0'.freeze
+  VERSION = '0.18.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oas_parser
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Adam Butler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A parser for Open API specifications