Merge pull request rails#53453 from rails/rm-fix-double-colon-routes

Fix routes with `::` in the path

Author: rafaelfranca

actionpack/lib/action_dispatch/journey/scanner.rb

@@ -55,7 +55,7 @@ def last_literal
         def scan
           next_byte = @scanner.peek_byte
           case
-          when (token = STATIC_TOKENS[next_byte])
+          when (token = STATIC_TOKENS[next_byte]) && (token != :SYMBOL || next_byte_is_not_a_token?)
             @scanner.pos += 1
             @length = @scanner.skip(/\w+/).to_i + 1 if token == :SYMBOL || token == :STAR
             token
@@ -65,6 +65,10 @@ def scan
             :LITERAL
           end
         end
+
+        def next_byte_is_not_a_token?
+          !STATIC_TOKENS[@scanner.string.getbyte(@scanner.pos + 1)]
+        end
     end
   end
 end

actionpack/test/dispatch/routing_test.rb

@@ -3924,6 +3924,16 @@ def test_nested_routes_under_format_resource
     assert_equal "/formats/1/items/2.json", format_item_path(1, 2, :json)
   end
 
+  def test_routes_with_double_colon
+    draw do
+      get "/sort::sort", to: "sessions#sort"
+    end
+
+    get "/sort:asc"
+    assert_equal "asc", @request.params[:sort]
+    assert_equal "sessions#sort", @response.body
+  end
+
 private
   def draw(&block)
     self.class.stub_controllers do |routes|

actionpack/test/journey/route/definition/scanner_test.rb

@@ -60,6 +60,12 @@ def setup
                           :SYMBOL,
                           :RPAREN,
                         ]],
+          ["/sort::sort", [
+                           :SLASH,
+                           :LITERAL,
+                           :LITERAL,
+                           :SYMBOL
+                         ]],
         ]
 
         CASES.each do |pattern, expected_tokens|