Introduce Router#process_route for refactoring

Author: namusyaka

CHANGELOG.md

@@ -12,7 +12,7 @@ Next Release
 #### Fixes
 
 * [#1505](https://github.com/ruby-grape/grape/pull/1505): Run `before` and `after` callbacks, but skip the rest when handling OPTIONS - [@jlfaber](https://github.com/jlfaber).
-* [#1517](https://github.com/ruby-grape/grape/pull/1517): Modify the priority of ANY routes, fixes #1089 - [@namusyaka](https://github.com/namusyaka), [@wagenet](https://github.com/wagenet).
+* [#1517](https://github.com/ruby-grape/grape/pull/1517), [#1089](https://github.com/ruby-grape/grape/pull/1089): Fix: priority of ANY routes - [@namusyaka](https://github.com/namusyaka), [@wagenet](https://github.com/wagenet).
 
 0.18.0 (10/7/2016)
 ==================

UPGRADING.md

@@ -3,10 +3,9 @@ Upgrading Grape
 
 ### Upgrading to >= 0.18.1
 
-#### Modify the priority of :any routes
+#### Changes in priority of :any routes
 
-Conventional, the :any routes had been searched after matching first route and 405 routes.
-This version adds the :any routes processing before 405 processing, so the behavior of following code will be changed. 
+Prior to this version, `:any` routes were searched after matching first route and 405 routes. This behavior has changed and `:any` routes are now searched before 405 processing. In the following example the `:any` route will match first when making a request with an unsupported verb.
 
 ```ruby
 post :example do
@@ -16,7 +15,7 @@ route :any, '*path' do
   error! :not_found, 404
 end
 
-get '/example' #=> before: 405, currently: 404
+get '/example' #=> before: 405, after: 404
 ```
 
 #### Removed param processing from built-in OPTIONS handler

lib/grape/router.rb

@@ -69,60 +69,65 @@ def recognize_path(input)
 
     def identity(env)
       route = nil
-      response = transaction(env) do |input, method, routing_args|
+      response = transaction(env) do |input, method|
         route = match?(input, method)
-        if route
-          env[Grape::Env::GRAPE_ROUTING_ARGS] = make_routing_args(routing_args, route, input)
-          route.exec(env)
-        end
+        process_route(route, env) if route
       end
       [response, route]
     end
 
     def rotation(env, exact_route = nil)
       response = nil
-      input, method, routing_args = *extract_required_args(env)
+      input, method = *extract_input_and_method(env)
       map[method].each do |route|
         next if exact_route == route
         next unless route.match?(input)
-        env[Grape::Env::GRAPE_ROUTING_ARGS] = make_routing_args(routing_args, route, input)
-        response = route.exec(env)
+        response = process_route(route, env)
         break unless cascade?(response)
       end
       response
     end
 
     def transaction(env)
-      input, method, routing_args = *extract_required_args(env)
-      response = yield(input, method, routing_args)
+      input, method = *extract_input_and_method(env)
+      response = yield(input, method)
 
       return response if response && !(cascade = cascade?(response))
-
       neighbor = greedy_match?(input)
 
-      if neighbor && method == 'OPTIONS'
-        return (!cascade && neighbor) ? call_with_allow_headers(env, neighbor.allow_header, neighbor.endpoint) : nil
-      end
-
-      if route = match?(input, '*')
-        env[Grape::Env::GRAPE_ROUTING_ARGS] = make_routing_args(routing_args, route, input)
-        response = route.exec(env)
+      # If neighbor exists and request method is OPTIONS,
+      # return response by using #call_with_allow_headers.
+      return call_with_allow_headers(
+        env,
+        neighbor.allow_header,
+        neighbor.endpoint
+      ) if neighbor && method == 'OPTIONS' && !cascade
+
+      route = match?(input, '*')
+      if route
+        response = process_route(route, env)
         return response if response && !(cascade = cascade?(response))
       end
 
       (!cascade && neighbor) ? call_with_allow_headers(env, neighbor.allow_header, neighbor.endpoint) : nil
     end
 
+    def process_route(route, env)
+      input, = *extract_input_and_method(env)
+      routing_args = env[Grape::Env::GRAPE_ROUTING_ARGS]
+      env[Grape::Env::GRAPE_ROUTING_ARGS] = make_routing_args(routing_args, route, input)
+      route.exec(env)
+    end
+
     def make_routing_args(default_args, route, input)
       args = default_args || { route_info: route }
       args.merge(route.params(input))
     end
 
-    def extract_required_args(env)
+    def extract_input_and_method(env)
       input = string_for(env[Grape::Http::Headers::PATH_INFO])
       method = env[Grape::Http::Headers::REQUEST_METHOD]
-      routing_args = env[Grape::Env::GRAPE_ROUTING_ARGS]
-      [input, method, routing_args]
+      [input, method]
     end
 
     def with_optimization

lib/grape/router/pattern.rb

@@ -36,12 +36,12 @@ def pattern_options
 
       def build_path(pattern, anchor: false, suffix: nil, **_options)
         unless anchor || pattern.end_with?('*path')
-          pattern << ?/ unless pattern.end_with?(?/)
+          pattern << '/' unless pattern.end_with?('/')
           pattern << '*path'
         end
-        pattern = pattern.split(?/).tap { |parts|
-          parts[parts.length - 1] = ?? + parts.last
-        }.join(?/) if pattern.end_with?('*path')
+        pattern = pattern.split('/').tap do |parts|
+          parts[parts.length - 1] = '?' + parts.last
+        end.join('/') if pattern.end_with?('*path')
         pattern + suffix.to_s
       end