aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-02-26 15:43:20 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2014-02-26 15:43:20 -0800
commit59ec4562a2e70df455b2e44a67c340fa5254e26e (patch)
treec3af70241e8224670dc36f07dc3ad89938552a11 /railties/lib
parent707dfcdbc36c48af3411b9de08d70757ee4e612f (diff)
downloadrails-59ec4562a2e70df455b2e44a67c340fa5254e26e.tar.gz
rails-59ec4562a2e70df455b2e44a67c340fa5254e26e.tar.bz2
rails-59ec4562a2e70df455b2e44a67c340fa5254e26e.zip
pass strings to the underscore method
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/engine.rb2
-rw-r--r--railties/lib/rails/railtie.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 5c54cdaa70..5661094d95 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -371,7 +371,7 @@ module Rails
end
def isolate_namespace(mod)
- engine_name(generate_railtie_name(mod))
+ engine_name(generate_railtie_name(mod.name))
self.routes.default_scope = { module: ActiveSupport::Inflector.underscore(mod.name) }
self.isolated = true
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index c63e0c0758..8d7e804bdc 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -183,8 +183,8 @@ module Rails
end
protected
- def generate_railtie_name(class_or_module)
- ActiveSupport::Inflector.underscore(class_or_module).tr("/", "_")
+ def generate_railtie_name(string)
+ ActiveSupport::Inflector.underscore(string).tr("/", "_")
end
# If the class method does not have a method, then send the method call