grimen-dry_scaffold 0.2.6 → 0.3.0

data/generators/dry_model/prototypes/active_record_migration.rb

@@ -1,4 +1,4 @@
-class CreateResources < ActiveRecord::Migration
+class CreateDucks < ActiveRecord::Migration
   def self.up
     create_table :resources, :force => true do |t|
       t.string :name

data/generators/dry_model/prototypes/active_record_model.rb

@@ -1,6 +1,6 @@
-class Resource < ActiveRecord::Base
+class Duck < ActiveRecord::Base
   
-  belongs_to :user
+  belongs_to :owner
   
   # object_daddy
   generator_for(:name) { "AString" }

data/generators/dry_model/prototypes/fixture_data/active_record_fixtures.yml

@@ -0,0 +1,3 @@
+default:
+  name: "AString"
+  description: "SomeText"

data/generators/dry_model/prototypes/fixture_data/factory_girl_factories.rb

@@ -0,0 +1,4 @@
+Factory.define :duck, :class => Duck do |f|
+  f.name "AString"
+  f.description "SomeText"
+end

data/generators/dry_model/prototypes/fixture_data/machinist_blueprints.rb

@@ -0,0 +1,8 @@
+Sham.define do
+  
+end
+
+Resource.blueprint do
+  name { "AString" }
+  description { "SomeText" }
+end

data/generators/dry_model/prototypes/tests/shoulda/unit_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class DuckTest < ActiveRecord::TestCase
+  
+  fixtures :ducks
+  
+  should_have_db_column :name
+  should_have_db_column :description
+  
+  context "A test context" do
+    setup do
+      
+    end
+    
+    should 'test something' do
+      assert true
+    end
+  end
+  
+end

data/generators/dry_model/prototypes/tests/test_unit/unit_test.rb

@@ -1,8 +1,14 @@
 require 'test_helper'
 
-class ResourceTest < ActiveSupport::TestCase
+class DuckTest < ActiveRecord::TestCase
   
-  test "something" do
+  fixtures :ducks
+  
+  setup do
+    
+  end
+  
+  test 'something' do
     assert true
   end
   

data/generators/dry_model/templates/models/active_record_migration.rb

@@ -1,6 +1,6 @@
 class <%= migration_name %> < ActiveRecord::Migration
   def self.up
-    create_table :<%= table_name %>, :force => true do |t|
+    create_table :<%= table_name %> do |t|
 <% attributes.each do |attribute| -%>
       t.<%= attribute.type %> :<%= attribute.name %>
 <% end -%>
@@ -10,7 +10,7 @@ class <%= migration_name %> < ActiveRecord::Migration
 <% end -%>
     end
 <% unless indexes.blank? -%>
-
+    
 <% indexes.each do |index| -%>
     add_index :<%= table_name %>, <%= index.is_a?(Array) ? "[:#{index.join(', :')}]" : ":#{index}" %>
 <% end -%>

data/generators/dry_model/templates/models/{test_data → fixture_data}/active_record_fixtures.yml

@@ -1,5 +1,5 @@
 <% unless attributes.empty? -%>
-<%= singular_name %>_1:
+basic:
 <% attributes.each do |attribute| -%>
   <%= attribute.name %>: <%= attribute.default_for_fixture %>
 <% end -%>

data/generators/dry_model/templates/models/fixture_data/factory_girl_factories.rb

@@ -0,0 +1,5 @@
+Factory.define :<%= singular_name %>, :class => <%= class_name %> do |f|
+<% attributes.each do |attribute| -%>
+  f.<%= attribute.name %> "<%= attribute.default_for_factory %>"
+<% end -%>
+end

data/generators/dry_model/templates/models/fixture_data/machinist_blueprints.rb

@@ -0,0 +1,9 @@
+Sham.define do
+  
+end
+
+<%= class_name %>.blueprint do
+<% attributes.each do |attribute| -%>
+  <%= attribute.name %> { "<%= attribute.default_for_factory %>" }
+<% end -%>
+end

data/generators/dry_model/templates/models/tests/shoulda/unit_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class <%= class_name %>Test < ActiveRecord::TestCase
+  
+<% if options[:fixtures] -%>
+  fixtures :<%= plural_name %>
+  
+<% end -%>
+<% attributes.each do |attribute| -%>
+  should_have_db_column :<%= attribute.name %>
+<% end -%>
+  
+  context "A test context" do
+    setup do
+      
+    end
+    
+    should 'test something' do
+      assert true
+    end
+  end
+  
+end

data/generators/dry_model/templates/models/tests/test_unit/unit_test.rb

@@ -1,8 +1,16 @@
 require 'test_helper'
 
-class <%= class_name %>Test < ActiveSupport::TestCase
+class <%= class_name %>Test < ActiveRecord::TestCase
   
-  test "something" do
+<% if options[:fixtures] -%>
+  fixtures :<%= plural_name %>
+  
+<% end -%>
+  setup do
+    
+  end
+  
+  test 'something' do
     assert true
   end
   

data/generators/dry_scaffold/USAGE

@@ -5,8 +5,7 @@ DESCRIPTION
   A replacement for the Rails scaffold generator that generates code that most people end up deleting or rewriting anyway because of the unusable code. The scaffold concept is powerful, but it has more potential than generating messy and almost useless code. The goal with dry_scaffold is to generate DRY, beautiful, and standards compliant code based on common patterns without adding a lot of magic.
   
 EXAMPLE
-  ./script/generate dry_scaffold ModelName [attribute:type attribute:type] [_actions:new,create,...] [_formats:html,json,...] [--skip-pagination] [--skip-resourceful] [--skip-formtastic] [--skip-views] [--skip-helpers] [--skip-tests] [--skip-builders] [--layout]
-  
-  ...or the shortcut version:
-  
-  ./script/generate dscaffold ...
+  ./script/generate dry_scaffold Zebra name:string about:text --skip-resourceful
+  ./script/generate dscaffold Kangaroo name:string about:text --skip-formtastic
+  ./script/generate dscaffold Duck name:string about:text _actions:new,create,index,quack
+  ./script/generate dscaffold Parrot name:string about:text _formats:html,xml,yml

data/generators/dry_scaffold/dry_scaffold_generator.rb

@@ -1,41 +1,33 @@
-require 'rubygems'
-%w(will_paginate formtastic inherited_resources).each do |lib|
-  begin
-    require lib
-  rescue MissingSourceFile
-    eval("#{lib.upcase} = #{false}")
-  else
-    eval("#{lib.upcase} = #{true}")
-  end
-end
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'dry_generator'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'dry_model', 'dry_model_generator'))
 
-class DryScaffoldGenerator < Rails::Generator::NamedBase
-  
-  # Load defaults from config file - default or custom.
-  begin
-    default_config_file = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'config', 'scaffold.yml'))
-    custom_config_file = File.expand_path(File.join(Rails.root, 'config', 'scaffold.yml'))
-    config_file = File.join(File.exist?(custom_config_file) ? custom_config_file : default_config_file)
-    config = YAML::load(File.open(config_file))
-    CONFIG_ARGS = config['dry_scaffold']['args'] rescue nil
-    CONFIG_OPTIONS = config['dry_scaffold']['options'] rescue nil
-  end
+class DryScaffoldGenerator < DryGenerator
   
-  DEFAULT_ARGS = {
-      :actions => (CONFIG_ARGS['actions'].split(',').compact.uniq.collect { |v| v.downcase.to_sym } rescue nil),
-      :formats => (CONFIG_ARGS['formats'].split(',').compact.uniq.collect { |v| v.downcase.to_sym } rescue nil)
-    }
-    
-  DEFAULT_OPTIONS = {
-      :resourceful => CONFIG_OPTIONS['resourceful'] || INHERITED_RESOURCES,
-      :formtastic => CONFIG_OPTIONS['formtastic'] || FORMTASTIC,
-      :pagination => CONFIG_OPTIONS['pagination'] || WILL_PAGINATE,
-      :skip_tests => !CONFIG_OPTIONS['tests'] || false,
-      :skip_helpers => !CONFIG_OPTIONS['helpers'] || false,
-      :skip_views => !CONFIG_OPTIONS['views'] || false,
-      :layout => CONFIG_OPTIONS['layout'] || false
-    }
+  # Banner: Generator arguments and options.
+  BANNER_ARGS = [
+      "[_actions:new,create,...]",
+      "[_formats:html,json,...]",
+      DryModelGenerator::BANNER_ARGS
+    ].freeze
+  BANNER_OPTIONS = [
+      "[--skip-pagination]",
+      "[--skip-resourceful]",
+      "[--skip-formtastic]",
+      "[--skip-views]",
+      "[--skip-builders]",
+      "[--skip-helpers]",
+      "[--layout]",
+      DryModelGenerator::BANNER_OPTIONS
+    ].freeze
     
+  # Paths.
+  CONTROLLERS_PATH =        File.join('app', 'controllers').freeze
+  HELPERS_PATH =            File.join('app', 'helpers').freeze
+  VIEWS_PATH =              File.join('app', 'views').freeze
+  LAYOUTS_PATH =            File.join(VIEWS_PATH, 'layouts').freeze
+  
+  ROUTES_FILE_PATH =        File.join(RAILS_ROOT, 'config', 'routes.rb').freeze
+  
   # Formats.
   DEFAULT_RESPOND_TO_FORMATS =          [:html, :xml, :json].freeze
   ENHANCED_RESPOND_TO_FORMATS =         [:yml, :yaml, :txt, :text, :atom, :rss].freeze
@@ -49,21 +41,9 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
   DEFAULT_CONTROLLER_ACTIONS =          (DEFAULT_COLLECTION_ACTIONS + DEFAULT_MEMBER_ACTIONS)
   
   DEFAULT_VIEW_TEMPLATE_FORMAT =        :haml
-  DEFAULT_TEST_FRAMEWORK =              :test_unit
   
-  CONTROLLERS_PATH =      File.join('app', 'controllers').freeze
-  HELPERS_PATH =          File.join('app', 'helpers').freeze
-  VIEWS_PATH =            File.join('app', 'views').freeze
-  LAYOUTS_PATH =          File.join(VIEWS_PATH, 'layouts').freeze
-  MODELS_PATH =           File.join('app', 'models').freeze
-  FUNCTIONAL_TESTS_PATH = File.join('test', 'functional').freeze
-  UNIT_TESTS_PATH =       File.join('test', 'unit').freeze
-  ROUTES_FILE_PATH =      File.join(Rails.root, 'config', 'routes.rb').freeze
-  
-  RESOURCEFUL_COLLECTION_NAME = 'collection'.freeze
-  RESOURCEFUL_SINGULAR_NAME =   'resource'.freeze
-  
-  NON_ATTR_ARG_KEY_PREFIX =     '_'.freeze
+  RESOURCEFUL_COLLECTION_NAME =         'collection'.freeze
+  RESOURCEFUL_SINGULAR_NAME =           'resource'.freeze
   
   # :{action} => [:{partial}, ...]
   ACTION_VIEW_TEMPLATES = {
@@ -72,7 +52,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       :new    => [:form],
       :edit   => [:form]
     }.freeze
-  
+    
   ACTION_FORMAT_BUILDERS = {
       :index => [:atom, :rss]
     }
@@ -90,7 +70,6 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
                 :model_singular_name,
                 :model_plural_name,
                 :view_template_format,
-                :test_framework,
                 :actions,
                 :formats,
                 :config
@@ -99,7 +78,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
   alias_method  :controller_table_name, :controller_plural_name
   
   def initialize(runtime_args, runtime_options = {})
-    super
+    super(runtime_args, runtime_options)
     
     @controller_name = @name.pluralize
     base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
@@ -112,8 +91,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
     
-    @view_template_format = DEFAULT_VIEW_TEMPLATE_FORMAT
-    @test_framework = DEFAULT_TEST_FRAMEWORK
+    @view_template_format = options[:view_template_format] || DEFAULT_VIEW_TEMPLATE_FORMAT
     
     @attributes ||= []
     @args_for_model ||= []
@@ -123,7 +101,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       arg_entities = arg.split(':')
       if arg =~ /^#{NON_ATTR_ARG_KEY_PREFIX}/
         if arg =~ /^#{NON_ATTR_ARG_KEY_PREFIX}action/
-          # Replace quantifiers with default actions
+          # Replace quantifiers with default actions.
           arg_entities[1].gsub!(/\*/, DEFAULT_CONTROLLER_ACTIONS.join(','))
           arg_entities[1].gsub!(/new\+/, [:new, :create].join(','))
           arg_entities[1].gsub!(/edit\+/, [:edit, :update].join(','))
@@ -131,7 +109,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
           arg_actions = arg_entities[1].split(',').compact.uniq
           @actions = arg_actions.collect { |action| action.downcase.to_sym }
         elsif arg =~ /^#{NON_ATTR_ARG_KEY_PREFIX}(format|respond_to)/
-          # Replace quantifiers with default respond_to-formats
+          # Replace quantifiers with default respond_to-formats.
           arg_entities[1].gsub!(/\*/, DEFAULT_RESPOND_TO_FORMATS.join(','))
           
           arg_formats = arg_entities[1].split(',').compact.uniq
@@ -156,38 +134,38 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       m.class_collisions "#{controller_class_name}Controller", "#{controller_class_name}ControllerTest"
       m.class_collisions "#{controller_class_name}Helper", "#{controller_class_name}HelperTest"
       
-      # Directories.
-      m.directory File.join(CONTROLLERS_PATH, controller_class_path)
-      m.directory File.join(HELPERS_PATH, controller_class_path) unless options[:skip_helpers]
-      m.directory File.join(VIEWS_PATH, controller_class_path, controller_file_name) unless options[:skip_views]
-      m.directory File.join(FUNCTIONAL_TESTS_PATH, controller_class_path) unless options[:skip_tests]
-      m.directory File.join(UNIT_TESTS_PATH, 'helpers', controller_class_path) unless options[:skip_tests] || options[:skip_helpers]
-      
       # Controllers.
       controller_template = options[:resourceful] ? 'inherited_resources' : 'action'
+      m.directory File.join(CONTROLLERS_PATH, controller_class_path)
       m.template File.join('controllers', "#{controller_template}_controller.rb"),
         File.join(CONTROLLERS_PATH, controller_class_path, "#{controller_file_name}_controller.rb")
         
       # Controller Tests.
       unless options[:skip_tests]
+        controller_tests_path = File.join(TEST_PATHS[test_framework], 'functional')
+        m.directory File.join(controller_tests_path, controller_class_path)
         m.template File.join('controllers', 'tests', "#{test_framework}", 'functional_test.rb'),
-          File.join(FUNCTIONAL_TESTS_PATH, controller_class_path, "#{controller_file_name}_controller_test.rb")
+          File.join(controller_tests_path, controller_class_path, "#{controller_file_name}_controller_test.rb")
       end
       
       # Helpers.
       unless options[:skip_helpers]
+        m.directory File.join(HELPERS_PATH, controller_class_path)
         m.template File.join('helpers', 'helper.rb'),
           File.join(HELPERS_PATH, controller_class_path, "#{controller_file_name}_helper.rb")
           
         # Helper Tests
         unless options[:skip_tests]
+          helper_tests_path = File.join(TEST_PATHS[test_framework], 'unit', 'helpers')
+          m.directory File.join(helper_tests_path, controller_class_path)
           m.template File.join('helpers', 'tests', "#{test_framework}", 'unit_test.rb'),
-            File.join(UNIT_TESTS_PATH, 'helpers', controller_class_path, "#{controller_file_name}_helper_test.rb")
+            File.join(helper_tests_path, controller_class_path, "#{controller_file_name}_helper_test.rb")
         end
       end
       
       # Views.
       unless options[:skip_views]
+        m.directory File.join(VIEWS_PATH, controller_class_path, controller_file_name)
         # View template for each action.
         (actions & ACTION_VIEW_TEMPLATES.keys).each do |action|
           m.template File.join('views', "#{view_template_format}", "#{action}.html.#{view_template_format}"),
@@ -203,6 +181,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       
       # Builders.
       unless options[:skip_builders]
+        m.directory File.join(VIEWS_PATH, controller_class_path, controller_file_name)
         (actions & ACTION_FORMAT_BUILDERS.keys).each do |action|
           (formats & ACTION_FORMAT_BUILDERS[action] || []).each do |format|
             m.template File.join('views', 'builder', "#{action}.#{format}.builder"),
@@ -213,12 +192,14 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       
       # Layout.
       if options[:layout]
+        m.directory File.join(LAYOUTS_PATH)
         m.template File.join('views', "#{view_template_format}", "layout.html.#{view_template_format}"),
           File.join(LAYOUTS_PATH, "#{controller_file_name}.html.#{view_template_format}")
       end
       
       # Routes.
       unless resource_route_exists?
+        # TODO: Override Rails default method to not generate route if it's already defined.
         m.route_resources controller_file_name
       end
       
@@ -227,6 +208,23 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
     end
   end
   
+  ### Fixture/Factory Helpers.
+  
+  def build_object
+    case options[:factory_framework]
+      when :factory_girl then
+        "Factory(:#{singular_name})"
+      when :machinist then
+        "#{class_name}.make"
+      when :object_daddy then
+        "#{class_name}.generate"
+      else #:fixtures
+        "#{plural_name}(:basic)"
+    end
+  end
+  
+  ### Link Helpers.
+  
   def collection_instance
     "@#{collection_name}"
   end
@@ -235,59 +233,81 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
     "@#{singular_name}"
   end
   
-  def index_link
+  def index_path
+    "#{collection_name}_path"
+  end
+  
+  def new_path
+    "new_#{singular_name}_path"
+  end
+  
+  def show_path(object_name = resource_instance)
+    "#{singular_name}_path(#{object_name})"
+  end
+  
+  def edit_path(object_name = resource_instance)
+    "edit_#{show_path(object_name)}"
+  end
+  
+  def destroy_path(object_name = resource_instance)
+    "#{object_name}"
+  end
+  
+  def index_url
     "#{collection_name}_url"
   end
   
-  def new_link
+  def new_url
     "new_#{singular_name}_url"
   end
   
-  def show_link(object_name = resource_instance)
+  def show_url(object_name = resource_instance)
     "#{singular_name}_url(#{object_name})"
   end
   
-  def edit_link(object_name = resource_instance)
-    "edit_#{show_link(object_name)}"
+  def edit_url(object_name = resource_instance)
+    "edit_#{show_url(object_name)}"
   end
   
-  def destroy_link(object_name = resource_instance)
+  def destroy_url(object_name = resource_instance)
     "#{object_name}"
   end
   
+  ### Feed Helpers.
+  
   def feed_link(format)
     case format
-    when :atom then
-      ":href => #{plural_name}_url(:#{format}), :rel => 'self'"
-    when :rss then
-      "#{plural_name}_url(#{singular_name}, :#{format})"
+      when :atom then
+        ":href => #{plural_name}_url(:#{format}), :rel => 'self'"
+      when :rss then
+        "#{plural_name}_url(#{singular_name}, :#{format})"
     end
   end
   
   def feed_entry_link(format)
     case format
-    when :atom then
-      ":href => #{singular_name}_url(#{singular_name}, :#{format})"
-    when :rss then
-      "#{singular_name}_url(#{singular_name}, :#{format})"
+      when :atom then
+        ":href => #{singular_name}_url(#{singular_name}, :#{format})"
+      when :rss then
+        "#{singular_name}_url(#{singular_name}, :#{format})"
     end
   end
   
   def feed_date(format)
     case format
-    when :atom then
-      "(#{collection_instance}.first.created_at rescue Time.now.utc).strftime('%Y-%m-%dT%H:%M:%SZ')"
-    when :rss then
-      "(#{collection_instance}.first.created_at rescue Time.now.utc).to_s(:rfc822)"
+      when :atom then
+        "(#{collection_instance}.first.created_at rescue Time.now.utc).strftime('%Y-%m-%dT%H:%M:%SZ')"
+      when :rss then
+        "(#{collection_instance}.first.created_at rescue Time.now.utc).to_s(:rfc822)"
     end
   end
   
   def feed_entry_date(format)
     case format
-    when :atom then
-      "#{singular_name}.try(:updated_at).strftime('%Y-%m-%dT%H:%M:%SZ')"
-    when :rss then
-      "#{singular_name}.try(:updated_at).to_s(:rfc822)"
+      when :atom then
+        "#{singular_name}.try(:updated_at).strftime('%Y-%m-%dT%H:%M:%SZ')"
+      when :rss then
+        "#{singular_name}.try(:updated_at).to_s(:rfc822)"
     end
   end
   
@@ -298,12 +318,8 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       File.read(ROUTES_FILE_PATH) =~ /(#{route_exp.strip}|#{route_exp.strip.tr('\'', '\"')})/
     end
     
-    def symbol_array_to_expression(array)
-      ":#{array.compact.join(', :')}" if array.present?
-    end
-    
     def assign_names!(name)
-      super
+      super(name)
       @model_singular_name = @singular_name
       @model_plural_name = @plural_name
       @collection_name = options[:resourceful] ? RESOURCEFUL_COLLECTION_NAME : @model_plural_name
@@ -312,96 +328,74 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
     end
     
     def add_options!(opt)
-      opt.separator ''
-      opt.separator 'Options:'
+      super(opt)
       
-      ### CONTROLLERS + VIEWS
+      ### CONTROLLER + VIEW + HELPER
       
-      opt.on('--skip-pagination',
-        "Skip 'will_paginate' for collections in controllers and views, wich requires gem 'mislav-will_paginate'.") do |v|
-        options[:pagination] = !v
-      end
+      opt.separator ' '
+      opt.separator 'Scaffold Options:'
       
       opt.on('--skip-resourceful',
-        "Skip 'inherited_resources' style controllers and views, wich requires gem 'josevalim-inherited_resources'.") do |v|
+        "Controller: Skip 'inherited_resources' style controllers and views. Requires gem 'josevalim-inherited_resources'.") do |v|
         options[:resourceful] = !v
       end
       
-      opt.on('--skip-formtastic',
-        "Skip 'formtastic' style forms, wich requires gem 'justinfrench-formtastic'.") do |v|
-        options[:formtastic] = !v
+      opt.on('--skip-pagination',
+        "Controller/View: Skip 'will_paginate' for collections in controllers and views. Requires gem 'mislav-will_paginate'.") do |v|
+        options[:pagination] = !v
       end
       
-      opt.on('--layout', "Generate layout.") do |v|
-        options[:layout] = v
+      opt.on('--skip-formtastic',
+        "View: Skip 'formtastic' style forms. Requires gem 'justinfrench-formtastic'.") do |v|
+        options[:formtastic] = !v
       end
       
-      opt.on('--skip-views', "Skip generation of views.") do |v|
+      opt.on('--skip-views', "View: Skip generation of views.") do |v|
         options[:skip_views] = v
       end
       
-      opt.on('--skip-helper', "Skip generation of helpers.") do |v|
-        options[:skip_helpers] = v
-      end
-      
-      opt.on('--skip-builders', "Skip generation of helpers.") do |v|
+      opt.on('--skip-builders', "View: Skip generation of builders.") do |v|
         options[:skip_builders] = v
       end
       
-      ### CONTROLLERS + MODELS
-      
-      opt.on('--skip-tests', "Skip generation of tests.") do |v|
-        options[:skip_tests] = v
-      end
-      
-      ### MODELS ONLY
-      
-      opt.on('--fixtures', "Model: Generate fixtures.") do |v|
-        options[:fixtures] = v
+      opt.on('--layout', "View: Generate layout.") do |v|
+        options[:layout] = v
       end
       
-      opt.on('--fgirl', "Model: Generate \"factory_girl\" factories.") do |v|
-        options[:factory_girl] = v
+      opt.on('--skip-helper', "Helper: Skip generation of helpers.") do |v|
+        options[:skip_helpers] = v
       end
       
-      opt.on('--machinist', "Model: Generate \"machinist\" blueprints (factories).") do |v|
-        options[:machinist] = v
-      end
+      ### MODEL
       
-      opt.on('--odaddy', "Model: Generate \"object_daddy\" generator/factory methods.") do |v|
-        options[:object_daddy] = v
-      end
+      opt.separator ' '
+      opt.separator 'Model Options:'
       
-      opt.on('--skip-timestamps', "Model: Don't add timestamps to the migration file.") do |v|
+      opt.on("--skip-timestamps", "Model: Don't add timestamps to the migration file.") do |v|
         options[:skip_timestamps] = v
       end
       
-      opt.on('--skip-migration', "Model: Skip generation of migration file.") do |v|
+      opt.on("--skip-migration", "Model: Skip generation of migration file.") do |v|
         options[:skip_migration] = v
       end
+      
+      opt.on("--skip-tests", "Model: Skip generation of tests.") do |v|
+        options[:skip_tests] = v
+      end
+      
+      opt.separator ' '
+    end
+    
+    def banner_args
+      [BANNER_ARGS, super].flatten.join(' ')
+    end
+    
+    def banner_options
+      [BANNER_OPTIONS, super].flatten.join(' ')
     end
     
     def banner
-      ["Usage: #{$0} #{spec.name} ModelName",
-        "[field:type field:type ...]",
-        "[_actions:new,create,...]",
-        "[_formats:html,json,...]",
-        "[_indexes:field,field+field,field,...]",
-        "[--skip-pagination]",
-        "[--skip-resourceful]",
-        "[--skip-formtastic]",
-        "[--skip-views]", 
-        "[--skip-helpers]",
-        "[--skip-tests]",
-        "[--skip-builders]",
-        "[--layout]",
-        "[--fixtures]",
-        "[--factory_girl]",
-        "[--machinist]",
-        "[--object_daddy]",
-        "[--skip-timestamps]",
-        "[--skip-migration]"
-      ].join(' ')
+      [super, banner_args, banner_options].join(' ')
     end
     
 end