diff options
author | Mario de la Ossa <mariodelaossa@gmail.com> | 2018-01-29 14:56:43 -0600 |
---|---|---|
committer | Mario de la Ossa <mariodelaossa@gmail.com> | 2018-01-29 15:28:14 -0600 |
commit | 233a9861113df678e1f54dfbd13d9ab23fd5d5a0 (patch) | |
tree | fa1b31885265303c7f92726707a468a9f734f957 /config | |
parent | 55f28ebbf64d98389cb5f0491c031af5591b9f5e (diff) | |
download | gitlab-ce-233a9861113df678e1f54dfbd13d9ab23fd5d5a0.tar.gz |
Fix grape-route-helper route shadowinggrape-router-helpers-bugfix
Bringing in https://github.com/reprah/grape-route-helpers/pull/21 as a
monkey patch since the grape-route-helpers project seems to be abandoned
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/grape_route_helpers_fix.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/config/initializers/grape_route_helpers_fix.rb b/config/initializers/grape_route_helpers_fix.rb index d3cf9e453d0..612cca3dfbd 100644 --- a/config/initializers/grape_route_helpers_fix.rb +++ b/config/initializers/grape_route_helpers_fix.rb @@ -1,5 +1,21 @@ if defined?(GrapeRouteHelpers) module GrapeRouteHelpers + module AllRoutes + # Bringing in PR https://github.com/reprah/grape-route-helpers/pull/21 due to abandonment. + # + # Without the following fix, when two helper methods are the same, but have different arguments + # (for example: api_v1_cats_owners_path(id: 1) vs api_v1_cats_owners_path(id: 1, owner_id: 2)) + # if the helper method with the least number of arguments is defined first (because the route was defined first) + # then it will shadow the longer route. + # + # The fix is to sort descending by amount of arguments + def decorated_routes + @decorated_routes ||= all_routes + .map { |r| DecoratedRoute.new(r) } + .sort_by { |r| -r.dynamic_path_segments.count } + end + end + class DecoratedRoute # GrapeRouteHelpers gem tries to parse the versions # from a string, not supporting Grape `version` array definition. |