Merge pull request rails#54517 from byroot/opt-find-routes

Micro-Optimize Router#find_routes

Author: byroot

actionpack/lib/action_dispatch/http/parameters.rb

@@ -65,14 +65,14 @@ def parameters
       alias :params :parameters
 
       def path_parameters=(parameters) # :nodoc:
-        delete_header("action_dispatch.request.parameters")
+        @env.delete("action_dispatch.request.parameters")
 
         parameters = Request::Utils.set_binary_encoding(self, parameters, parameters[:controller], parameters[:action])
         # If any of the path parameters has an invalid encoding then raise since it's
         # likely to trigger errors further on.
         Request::Utils.check_param_encoding(parameters)
 
-        set_header PARAMETERS_KEY, parameters
+        @env[PARAMETERS_KEY] = parameters
       rescue Rack::Utils::ParameterTypeError, Rack::Utils::InvalidParameterError => e
         raise ActionController::BadRequest.new("Invalid path parameters: #{e.message}")
       end
@@ -82,7 +82,7 @@ def path_parameters=(parameters) # :nodoc:
       #
       #     { action: "my_action", controller: "my_controller" }
       def path_parameters
-        get_header(PARAMETERS_KEY) || set_header(PARAMETERS_KEY, {})
+        @env[PARAMETERS_KEY] ||= {}
       end
 
       private

actionpack/lib/action_dispatch/http/request.rb

@@ -166,7 +166,7 @@ def route_uri_pattern
     end
 
     def route=(route) # :nodoc:
-      set_header("action_dispatch.route", route)
+      @env["action_dispatch.route"] = route
     end
 
     def routes # :nodoc:

actionpack/lib/action_dispatch/journey/router.rb

@@ -2,6 +2,7 @@
 
 # :markup: markdown
 
+require "cgi"
 require "action_dispatch/journey/router/utils"
 require "action_dispatch/journey/routes"
 require "action_dispatch/journey/formatter"
@@ -116,17 +117,28 @@ def find_routes(req)
             routes.select! { |r| r.matches?(req) }
           end
 
-          routes.sort_by!(&:precedence)
+          if routes.size > 1
+            routes.sort! do |a, b|
+              a.precedence <=> b.precedence
+            end
+          end
 
-          routes.each { |r|
+          routes.each do |r|
             match_data = r.path.match(path_info)
             path_parameters = {}
-            match_data.names.each_with_index { |name, i|
-              val = match_data[i + 1]
-              path_parameters[name.to_sym] = Utils.unescape_uri(val) if val
-            }
+            index = 1
+            match_data.names.each do |name|
+              if val = match_data[index]
+                path_parameters[name.to_sym] = if val.include?("%")
+                  CGI.unescapeURIComponent(val)
+                else
+                  val
+                end
+              end
+              index += 1
+            end
             yield [match_data, path_parameters, r]
-          }
+          end
         end
 
         def match_head_routes(routes, req)

actionpack/lib/action_dispatch/journey/router/utils.rb

@@ -17,7 +17,14 @@ class Utils # :nodoc:
         #     normalize_path("")      # => "/"
         #     normalize_path("/%ab")  # => "/%AB"
         def self.normalize_path(path)
-          path ||= ""
+          return "/".dup unless path
+
+          # Fast path for the overwhelming majority of paths that don't need to be normalized
+          if path == "/" || (path.start_with?("/") && !path.end_with?("/") && !path.match?(%r{%|//}))
+            return path.dup
+          end
+
+          # Slow path
           encoding = path.encoding
           path = +"/#{path}"
           path.squeeze!("/")
@@ -61,11 +68,6 @@ def escape_segment(segment)
             escape(segment, SEGMENT)
           end
 
-          def unescape_uri(uri)
-            encoding = uri.encoding == US_ASCII ? UTF_8 : uri.encoding
-            uri.gsub(ESCAPED) { |match| [match[1, 2].hex].pack("C") }.force_encoding(encoding)
-          end
-
           private
             def escape(component, pattern)
               component.gsub(pattern) { |unsafe| percent_encode(unsafe) }.force_encoding(US_ASCII)
@@ -91,14 +93,6 @@ def self.escape_segment(segment)
         def self.escape_fragment(fragment)
           ENCODER.escape_fragment(fragment.to_s)
         end
-
-        # Replaces any escaped sequences with their unescaped representations.
-        #
-        #     uri = "/topics?title=Ruby%20on%20Rails"
-        #     unescape_uri(uri)  #=> "/topics?title=Ruby on Rails"
-        def self.unescape_uri(uri)
-          ENCODER.unescape_uri(uri)
-        end
       end
     end
   end

actionpack/test/journey/router/utils_test.rb

@@ -18,12 +18,12 @@ def test_fragment_escape
           assert_equal "a/b%20c+d%25?e", Utils.escape_fragment("a/b c+d%?e")
         end
 
-        def test_uri_unescape
-          assert_equal "a/b c+d", Utils.unescape_uri("a%2Fb%20c+d")
+        def test_CGI_unescapeURIComponent
+          assert_equal "a/b c+d", CGI.unescapeURIComponent("a%2Fb%20c+d")
         end
 
-        def test_uri_unescape_with_utf8_string
-          assert_equal "Šašinková", Utils.unescape_uri((+"%C5%A0a%C5%A1inkov%C3%A1").force_encoding(Encoding::US_ASCII))
+        def test_CGI_unescapeURIComponent_with_utf8_string
+          assert_equal "Šašinková", CGI.unescapeURIComponent((+"%C5%A0a%C5%A1inkov%C3%A1").force_encoding(Encoding::US_ASCII))
         end
 
         def test_normalize_path_not_greedy
@@ -36,7 +36,7 @@ def test_normalize_path_uppercase
 
         def test_normalize_path_maintains_string_encoding
           path = "/foo%AAbar%AAbaz".b
-          assert_equal Encoding::ASCII_8BIT, Utils.normalize_path(path).encoding
+          assert_equal Encoding::BINARY, Utils.normalize_path(path).encoding
         end
 
         def test_normalize_path_with_nil