grimen-dry_scaffold 0.1.2 → 0.2.0

data/README.textile

@@ -6,12 +6,13 @@ h2. Description
 
 DryScaffold is 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 DryScaffold is to generate DRY, beautiful, and standards compliant code based on common patterns without adding a lot of magic.
 
-h4. Key concepts:
+h3. Key concepts:
 
-* Controllers that are DRY, RESTful, no code-smells, following conventions, and implementing VERY common patterns
-* Views that are DRY, semantic, standards compliant, valid, and more useful in development
-* Generator that gets smart with additional arguments - but not stupid without them
-* Any Rails developer should be able to switch generator with no effort - follow current conventions, but extend them
+* Controllers that are DRY, RESTful, no code-smells, following conventions, and implementing VERY common patterns.
+* Views that are DRY, semantic, standards compliant, valid, and more useful in development.
+* Factories instead of fixtures.
+* Generator that gets smart with additional arguments - but not stupid without them.
+* Any Rails developer should be able to switch generator with no effort - follow current conventions, but extend them.
 
 h2. Dependencies
 
@@ -21,10 +22,18 @@ h3. Required:
 
 h3. Optional:
 
+h4. Controllers/Views
+
 * "*will_paginate*":http://github.com/mislav/will_paginate - Pagination
 * "*formtastic*":http://github.com/justinfrench/formtastic - DRY and semantic forms
 * "*inherited_resources*":http://github.com/josevalim/inherited_resources - DRY/Resourceful controllers
 
+h4. Models
+
+* "*factory_girl*":http://github.com/thoughtbot/factory_girl - Fixture-replacement
+* "*machinist*":http://github.com/notahat/machinist - Fixture-replacement
+* "*object_daddy*":http://github.com/flogic/object_daddy - Fixture-replacement
+
 h2. Features
 
 h3. Overview
@@ -94,7 +103,7 @@ Find out more about *inherited_resources*: "http://github.com/josevalim/inherite
 
 h3. Pagination
 
-Pagination is such a common feature that always seems to be implemented anyway, so dry_scaffold will generate a DRY solution for this in each controller that you can tweak - even thought that will not be needed in most cases. See DRY Patterns beneath for more details how it's done.
+Pagination is such a common feature that always seems to be implemented anyway, so DryScaffold will generate a DRY solution for this in each controller that you can tweak - even thought that will not be needed in most cases. See DRY Patterns beneath for more details how it's done. Pagination - using WillPaginate - can be turned off.
 
 Find out more about *will_paginate*: "http://github.com/mislav/will_paginate":http://github.com/mislav/will_paginate
 
@@ -102,11 +111,13 @@ h3. DRY Patterns
 
 Either if you choosing default or resourceful controllers, this pattern is used to DRYing up controllers a bit more, and at the same time loading resources in the same place using before_filter while adding automatic pagination for collections.
 
-h4. Default (ActionController, without InheritedResources)
+h4. Default (ActionController with pagination - not using InheritedResources)
 
 <pre>before_filter :load_resource, :only => [:show, :edit, :update, :destroy]
 before_filter :load_and_paginate_resources, :only => [:index]
 
+...
+
 protected
   
   def collection
@@ -122,7 +133,7 @@ protected
   end
   alias :load_resource :resource</pre>
 
-h4. Resourceful (InheritedResources)
+h4. Resourceful (InheritedResources with pagination)
 
 <pre>protected
   
@@ -139,7 +150,7 @@ h4. Resourceful (InheritedResources)
 
 h3. View Partials
 
-A very common pattern is to break up views in partials, wich is also what DryScaffold does:
+A very common pattern is to break up views in partials, which is also what DryScaffold does:
 
 * new/edit => _form
 * index => _item
@@ -148,8 +159,8 @@ h3. More To Come... (TODO)
 
 These are things I have in mind:
 
-* Generation of factory stubs instead of fixture stubs that Rails model generator generates
-* Generation of Rails builder stubs (RSS/Atom/...)
+* Generation of Rails builder stubs automatically for formats atom/rss.
+* Read default scaffold options for current Rails porject from a config (say "config/scaffold.yml")
 * Break up into multiple generators as dependencies (like Rails generators): dry_controller, dry_views, dry_scaffold, ...
 
 h2. Setup
@@ -179,14 +190,24 @@ h3. 3. Install Dependencies (Partly optional)
 
 Install dependencies to release the full power of dry_scaffold. Only HAML is really required of these, but how could anyone resist candy? =)
 
-h4. Installation, i.e. get the gems
+h4. Express
+
+For us lazy ones... =)
+
+<pre>rake dry_scaffold:setup</pre>
+
+Will install the dependencies, initialize HAML within current Rails project if not already done, and automatically referencing the dependency gems within the current Rails project environment config if they are not already in there (note: nothing will be overwritten).
+
+h4. Installation
+
+Get the gems...
 
 <pre>sudo gem install haml</pre>
 <pre>sudo gem install will_paginate</pre>
 <pre>sudo gem install justinfrench-formtastic</pre>
 <pre>sudo gem install josevalim-inherited_resources</pre>
 
-h4. Configuration
+h4. B2. Configuration
 
 In: @config/environment.rb@
 
@@ -199,21 +220,31 @@ h2. Usage
 
 <pre>./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] [--include-layout]</pre>
 
+...or use the alias (instead of @dry_scaffold@):
+
+<pre>./script/generate dscaffold ...</pre>
+
 h3. Model Name
 
-Example: <pre>Hello</pre>
+Example:
+
+<pre>Duck</pre>
 
 Same as in the default scaffold/model generator; the name of a new/existing model.
 
 h3. Model Attributes
 
-Example: <pre>title:string description:text ...</pre>
+Example:
+
+<pre>name:string about:text ...</pre>
 
 Same as in the default scaffold/model generator; model attributes and database migration column types.
 
 h3. Controller Actions
 
-Usage: <pre>_actions:new,create,recent,index,...</pre>
+Usage:
+
+<pre>_actions:new,create,quack,index,...</pre>
 
 You can override what actions that should be generated directly - including custom actions.
 
@@ -233,13 +264,20 @@ If no actions are specified, the following REST-actions will be generated by def
 
 Default controller action stubs, controller action test stubs, and corresponding views (and required partials), are generated for all of these actions.
 
+These default actions can also be included using the alias symbol @*@, which makes it easier to add new actions without having to specify all the default actions explicit. Example:
+
+<pre>_actions:quack     # => quack</pre>
+<pre>_actions:*,quack   # => show,index,new,edit,create,update,destroy,quack</pre>
+
 h4. Custom actions
 
 The above REST actions are in many RESTful applications the only ones needed. Any other specified actions will generate empty action function stubs for manual implementation. No views will be generated for custom actions.
 
 h3. Controller Formats
 
-Usage: <pre>_formats:html,xml,txt,...</pre>
+Usage:
+
+<pre>_formats:html,xml,txt,...   # <=> _respond_to:html,xml,txt,...</pre>
 
 You can override what respond_to-formats that should be generated directly - only for REST-actions right now because I tried to avoid bad assumptions.
 
@@ -256,6 +294,11 @@ If no formats are specified, the following formats will be generated by default:
 
 Default respond block stubs are generated for all of these formats - for each generated REST-action.
 
+Like for actions, these default respond_to-formats can also be included using the alias symbol @*@, which makes it easier to add new formats without having to specify all the default formats explicit. Example:
+
+<pre>_formats:iphone     # => _formats:iphone</pre>
+<pre>_formats:*,iphone   # => _formats:html,js,xml,json,iphone</pre>
+
 h4. Additional formats
 
 Also, default respond block stubs are generated for any of these formats - for each generated REST-action - if they are specified:
@@ -263,13 +306,19 @@ Also, default respond block stubs are generated for any of these formats - for e
 * @yaml@ or @yml@   => Render: resource.to_yaml
 * @txt@ or @text@   => Render: resource.to_s
 
+NOTE: Only for Non-InheritedResources controllers for now. 
+
 h4. Custom formats
 
 The above formats are the most commonly used ones, and respond blocks are already implemented using Rails default dependencies. Any other specified formats (such as PDF, CSV, etc.) will generate empty respond block stubs for manual implementation with help of additional dependencies.
 
 h3. Options/Flags
 
-Example: <pre>--skip-resourceful --include-layout</pre>
+Example:
+
+<pre>--skip-resourceful --layout</pre>
+
+h4. General
 
 * @--skip-pagination@   - Don't generate pagination of collections in controller and views, i.e. don't use *will_paginate*.
 * @--skip-resourceful@  - Don't generate resourceful controller, i.e. don't use *inherited_resources*.
@@ -277,20 +326,31 @@ Example: <pre>--skip-resourceful --include-layout</pre>
 * @--skip-views@        - Don't generate views.
 * @--skip-helpers@      - Don't generate helpers.
 * @--skip-tests@        - Don't generate tests (functional/unit/...).
-* @--include-layout@    - Generate a neat application layout.
+* @--layout@            - Generate layout.
+
+h4. Model-specific
+
+* @--fixtures@          - Generate fixtures.
+* @--fgirl@             - Generate *factory_girl* factories.
+* @--machinist@         - Generate *machinist* blueprints (factories).
+* @--odaddy@            - Generate *object_daddy* generator/factory methods.
+* @--skip-timestamps@   - Don't add timestamps to the migration file.
+* @--skip-migration@    - Skip generation of migration file.
 
 As DryScaffold is built upon Rails generator, the default generator options is available as well. For more details; see Rails documentation.
 
 h2. Examples
 
-No need for more samples here, just create a new Rails project, install dry_scaffold and it's dependencies, and try it out!
+No need for more samples here, just create a new Rails project, install DryScaffold and it's dependencies, and try it out!
 
 For your inspiration, you could try the following:
 
 <pre>./script/generate dry_scaffold Zebra name:string about:text --skip-resourceful
 ./script/generate dry_scaffold Kangaroo name:string about:text --skip-formtastic
 ./script/generate dry_scaffold Duck name:string about:text _actions:new,create,index,quack
-./script/generate dry_scaffold Parrot name:string about:text _formats:html,xml,yml</pre>
+./script/generate dry_scaffold Parrot name:string about:text _formats:html,xml,yml
+./script/generate dry_scaffold Parrot name:string about:text _indexes:name --fgirl
+./script/generate dry_scaffold Parrot name:string about:text _indexes:name,name+about --fixtures</pre>
 
 ...or just go crazy!
 

data/TODO.textile

@@ -2,11 +2,11 @@ h1. TODO
 
 h2. Next
 
-* Something like "model_generator_with_factories" (using machinist, factory_girl, ...). Source: http://github.com/vigetlabs/model_generator_with_factories/tree/master
-* Break up in different generators: dry_controller, dry_views, etc., and use as dependencies in dry_scaffold
-* Optionally generate builders (Atom/RSS/...)
+* Feature: Generate Atom/RSS builder stubs for formats - if specified - atom/rss for index action. (Reference: http://gatezero.org/~tim/2008/04/22/generating-valid-atom-feeds-from-rails-202/)
+* Feature: Read default scaffold options from a config in: "RAILS_ROOT/config/scaffold.yml"
 
 h2. Maybe later
 
-* Comment the code a bit more =)
-* Check for overridden templates in: RAILS_ROOT/lib/dry_scaffold/templates/
+* Clean-up: Comment the code a bit more =)
+* Feature: Check for overridden templates in: RAILS_ROOT/lib/dry_scaffold/templates/
+* Refactor: Break up in different generators: dry_controller, dry_views, etc., and use as dependencies in dry_scaffold

data/generators/dmodel/dmodel_generator.rb

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), '..', 'dry_model', 'dry_model_generator')
+
+class DmodelGenerator < DryModelGenerator
+  
+  def initialize(runtime_args, runtime_options = {})
+    super
+    # Make Rails look for templates within generator "dry_model" path
+    @source_root = options[:source] || File.join(spec.path, '..', 'dry_model', 'templates')
+  end
+  
+  def usage_message
+    File.read(File.join(spec.path, '..', 'dry_model', 'USAGE')) rescue ''
+  end
+  
+end

data/generators/dry_model/USAGE

@@ -0,0 +1,8 @@
+NAME
+  dry_model a.k.a. dmodel - A Rails scaffold generator that generates DRYer, cleaner, and more useful code - for models.
+  
+DESCRIPTION
+  A replacement for the Rails model generator - a part of the dry_generator toolset.
+  
+EXAMPLE
+  ./script/generate dry_model ModelName [attribute:type attribute:type] [_index:name,owner_id+owner_type,active,...] [--fixtures] [--fgirl] [--machinist] [--odaddy] [--skip-timestamps] [--skip-migration] [--skip-tests]

data/generators/dry_model/dry_model_generator.rb

@@ -0,0 +1,201 @@
+require 'rubygems'
+begin
+  require 'factory_girl'
+  FACTORY_GIRL = true
+rescue MissingSourceFile
+  FACTORY_GIRL = false
+end
+begin
+  require 'machinist'
+  MACHINIST = true
+rescue MissingSourceFile
+  MACHINIST = false
+end
+begin
+  require 'object_daddy'
+  OBJECT_DADDY = true
+rescue MissingSourceFile
+  OBJECT_DADDY = false
+end
+
+class DryModelGenerator < Rails::Generator::NamedBase
+  
+  MODELS_PATH =                 File.join('app', 'models').freeze
+  MIGRATIONS_PATH =             File.join('db', 'migrate').freeze
+  TESTS_PATH =                  File.join('test').freeze
+  UNIT_TESTS_PATH =             File.join(TESTS_PATH, 'unit').freeze
+  FIXTURES_PATH =               File.join(TESTS_PATH, 'fixtures').freeze
+  FACTORY_GIRL_FACTORIES_PATH = File.join(TESTS_PATH, 'factories').freeze
+  MACHINIST_FACTORIES_PATH =    File.join(TESTS_PATH, 'blueprints').freeze
+  
+  NON_ATTR_ARG_KEY_PREFIX =     '_'.freeze
+  
+  default_options :fixtures => false,
+                  :factory_girl => false,
+                  :machinist => false,
+                  :object_daddy => false,
+                  :faker => false,
+                  :skip_timestamps => false,
+                  :skip_migration => false,
+                  :skip_tests => false
+                  
+  attr_reader :indexes,
+              :references
+              
+  def initialize(runtime_args, runtime_options = {})
+    super
+    
+    @attributes ||= []
+    args_for_model = []
+    
+    @args.each do |arg|
+      arg_entities = arg.split(':')
+      if arg =~ /^#{NON_ATTR_ARG_KEY_PREFIX}/
+        if arg =~ /^#{NON_ATTR_ARG_KEY_PREFIX}index/
+          arg_indexes = arg_entities[1].split(',').compact.uniq
+          @indexes = arg_indexes.collect do |index|
+            if index =~ /\+/
+              index.split('+').collect { |i| i.downcase.to_sym  }
+            else
+              index.downcase.to_sym
+            end
+          end
+        end
+      else
+        @attributes << Rails::Generator::GeneratedAttribute.new(*arg_entities)
+        args_for_model << arg
+      end
+    end
+    @args = args_for_model
+    @references = attributes.select(&:reference?)
+  end
+  
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_name, "#{class_name}"
+      m.class_collisions class_name, "#{class_name}Test"
+      
+      # Directories.
+      m.directory File.join(MODELS_PATH, class_path)
+      m.directory File.join(UNIT_TESTS_PATH, class_path) unless options[:skip_tests]
+      m.directory File.join(FIXTURES_PATH, class_path) if options[:fixtures]
+      m.directory File.join(FACTORY_GIRL_FACTORIES_PATH, class_path) if options[:factory_girl]
+      m.directory File.join(MACHINIST_FACTORIES_PATH, class_path) if options[:machinist]
+      
+      # Model Class + Unit Test.
+      m.template 'model_standard.rb', File.join(MODELS_PATH, class_path, "#{file_name}.rb")
+      unless options[:skip_tests]
+      m.template 'unit_test_standard.rb',
+        File.join(UNIT_TESTS_PATH, class_path, "#{file_name}_test.rb")
+      end
+      
+      # Fixtures/Factories.
+      if options[:fixtures]
+        m.template 'fixtures_standard.yml',
+          File.join(FIXTURES_PATH, "#{file_name}.yml")
+      end
+      if options[:factory_girl]
+        m.template 'factories_factory_girl.rb',
+          File.join(FACTORY_GIRL_FACTORIES_PATH, "#{file_name}.rb")
+      end
+      if options[:machinist]
+        m.template 'factories_machinist.rb',
+          File.join(MACHINIST_FACTORIES_PATH, "#{file_name}.rb")
+      end
+      # NOTE: :object_daddy handled in model
+      
+      # Migration.
+      unless options[:skip_migration]
+        m.migration_template 'migration_standard.rb', MIGRATIONS_PATH,
+          :assigns => {:migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"},
+          :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
+      end
+    end
+  end
+  
+  protected
+      
+      def add_options!(opt)
+        opt.separator ''
+        opt.separator 'Options:'
+        
+        opt.on("--fixtures", "Generate fixtures.") do |v|
+          options[:fixtures] = v
+        end
+        
+        opt.on("--fgirl", "Generate \"factory_girl\" factories.") do |v|
+          options[:factory_girl] = v
+        end
+        
+        opt.on("--machinist", "Generate \"machinist\" blueprints (factories).") do |v|
+          options[:machinist] = v
+        end
+        
+        opt.on("--odaddy", "Generate \"object_daddy\" generator/factory methods.") do |v|
+          options[:object_daddy] = v
+        end
+        
+        opt.on("--skip-timestamps", "Don't add timestamps to the migration file.") do |v|
+          options[:skip_timestamps] = v
+        end
+        
+        opt.on("--skip-migration", "Skip generation of migration file.") do |v|
+          options[:skip_migration] = v
+        end
+        
+        opt.on("--skip-tests", "Skip generation of tests.") do |v|
+          options[:skip_tests] = v
+        end
+      end
+      
+      def banner
+        ["Usage: #{$0} #{spec.name} ModelName",
+          "[field:type field:type]",
+          "[_indexes:name,owner_id+owner_type,active,...]",
+          "[--fixtures]",
+          "[--fgirl]",
+          "[--machinist]",
+          "[--odaddy]",
+          "[--skip_timestamps]",
+          "[--skip-migration]",
+          "[--skip-tests]"
+        ].join(' ')
+      end
+      
+end
+
+module Rails
+  module Generator
+    class GeneratedAttribute
+      def default_for_fixture
+        @default ||= case type
+        when :integer                     then 1
+        when :float                       then 1.5
+        when :decimal                     then '9.99'
+        when :datetime, :timestamp, :time then Time.now.to_s(:db)
+        when :date                        then Date.today.to_s(:db)
+        when :string                      then 'Hello'
+        when :text                        then 'Lorem ipsum dolor sit amet...'
+        when :boolean                     then false
+        else
+          ''
+        end
+      end
+      def default_for_factory
+        @default ||= case type
+        when :integer                     then 1
+        when :float                       then 1.5
+        when :decimal                     then '9.99'
+        when :datetime, :timestamp, :time then 'Time.now'
+        when :date                        then 'Date.today'
+        when :string                      then '"Hello"'
+        when :text                        then '"Lorem ipsum dolor sit amet..."'
+        when :boolean                     then false
+        else
+          ''
+        end
+      end
+    end
+  end
+end

data/generators/dry_model/templates/factories_factory_girl.rb

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

data/generators/dry_model/templates/factories_machinist.rb

@@ -0,0 +1,9 @@
+Sham.define do
+  # TODO: Define blueprint shams for "<%= class_name %>"
+end
+
+<%= class_name %>.blueprint :basic do
+<% attributes.each do |attribute| -%>
+  <%= attribute.name %> { <%= attribute.default_for_factory %> }
+<% end -%>
+end

data/generators/dry_model/templates/fixtures_standard.yml

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

data/generators/dry_model/templates/migration_standard.rb

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

data/generators/dry_model/templates/model_standard.rb

@@ -0,0 +1,15 @@
+class <%= class_name %> < ActiveRecord::Base
+  
+<% unless references.empty? -%>
+<% references.each do |attribute| -%>
+  belongs_to :<%= attribute.name %>
+<% end -%>
+  
+<% end -%>
+<% if options[:object_daddy] -%>
+<% attributes.each do |attribute| -%>
+  generator_for(:<%= attribute.name %>) { <%= attribute.default_for_factory %> }
+<% end -%>
+  
+<% end -%>
+end

data/generators/dry_model/templates/unit_test_standard.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class <%= class_name %>Test < ActiveSupport::TestCase
+  
+  test "something" do
+    assert true
+  end
+  
+end

data/generators/dry_scaffold/USAGE

@@ -9,4 +9,4 @@ EXAMPLE
   
   ...or the shortcut version:
   
-  ./script/generate dscaffold ModelName [attribute:type attribute:type] [_actions:new,create,...] [_formats:html,json,...] [--skip-pagination] [--skip-resourceful] [--skip-formtastic] [--skip-views] [--skip-helpers] [--skip-tests] [--include-layout]
+  ./script/generate dscaffold ModelName [attribute:type attribute:type] [_actions:new,create,...] [_formats:html,json,...] [--skip-pagination] [--skip-resourceful] [--skip-formtastic] [--skip-views] [--skip-helpers] [--skip-tests] [--layout]

data/generators/dry_scaffold/dry_scaffold_generator.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-
 begin
   require 'formtastic'
   FORMTASTIC = true
@@ -41,9 +40,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
   RESOURCEFUL_COLLECTION_NAME = 'collection'.freeze
   RESOURCEFUL_SINGULAR_NAME =   'resource'.freeze
   
-  ARG_KEY_VALUE_DIVIDER =       ':'.freeze
   NON_ATTR_ARG_KEY_PREFIX =     '_'.freeze
-  NON_ATTR_ARG_VALUE_DIVIDER =  ','.freeze
   
   # :{action} => [:{partial}, ...]
   VIEW_TEMPLATES = {
@@ -99,20 +96,28 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
     @attributes ||= []
     @args_for_model ||= []
     
-    # Non-attribute args, i.e. "_actions:new,create". Add to options instead
+    # Non-attribute args, i.e. "_actions:new,create".
     @args.each do |arg|
-      arg_entities = arg.split(ARG_KEY_VALUE_DIVIDER)
-      if arg =~ /^#{NON_ATTR_ARG_KEY_PREFIX}actions/
-        @actions = arg_entities[1].split(NON_ATTR_ARG_VALUE_DIVIDER).compact.collect { |action| action.dowcase.to_sym }
-      elsif arg =~ /^#{NON_ATTR_ARG_KEY_PREFIX}(formats|respond_to)/
-        @formats = arg_entities[1].split(NON_ATTR_ARG_VALUE_DIVIDER).compact.collect { |format| format.dowcases.to_sym }
+      arg_entities = arg.split(':')
+      if arg =~ /^#{NON_ATTR_ARG_KEY_PREFIX}/
+        if arg =~ /^#{NON_ATTR_ARG_KEY_PREFIX}action/
+          # Replace a '*' with default actions
+          arg_entities[1].gsub!(/\*/, DEFAULT_CONTROLLER_ACTIONS.join(','))
+          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 a '*' with default respond_to-formats
+          arg_entities[1].gsub!(/\*/, DEFAULT_RESPOND_TO_FORMATS.join(','))
+          arg_formats = arg_entities[1].split(',').compact.uniq
+          @formats = arg_formats.collect { |format| format.downcases.to_sym }
+        end
       else
         @attributes << Rails::Generator::GeneratedAttribute.new(*arg_entities)
         @args_for_model << arg
       end
     end
     
-    @actions ||= DEFAULT_COLLECTION_ACTIONS + DEFAULT_MEMBER_ACTIONS
+    @actions ||= DEFAULT_CONTROLLER_ACTIONS
     @formats ||= DEFAULT_RESPOND_TO_FORMATS
   end
   
@@ -137,7 +142,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
         
       # Controller Tests.
       unless options[:skip_tests]
-        m.template 'controller_test_standard.rb',
+        m.template 'functional_test_standard.rb',
           File.join(FUNCTIONAL_TESTS_PATH, controller_class_path, "#{controller_file_name}_controller_test.rb")
       end
       
@@ -175,7 +180,17 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       m.route_resources controller_file_name
       
       # Models - use Rails default generator.
-      m.dependency 'model', [name] + @args_for_model, :collision => :skip
+      m.dependency 'dry_model',
+        [name] + @args_for_model +
+        options.slice(:skip_tests,
+            :fixtures,
+            :factory_girl,
+            :machinist,
+            :object_daddy,
+            :skip_timestamps,
+            :skip_migration
+          ),
+        :collision => :skip
     end
   end
   
@@ -213,6 +228,10 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
         options[:formtastic] = !v
       end
       
+      opt.on('--layout', "Generate layout.") do |v|
+        options[:include_layout] = v
+      end
+      
       opt.on('--skip-views', "Skip generation of views.") do |v|
         options[:skip_views] = v
       end
@@ -225,27 +244,51 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
         options[:skip_tests] = v
       end
       
-      opt.on('--include-layout', "Generate layout.") do |v|
-        options[:include_layout] = v
+      opt.on('--fixtures', "Model: Generate fixtures.") do |v|
+        options[:fixtures] = v
+      end
+      
+      opt.on('--fgirl', "Model: Generate \"factory_girl\" factories.") do |v|
+        options[:machinist] = v
+      end
+      
+      opt.on('--machinist', "Model: Generate \"machinist\" blueprints (factories).") do |v|
+        options[:factory_girl] = v
+      end
+      
+      opt.on('--odaddy', "Model: Generate \"object_daddy\" generator/factory methods.") do |v|
+        options[:object_daddy] = v
+      end
+      
+      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|
+        options[:skip_migration] = v
       end
-    end
-    
-    def model_name
-      class_name.demodulize
     end
     
     def banner
-      "Usage: #{$0} dry_scaffold ModelName [field:type field:type ...]" +
-        " [_actions:new,create,...]" +
-        " [_formats:html,json,...]" +
-        " [--skip-pagination]" +
-        " [--skip-resourceful]" +
-        " [--skip-formtastic]" +
-        " [--skip-views]" + 
-        " [--skip-helpers]" +
-        " [--skip-tests]" +
-        " [--include-layout]" +
-      "Alias: dscaffold"
+      ["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]",
+        "[--layout]",
+        "[--fixtures]",
+        "[--factory_girl]",
+        "[--machinist]",
+        "[--object_daddy]",
+        "[--skip-timestamps]",
+        "[--skip-migration]",
+      ].join(' ')
     end
     
 end

data/generators/dry_scaffold/templates/controller_inherited_resources.rb

@@ -17,6 +17,7 @@ class <%= controller_class_name %>Controller < InheritedResources::Base
 <% (actions - DryScaffoldGenerator::DEFAULT_CONTROLLER_ACTIONS).each do |action| -%>
   # GET /<%= plural_name %>/<%= action.to_s %>
   def <%= action.to_s %>
+    # TODO: Implement action "<%= plural_name %>/<%= action.to_s %>"
   end
   
 <% end -%>

data/generators/dry_scaffold/templates/controller_standard.rb

@@ -217,6 +217,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% (actions - DryScaffoldGenerator::DEFAULT_CONTROLLER_ACTIONS).each do |action| -%>
   # GET /<%= plural_name %>/<%= action.to_s %>
   def <%= action.to_s %>
+    # TODO: Implement action "<%= plural_name %>/<%= action.to_s %>"
   end
   
 <% end -%>

data/generators/dry_scaffold/templates/view_show.html.haml

@@ -1,5 +1,5 @@
 %h1.heading
-  = "Resource %s" % @<%= singular_name %>.id
+  = "<%= singular_name.humanize %> %s" % @<%= singular_name %>.id
   
 - content_tag_for(:dl, @<%= singular_name %>) do
 <% attributes.each do |attribute| -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grimen-dry_scaffold
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-29 00:00:00 -07:00
+date: 2009-05-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -24,17 +24,24 @@ extra_rdoc_files:
 files: 
 - MIT-LICENSE
 - README.textile
-- TODO.textile
 - Rakefile
-- generators/dry_scaffold
+- TODO.textile
+- generators/dmodel/dmodel_generator.rb
+- generators/dry_model/USAGE
+- generators/dry_model/dry_model_generator.rb
+- generators/dry_model/templates/factories_factory_girl.rb
+- generators/dry_model/templates/factories_machinist.rb
+- generators/dry_model/templates/fixtures_standard.yml
+- generators/dry_model/templates/migration_standard.rb
+- generators/dry_model/templates/model_standard.rb
+- generators/dry_model/templates/unit_test_standard.rb
+- generators/dry_scaffold/USAGE
 - generators/dry_scaffold/dry_scaffold_generator.rb
-- generators/dry_scaffold/templates
 - generators/dry_scaffold/templates/controller_inherited_resources.rb
 - generators/dry_scaffold/templates/controller_standard.rb
-- generators/dry_scaffold/templates/controller_test_standard.rb
+- generators/dry_scaffold/templates/functional_test_standard.rb
 - generators/dry_scaffold/templates/helper_standard.rb
 - generators/dry_scaffold/templates/helper_test_standard.rb
-- generators/dry_scaffold/templates/prototypes
 - generators/dry_scaffold/templates/prototypes/controller_inherited_resources.rb
 - generators/dry_scaffold/templates/prototypes/controller_standard.rb
 - generators/dry_scaffold/templates/prototypes/controller_test_standard.rb
@@ -54,8 +61,6 @@ files:
 - generators/dry_scaffold/templates/view_layout.html.haml
 - generators/dry_scaffold/templates/view_new.html.haml
 - generators/dry_scaffold/templates/view_show.html.haml
-- generators/dry_scaffold/USAGE
-- generators/dscaffold
 - generators/dscaffold/dscaffold_generator.rb
 - rails/init.rb
 - tasks/dry_scaffold.rake
@@ -63,7 +68,6 @@ has_rdoc: true
 homepage: http://github.com/grimen/dry_scaffold/tree/master
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib