aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-07-16 15:41:47 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-07-16 15:41:47 -0700
commit4a7b95985f54ef1847f50eff294f7361d900539f (patch)
tree6c615a4b34e1f8e0a474b5a6e3112353b756297a /actionpack/lib
parentd66536d7d478c47d3b47f4a9aee892e2881c7d64 (diff)
downloadrails-4a7b95985f54ef1847f50eff294f7361d900539f.tar.gz
rails-4a7b95985f54ef1847f50eff294f7361d900539f.tar.bz2
rails-4a7b95985f54ef1847f50eff294f7361d900539f.zip
Rails-ish apps should descend from Rails::Railtie
Use an is_a check to ensure it's a Railsish app so we can avoid respond_to calls everywhere.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb11
1 files changed, 3 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 1fe5cce6a8..c16b04520e 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -605,18 +605,13 @@ module ActionDispatch
private
def app_name(app)
- return unless app.respond_to?(:routes)
+ return unless app.is_a?(Class) && app < Rails::Railtie
- if app.respond_to?(:railtie_name)
- app.railtie_name
- else
- class_name = app.name
- ActiveSupport::Inflector.underscore(class_name).tr("/", "_")
- end
+ app.railtie_name
end
def define_generate_prefix(app, name)
- return unless app.respond_to?(:routes)
+ return unless app.is_a?(Class) && app < Rails::Railtie
_route = @set.named_routes.routes[name.to_sym]
_routes = @set