aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-07-16 14:47:45 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-07-16 14:49:45 -0700
commit832d2c40df31db7dd6b679b85644089518810638 (patch)
treea8b34c72214b95c67dfab3deb0060ed8ef67d61c /actionpack/lib/action_dispatch/routing
parent6feb2aa6bd3b342a73ced32888f6fd1b039639c0 (diff)
downloadrails-832d2c40df31db7dd6b679b85644089518810638.tar.gz
rails-832d2c40df31db7dd6b679b85644089518810638.tar.bz2
rails-832d2c40df31db7dd6b679b85644089518810638.zip
we should be checking if the app is a class
Hopefully `object.class` always returns something that is_a?(Class), so the previous logic didn't really make sense.
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 6419c17be9..e77f6286ea 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -610,7 +610,7 @@ module ActionDispatch
if app.respond_to?(:railtie_name)
app.railtie_name
else
- class_name = app.class.is_a?(Class) ? app.name : app.class.name
+ class_name = app.is_a?(Class) ? app.name : app.class.name
ActiveSupport::Inflector.underscore(class_name).tr("/", "_")
end
end