oas_parser 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b44913e6a3d388f77e72ddb2340b2c8a573417ddbe92e45e8a1b8f97ea1f3de7
-  data.tar.gz: 929ced8cdf91798199f31eef3837680d8054db93004928943cde3fcf08b7492e
+  metadata.gz: 0fd70d73eed5326319f61572f5a89e256553ba1ff5af7855f95db7854d6164ed
+  data.tar.gz: 953cff2adbfd8904d867d555a3aec1cd9567148842bcefefaa48a5e63a93000f
 SHA512:
-  metadata.gz: af8baaf8f63f92126322dacda77c745bc1036050aa28e6970f1d167d1412483c212a2c7ec6a4023aa192fc542c6874b59e7dd415dd8df1d6c59cacdc6548a3c5
-  data.tar.gz: fbfa2c0d997531c2736b233783405758d6c3e6f5e3ad131839d5194269e6ed7ce422d7a21f0a9f6e6e0baf197d02d3263a5fbdb4168262d12cd609f667e2902f
+  metadata.gz: 28459e9e0a12e418f5b38934734529a95b06612dd7ce23a0bf3ed4f8255dabd6c47426011e3284285f295ff4a4838f9a771c6e1eeec92d36bb71778342c2ab50
+  data.tar.gz: ae2e6a3ff725f9b06338cdb694be2782a8b511d0b0f8e885585810b97d14e25cc1dd25a5bb8d51459917c67ea27f4a80c43327e8276caaab92f5e4ef713e43b8

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    oas_parser (0.23.0)
+    oas_parser (0.24.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.3)
       builder (~> 3.2.3)
       deep_merge (~> 1.2.1)
       hash-deep-merge
-      mustermann-contrib (~> 1.0.3s)
+      mustermann-contrib (~> 1.1.1)
       nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -45,7 +45,7 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     hansi (0.2.0)
     hash-deep-merge (0.1.1)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     listen (3.1.5)
@@ -55,13 +55,14 @@ GEM
     lumberjack (1.0.13)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
-    mustermann (1.0.3)
-    mustermann-contrib (1.0.3)
+    minitest (5.14.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mustermann-contrib (1.1.1)
       hansi (~> 0.2.0)
-      mustermann (= 1.0.3)
+      mustermann (= 1.1.1)
     nenv (0.3.0)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -69,7 +70,7 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (4.0.1)
+    public_suffix (4.0.3)
     rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
@@ -89,6 +90,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    ruby2_keywords (0.0.2)
     ruby_dep (1.5.0)
     shellany (0.0.1)
     simplecov (0.15.1)
@@ -98,7 +100,7 @@ GEM
     simplecov-html (0.10.2)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     zeitwerk (2.2.2)
 
@@ -106,7 +108,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1)
   guard-rspec (~> 4.7.3)
   oas_parser!
   pry (~> 0.11.3)
@@ -116,4 +118,4 @@ DEPENDENCIES
   simplecov (~> 0.15.1)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/lib/oas_parser/request_body.rb

@@ -28,13 +28,34 @@ module OasParser
     end
 
     def handle_all_of(schema)
+      newSchema = {}
       if schema['allOf']
         schema['allOf'].each do |p|
-          schema.deep_merge!(p)
+          newSchema = deep_safe_merge(newSchema, p)
+          if newSchema['allOf']
+            newSchema = deep_safe_merge(newSchema, handle_all_of(newSchema))
+            newSchema.delete('allOf')
+          end
         end
-        schema.delete('allOf')
+      else
+        newSchema = schema
       end
-      schema
+
+      newSchema
     end
+
+     def deep_safe_merge(source_hash, new_hash)
+       source_hash.merge(new_hash) do |key, old, new|
+         if new.respond_to?(:blank) && new.blank?
+           old
+         elsif (old.kind_of?(Hash) and new.kind_of?(Hash))
+           old.deep_merge(new)
+         elsif (old.kind_of?(Array) and new.kind_of?(Array))
+           old.concat(new).uniq
+         else
+           new
+         end
+       end
+     end
   end
 end

data/lib/oas_parser/version.rb

@@ -1,3 +1,3 @@
 module OasParser
-  VERSION = '0.23.0'.freeze
+  VERSION = '0.24.0'.freeze
 end

data/oas_parser.gemspec

@@ -24,11 +24,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "deep_merge", "~> 1.2.1"
   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 "mustermann-contrib", "~> 1.1.1"
   spec.add_dependency "nokogiri"
   spec.add_dependency "hash-deep-merge"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "guard-rspec", "~> 4.7.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oas_parser
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Adam Butler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3s
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3s
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -263,7 +263,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A parser for Open API specifications