rspec-openapi 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9de2ab7b530ea8a400d157e5296b042e7a1988b84537a2def73007a169d530fe
-  data.tar.gz: 4550f2cee402ccbd45c2722a8bac19550494e2822ea5344a09294ba06845901b
+  metadata.gz: df4214dc6ec5b88e9418ccc5e0c7cc86b69fbe90ec960faba1c48db8c5a5885d
+  data.tar.gz: f4de4de889d2e8df45173ce55c3e010e7838fa32b7f4af20435df7ba01b03868
 SHA512:
-  metadata.gz: 9ad939c9bfc561a429838f5e6149c1cefbe7c6e1346c8d0cf95fd83fa7cbd55654c7dcb9d889d9fdb8f6eead6c35c6eb316d35445679ba6cabc3b8e7cc2a5022
-  data.tar.gz: bac87ded3a5f9cbcbedf675b8a29e18ea53ec87f3abc396d56872279a6c88c879afcb09589db87796736b947cef34ef9b59af49e903e297c6aa0c4389f5b2465
+  metadata.gz: 908be0ef51bad71044644c4e3abaf6dccf54d712f489963afd4b7e05a4cdbfdb6848536ed1aa9004e38bf1b85f0ebe79da365368a7f0559f291aa29416e54040
+  data.tar.gz: 542c5ed74819337e5cddcd244792aab84084afc9a43e81cb2b73e3bbb8eff9056ed3b62f5354d4421a6c3490e8356b16366b22da30c317989efcce757e77d714

data/.github/workflows/create_release.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version to release (e.g. 0.23.1 or 0.24.0)'
+        description: 'Version to release (e.g. 0.24.1 or 0.25.0)'
         required: true
 
 jobs:

data/lib/rspec/openapi/schema_merger.rb

@@ -65,13 +65,61 @@ class << RSpec::OpenAPI::SchemaMerger = Object.new
 
     all_parameters = all_parameters.map do |parameter|
       base_parameter = unique_base_parameters[[parameter[:name], parameter[:in]]] || {}
-      base_parameter ? base_parameter.merge(parameter) : parameter
+      if base_parameter.empty?
+        parameter
+      else
+        merge_parameter_with_schema(base_parameter, parameter)
+      end
     end
 
     all_parameters.uniq! { |param| param.slice(:name, :in) }
     base[key] = all_parameters
   end
 
+  def merge_parameter_with_schema(base_param, new_param)
+    base_schema = base_param[:schema]
+    new_schema = new_param[:schema]
+
+    # If schemas have different types, create a oneOf
+    if base_schema && new_schema && schemas_have_different_types?(base_schema, new_schema)
+      merged_schema = merge_schemas_into_one_of(base_schema, new_schema)
+      base_param.merge(new_param).merge(schema: merged_schema)
+    else
+      base_param.merge(new_param)
+    end
+  end
+
+  def schemas_have_different_types?(schema1, schema2)
+    # If either already has oneOf, we need to merge into it
+    return true if schema1[:oneOf] || schema2[:oneOf]
+
+    type1 = schema1[:type]
+    type2 = schema2[:type]
+
+    type1 && type2 && type1 != type2
+  end
+
+  def merge_schemas_into_one_of(base_schema, new_schema)
+    existing_types = extract_schema_types(base_schema)
+    new_types = extract_schema_types(new_schema)
+
+    all_types = existing_types + new_types
+    all_types.uniq!
+
+    # If only one type remains, return it directly
+    return all_types.first if all_types.size == 1
+
+    { oneOf: all_types }
+  end
+
+  def extract_schema_types(schema)
+    if schema[:oneOf]
+      schema[:oneOf].map { |s| s.reject { |k, _| k == :example } }
+    else
+      [schema.reject { |k, _| k == :example }]
+    end
+  end
+
   def build_unique_params(base, key)
     base[key].each_with_object({}) do |parameter, hash|
       hash[[parameter[:name], parameter[:in]]] = parameter

data/lib/rspec/openapi/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenAPI
-    VERSION = '0.23.0'
+    VERSION = '0.24.0'
   end
 end

metadata

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