From 7022b58842ec3490d85efc5b947d86a0fd72d0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 15 Jul 2009 16:20:48 +0200
Subject: Allow namespaced configuration on generators.

---
 .../rails/app/templates/config/environment.rb      | 26 ++++++++++++----------
 .../generators/rails/plugin/plugin_generator.rb    |  5 ++---
 2 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'railties/lib/generators/rails')

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
diff --git a/railties/lib/generators/rails/plugin/plugin_generator.rb b/railties/lib/generators/rails/plugin/plugin_generator.rb
index 49fe409ea8..a7417f28c2 100644
--- a/railties/lib/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/generators/rails/plugin/plugin_generator.rb
@@ -3,8 +3,7 @@ require 'generators/rails/generator/generator_generator'
 module Rails
   module Generators
     class PluginGenerator < NamedBase
-      class_option :tasks, :type => :boolean, :aliases => "-t", :default => false,
-                           :desc => "When supplied creates tasks base files."
+      class_option :tasks, :desc => "When supplied creates tasks base files."
 
       check_class_collision
 
@@ -21,7 +20,7 @@ module Rails
         directory 'tasks', plugin_dir('tasks')
       end
 
-      hook_for :generator, :aliases => "-g", :type => :boolean do |instance, generator|
+      hook_for :generator do |instance, generator|
         instance.inside_with_padding instance.send(:plugin_dir) do
           instance.invoke generator, [ instance.name ], :namespace => false
         end
-- 
cgit v1.2.3