rspec-openapi 0.21.1 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcdab2071b77e7d4df6910839d60df6d3493fcf3bc10c47829fc0609451c5094
-  data.tar.gz: 0efb97d546a285eaa1108dbec9b9dd6598a119b93f46dde04e070cdaf8f029d3
+  metadata.gz: 3d8b74f9e75f015e91e3ebc37ab353459d0a8d887fb096ad7e9fcf829898290e
+  data.tar.gz: 1fdbc903fdb61f685ca02d63a88a82eb9a3184e00a0766f1e31e82001ed068b1
 SHA512:
-  metadata.gz: cb16c77c27f8a766cb5e09bce79d2ef7af160277b274dbd75785f8ca9466e28e6800f498f167644fb16e66b4f6a1dc7becd77b0632d4c1a717b49739e4ed014c
-  data.tar.gz: efa94d5ea193fd56f3ac3b4f220453c3ceb184596688422fff7fe9e14223a44c5427ad17206a7cd4014e16f8e1f4bafc3f3ebdce3a336251a036f5daee83ee2e
+  metadata.gz: eb64851800a090a4cf4d9f78921f1203456ddf8b9d4e820af73d9449a259c7d6e5dd9997e01058136b0dc7b551bc5406e2e176f2818c27b6d7e5a6a00a136fb3
+  data.tar.gz: 82600b4917083f3b4a27f7bf4ee8b8b4314dc76a4c9c03f5143e5e182d652edea3cb6cef97f7b2f3598a2c27f143fdcb714058143d47fb44d2ccb6181fafe4fd

data/.github/workflows/codeql-analysis.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v4

data/.github/workflows/rubocop.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

data/.github/workflows/test.yml

@@ -32,7 +32,7 @@ jobs:
       RAILS_VERSION: ${{ matrix.rails == '' && '6.1.6' || matrix.rails }}
       COVERAGE: ${{ matrix.coverage || '' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: bundle install
         run: bundle install -j$(nproc) --retry 3
       - run: bundle exec rspec

data/lib/rspec/openapi/schema_builder.rb

@@ -256,12 +256,19 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
     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
+      all_property_schemas = all_schemas.map { |s| s[:properties]&.[](key) }
 
-      next if property_variations.empty?
+      nullable_only_schemas = all_property_schemas.select { |p| p && p.keys == [:nullable] }
+      property_variations = all_property_schemas.select { |p| p && p.keys != [:nullable] }
 
-      if property_variations.size == 1
-        merged_schema[:properties][key] = make_property_nullable(property_variations.first)
+      has_nullable = all_property_schemas.any?(&:nil?) || nullable_only_schemas.any?
+
+      next if property_variations.empty? && !has_nullable
+
+      if property_variations.empty? && has_nullable
+        merged_schema[:properties][key] = { nullable: true }
+      elsif property_variations.size == 1
+        merged_schema[:properties][key] = property_variations.first.dup
       else
         unique_types = property_variations.map { |p| p[:type] }.compact.uniq
 
@@ -275,9 +282,9 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
         else
           merged_schema[:properties][key] = property_variations.first.dup
         end
-
-        merged_schema[:properties][key][:nullable] = true if property_variations.size < all_schemas.size
       end
+
+      merged_schema[:properties][key][:nullable] = true if has_nullable && merged_schema[:properties][key].is_a?(Hash)
     end
 
     all_required_sets = all_schemas.map { |s| s[:required] || [] }
@@ -297,21 +304,32 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
       all_keys = variations.flat_map { |v| v[:properties]&.keys || [] }.uniq
 
       all_keys.each do |key|
-        prop_variations = variations.map { |v| v[:properties]&.[](key) }.compact
+        all_prop_variations = variations.map { |v| v[:properties]&.[](key) }
+
+        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?
 
         if prop_variations.size == 1
-          merged[:properties][key] = make_property_nullable(prop_variations.first)
+          merged[:properties][key] = prop_variations.first.dup
+          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
-            merged[:properties][key] = prop_variations.first.dup
+            # Only recursively merge if it's an object type
+            merged[:properties][key] = if prop_types.first == 'object'
+                                         build_merged_schema_from_variations(prop_variations)
+                                       else
+                                         prop_variations.first.dup
+                                       end
           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
+          merged[:properties][key][:nullable] = true if has_nullable || prop_variations.size < variations.size
         end
       end
 
@@ -323,56 +341,4 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
       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'
-
-    merged = schema1.dup
-
-    if schema1[:properties] && schema2[:properties]
-      merged[:properties] = schema1[:properties].dup
-
-      schema2[:properties].each do |key, prop2|
-        if merged[:properties][key]
-          prop1 = merged[:properties][key]
-          merged[:properties][key] = merge_property_schemas(prop1, prop2)
-        else
-          merged[:properties][key] = make_property_nullable(prop2)
-        end
-      end
-
-      schema1[:properties].each do |key, prop1|
-        merged[:properties][key] = make_property_nullable(prop1) unless schema2[:properties][key]
-      end
-
-      required1 = Set.new(schema1[:required] || [])
-      required2 = Set.new(schema2[:required] || [])
-      merged[:required] = (required1 & required2).to_a
-    end
-
-    merged
-  end
-
-  def merge_property_schemas(prop1, prop2)
-    return prop1 unless prop2.is_a?(Hash) && prop1.is_a?(Hash)
-
-    merged = prop1.dup
-
-    # If either property is nullable, the merged property should be nullable
-    merged[:nullable] = true if prop2[:nullable] && !prop1[:nullable]
-
-    # If both are objects, recursively merge their properties
-    merged = merge_object_schemas(prop1, prop2) if prop1[:type] == 'object' && prop2[:type] == 'object'
-
-    merged
-  end
-
-  def make_property_nullable(property)
-    return property unless property.is_a?(Hash)
-
-    nullable_prop = property.dup
-    nullable_prop[:nullable] = true unless nullable_prop[:nullable]
-    nullable_prop
-  end
 end

data/lib/rspec/openapi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openapi
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.21.2
 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.1
+  changelog_uri: https://github.com/exoego/rspec-openapi/releases/tag/v0.21.2
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: