rspec-openapi 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b40fcb7598d29cf3c8bf2f95f6aafb5a011ddbb2beff06d6366052d11effa02
-  data.tar.gz: 85bd479d5b7e4da9e19dcc8bbbb963a594eed99437cb911a965695d04768a4bd
+  metadata.gz: fcdab2071b77e7d4df6910839d60df6d3493fcf3bc10c47829fc0609451c5094
+  data.tar.gz: 0efb97d546a285eaa1108dbec9b9dd6598a119b93f46dde04e070cdaf8f029d3
 SHA512:
-  metadata.gz: 89c7e3788cfccd022711d1ce76be3ee1b1568af4bade87908afb3384e64e88714a0d4b30499f0eeebb45909fe5eab5267c96afc231ea1db60a6b2fe8fc0155d6
-  data.tar.gz: 71e418493c5f3db1c8a5388bd2826fe36e15375445d3ddc7c1b2364cdfb7d160cdf3c9b02554e6134abf82e0f994355b725223c773857fb034e3b7eb034c2db7
+  metadata.gz: cb16c77c27f8a766cb5e09bce79d2ef7af160277b274dbd75785f8ca9466e28e6800f498f167644fb16e66b4f6a1dc7becd77b0632d4c1a717b49739e4ed014c
+  data.tar.gz: efa94d5ea193fd56f3ac3b4f220453c3ceb184596688422fff7fe9e14223a44c5427ad17206a7cd4014e16f8e1f4bafc3f3ebdce3a336251a036f5daee83ee2e

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 /Gemfile.lock
+.DS_Store
 
 # rspec failure tracking
 .rspec_status

data/lib/rspec/openapi/schema_builder.rb

@@ -246,20 +246,84 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
 
   def build_array_items_schema(array, record: nil)
     return {} if array.empty?
+    return build_property(array.first, record: record) if array.size == 1
+    return build_property(array.first, record: record) unless array.all? { |item| item.is_a?(Hash) }
 
-    merged_schema = build_property(array.first, record: record)
+    all_schemas = array.map { |item| build_property(item, record: record) }
+    merged_schema = all_schemas.first.dup
+    merged_schema[:properties] = {}
 
-    # Future improvement - cover other types than just hashes
-    if array.size > 1 && array.all? { |item| item.is_a?(Hash) }
-      array[1..].each do |item|
-        item_schema = build_property(item, record: record)
-        merged_schema = merge_object_schemas(merged_schema, item_schema)
+    all_keys = all_schemas.flat_map { |s| s[:properties]&.keys || [] }.uniq
+
+    all_keys.each do |key|
+      property_variations = all_schemas.map { |s| s[:properties]&.[](key) }.compact
+
+      next if property_variations.empty?
+
+      if property_variations.size == 1
+        merged_schema[:properties][key] = make_property_nullable(property_variations.first)
+      else
+        unique_types = property_variations.map { |p| p[:type] }.compact.uniq
+
+        case unique_types.first
+        when 'array'
+          merged_schema[:properties][key] = { type: 'array' }
+          items_variations = property_variations.map { |p| p[:items] }.compact
+          merged_schema[:properties][key][:items] = build_merged_schema_from_variations(items_variations)
+        when 'object'
+          merged_schema[:properties][key] = build_merged_schema_from_variations(property_variations)
+        else
+          merged_schema[:properties][key] = property_variations.first.dup
+        end
+
+        merged_schema[:properties][key][:nullable] = true if property_variations.size < all_schemas.size
       end
     end
 
+    all_required_sets = all_schemas.map { |s| s[:required] || [] }
+    merged_schema[:required] = all_required_sets.reduce(:&) || []
+
     merged_schema
   end
 
+  def build_merged_schema_from_variations(variations)
+    return {} if variations.empty?
+    return variations.first if variations.size == 1
+
+    types = variations.map { |v| v[:type] }.compact.uniq
+
+    if types.size == 1 && types.first == 'object'
+      merged = { type: 'object', properties: {} }
+      all_keys = variations.flat_map { |v| v[:properties]&.keys || [] }.uniq
+
+      all_keys.each do |key|
+        prop_variations = variations.map { |v| v[:properties]&.[](key) }.compact
+
+        if prop_variations.size == 1
+          merged[:properties][key] = make_property_nullable(prop_variations.first)
+        elsif prop_variations.size > 1
+          prop_types = prop_variations.map { |p| p[:type] }.compact.uniq
+
+          if prop_types.size == 1
+            merged[:properties][key] = prop_variations.first.dup
+          else
+            unique_props = prop_variations.map { |p| p.reject { |k, _| k == :nullable } }.uniq
+            merged[:properties][key] = { oneOf: unique_props }
+          end
+
+          merged[:properties][key][:nullable] = true if prop_variations.size < variations.size
+        end
+      end
+
+      all_required = variations.map { |v| v[:required] || [] }
+      merged[:required] = all_required.reduce(:&) || []
+
+      merged
+    else
+      variations.first
+    end
+  end
+
   def merge_object_schemas(schema1, schema2)
     return schema1 unless schema2.is_a?(Hash) && schema1.is_a?(Hash)
     return schema1 unless schema1[:type] == 'object' && schema2[:type] == 'object'

data/lib/rspec/openapi/schema_merger.rb

@@ -77,6 +77,8 @@ class << RSpec::OpenAPI::SchemaMerger = Object.new
 
     return if option&.key?(:$ref)
 
+    return if spec[:oneOf]
+
     if score.to_f > SIMILARITY_THRESHOLD
       merge_schema!(option, spec)
     else

data/lib/rspec/openapi/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenAPI
-    VERSION = '0.21.0'
+    VERSION = '0.21.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openapi
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -108,7 +108,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/exoego/rspec-openapi
   source_code_uri: https://github.com/exoego/rspec-openapi
-  changelog_uri: https://github.com/exoego/rspec-openapi/releases/tag/v0.21.0
+  changelog_uri: https://github.com/exoego/rspec-openapi/releases/tag/v0.21.1
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: