rspec-openapi 0.18.0 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6e2096ff66c70fb288c3a18a0a9e14c47908ce55963f1cd22a26fa676f86858
-  data.tar.gz: 1e2baa5f03c45f80b26647ef2c623bf9af4ae281fd4305c682112786d509ef44
+  metadata.gz: e9d5e7e261220ae8c790eff0702c0d5e08dbf53667a410a1a540bdb4557d5f55
+  data.tar.gz: ffd9b3d5cab09166652fb03d1a22cf774170c6e80690ed4215e3483b951d8f73
 SHA512:
-  metadata.gz: 13be21458d7e45bb8c2cba02dc89e125efccc1c56a2f2cb44e18bd607e859634bf8174e7ad650c920254ef0c649453f0f6ac38e0ed20e33b689a80e4f457a41e
-  data.tar.gz: e77910efe4dfb113fab8f022a7333aa81f1aae36004715ffdeef93706e77921f639ee743f143829943259d6ba562441ebfeb8fa8ade8d653416b2c755c8ee7f8
+  metadata.gz: 007a4e0466e55fa656667eb498a0f27cd3b049dc8fb2d3a2b46b1b511fbe0f28fab3a79282577b0c5db08a55301576e8104013854fdf400884ab58d3312fba04
+  data.tar.gz: 39f0f78cfe88df09e7b16c540dc95890ac712feb7700df6f18101e5355540f21881f2905652c808422065f9330abfdd0c8f1037342192e5ee0b643fc71b65713

data/.rubocop_todo.yml

@@ -1,15 +1,15 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-04-12 14:06:44 UTC using RuboCop version 1.62.1.
+# on 2024-04-20 21:25:22 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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 13
+# Offense count: 14
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 47
+  Max: 46
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
@@ -19,7 +19,7 @@ Metrics/ClassLength:
 # Offense count: 9
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 12
+  Max: 13
 
 # Offense count: 22
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
@@ -29,7 +29,7 @@ Metrics/MethodLength:
 # Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
-  Max: 12
+  Max: 13
 
 # Offense count: 1
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.

data/lib/rspec/openapi/extractors/hanami.rb

@@ -19,7 +19,10 @@ class Inspector
   def call(verb, path)
     route = routes.find { |r| r.http_method == verb && r.path == path }
 
-    if route.to.is_a?(Proc)
+    if route.nil?
+      # FIXME: This is a hack to pass `/sites/***` in testing
+      {}
+    elsif route.to.is_a?(Proc)
       {
         tags: [],
         summary: "#{verb} #{path}",
@@ -66,7 +69,7 @@ class << RSpec::OpenAPI::Extractors::Hanami = Object.new
     deprecated = metadata[:deprecated]
     path = request.path
 
-    raw_path_params = route.params.filter { |_key, value| number_or_nil(value) }
+    raw_path_params = route.params.filter { |_key, value| RSpec::OpenAPI::Extractors.number_or_nil(value) }
 
     result = InspectorAnalyzer.call(request.method, add_id(path, route))
 
@@ -92,7 +95,7 @@ class << RSpec::OpenAPI::Extractors::Hanami = Object.new
     return path if route.params.empty?
 
     route.params.each_pair do |key, value|
-      next unless number_or_nil(value)
+      next unless RSpec::OpenAPI::Extractors.number_or_nil(value)
 
       path = path.sub("/#{value}", "/:#{key}")
     end
@@ -104,17 +107,11 @@ class << RSpec::OpenAPI::Extractors::Hanami = Object.new
     return path if route.params.empty?
 
     route.params.each_pair do |key, value|
-      next unless number_or_nil(value)
+      next unless RSpec::OpenAPI::Extractors.number_or_nil(value)
 
       path = path.sub("/#{value}", "/{#{key}}")
     end
 
     path
   end
-
-  def number_or_nil(string)
-    Integer(string || '')
-  rescue ArgumentError
-    nil
-  end
 end

data/lib/rspec/openapi/extractors/rails.rb

@@ -44,38 +44,23 @@ class << RSpec::OpenAPI::Extractors::Rails = Object.new
 
   # @param [ActionDispatch::Request] request
   def find_rails_route(request, app: Rails.application, path_prefix: '')
-    app.routes.router.recognize(request) do |route, parameters|
+    app.routes.router.recognize(request) do |route, _parameters|
       path = route.path.spec.to_s.delete_suffix('(.:format)')
 
       if route.app.matches?(request)
         if route.app.engine?
           route, path = find_rails_route(request, app: route.app.app, path_prefix: path)
           next if route.nil?
-        elsif path_prefix + path == add_id(request.path, parameters)
-          return [route, path_prefix + path]
-        else
-          return [route, nil]
         end
-        return [route, path_prefix + path]
-      end
-    end
-
-    nil
-  end
 
-  def add_id(path, parameters)
-    parameters.each_pair do |key, value|
-      next unless number_or_nil(value)
+        # Params are empty when it is Engine or Rack app.
+        # In that case, we can't handle parameters in path.
+        return [route, nil] if request.params.empty?
 
-      path = path.sub("/#{value}", "/:#{key}")
+        return [route, path_prefix + path]
+      end
     end
 
-    path
-  end
-
-  def number_or_nil(string)
-    Integer(string || '')
-  rescue ArgumentError
     nil
   end
 end

data/lib/rspec/openapi/extractors.rb

@@ -2,4 +2,11 @@
 
 # Create namespace
 module RSpec::OpenAPI::Extractors
+  # @param [String, Symbol] path_parameter
+  # @return [Integer, nil]
+  def self.number_or_nil(path_parameter)
+    Integer(path_parameter.to_s || '')
+  rescue ArgumentError
+    nil
+  end
 end

data/lib/rspec/openapi/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenAPI
-    VERSION = '0.18.0'
+    VERSION = '0.18.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openapi
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.2
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -109,7 +109,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.18.0
+  changelog_uri: https://github.com/exoego/rspec-openapi/releases/tag/v0.18.2
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []