Fix problem with symbol/string mismatch on some routes

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1500 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/lib/action_controller/code_generation.rb

@@ -115,7 +115,7 @@ module ActionController
         end
         code = "(#{code} || #{default.inspect})" if default 
       
-        return code
+        return code.to_s
       end
     
       def segment_name() "segment#{depth}".to_sym end

actionpack/test/controller/routing_test.rb

@@ -622,6 +622,13 @@ class RouteSetTests < Test::Unit::TestCase
     end
   end
 
+  def test_route_with_colon_first
+    rs.draw do |map|
+      map.connect '/:controller/:action/:id', :action => 'index', :id => nil
+      map.connect ':url', :controller => 'tiny_url', :action => 'translate'
+    end
+  end
+
   def test_basic_named_route
     rs.home '', :controller => 'content', :action => 'list' 
     x = setup_for_named_route