rspec-openapi 0.21.2 → 0.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d8b74f9e75f015e91e3ebc37ab353459d0a8d887fb096ad7e9fcf829898290e
-  data.tar.gz: 1fdbc903fdb61f685ca02d63a88a82eb9a3184e00a0766f1e31e82001ed068b1
+  metadata.gz: 10130361a7c2ee93e28be624decd6662215eaeb981a28981f02e5f1c95e82559
+  data.tar.gz: f32bbbe9f13c4a2b454ba4138b7c4825ca582f2ad32af73318c0a9c0c3d81147
 SHA512:
-  metadata.gz: eb64851800a090a4cf4d9f78921f1203456ddf8b9d4e820af73d9449a259c7d6e5dd9997e01058136b0dc7b551bc5406e2e176f2818c27b6d7e5a6a00a136fb3
-  data.tar.gz: 82600b4917083f3b4a27f7bf4ee8b8b4314dc76a4c9c03f5143e5e182d652edea3cb6cef97f7b2f3598a2c27f143fdcb714058143d47fb44d2ccb6181fafe4fd
+  metadata.gz: ad8029bb23d7c9ec5b2a6c6898d82b906a061806e93912b166e6ab6b5464263dc936a3bbe86e821eea01a3d60e49f379327a966d8d1986e99258997f9132823e
+  data.tar.gz: 310ab5b4ff9b5a63555881679e77f0e1e829d3e1b296df79170db0915441bb70f5c8ebc553444574c93de80e6a7f510c2f26622c9df1052848dfc789df87d1f6

data/.github/workflows/create_release.yml

@@ -0,0 +1,79 @@
+name: prepare release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to release (e.g. 0.21.3 or v0.21.3)'
+        required: true
+
+jobs:
+  push:
+    name: Prepare release PR
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
+      contents: write # required to push release branch and open PR
+      pull-requests: write # required to create the release PR with GITHUB_TOKEN
+
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Bump version.rb
+        run: |
+          set -euo pipefail
+          version="${{ github.event.inputs.version }}"
+          version="${version#v}"
+
+          echo "VERSION_NO_V=$version" >> "$GITHUB_ENV"
+          echo "VERSION_TAG=v$version" >> "$GITHUB_ENV"
+
+          current_version=$(ruby -e "require_relative './lib/rspec/openapi/version'; puts RSpec::OpenAPI::VERSION")
+          VERSION_NO_V="$version" CURRENT_VERSION="$current_version" ruby - <<'RUBY'
+            version = ENV.fetch('VERSION_NO_V')
+            unless version.match?(/\A\d+(?:\.\d+)*\z/)
+              warn "Invalid version format: #{version}"
+              exit 1
+            end
+
+            require 'rubygems'
+            new_version = Gem::Version.new(version)
+            current_version = Gem::Version.new(ENV.fetch('CURRENT_VERSION'))
+            if new_version <= current_version
+              warn "Given version (#{new_version}) must be newer than current version (#{current_version})"
+              exit 1
+            end
+          RUBY
+
+          ruby -pi -e "sub(/VERSION = .*/, \"VERSION = '$version'\")" lib/rspec/openapi/version.rb
+          git status --short
+
+      - name: Commit version bump
+        run: |
+          set -euo pipefail
+          version="$VERSION_NO_V"
+
+          release_branch="release/v${version}"
+          echo "RELEASE_BRANCH=${release_branch}" >> "$GITHUB_ENV"
+
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git commit -am "Bump version to ${version}"
+          git push origin "HEAD:${release_branch}"
+
+      - name: Open release PR
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          add-paths: |
+            lib/rspec/openapi/version.rb
+          branch: ${{ env.RELEASE_BRANCH }}
+          title: Release v${{ env.VERSION_NO_V }}
+          commit-message: Bump version to ${{ env.VERSION_NO_V }}
+          body: |
+            Automated release PR created by workflow_dispatch.
+            - Version: v${{ env.VERSION_NO_V }}
+            - Triggered by: ${{ github.actor }}

data/.github/workflows/publish.yml

@@ -0,0 +1,46 @@
+name: Publish to RubyGems
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  publish:
+    name: Publish gem and GitHub release
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write   # for RubyGems trusted publishing
+      contents: write   # to create GitHub release
+
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      - name: Verify tag matches version.rb
+        run: |
+          set -euo pipefail
+          tag="${GITHUB_REF_NAME}"
+          version="${tag#v}"
+          file_version=$(ruby -e "require_relative './lib/rspec/openapi/version'; puts RSpec::OpenAPI::VERSION")
+          if [ "$version" != "$file_version" ]; then
+            echo "Tag version ($version) does not match lib/rspec/openapi/version.rb ($file_version)" >&2
+            exit 1
+          fi
+
+      - uses: rubygems/release-gem@v1
+
+      - name: Create GitHub release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
+          generate_release_notes: true

data/.gitignore

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

data/README.md

@@ -410,9 +410,10 @@ Existing RSpec plugins which have OpenAPI integration:
 
 ## Releasing
 
-1. Bump version in `lib/rspec/openapi/version.rb`
-2. Run `bundle exec rake release`
-3. Push tag
+1. Ensure RubyGems trusted publishing is configured for this repo and gem ownership (see [Trusted publishing](https://guides.rubygems.org/trusted-publishing/)).
+2. In GitHub Actions, run the `prepare release` workflow manually. It bumps `lib/rspec/openapi/version.rb`, pushes `release/v<version>` to origin, and opens a PR.
+3. Review and merge the release PR into the default branch.
+4. Create and push a tag `v<version>` on the merged commit (via the GitHub UI or `git tag v<version>; git push origin v<version>`). Tag creation triggers the `Publish to RubyGems` workflow, which publishes the gem and creates the GitHub release notes automatically.
 
 ## License
 

data/lib/rspec/openapi/schema_builder.rb

@@ -272,15 +272,21 @@ 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
+          # Different types detected - create oneOf
+          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
 
@@ -311,7 +317,9 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
 
         has_nullable = all_prop_variations.any?(&:nil?) || nullable_only.any?
 
-        if prop_variations.size == 1
+        if prop_variations.empty? && has_nullable
+          merged[:properties][key] = { nullable: true }
+        elsif prop_variations.size == 1
           merged[:properties][key] = prop_variations.first.dup
           merged[:properties][key][:nullable] = true if has_nullable
         elsif prop_variations.size > 1

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.2'
+    VERSION = '0.21.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openapi
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.21.4
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -63,6 +63,8 @@ files:
 - ".github/dependabot.yml"
 - ".github/release.yaml"
 - ".github/workflows/codeql-analysis.yml"
+- ".github/workflows/create_release.yml"
+- ".github/workflows/publish.yml"
 - ".github/workflows/rubocop.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
@@ -108,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.2
+  changelog_uri: https://github.com/exoego/rspec-openapi/releases/tag/v0.21.4
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: