* lib/journey/formatter.rb: when generating routes, skip route

  literals (routes that do not have replacement values like
  "/:controller") when matching unnamed routes.

    rails/rails#6459

* test/test_router.rb: corresponding test

Conflicts:

	lib/journey/formatter.rb

CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+Thu Jun 14 14:03:22 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/journey/formatter.rb: when generating routes, skip route
+          literals (routes that do not have replacement values like
+          "/:controller") when matching unnamed routes.
+
+            https://github.com/rails/rails/issues/6459
+
+        * test/test_router.rb: corresponding test
+
 Wed Feb 15 11:49:41 2012  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* lib/journey/formatter.rb: reject non-truthy parameters parts.

lib/journey/formatter.rb

@@ -34,6 +34,8 @@ def generate key, name, options, recall = {}, parameterize = nil
 
         parameterized_parts.keep_if { |_,v| v  }
 
+        next if !name && route.requirements.empty? && route.parts.empty?
+
         next unless verify_required_parts!(route, parameterized_parts)
 
         z = Hash[options.to_a - data.to_a - route.defaults.to_a]

test/test_router.rb

@@ -305,11 +305,12 @@ def test_nil_path_parts_are_ignored
     end
 
     def test_generate_slash
-      path  = Path::Pattern.new '/'
-      @router.routes.add_route nil, path, {}, {}, {}
-
       params = [ [:controller, "tasks"],
                  [:action, "show"] ]
+      str = Router::Strexp.new("/", Hash[params], ['/', '.', '?'], true)
+      path  = Path::Pattern.new str
+
+      @router.routes.add_route nil, path, {}, {}, {}
 
       path, _ = @formatter.generate(:path_info, nil, Hash[params], {})
       assert_equal '/', path