rspec-openapi 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61aad8140991defb871eca3436054e43a6e933d6062ac813c987faf93aa767b5
-  data.tar.gz: 8c3d02cf5be2e31131c1d855528f597b0bd604d306dba79e91c782448ae111a3
+  metadata.gz: c69f9d896be2ad115cb158175dbcf2c1cba9b6d08a7214d23a107a67ec5fc529
+  data.tar.gz: a5af92611c4b47790f165ce6d861bfdedd1214f5dcd9c5641e618f272fe5a7ca
 SHA512:
-  metadata.gz: 2b879c9733c1704b94c2f5649de5a3200df3bbdac2b5cb76d668e94da32a45262bf40301d74359f30a86af7622851131243c8e95e3ffcfbc716bbd1d6765b47f
-  data.tar.gz: 16f048fae7721a7986de3dc0a293a29f1986085c55cb6fc793d596826e3fedff0540de4ab94dca2a3363a3c233c58f7d2f63fdcf8ec66793eed4ae72fe237a48
+  metadata.gz: 8e345e850fc539eb4e9fb018cdc48e7acadb47c774b47b438fcd1a95ebc680708999ae6d5440ee45f793bab47d27effd4e054fa3a08e25bf4e6956085effe9ea
+  data.tar.gz: b1f47ba0a95186141f38465ac4e6a89636185606c48b8a0a67b7f163934c18181ea59e4c7fe94e54291aa821f662ee726437f350f69f872399063b024f7cbfde

data/.rubocop.yml

@@ -5,7 +5,7 @@ AllCops:
   SuggestExtensions: false
   TargetRubyVersion: 2.7
   Exclude:
-    - 'spec/rails/**/*'
+    - 'spec/apps/**/*'
     - 'vendor/**/*'
 
 Style/TrailingCommaInHashLiteral:

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-03-25 05:35:37 UTC using RuboCop version 1.62.1.
+# on 2024-04-01 14:13:50 UTC using RuboCop version 1.62.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -9,12 +9,12 @@
 # Offense count: 11
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 48
+  Max: 49
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 207
+  Max: 195
 
 # Offense count: 8
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -24,9 +24,9 @@ Metrics/CyclomaticComplexity:
 # Offense count: 19
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 34
+  Max: 36
 
-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 13

data/Gemfile

@@ -6,7 +6,16 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rails', ENV['RAILS_VERSION'] || '6.0.3.7'
+
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+  gem 'hanami', ENV['HANAMI_VERSION'] || '2.1.0'
+  gem 'hanami-controller', ENV['HANAMI_VERSION'] || '2.1.0'
+  gem 'hanami-router', ENV['HANAMI_VERSION'] || '2.1.0'
+end
+
 gem 'roda'
+
+gem 'rails-dom-testing', '~> 2.2'
 gem 'rspec-rails'
 
 group :test do

data/lib/rspec/openapi/record.rb

@@ -14,6 +14,7 @@ RSpec::OpenAPI::Record = Struct.new(
   :operation_id,          # @param [String]   - "request-1234"
   :description,           # @param [String]  - "returns a status"
   :security,              # @param [Array]  - [{securityScheme1: []}]
+  :deprecated,            # @param [Boolean] - true
   :status,                # @param [Integer] - 200
   :response_body,         # @param [Object]  - {"status" => "ok"}
   :response_headers,      # @param [Array]  - [["header_key1", "header_value1"], ["header_key2", "header_value2"]]

data/lib/rspec/openapi/record_builder.rb

@@ -11,7 +11,7 @@ class << RSpec::OpenAPI::RecordBuilder = Object.new
     request, response = extract_request_response(context)
     return if request.nil?
 
-    path, summary, tags, operation_id, required_request_params, raw_path_params, description, security =
+    path, summary, tags, operation_id, required_request_params, raw_path_params, description, security, deprecated =
       extract_request_attributes(request, example)
 
     return if RSpec::OpenAPI.ignored_paths.any? { |ignored_path| path.match?(ignored_path) }
@@ -32,6 +32,7 @@ class << RSpec::OpenAPI::RecordBuilder = Object.new
       operation_id: operation_id,
       description: description,
       security: security,
+      deprecated: deprecated,
       status: response.status,
       response_body: safe_parse_body(response, response.media_type),
       response_headers: response_headers,
@@ -54,7 +55,10 @@ class << RSpec::OpenAPI::RecordBuilder = Object.new
   def extract_headers(request, response)
     request_headers = RSpec::OpenAPI.request_headers.each_with_object([]) do |header, headers_arr|
       header_key = header.gsub('-', '_').upcase.to_sym
-      header_value = request.get_header(['HTTP', header_key].join('_')) || request.get_header(header_key)
+
+      header_value = request.get_header(['HTTP', header_key].join('_')) ||
+                     request.get_header(header_key) ||
+                     request.get_header(header_key.to_s)
       headers_arr << [header, header_value] if header_value
     end
     response_headers = RSpec::OpenAPI.response_headers.each_with_object([]) do |header, headers_arr|
@@ -73,6 +77,7 @@ class << RSpec::OpenAPI::RecordBuilder = Object.new
     required_request_params = metadata[:required_request_params] || []
     security = metadata[:security]
     description = metadata[:description] || RSpec::OpenAPI.description_builder.call(example)
+    deprecated = metadata[:deprecated]
     raw_path_params = request.path_parameters
     path = request.path
     if rails?
@@ -91,7 +96,7 @@ class << RSpec::OpenAPI::RecordBuilder = Object.new
       raw_path_params = raw_path_params.slice(*(raw_path_params.keys - RSpec::OpenAPI.ignored_path_params))
     end
     summary ||= "#{request.method} #{path}"
-    [path, summary, tags, operation_id, required_request_params, raw_path_params, description, security]
+    [path, summary, tags, operation_id, required_request_params, raw_path_params, description, security, deprecated]
   end
 
   def extract_request_response(context)

data/lib/rspec/openapi/schema_builder.rb

@@ -34,6 +34,7 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
             tags: record.tags,
             operationId: record.operation_id,
             security: record.security,
+            deprecated: record.deprecated ? true : nil,
             parameters: build_parameters(record),
             requestBody: http_method == 'get' ? nil : build_request_body(record),
             responses: {

data/lib/rspec/openapi/schema_merger.rb

@@ -53,7 +53,8 @@ class << RSpec::OpenAPI::SchemaMerger = Object.new
   def merge_parameters(base, key, value)
     all_parameters = value | base[key]
 
-    unique_base_parameters = base[key].index_by { |parameter| [parameter[:name], parameter[:in]] }
+    unique_base_parameters = build_unique_params(base, key)
+
     all_parameters = all_parameters.map do |parameter|
       base_parameter = unique_base_parameters[[parameter[:name], parameter[:in]]] || {}
       base_parameter ? base_parameter.merge(parameter) : parameter
@@ -63,6 +64,12 @@ class << RSpec::OpenAPI::SchemaMerger = Object.new
     base[key] = all_parameters
   end
 
+  def build_unique_params(base, key)
+    base[key].each_with_object({}) do |parameter, hash|
+      hash[[parameter[:name], parameter[:in]]] = parameter
+    end
+  end
+
   SIMILARITY_THRESHOLD = 0.5
 
   def merge_closest_match!(options, spec)

data/lib/rspec/openapi/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenAPI
-    VERSION = '0.16.0'
+    VERSION = '0.16.1'
   end
 end

data/rspec-openapi.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'actionpack', '>= 5.2.0'
+  spec.add_dependency 'rails-dom-testing'
   spec.add_dependency 'rspec-core'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openapi
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: rails-dom-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +103,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.16.0
+  changelog_uri: https://github.com/exoego/rspec-openapi/releases/tag/v0.16.1
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []