oas_parser 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76538bff6c3f4e9fd3ea31b6c2d365a55f7ae1db7a71f5d22cf6e19a2aa0456b
-  data.tar.gz: '0855e16c2b41697b079dfab75a1523a64ef5491d1f2f0a071ad43c810465dfb1'
+  metadata.gz: b87fccaab412d43a8da11115041d8fc3170e3f7410d8d4fe3da50223dae7abf1
+  data.tar.gz: 41c5f6103025494d905939df9018ffcfee48db0352928d851bc589fc6e06e9f3
 SHA512:
-  metadata.gz: ccf0cccc79a10d749e18646a7dd0b64889209f60f2edc67647bd6706e604d8373955867e3d198842f6fb8dc50b0131656c3f0f17e02a62674a1223592a808bc7
-  data.tar.gz: 81f6f36dff3902db4fcfaef359b0f18c592cd7608c52f998ac4ec87a9edd8cedd608334e75e6800418da6a4fed09867d9ed7bc79b2732f77185f11327aa2bf0b
+  metadata.gz: b508516b6340d6a111a303e916907c68f798e2d0ea65fd193a109591d8753b9b595f6d24a8481c05e4296beb303649d2176280741612fb2be6524387689cb69e
+  data.tar.gz: e5c6793cf56a29142c6c9629fd1dc4430d63370363c42fdcd847b57ebc000a943544c8b720223294d27c54fef36544c98f91ae900351ab2bb76165468eca5aac

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.21.0
+
+- oneOf values that contain allOf values at the top level of a request body are now handled correctly
+
 ## 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)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oas_parser (0.19.0)
+    oas_parser (0.21.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.3)
       builder (~> 3.2.3)
@@ -100,7 +100,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    zeitwerk (2.1.9)
+    zeitwerk (2.1.10)
 
 PLATFORMS
   ruby

data/lib/oas_parser/request_body.rb

@@ -11,17 +11,31 @@ module OasParser
     end
 
     def properties_for_format(format)
-      schema(format)['properties'].map do |name, definition|
-        OasParser::Property.new(self, schema(format), name, definition)
+      s = schema(format)
+      s = handle_all_of(s)
+      s['properties'].map do |name, definition|
+        OasParser::Property.new(self, s, name, definition)
       end
     end
 
     def split_properties_for_format(format)
       split_schemas(format).map do |schema|
+        schema = handle_all_of(schema)
         schema['properties'].map do |name, definition|
           OasParser::Property.new(self, schema(format), name, definition)
         end
       end
     end
+
+    def handle_all_of(schema)
+      if schema['allOf']
+        schema['properties'] = {}
+        schema['allOf'].each do |p|
+          schema['properties'].deep_merge!(p['properties'])
+        end
+        schema.delete('allOf')
+      end
+      schema
+    end
   end
 end

data/lib/oas_parser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oas_parser
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Adam Butler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -263,7 +263,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A parser for Open API specifications