aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorFred Wu <ifredwu@gmail.com>2010-07-28 22:55:57 +1000
committerJosé Valim <jose.valim@gmail.com>2010-08-02 16:30:20 +0200
commitcdad483dff4fef1b640dc3c750719c325b252f89 (patch)
tree8530a62df5cdbd352229e7c14cba3e00f2e59f32 /railties/lib/rails
parentaeaab06c79a9e3cfa9988270847fa8c6f863570a (diff)
downloadrails-cdad483dff4fef1b640dc3c750719c325b252f89.tar.gz
rails-cdad483dff4fef1b640dc3c750719c325b252f89.tar.bz2
rails-cdad483dff4fef1b640dc3c750719c325b252f89.zip
Improved how AppGenerator generates the application name. It now detects the current app name whenever possible. This means that renaming the residing directory will not effect the app name generated by AppGenerator.
[#5225 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 96c49a81bb..dd18588b39 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -356,8 +356,12 @@ module Rails
@app_name ||= File.basename(destination_root)
end
+ def defined_app_const_base
+ Rails.application.class.name.sub(/::Application$/, "") if Rails.application.instance_of?(Rails::Application)
+ end
+
def app_const_base
- @app_const_base ||= app_name.gsub(/\W/, '_').squeeze('_').camelize
+ @app_const_base ||= defined_app_const_base || app_name.gsub(/\W/, '_').squeeze('_').camelize
end
def app_const