rspec-openapi 0.18.1 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20d994264ab34877708e7c467c98b31f1b672ee0d73b953f2791e404895eed58
-  data.tar.gz: 6c319639b445a9178919a435a7816d0dfb5d8156c71d0fe1f929ab76d4733086
+  metadata.gz: 39da96c0f0b1650e0504d45a624be7905c9f47a2b128e992eecb5b05b828dd87
+  data.tar.gz: 5c6cb0fdaf3900ae93d0618c82b6762c8cf50002e7ac155c23a46b543f91d126
 SHA512:
-  metadata.gz: c7526eb5af4a66264ad5874c9f3fb3c9dd964196a3d91d7e0739956443fc643646822038c90a707a9b9fb5e26bba9bccd5652973ef227f4c8dd961a440a4682e
-  data.tar.gz: e3d71afaa32041ba31266832c51d4241e248cba2cb4b607adbd157b0164eedab4ef9d5e17ab89c7e196b52a64365aab584aa0dae1f5f0c0701f4dfde49f1f26c
+  metadata.gz: df87ce7e2b08623ec314330020d011ede771872a435f11b266be1f1c1a2e24c8329559b1f3e42b50a58a86c442c0afed2e98444694138823b9b17ebb94e54878
+  data.tar.gz: c89fb952a0d8fbc4c5ed814bd11513d2323f2c5237ad0a7b0e341e2522c329a331230b51ecab3bcf42a60dd4e5da090a337202dac37db3d4f68ab82ad7a9f91b

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

@@ -52,7 +52,7 @@ class << RSpec::OpenAPI::Extractors::Hanami = Object.new
   # @param [RSpec::Core::Example] example
   # @return Array
   def request_attributes(request, example)
-    route = Hanami.app.router.recognize(request.path, method: request.method)
+    route = Hanami.app.router.recognize(Rack::MockRequest.env_for(request.path, method: request.method))
 
     return RSpec::OpenAPI::Extractors::Rack.request_attributes(request, example) unless route.routable?
 
@@ -66,7 +66,7 @@ class << RSpec::OpenAPI::Extractors::Hanami = Object.new
     deprecated = metadata[:deprecated]
     path = request.path
 
-    raw_path_params = route.params.filter { |_key, value| RSpec::OpenAPI::Extractors.number_or_nil(value) }
+    raw_path_params = route.params
 
     result = InspectorAnalyzer.call(request.method, add_id(path, route))
 
@@ -92,8 +92,6 @@ class << RSpec::OpenAPI::Extractors::Hanami = Object.new
     return path if route.params.empty?
 
     route.params.each_pair do |key, value|
-      next unless RSpec::OpenAPI::Extractors.number_or_nil(value)
-
       path = path.sub("/#{value}", "/:#{key}")
     end
 
@@ -104,8 +102,6 @@ class << RSpec::OpenAPI::Extractors::Hanami = Object.new
     return path if route.params.empty?
 
     route.params.each_pair do |key, value|
-      next unless RSpec::OpenAPI::Extractors.number_or_nil(value)
-
       path = path.sub("/#{value}", "/{#{key}}")
     end
 

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

@@ -44,32 +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
+
+        # 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?
+
         return [route, path_prefix + path]
       end
     end
 
     nil
   end
-
-  def add_id(path, parameters)
-    parameters.each_pair do |key, value|
-      next unless RSpec::OpenAPI::Extractors.number_or_nil(value)
-
-      path = path.sub("/#{value}", "/:#{key}")
-    end
-
-    path
-  end
 end

data/lib/rspec/openapi/extractors.rb

@@ -2,11 +2,4 @@
 
 # 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.1'
+    VERSION = '0.18.3'
   end
 end

data/lib/rspec/openapi.rb

@@ -15,30 +15,17 @@ require 'rspec/openapi/shared_hooks'
 require 'rspec/openapi/extractors'
 require 'rspec/openapi/extractors/rack'
 
-if ENV['OPENAPI']
-  DEBUG_ENABLED = ['', '1', 'true'].include?(ENV['DEBUG']&.downcase)
-
-  begin
-    require 'hanami'
-  rescue LoadError
-    warn 'Hanami not detected' if DEBUG_ENABLED
-  else
-    require 'rspec/openapi/extractors/hanami'
-  end
+module RSpec::OpenAPI
+  class Config
+    class << self
+      attr_accessor :debug_enabled
 
-  begin
-    require 'rails'
-  rescue LoadError
-    warn 'Rails not detected' if DEBUG_ENABLED
-  else
-    require 'rspec/openapi/extractors/rails'
+      def load_environment_settings
+        @debug_enabled = ['', '1', 'true'].include?(ENV['DEBUG']&.downcase)
+      end
+    end
   end
-end
 
-require 'rspec/openapi/minitest_hooks' if Object.const_defined?('Minitest')
-require 'rspec/openapi/rspec_hooks' if ENV['OPENAPI'] && Object.const_defined?('RSpec')
-
-module RSpec::OpenAPI
   @path = 'doc/openapi.yaml'
   @title = File.basename(Dir.pwd)
   @comment = nil
@@ -84,3 +71,26 @@ module RSpec::OpenAPI
     attr_reader   :config_filename
   end
 end
+
+if ENV['OPENAPI']
+  RSpec::OpenAPI::Config.load_environment_settings
+
+  begin
+    require 'hanami'
+  rescue LoadError
+    warn 'Hanami not detected' if RSpec::OpenAPI::Config.debug_enabled
+  else
+    require 'rspec/openapi/extractors/hanami'
+  end
+
+  begin
+    require 'rails'
+  rescue LoadError
+    warn 'Rails not detected' if RSpec::OpenAPI::Config.debug_enabled
+  else
+    require 'rspec/openapi/extractors/rails'
+  end
+end
+
+require 'rspec/openapi/minitest_hooks' if Object.const_defined?('Minitest')
+require 'rspec/openapi/rspec_hooks' if ENV['OPENAPI'] && Object.const_defined?('RSpec')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openapi
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.3
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-20 00:00:00.000000000 Z
+date: 2024-05-01 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.1
+  changelog_uri: https://github.com/exoego/rspec-openapi/releases/tag/v0.18.3
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []