aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2011-12-26 11:31:22 +0100
committerPiotr Sarnacki <drogus@gmail.com>2011-12-26 11:41:45 +0100
commit28cd098d99c52486aecb72aab39105d8abcd52ad (patch)
tree93b3c7e55d9366ca93496977498cf34d2663fd7d /railties/lib/rails
parent63e14a7969834f9cc716b9c996aad381b57c0882 (diff)
downloadrails-28cd098d99c52486aecb72aab39105d8abcd52ad.tar.gz
rails-28cd098d99c52486aecb72aab39105d8abcd52ad.tar.bz2
rails-28cd098d99c52486aecb72aab39105d8abcd52ad.zip
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.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application/route_inspector.rb11
1 files changed, 10 insertions, 1 deletions
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