rspec-openapi 0.4.3 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bf318171323fbd3fa8d664a4f34ec1fe5af39a4d39ab5ee7b020b3871a31cb4
-  data.tar.gz: 610173247f3b9c99c7f5d2461bad49ae1d9000d7c8f63dfc4ac884472830c005
+  metadata.gz: f83672f313f4451abb668adf66697c74be2d0ad7866c6fbc433b2ef815e06419
+  data.tar.gz: 696c074c32d5ec4f6dfc0f5ea2ab02f9123a4b88a8ce7d09a4c8aada60fe1b6f
 SHA512:
-  metadata.gz: 4b8c0402fe94dbcc43353c210acb1c9c4b182331020670bb8955dc4abf17a18732852fc4b191a3d1ded1d3613ef5e0059aa79e09084eb23bd9ce7ca5beec9e25
-  data.tar.gz: 6c4cd49edbaea41dfc1c2b17c89ec85dac8e1063612ff29f3c63dccde9dacd7a19eb276253363f1091a19976e0e6a20d40dc32f5deae36fa291e17f054b22eaf
+  metadata.gz: 232765a27c157fdbb1bd479b14987d095c0fce190e3b76cc10a4f8f3b990c253456af15a79924be632daaf0d08254e934b9da00f24c9779f4f9c4531b3f36bae
+  data.tar.gz: fbf0fb968a2d1afde12566cc472bb72a97b800101e60c640c1b7fa218a5563f993f48070532af6903c0cf1432a4142fd08235c1e9b6443847e5c2e4b6b22dfdb

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## v0.4.6
+
+* Fix "No route matched for" error in engine routes
+  [#38](https://github.com/k0kubun/rspec-openapi/pull/38)
+
+## v0.4.5
+
+* Fix linter issues for `tags` and `summary`
+  [#40](https://github.com/k0kubun/rspec-openapi/pull/40)
+
+## v0.4.4
+
+* De-duplicate parameters by a combination of `name` and `in`
+  [#39](https://github.com/k0kubun/rspec-openapi/pull/39)
+
 ## v0.4.3
 
 * Allow customizing `schema`, `description`, and `tags` through `:openapi` metadata

data/lib/rspec/openapi/record_builder.rb

@@ -20,8 +20,8 @@ class << RSpec::OpenAPI::RecordBuilder = Object.new
     if rails?
       route = find_rails_route(request)
       path = route.path.spec.to_s.delete_suffix('(.:format)')
-      summary = "#{route.requirements[:action]}"
-      tags = [route.requirements[:controller].classify]
+      summary = route.requirements[:action] || "#{request.method} #{path}"
+      tags = [route.requirements[:controller]&.classify].compact
     else
       path = request.path
       summary = "#{request.method} #{request.path}"
@@ -79,10 +79,13 @@ class << RSpec::OpenAPI::RecordBuilder = Object.new
     end
 
     app.routes.router.recognize(request) do |route|
-      unless route.path.anchored
-        route = find_rails_route(request, app: route.app.app, fix_path: false)
+      if route.app.matches?(request)
+        if route.app.engine?
+          return find_rails_route(request, app: route.app.app, fix_path: false)
+        else
+          return route
+        end
       end
-      return route
     end
     raise "No route matched for #{request.request_method} #{request.path_info}"
   end

data/lib/rspec/openapi/schema_merger.rb

@@ -21,9 +21,12 @@ class << RSpec::OpenAPI::SchemaMerger = Object.new
     end
   end
 
-  # Not doing `base.replace(deep_merge(base, spec))` to preserve key orders
+  # Not doing `base.replace(deep_merge(base, spec))` to preserve key orders.
+  # Also this needs to be aware of OpenAPI details unlike an ordinary deep_reverse_merge
+  # because a Hash-like structure may be an array whose Hash elements have a key name.
+  #
   # TODO: Perform more intelligent merges like rerouting edits / merging types
-  # Should we probably force-merge `summary` regardless of manual modifications?
+  # TODO: Should we probably force-merge `summary` regardless of manual modifications?
   def deep_reverse_merge!(base, spec)
     spec.each do |key, value|
       if base[key].is_a?(Hash) && value.is_a?(Hash)
@@ -31,9 +34,10 @@ class << RSpec::OpenAPI::SchemaMerger = Object.new
       elsif !base.key?(key)
         base[key] = value
       elsif base[key].is_a?(Array) && value.is_a?(Array)
-        if key == "parameters"
-          # merge arrays
+        # parameters need to be merged as if `name` and `in` were the Hash keys.
+        if key == 'parameters'
           base[key] |= value
+          base[key].uniq! { |param| param.slice('name', 'in') }
         end
       else
         # no-op

data/lib/rspec/openapi/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module OpenAPI
-    VERSION = '0.4.3'
+    VERSION = '0.4.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openapi
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.6
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Generate OpenAPI schema from RSpec request specs