rspec-openapi 0.21.3 → 0.21.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d28b278fc0d9e8f0ce356103ea53e7b97392eac4f7c09fda493a9d7b1e2bfa10
-  data.tar.gz: 501c53f68a84d09f96f40a0e0749d65b2ceba13d16ebeb4819c989fdd7f62c2e
+  metadata.gz: b35d6193603f213ab605629e833a56827da2cc4071a9bde884ed7f67ae257946
+  data.tar.gz: d3f5d1b55e242ccde842aca000aebdcff950fac29d11197cdd2002bedd9f6976
 SHA512:
-  metadata.gz: 7e4636d3f30bb1114932aabdb6ae2ef40bb9492a08d5d7c9022f52d8b5e4a415e424abc8611a14a8f7f6d8c139947ee900bc50cdfafda19e95bcd6cb06d26142
-  data.tar.gz: 8a3e455ed8a022f5e9df443a14f3159665b77ca4a416b6b3f29404efd367717060f7121fd1a3ec77190d1bc426850b58faf2cc6092c7acc9c18e8f78e732aeb7
+  metadata.gz: c30cc46860494d67aed4b1eb9ea11db58b77bbfec31f3d1fef1f0723aad7a16775ed30f4b874331eec6ed26a3238522f8ee018d0ae252fe769a78de3b6b5eb46
+  data.tar.gz: e50cf253d00c8d4c11d6abe1793c32b8a5eec594dca37d8fdeb48969a3e4c13c79b40e8a034f3ca0f4cec2909e0c48d5d8082131c9109ffe9015ddc0ec5bdf75

data/lib/rspec/openapi/schema_builder.rb

@@ -272,15 +272,20 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
       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)
+        if unique_types.size > 1
+          unique_props = property_variations.map { |p| p.reject { |k, _| k == :nullable } }.uniq
+          merged_schema[:properties][key] = { oneOf: unique_props }
         else
-          merged_schema[:properties][key] = property_variations.first.dup
+          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
         end
       end
 
@@ -309,7 +314,9 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
         nullable_only = all_prop_variations.select { |p| p && p.keys == [:nullable] }
         prop_variations = all_prop_variations.select { |p| p && p.keys != [:nullable] }.compact
 
-        has_nullable = all_prop_variations.any?(&:nil?) || nullable_only.any?
+        has_nullable = all_prop_variations.any? do |v|
+          v.nil? || (v.is_a?(Hash) && v[:nullable] == true)
+        end || nullable_only.any?
 
         if prop_variations.empty? && has_nullable
           merged[:properties][key] = { nullable: true }
@@ -318,8 +325,21 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
           merged[:properties][key][:nullable] = true if has_nullable
         elsif prop_variations.size > 1
           prop_types = prop_variations.map { |p| p[:type] }.compact.uniq
-
-          if prop_types.size == 1
+          has_one_of = prop_variations.any? { |p| p.key?(:oneOf) }
+
+          if has_one_of
+            all_options = []
+            prop_variations.each do |prop|
+              clean_prop = prop.reject { |k, _| k == :nullable }
+              if clean_prop.key?(:oneOf)
+                all_options.concat(clean_prop[:oneOf])
+              else
+                all_options << clean_prop unless clean_prop.empty?
+              end
+            end
+            all_options.uniq!
+            merged[:properties][key] = { oneOf: all_options }
+          elsif prop_types.size == 1
             # Only recursively merge if it's an object type
             merged[:properties][key] = if prop_types.first == 'object'
                                          build_merged_schema_from_variations(prop_variations)

data/lib/rspec/openapi/schema_merger.rb

@@ -25,7 +25,12 @@ class << RSpec::OpenAPI::SchemaMerger = Object.new
 
     spec.each do |key, value|
       if base[key].is_a?(Hash) && value.is_a?(Hash)
-        merge_schema!(base[key], value) unless base[key].key?(:$ref)
+        # If the new value has oneOf, replace the entire value instead of merging
+        if value.key?(:oneOf)
+          base[key] = value
+        else
+          merge_schema!(base[key], value) unless base[key].key?(:$ref)
+        end
       elsif base[key].is_a?(Array) && value.is_a?(Array)
         # parameters need to be merged as if `name` and `in` were the Hash keys.
         merge_arrays(base, key, value)

data/lib/rspec/openapi/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenAPI
-    VERSION = '0.21.3'
+    VERSION = '0.21.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openapi
 version: !ruby/object:Gem::Version
-  version: 0.21.3
+  version: 0.21.5
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -110,7 +110,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.3
+  changelog_uri: https://github.com/exoego/rspec-openapi/releases/tag/v0.21.5
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: