minor refactoring (exoego#323)

Author: exoego

lib/rspec/openapi/components_updater.rb

@@ -3,6 +3,8 @@
 require_relative 'hash_helper'
 
 class << RSpec::OpenAPI::ComponentsUpdater = Object.new
+  SCHEMA_REF_PREFIX = '#/components/schemas/'
+
   # @param [Hash] base
   # @param [Hash] fresh
   def update!(base, fresh)
@@ -30,7 +32,7 @@ def update!(base, fresh)
       # Skip if the property using $ref is not found in the parent schema. The property may be removed.
       next if nested_schema.nil?
 
-      schema_name = base.dig(*paths)&.gsub('#/components/schemas/', '')&.to_sym
+      schema_name = extract_schema_name(base.dig(*paths))&.to_sym
       fresh_schemas[schema_name] ||= {}
       RSpec::OpenAPI::SchemaMerger.merge!(fresh_schemas[schema_name], nested_schema)
     end
@@ -44,7 +46,7 @@ def update!(base, fresh)
   def build_fresh_schemas(references, base, fresh)
     references.inject({}) do |acc, paths|
       ref_link = dig_schema(base, paths)[:$ref]
-      schema_name = ref_link.to_s.gsub('#/components/schemas/', '')
+      schema_name = extract_schema_name(ref_link)
       schema_body = dig_schema(fresh, paths.grep_v(Integer))
 
       RSpec::OpenAPI::SchemaMerger.merge!(acc, { schema_name => schema_body })
@@ -81,7 +83,7 @@ def find_non_top_level_nested_refs(base, generated_names)
     # Reject already-generated schemas to reduce unnecessary loop
     nested_refs.reject do |paths|
       ref_link = base.dig(*paths)
-      schema_name = ref_link.gsub('#/components/schemas/', '')
+      schema_name = extract_schema_name(ref_link)
       generated_names.include?(schema_name)
     end
   end
@@ -91,11 +93,19 @@ def find_one_of_refs(base, paths)
     return unless one_of
 
     one_of.each_with_index.filter_map do |schema, index|
-      paths + [index] if schema&.dig(:$ref)&.start_with?('#/components/schemas/')
+      paths + [index] if schema_ref?(schema&.dig(:$ref))
     end
   end
 
   def find_object_refs(base, paths)
-    [paths] if dig_schema(base, paths)&.dig(:$ref)&.start_with?('#/components/schemas/')
+    [paths] if schema_ref?(dig_schema(base, paths)&.dig(:$ref))
+  end
+
+  def extract_schema_name(ref_link)
+    ref_link&.delete_prefix(SCHEMA_REF_PREFIX)
+  end
+
+  def schema_ref?(ref_link)
+    ref_link&.start_with?(SCHEMA_REF_PREFIX)
   end
 end

lib/rspec/openapi/extractors/hanami.rb

@@ -61,11 +61,11 @@ def request_attributes(request, example)
 
     raw_path_params = route.params
 
-    result = InspectorAnalyzer.call(request.method, add_id(path, route))
+    result = InspectorAnalyzer.call(request.method, replace_path_params(path, route, '/:%{key}'))
 
     summary ||= result[:summary]
     tags ||= result[:tags]
-    path = add_openapi_id(path, route)
+    path = replace_path_params(path, route, '/{%{key}}')
 
     raw_path_params = raw_path_params.slice(*(raw_path_params.keys - RSpec::OpenAPI.ignored_path_params))
 
@@ -99,21 +99,11 @@ def request_response(context)
 
   private
 
-  def add_id(path, route)
+  def replace_path_params(path, route, format)
     return path if route.params.empty?
 
     route.params.each_pair do |key, value|
-      path = path.sub("/#{value}", "/:#{key}")
-    end
-
-    path
-  end
-
-  def add_openapi_id(path, route)
-    return path if route.params.empty?
-
-    route.params.each_pair do |key, value|
-      path = path.sub("/#{value}", "/{#{key}}")
+      path = path.sub("/#{value}", format % { key: key })
     end
 
     path

lib/rspec/openapi/schema_builder.rb

@@ -270,8 +270,8 @@ def infer_enum(path, record, context)
     enum_hash = context == :request ? record.request_enum : record.response_enum
     return nil unless enum_hash
 
-    # Try both string and symbol keys
-    enum_hash[path.to_s] || enum_hash[path.to_sym]
+    # Keys are already normalized to strings by SharedExtractor.normalize_enum
+    enum_hash[path.to_s]
   end
 
   # Convert an always-String param to an appropriate type
@@ -319,9 +319,8 @@ def normalize_content_type(content_type)
     content_type&.sub(/;.+\z/, '')
   end
 
-  def normalize_content_disposition(content_disposition)
-    content_disposition&.sub(/;.+\z/, '')
-  end
+  # Same logic as normalize_content_type – strips header parameters after ';'
+  alias normalize_content_disposition normalize_content_type
 
   def build_array_items_schema(array, record: nil, path: nil, context: nil)
     return {} if array.empty?