oas_parser 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 825c569ee33db4ed6f8b1e666b9bbba45a5440d34d3490074e63f5815414efd8
-  data.tar.gz: 289f26572fa6abbf927305aaba1452d1c15ca6639726bf29768ec5ad12b490ef
+  metadata.gz: 76538bff6c3f4e9fd3ea31b6c2d365a55f7ae1db7a71f5d22cf6e19a2aa0456b
+  data.tar.gz: '0855e16c2b41697b079dfab75a1523a64ef5491d1f2f0a071ad43c810465dfb1'
 SHA512:
-  metadata.gz: ff8b3c7bcedfd51b38de3a61b0781ea8f64af25238918091b83304c549331aec97ec9714c7daa5c481e37867adb1306529460406e66b21e33fc987772d2b81d8
-  data.tar.gz: 35fe373a593e01a8b26fa8a1e04f0dbc388a6d87475c6523254a54a5de5883adb7ca65c5cc28f566c6c641f5e7a98c21aa9bf0e5db356b561043d875c0efba69
+  metadata.gz: ccf0cccc79a10d749e18646a7dd0b64889209f60f2edc67647bd6706e604d8373955867e3d198842f6fb8dc50b0131656c3f0f17e02a62674a1223592a808bc7
+  data.tar.gz: 81f6f36dff3902db4fcfaef359b0f18c592cd7608c52f998ac4ec87a9edd8cedd608334e75e6800418da6a4fed09867d9ed7bc79b2732f77185f11327aa2bf0b

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 0.20.0
+
+- allOf values are now deep-merged in to a single hash before being processed as properties/oneOf. This means that allOf will never be present in your data (just like JSON pointers are auto-resolved)
+
+## 0.19.0
+
+- Parser now handles circular/self reference by returning the $ref as is instead of expanding it indefinitely. (Qihuan Piao)

data/Gemfile.lock

@@ -6,19 +6,21 @@ PATH
       addressable (~> 2.3)
       builder (~> 3.2.3)
       deep_merge (~> 1.2.1)
+      hash-deep-merge
       mustermann-contrib (~> 1.0.3s)
       nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.3)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
@@ -42,6 +44,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hansi (0.2.0)
+    hash-deep-merge (0.1.1)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
@@ -58,7 +61,7 @@ GEM
       hansi (~> 0.2.0)
       mustermann (= 1.0.3)
     nenv (0.3.0)
-    nokogiri (1.10.1)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -66,7 +69,7 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.3)
+    public_suffix (4.0.1)
     rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
@@ -97,6 +100,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    zeitwerk (2.1.9)
 
 PLATFORMS
   ruby

data/lib/oas_parser/abstract_attribute.rb

@@ -20,6 +20,10 @@ module OasParser
       raw['enum'] || (schema ? schema['enum'] : nil)
     end
 
+    def allOf?
+      raw['allOf'] ? true : false
+    end
+
     def oneOf?
       raw['oneOf'] ? true : false
     end
@@ -44,7 +48,7 @@ module OasParser
     end
 
     def properties
-      return convert_property_schema_to_properties(raw) if oneOf?
+      return convert_property_schema_to_properties(raw) if (oneOf? || allOf?)
       return nil unless collection?
       return [] if empty?
       return convert_property_schema_to_properties(raw['properties']) if object?

data/lib/oas_parser/property.rb

@@ -20,6 +20,14 @@ module OasParser
     end
 
     def convert_property_schema_to_properties(schema)
+      if schema['allOf']
+        schema['properties'] = {}
+        schema['allOf'].each do |p|
+          schema['properties'].deep_merge!(p['properties'])
+        end
+        schema.delete('allOf')
+      end
+
       if schema['oneOf']
         schema['oneOf'].map do |subschema|
           subschema['properties'] = convert_property_schema_to_properties(subschema)

data/lib/oas_parser/version.rb

@@ -1,3 +1,3 @@
 module OasParser
-  VERSION = '0.19.0'.freeze
+  VERSION = '0.20.0'.freeze
 end

data/oas_parser.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "builder", "~> 3.2.3"
   spec.add_dependency "mustermann-contrib", "~> 1.0.3s"
   spec.add_dependency "nokogiri"
+  spec.add_dependency "hash-deep-merge"
 
   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.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Adam Butler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hash-deep-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +216,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -212,7 +227,6 @@ files:
 - bin/console
 - bin/setup
 - lib/oas_parser.rb
-- lib/oas_parser/CHANGELOG.md
 - lib/oas_parser/abstract_attribute.rb
 - lib/oas_parser/callback.rb
 - lib/oas_parser/definition.rb
@@ -249,8 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A parser for Open API specifications

data/lib/oas_parser/CHANGELOG.md

@@ -1,3 +0,0 @@
-## Unreleased
-
-- Parser now handles circular/self reference by returning the $ref as is instead of expanding it indefinitely. (Qihuan Piao)