Revert "Remove literal? check to fix issue with prefixed optionals"

This reverts commit 5d1b7c3b441654e8008dcd303f5367883ec660a6.

The change here didn't actually fix the issue it was trying to fix, and
this isn't the correct way to fix either issue. The problem is switching
from the builder to grouping with find_all/regex is now very dependent
on how you structure your path pattern.

2 files changed, 1 insertions, 13 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index f57d88d1a5..522012063d 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -187,7 +187,7 @@ module ActionDispatch
           # Get all the symbol nodes followed by literals that are not the
           # dummy node.
           symbols = ast.find_all { |n|
-            n.cat? && n.left.symbol? && n.right.cat?
+            n.cat? && n.left.symbol? && n.right.cat? && n.right.left.literal?
           }.map(&:left)
 
           # Get all the symbol nodes preceded by literals.
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 178cd41922..a39fede5b9 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -94,18 +94,6 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     assert_equal({"artist"=>"journey", "song"=>"faithfully"}, hash)
   end
 
-  def test_symbols_with_dashes_reversed
-    rs.draw do
-      get ':artist(/omg-:song)', :to => lambda { |env|
-        resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters
-        [200, {}, [resp]]
-      }
-    end
-
-    hash = ActiveSupport::JSON.decode get(URI('http://example.org/journey/omg-faithfully'))
-    assert_equal({"artist"=>"journey", "song"=>"faithfully"}, hash)
-  end
-
   def test_id_with_dash
     rs.draw do
       get '/journey/:id', :to => lambda { |env|