From d7cfb636367f2f929d07ade9060d35a2cf7ad20b Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 26 Dec 2011 11:31:22 +0100
Subject: Correctly display rack apps with dynamic constraints in
 RoutesInspector

If you used dynamic constraint like that:

  scope :constraint => MyConstraint.new do
    mount RackApp => "/foo"
  end

routes were not displayed correctly when using `rake routes`.
This commit fixes it. If you want nice display of dynamic
constraints in `rake routes` output, please just override
to_s method in your constraint's class.
---
 railties/lib/rails/application/route_inspector.rb | 11 ++++++++++-
 railties/test/application/route_inspect_test.rb   | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

(limited to 'railties')

diff --git a/railties/lib/rails/application/route_inspector.rb b/railties/lib/rails/application/route_inspector.rb
index 26652a8e5e..3e08b78221 100644
--- a/railties/lib/rails/application/route_inspector.rb
+++ b/railties/lib/rails/application/route_inspector.rb
@@ -23,7 +23,7 @@ module Rails
         routes = routes.collect do |route|
           route_reqs = route.requirements
 
-          rack_app = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
+          rack_app = discover_rack_app(route.app)
 
           controller = route_reqs[:controller] || ':controller'
           action     = route_reqs[:action]     || ':action'
@@ -70,6 +70,15 @@ module Rails
           "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"
         end
       end
+
+      def discover_rack_app(app)
+        class_name = app.class.name.to_s
+        if class_name == "ActionDispatch::Routing::Mapper::Constraints"
+          discover_rack_app(app.app)
+        elsif class_name !~ /^ActionDispatch::Routing/
+          app
+        end
+      end
     end
   end
 end
diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
index 2ad5ee6c4c..6503251b9f 100644
--- a/railties/test/application/route_inspect_test.rb
+++ b/railties/test/application/route_inspect_test.rb
@@ -127,5 +127,22 @@ module ApplicationTests
       output = @inspector.format @set.routes
       assert_equal ["  /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"], output
     end
+
+    def test_rake_routes_shows_route_with_rack_app_nested_with_dynamic_constraints
+      constraint = Class.new do
+        def to_s
+          "( my custom constraint )"
+        end
+      end
+
+      @set.draw do
+        scope :constraint => constraint.new do
+          mount RackApp => '/foo'
+        end
+      end
+
+      output = @inspector.format @set.routes
+      assert_equal ["  /foo #{RackApp.name} {:constraint=>( my custom constraint )}"], output
+    end
   end
 end
-- 
cgit v1.2.3