Allow namespaced configuration on generators.

1 files changed, 14 insertions, 12 deletions

diff --git a/railties/lib/generators/rails/app/templates/config/environment.rb b/railties/lib/generators/rails/app/templates/config/environment.rb
index 02fbb57b87..59c1f0bfb2 100644
--- a/railties/lib/generators/rails/app/templates/config/environment.rb
+++ b/railties/lib/generators/rails/app/templates/config/environment.rb
@@ -45,20 +45,22 @@ Rails::Initializer.run do |config|
 
   # Configure generators default options.
   config.generators do |g|
-    # Scaffold configuration
-    g.helper      = true
-    g.layout      = true
-    g.stylesheets = true
+    g.rails do |r|
+      r.helper      = true
+      r.stylesheets = true
+    end
 
-    # ORM configuration
-    g.orm        = :active_record
-    g.timestamps = true
+    g.orm :active_record do |ar|
+      ar.migration  = true
+      ar.timestamps = true
+    end
 
-    # Template engine configuration
-    g.template_engine = :erb
+    g.template_engine :erb do |erb|
+      erb.layout = true
+    end
 
-    # Test framework configuration
-    g.test_framework = :test_unit
-    g.fixtures       = true
+    g.test_framework :test_unit do |tu|
+      tu.fixtures = true
+    end
   end
 end