Introduce resolve_path()

Author: kaorukobo

lib/openapi_first.rb

@@ -35,13 +35,6 @@ def self.configure
   ERROR_RESPONSES = {} # rubocop:disable Style/MutableConstant
   private_constant :ERROR_RESPONSES
 
-  # Retrieve the path used for schema matching.
-  #
-  # @param [Rack::Request] rack_request
-  def self.get_path_to_match(rack_request)
-    rack_request.env[PATH] || rack_request.path
-  end
-
   # Register an error response class
   # @param name [Symbol]
   # @param klass [Class] A class that includes / implements OpenapiFirst::ErrorResponse

lib/openapi_first/definition.rb

@@ -45,7 +45,7 @@ def initialize(contents, filepath = nil)
     # @param [Boolean] raise_error Whether to raise an error if validation fails.
     # @return [ValidatedRequest] The validated request object.
     def validate_request(request, raise_error: false)
-      route = @router.match(request.request_method, OpenapiFirst.get_path_to_match(request), content_type: request.content_type)
+      route = @router.match(request.request_method, resolve_path(request), content_type: request.content_type)
       if route.error
         ValidatedRequest.new(request, error: route.error)
       else
@@ -62,7 +62,7 @@ def validate_request(request, raise_error: false)
     # @param raise_error [Boolean] Whethir to raise an error if validation fails.
     # @return [ValidatedResponse] The validated response object.
     def validate_response(rack_request, rack_response, raise_error: false)
-      route = @router.match(rack_request.request_method, OpenapiFirst.get_path_to_match(rack_request), content_type: rack_request.content_type)
+      route = @router.match(rack_request.request_method, resolve_path(rack_request), content_type: rack_request.content_type)
       return if route.error # Skip response validation for unknown requests
 
       response_match = route.match_response(status: rack_response.status, content_type: rack_response.content_type)
@@ -76,5 +76,11 @@ def validate_response(rack_request, rack_response, raise_error: false)
         raise validated.error.exception(validated) if raise_error && validated.invalid?
       end
     end
+
+    private
+
+    def resolve_path(rack_request)
+      rack_request.env[PATH] || rack_request.path
+    end
   end
 end