Get rid of Jounry::Utils.unescape

The `cgi` default gem provide the same functionality but much more
optimized. Might as well just use that.

We can also pre check if the string need escaping, assuming most
don't, we save an allocation.

Author: byroot

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"
@@ -123,8 +124,13 @@ def find_routes(req)
             path_parameters = {}
             index = 1
             match_data.names.each do |name|
-              val = match_data[index]
-              path_parameters[name.to_sym] = Utils.unescape_uri(val) if val
+              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]

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

@@ -61,11 +61,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 +86,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