Remove requirements and path from greedy route (not used)

allow header is joined
ericproulx · Nov 11, 2024 · ccbe23c · ccbe23c
1 parent db7c156
commit ccbe23c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/lib/grape/api/instance.rb b/lib/grape/api/instance.rb
@@ -216,10 +216,8 @@ def collect_route_config_per_pattern(all_routes)
           last_route.app.options[:options_route_enabled] = true unless self.class.namespace_inheritable(:do_not_route_options) || allowed_methods.include?(Rack::OPTIONS)
 
           @router.associate_routes(last_route.pattern, {
-                                     requirements: last_route.options[:requirements],
-                                     path: last_route.origin,
-                                     endpoint: last_route.app,
-                                     allow_header: allow_header
+            endpoint: last_route.app,
+                                     allow_header: allow_header.join(', ').freeze
                                    })
         end
       end

diff --git a/lib/grape/router.rb b/lib/grape/router.rb
@@ -107,7 +107,7 @@ def transaction(env)
 
       route = match?(input, '*')
 
-      return last_neighbor_route.endpoint.call(env) if last_neighbor_route && last_response_cascade && route
+      return last_neighbor_route.options[:endpoint].call(env) if last_neighbor_route && last_response_cascade && route
 
       last_response_cascade = cascade_or_return_response.call(process_route(route, env)) if route
 
@@ -152,8 +152,8 @@ def greedy_match?(input)
 
     def call_with_allow_headers(env, route)
       prepare_env_from_route(env, route)
-      env[Grape::Env::GRAPE_ALLOWED_METHODS] = route.options[:allow_header].join(', ').freeze
-      route.endpoint.call(env)
+      env[Grape::Env::GRAPE_ALLOWED_METHODS] = route.options[:allow_header]
+      route.options[:endpoint].call(env)
     end
 
     def prepare_env_from_route(env, route)