oas_parser 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69856fb6b9f6d1fe397f91a1089781129c53034618bca01119e238324350f0c5
-  data.tar.gz: d49a50d9b06b3ea31d89dc693cd6a359e24cc75c01786f74dd44ddad263a2b5f
+  metadata.gz: 37e97626c43f146f01f818554db72c53c9aeb7d80adfdfeb030e64ed1c23bdff
+  data.tar.gz: c5b84aabd9f633dedc50b9fcafc394f62585e7922bae8530f244582c375b5059
 SHA512:
-  metadata.gz: 3bd4584baa8eca3d9477c9845174fa203978717f00e60e9818894b03bb5ccfd2d97e034c42828b5d7e97cb55c0b16ada5ad424be7f7a8e51a330593e364133a2
-  data.tar.gz: fa3fd17b559c36b373a949c79b4c23fe34fb6a37901014570a377a54fbf4e0d2bc8db8cf2bc89b2b95b43cef05fc3e07acb450deb33e9c91528af105145f5199
+  metadata.gz: 16bcbfdf167076235e13b3d01a34796d7e0a67306dea7c10490ebe20a737e5e57f422a1853a680fb7346b93b402c7128c2b32461d99ad379c09e988a3e631ac8
+  data.tar.gz: a6b26fcb02a9751e7019f10ad05bd20735dd0ba71aa631db63eb1376310c7fc05b1d8c925390317177cad797823ae7b6d05c0a6490022f1e4e36e0f68a41268b

data/.gitignore

@@ -10,3 +10,5 @@
 
 # rspec failure tracking
 .rspec_status
+.ruby-gemset
+.ruby-version

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    oas_parser (0.15.2)
-      activesupport (> 5.1.2, < 6)
+    oas_parser (0.16.0)
+      activesupport (>= 4.0.0)
       addressable (~> 2.3)
       builder (~> 3.2.3)
       deep_merge (~> 1.2.1)
       mustermann-contrib (~> 1.0.3s)
-      nokogiri (~> 1.8.1)
+      nokogiri
 
 GEM
   remote: https://rubygems.org/
@@ -17,11 +17,11 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     builder (3.2.3)
     coderay (1.1.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     deep_merge (1.2.1)
     diff-lcs (1.3)
     docile (1.1.5)
@@ -42,7 +42,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hansi (0.2.0)
-    i18n (1.2.0)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     listen (3.1.5)
@@ -51,15 +51,15 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.2)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     mustermann (1.0.3)
     mustermann-contrib (1.0.3)
       hansi (~> 0.2.0)
       mustermann (= 1.0.3)
     nenv (0.3.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)

data/lib/oas_parser/parser.rb

@@ -34,10 +34,12 @@ module OasParser
       if fragment.is_a?(Hash) && fragment.has_key?("$ref")
         ref = fragment["$ref"]
 
-        if ref =~ /\Afile:/
-          expand_file(ref)
-        else
+        if ref =~ /^#/
           expand_pointer(ref)
+        elsif ref =~ /^(http(s)?|\/\/)/
+          expand_url(ref)
+        else
+          expand_file(ref)
         end
       else
         fragment
@@ -45,17 +47,34 @@ module OasParser
     end
 
     def expand_file(ref)
-      relative_path = ref.split(":").last
-      absolute_path = File.expand_path(File.join("..", relative_path), @path)
+      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)
 
-      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)
+      end
     end
 
-    def expand_pointer(ref)
+    def expand_pointer(ref, content=nil)
       pointer = OasParser::Pointer.new(ref)
-      fragment = pointer.resolve(@content)
+      fragment = pointer.resolve(content || @content)
 
       expand_refs(fragment)
     end
+
+    def expand_url(ref)
+      raise 'Expanding URL References is not supported'
+    end
   end
 end

data/lib/oas_parser/version.rb

@@ -1,3 +1,3 @@
 module OasParser
-  VERSION = '0.15.2'.freeze
+  VERSION = '0.16.0'.freeze
 end

data/oas_parser.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "addressable", "~> 2.3"
   spec.add_dependency "deep_merge", "~> 1.2.1"
-  spec.add_dependency "activesupport", "> 5.1.2", "< 6"
+  spec.add_dependency "activesupport", ">= 4.0.0"
   spec.add_dependency "builder", "~> 3.2.3"
   spec.add_dependency "mustermann-contrib", "~> 1.0.3s"
-  spec.add_dependency "nokogiri", "~> 1.8.1"
+  spec.add_dependency "nokogiri"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "guard-rspec", "~> 4.7.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oas_parser
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Adam Butler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -42,22 +42,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 5.1.2
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -90,16 +84,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement