rspec-openapi 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a94cc7be13ab8a500bf3eb4bb5831f1c06c7722e96f9f7157e424fa402f2f137
-  data.tar.gz: db6591ab069d1f7bd1d7f07b6f2c4d9be9ef86f90df497c28a2b8ed01ee1d5e4
+  metadata.gz: 6b40fcb7598d29cf3c8bf2f95f6aafb5a011ddbb2beff06d6366052d11effa02
+  data.tar.gz: 85bd479d5b7e4da9e19dcc8bbbb963a594eed99437cb911a965695d04768a4bd
 SHA512:
-  metadata.gz: 785d100550f4ecde118a8986ee7c98349e310de9c870a04067a9f84892d37b63cadf9a88d0ff2158012c153c561c3a0576a3c0c79860a645bb53bb295c64bbc5
-  data.tar.gz: 660bd242fa8c5686bc6fbead56f595be959f1f1cae465723ed89e93c0b0096ee6c86094c8561193cabf119cedb74762e84e6b9c3651d34fca7691b63317fc611
+  metadata.gz: 89c7e3788cfccd022711d1ce76be3ee1b1568af4bade87908afb3384e64e88714a0d4b30499f0eeebb45909fe5eab5267c96afc231ea1db60a6b2fe8fc0155d6
+  data.tar.gz: 71e418493c5f3db1c8a5388bd2826fe36e15375445d3ddc7c1b2364cdfb7d160cdf3c9b02554e6134abf82e0f994355b725223c773857fb034e3b7eb034c2db7

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

@@ -28,12 +28,12 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

data/.github/workflows/rubocop.yml

@@ -30,6 +30,6 @@ jobs:
         "
 
     - name: Upload Sarif output
-      uses: github/codeql-action/upload-sarif@v3
+      uses: github/codeql-action/upload-sarif@v4
       with:
         sarif_file: rubocop.sarif

data/README.md

@@ -408,6 +408,12 @@ Existing RSpec plugins which have OpenAPI integration:
 * Orignally created by [k0kubun](https://github.com/k0kubun) and the ownership was transferred to [exoego](https://github.com/exoego) in 2022-11-29.
 
 
+## Releasing
+
+1. Bump version in `lib/rspec/openapi/version.rb`
+2. Run `bundle exec rake release`
+3. Push tag
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/rspec/openapi/schema_builder.rb

@@ -151,7 +151,7 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
       property[:items] = if value.empty?
                            {} # unknown
                          else
-                           build_property(value.first, record: record)
+                           build_array_items_schema(value, record: record)
                          end
     when Hash
       property[:properties] = {}.tap do |properties|
@@ -243,4 +243,72 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
   def normalize_content_disposition(content_disposition)
     content_disposition&.sub(/;.+\z/, '')
   end
+
+  def build_array_items_schema(array, record: nil)
+    return {} if array.empty?
+
+    merged_schema = build_property(array.first, record: record)
+
+    # 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)
+      end
+    end
+
+    merged_schema
+  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.20.0'
+    VERSION = '0.21.0'
   end
 end

metadata

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