ruby-grape / grape / 33755546064

97%

master: 97%

Pull #2889

github

Read the path version off the route the router already matched (#2890)

Under path versioning the version is a named capture in every route pattern —
`Pattern::Path#build_parts` inserts `:version` ahead of the namespace — and it
is constrained to the declared versions. So by the time a request reaches the
endpoint's middleware stack, the router has already sliced the segment out of
the path, validated it, and left it in `env['grape.routing_args'][:version]`.

`Versioner::Path#before` derived it a second time, from scratch:

    path_info = Grape::Util::PathNormalizer.call(env[Rack::PATH_INFO])
    return if path_info == '/'
    @prefixes.each { |prefix| path_info = path_info.delete_prefix(prefix) if ... }
    slash_position = path_info.index('/', 1)
    return version_from_first_segment(path_info, slash_position) if slash_position

— a normalize, a prefix strip and a slice, for an answer already in the env.

Read it from there instead. The path parse stays, and answers three cases the
routing args cannot:

* no routing args at all, when the middleware runs outside a Grape router;
* the greedy routes behind auto-OPTIONS and 405, which capture nothing;
* a route that declares a `:version` segment of its own on top of the
  versioning one, where Mustermann reports the capture as every position it
  matched rather than the single segment recorded here — hence the
  `is_a?(String)` guard.

`Router#call` now also publishes the path it routed on as
`env['grape.normalized_path']`, so that fallback does not normalize `PATH_INFO`
a second time either. It is the same string the router matched against, which
is what the versioner wants to agree with.

This leans on the version capture being strict, so it comes after
"Constrain the version capture with a Regexp instead of an Array" — before it,
a percent-encoded segment matched the route and Mustermann decoded it, and the
versioner would have accepted what it used to reject.

Median of 5 interleaved runs against m... (continued)

1244 of 1338 branches covered (92.97%)

Branch coverage included in aggregate %.

9 of 9 new or added lines in 4 files covered. (100.0%)

3945 of 4014 relevant lines covered (98.28%)

27001.72 hits per line