grimen-dry_scaffold 0.2.1 → 0.2.2

data/README.textile

@@ -268,10 +268,12 @@ 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:
+These default actions can also be included using the quantifiers @*@ and @+@, 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>
+<pre>_actions:quack               # => quack</pre>
+<pre>_actions:*,quack             # => show,index,new,edit,create,update,destroy,quack</pre>
+<pre>_actions:new+,edit,quack     # => new,edit,create,quack</pre>
+<pre>_actions:new+,edit+,quack    # => new,edit,create,update,quack</pre>
 
 h4. Custom Actions
 
@@ -291,8 +293,8 @@ h4. Default Formats
 
 If no formats are specified, the following formats will be generated by default:
 
-* @html@  => Render: resource using view template (HTML/HAML)
-* @js@    => Render: resource using view template (JS/RJS)
+* @html@  => Template: resource.html.haml
+* @js@    => Template: resource.js.rjs
 * @xml@   => Render: resource.to_xml
 * @json@  => Render: resource.to_json
 
@@ -307,10 +309,37 @@ h4. Additional Formats
 
 Also, default respond block stubs are generated for any of these formats - for each generated REST-action - if they are specified:
 
-* @yaml@ or @yml@   => Render: resource.to_yaml
-* @txt@ or @text@   => Render: resource.to_s
+* @atom@        => Template: index.atom.builder
+* @rss@         => Template: index.rss.builder
+* @yaml@/@yml@  => Render: resource.to_yaml
+* @txt@/@text@  => Render: resource.to_s
+
+NOTE: Only for Non-InheritedResources controllers for now.
+
+For the feed formats @atom@ and @rss@, builders are automatically generated if @index@-action is specified. Example:
+
+@app/views/ducks/index.atom.builder@
+
+<pre>
+  atom_feed(:language => I18n.locale) do |feed|
+    feed.title 'Resources'
+    feed.subtitle 'Index of all resources.'
+    feed.updated (@resources.first.created_at rescue Time.now.utc).strftime('%Y-%m-%dT%H:%M:%SZ'))
+    
+    @resources.each do |resource|
+      feed.entry(resource) do |entry|
+        entry.title 'title'
+        entry.summary 'summary'
+        
+        resource.author do |author|
+          author.name 'author_name'
+        end
+      end
+    end
+  end
+</pre>
 
-NOTE: Only for Non-InheritedResources controllers for now. 
+Builder generation can be skipped by specifying the @--skip-builders@ flag.
 
 h4. Custom Formats
 
@@ -348,6 +377,7 @@ h4. General
 * @--skip-views@        - Don't generate views.
 * @--skip-helpers@      - Don't generate helpers.
 * @--skip-tests@        - Don't generate tests (functional/unit/...).
+* @--skip-builders@     - Don't generate builders.
 * @--layout@            - Generate layout.
 
 h4. Model-specific

data/TODO.textile

@@ -2,11 +2,12 @@ h1. TODO
 
 h2. Next
 
-* 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: If route is already declared in config/routes.rb, then don't generate it.
+* Feature: Handle belongs_to, i.e. specify MODEL --belongs-to PARENT_MODEL, which generates proper routes, proper before-filters if inherited_resources-controller, adding belongs_to-association in model, and correct form_for arguments.
+* Choose test suits: testunit/shoulda/rspec
 
 h2. Maybe later
 
 * Clean-up: Comment the code a bit more =)
 * Refactor: Break up in different generators: dry_controller, dry_views, etc., and use as dependencies in dry_scaffold?
-* Feature: Check for overridden templates in: RAILS_ROOT/lib/dry_scaffold/templates/
+* Feature: Check for overridden templates in: RAILS_ROOT/lib/dry_scaffold/templates/
+* Feature: Builder for podcast-feed, similar to RSS/Atom-builders.

data/generators/dry_model/dry_model_generator.rb

@@ -5,7 +5,7 @@ require 'rubygems'
   rescue MissingSourceFile
     eval("#{lib.upcase} = #{false}")
   else
-    eval("#{lib.upcase} = #{false}")
+    eval("#{lib.upcase} = #{true}")
   end
 end
 
@@ -24,12 +24,14 @@ class DryModelGenerator < Rails::Generator::NamedBase
       :fixtures => CONFIG_OPTIONS['fixtures'] || false,
       :factory_girl => CONFIG_OPTIONS['factory_girl'] || false,
       :machinist => CONFIG_OPTIONS['machinist'] || false,
-      :object_daddy => !CONFIG_OPTIONS['object_daddy'] || false,
-      :skip_timestamps => !CONFIG_OPTIONS['skip_timestamps'] || false,
-      :skip_migration => !CONFIG_OPTIONS['skip_migration'] || false,
-      :skip_tests => CONFIG_OPTIONS['skip_tests'] || false
+      :object_daddy => CONFIG_OPTIONS['object_daddy'] || false,
+      :skip_timestamps => !CONFIG_OPTIONS['timestamps'] || false,
+      :skip_migration => !CONFIG_OPTIONS['migration'] || false,
+      :skip_tests => !CONFIG_OPTIONS['tests'] || false
     }
     
+  DEFAULT_TEST_FRAMEWORK =      :test_unit
+  
   MODELS_PATH =                 File.join('app', 'models').freeze
   MIGRATIONS_PATH =             File.join('db', 'migrate').freeze
   TESTS_PATH =                  File.join('test').freeze
@@ -41,11 +43,14 @@ class DryModelGenerator < Rails::Generator::NamedBase
   NON_ATTR_ARG_KEY_PREFIX =     '_'.freeze
                   
   attr_reader :indexes,
-              :references
+              :references,
+              :test_framework
               
   def initialize(runtime_args, runtime_options = {})
     super
     
+    @test_framework = DEFAULT_TEST_FRAMEWORK
+    
     @attributes ||= []
     args_for_model = []
     
@@ -70,13 +75,12 @@ class DryModelGenerator < Rails::Generator::NamedBase
     
     @args = args_for_model
     @references = attributes.select(&:reference?)
-    @options = DEFAULT_OPTIONS.merge(runtime_options)
+    @options = DEFAULT_OPTIONS.merge(options)
   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.
@@ -86,31 +90,34 @@ class DryModelGenerator < Rails::Generator::NamedBase
       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")
+      # Model
+      m.template File.join('models', 'active_record_model.rb'),
+        File.join(MODELS_PATH, class_path, "#{file_name}.rb")
+        
+      # Model Tests.
       unless options[:skip_tests]
-      m.template 'unit_test_standard.rb',
-        File.join(UNIT_TESTS_PATH, class_path, "#{file_name}_test.rb")
+        m.template File.join('models', 'tests', "#{test_framework}", 'unit_test.rb'),
+          File.join(UNIT_TESTS_PATH, class_path, "#{file_name}_test.rb")
       end
       
       # Fixtures/Factories.
       if options[:fixtures]
-        m.template 'fixtures_standard.yml',
+        m.template File.join('models', 'test_data', 'active_record_fixtures.yml'),
           File.join(FIXTURES_PATH, "#{file_name}.yml")
       end
       if options[:factory_girl]
-        m.template 'factories_factory_girl.rb',
+        m.template File.join('models', 'test_data', 'factory_girl_factories.rb'),
           File.join(FACTORY_GIRL_FACTORIES_PATH, "#{file_name}.rb")
       end
       if options[:machinist]
-        m.template 'factories_machinist.rb',
+        m.template File.join('models', 'test_data', 'machinist_factories.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,
+        m.migration_template File.join('models', 'active_record_migration.rb') , MIGRATIONS_PATH,
           :assigns => {:migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"},
           :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
       end

data/generators/dry_model/prototypes/active_record_migration.rb

@@ -0,0 +1,17 @@
+class CreateResources < ActiveRecord::Migration
+  def self.up
+    create_table :resources, :force => true do |t|
+      t.string :name
+      t.text :description
+      
+      t.timestamps
+    end
+    
+    add_index :resources, :name
+    add_index :resources, [:name, :description]
+  end
+  
+  def self.down
+    drop_table :resources
+  end
+end

data/generators/dry_model/prototypes/active_record_model.rb

@@ -0,0 +1,9 @@
+class Resource < ActiveRecord::Base
+  
+  belongs_to :user
+  
+  # object_daddy
+  generator_for(:name) { "AString" }
+  generator_for(:description) { "SomeText" }
+  
+end

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

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

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

@@ -0,0 +1,4 @@
+Factory.define :basic_resource do |f|
+  f.name "AString"
+  f.description "SomeText"
+end

data/generators/dry_model/prototypes/test_data/machinist_factories.rb

@@ -0,0 +1,8 @@
+Sham.define do
+  # TODO: Define blueprint shams for "<%= class_name %>"
+end
+
+Resource.blueprint :basic do
+  name { "AString" }
+  description { "SomeText" }
+end 

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

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class ResourceTest < ActiveSupport::TestCase
+  
+  test "something" do
+    assert true
+  end
+  
+end

data/generators/dry_scaffold/dry_scaffold_generator.rb

@@ -5,7 +5,7 @@ require 'rubygems'
   rescue MissingSourceFile
     eval("#{lib.upcase} = #{false}")
   else
-    eval("#{lib.upcase} = #{false}")
+    eval("#{lib.upcase} = #{true}")
   end
 end
 
@@ -25,6 +25,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       :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,
@@ -32,10 +33,15 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       :skip_tests => !CONFIG_OPTIONS['tests'] || false,
       :skip_helpers => !CONFIG_OPTIONS['helpers'] || false,
       :skip_views => !CONFIG_OPTIONS['views'] || false,
-      :generate_layout => CONFIG_OPTIONS['layout'] || false
+      :layout => CONFIG_OPTIONS['layout'] || false
     }
     
+  # Formats.
   DEFAULT_RESPOND_TO_FORMATS =          [:html, :xml, :json].freeze
+  ENHANCED_RESPOND_TO_FORMATS =         [:yml, :yaml, :txt, :text, :atom, :rss].freeze
+  RESPOND_TO_FEED_FORMATS =             [:atom, :rss].freeze
+  
+  # Actions.
   DEFAULT_MEMBER_ACTIONS =              [:show, :new, :edit, :create, :update, :destroy].freeze
   DEFAULT_MEMBER_AUTOLOAD_ACTIONS =     (DEFAULT_MEMBER_ACTIONS - [:new, :create])
   DEFAULT_COLLECTION_ACTIONS =          [:index].freeze
@@ -43,6 +49,7 @@ 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
@@ -50,7 +57,8 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
   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', 'helpers').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
@@ -58,13 +66,17 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
   NON_ATTR_ARG_KEY_PREFIX =     '_'.freeze
   
   # :{action} => [:{partial}, ...]
-  VIEW_TEMPLATES = {
-    :index  => [:item],
-    :show   => [],
-    :new    => [:form],
-    :edit   => [:form]
-  }.freeze
+  ACTION_VIEW_TEMPLATES = {
+      :index  => [:item],
+      :show   => [],
+      :new    => [:form],
+      :edit   => [:form]
+    }.freeze
   
+  ACTION_FORMAT_BUILDERS = {
+      :index => [:atom, :rss]
+    }
+    
   attr_reader   :controller_name,
                 :controller_class_path,
                 :controller_file_path,
@@ -78,6 +90,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
                 :model_singular_name,
                 :model_plural_name,
                 :view_template_format,
+                :test_framework,
                 :actions,
                 :formats,
                 :config
@@ -100,6 +113,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
     end
     
     @view_template_format = DEFAULT_VIEW_TEMPLATE_FORMAT
+    @test_framework = DEFAULT_TEST_FRAMEWORK
     
     @attributes ||= []
     @args_for_model ||= []
@@ -109,13 +123,17 @@ 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 a '*' 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(','))
+          
           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
+          # Replace quantifiers 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.downcase.to_sym }
         elsif arg =~ /^#{NON_ATTR_ARG_KEY_PREFIX}index/
@@ -129,7 +147,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
     
     @actions ||= DEFAULT_ARGS[:actions] || DEFAULT_CONTROLLER_ACTIONS
     @formats ||= DEFAULT_ARGS[:formats] || DEFAULT_RESPOND_TO_FORMATS
-    @options = DEFAULT_OPTIONS.merge(runtime_options)
+    @options = DEFAULT_OPTIONS.merge(options)
   end
   
   def manifest
@@ -137,7 +155,6 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       # Check for class naming collisions.
       m.class_collisions "#{controller_class_name}Controller", "#{controller_class_name}ControllerTest"
       m.class_collisions "#{controller_class_name}Helper", "#{controller_class_name}HelperTest"
-      m.class_collisions "#{class_path}", "#{class_name}"
       
       # Directories.
       m.directory File.join(CONTROLLERS_PATH, controller_class_path)
@@ -147,56 +164,140 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       m.directory File.join(UNIT_TESTS_PATH, controller_class_path) unless options[:skip_tests]
       
       # Controllers.
-      controller_template = options[:resourceful] ? 'inherited_resources' : 'standard'
-      m.template "controller_#{controller_template}.rb",
+      controller_template = options[:resourceful] ? 'inherited_resources' : 'action'
+      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]
-        m.template 'functional_test_standard.rb',
+        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")
       end
       
       # Helpers.
       unless options[:skip_helpers]
-        m.template 'helper_standard.rb',
+        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]
-          m.template 'helper_test_standard.rb',
-            File.join(UNIT_TESTS_PATH, controller_class_path, "#{controller_file_name}_helper_test.rb")
+          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")
         end
       end
       
       # Views.
       unless options[:skip_views]
         # View template for each action.
-        (actions & VIEW_TEMPLATES.keys).each do |action|
-          m.template "view_#{action}.html.#{view_template_format}", File.join(VIEWS_PATH, controller_file_name, "#{action}.html.#{view_template_format}")
+        (actions & ACTION_VIEW_TEMPLATES.keys).each do |action|
+          m.template File.join('views', "#{view_template_format}", "#{action}.html.#{view_template_format}"),
+            File.join(VIEWS_PATH, controller_file_name, "#{action}.html.#{view_template_format}")
+            
           # View template for each partial - if not already copied.
-          (VIEW_TEMPLATES[action] || []).each do |partial|
-            m.template "view__#{partial}.html.#{view_template_format}",
+          (ACTION_VIEW_TEMPLATES[action] || []).each do |partial|
+            m.template File.join('views', "#{view_template_format}", "_#{partial}.html.#{view_template_format}"),
               File.join(VIEWS_PATH, controller_file_name, "_#{partial}.html.#{view_template_format}")
           end
         end
       end
       
+      # Builders.
+      unless options[:skip_builders]
+        (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"),
+              File.join(VIEWS_PATH, controller_file_name, "#{action}.#{format}.builder")
+          end
+        end
+      end
+      
       # Layout.
-      if options[:generate_layout]
-        m.template "view_layout.html.#{view_template_format}",
+      if options[:layout]
+        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.
-      m.route_resources controller_file_name
+      unless resource_route_exists?
+        m.route_resources controller_file_name
+      end
       
       # Models - use Rails default generator.
-      m.dependency 'dry_model', [name] + @args_for_model, :collision => :skip
+      m.dependency 'dry_model', [name] + @args_for_model, options.merge(:collision => :skip)
+    end
+  end
+  
+  def collection_instance
+    "@#{collection_name}"
+  end
+  
+  def resource_instance
+    "@#{singular_name}"
+  end
+  
+  def index_link
+    "#{collection_name}_url"
+  end
+  
+  def new_link
+    "new_#{singular_name}_url"
+  end
+  
+  def show_link(object_name = resource_instance)
+    "#{singular_name}_url(#{object_name})"
+  end
+  
+  def edit_link(object_name = resource_instance)
+    "edit_#{show_link(object_name)}"
+  end
+  
+  def destroy_link(object_name = resource_instance)
+    "#{object_name}"
+  end
+  
+  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})"
+    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})"
+    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)"
+    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)"
     end
   end
   
   protected
     
+    def resource_route_exists?
+      route_exp = "map.resources :#{controller_file_name}"
+      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
@@ -232,7 +333,7 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       end
       
       opt.on('--layout', "Generate layout.") do |v|
-        options[:generate_layout] = v
+        options[:layout] = v
       end
       
       opt.on('--skip-views', "Skip generation of views.") do |v|
@@ -243,6 +344,10 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
         options[:skip_helpers] = v
       end
       
+      opt.on('--skip-builders', "Skip generation of helpers.") do |v|
+        options[:skip_builders] = v
+      end
+      
       ### CONTROLLERS + MODELS
       
       opt.on('--skip-tests', "Skip generation of tests.") do |v|
@@ -256,11 +361,11 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
       end
       
       opt.on('--fgirl', "Model: Generate \"factory_girl\" factories.") do |v|
-        options[:machinist] = v
+        options[:factory_girl] = v
       end
       
       opt.on('--machinist', "Model: Generate \"machinist\" blueprints (factories).") do |v|
-        options[:factory_girl] = v
+        options[:machinist] = v
       end
       
       opt.on('--odaddy', "Model: Generate \"object_daddy\" generator/factory methods.") do |v|
@@ -288,13 +393,14 @@ class DryScaffoldGenerator < Rails::Generator::NamedBase
         "[--skip-views]", 
         "[--skip-helpers]",
         "[--skip-tests]",
+        "[--skip-builders]",
         "[--layout]",
         "[--fixtures]",
         "[--factory_girl]",
         "[--machinist]",
         "[--object_daddy]",
         "[--skip-timestamps]",
-        "[--skip-migration]",
+        "[--skip-migration]"
       ].join(' ')
     end
     

data/generators/dry_scaffold/{templates/prototypes/controller_standard.rb → prototypes/controllers/action_controller.rb}

@@ -12,6 +12,8 @@ class ResourcesController < ApplicationController
       #format.js  # index.js.rjs
       format.xml  { render :xml => @resources }
       format.json { render :json => @resources }
+      format.atom # index.atom.builder
+      format.rss  # index.rss.builder
     end
   end
   

data/generators/dry_scaffold/{templates/prototypes/controller_inherited_resources.rb → prototypes/controllers/inherited_resources_controller.rb}

@@ -2,6 +2,7 @@ class ResourcesController < InheritedResources::Base
   
   actions :index, :show, :new, :create, :edit, :update, :destroy
   respond_to :html, :xml, :json
+  respond_to :atom, :rss, :only => [:index]
   
   # GET /resources/custom_action
   def custom_action

data/generators/dry_scaffold/{templates/prototypes/controller_test_standard.rb → prototypes/controllers/tests/unit_test/functional_test.rb}

@@ -5,7 +5,7 @@ class ResourceControllerTest < ActionController::TestCase
   test "create" do
     Resource.any_instance.expects(:save).returns(true)
     post :create, :resource => { }
-    assert_response :redirect
+    assert_response :redirect 
   end
   
   test "create_with_failure" do

data/generators/dry_scaffold/prototypes/views/builder/index.atom.builder

@@ -0,0 +1,20 @@
+atom_feed(:language => I18n.locale) do |feed|
+  feed.title 'Resources'
+  feed.subtitle 'Index of all resources.'
+  # Optional: feed.link :href => resources_url(:atom), :rel => 'self'
+  feed.updated (@resources.first.created_at rescue Time.now.utc).strftime('%Y-%m-%dT%H:%M:%SZ'))
+  
+  @resources.each do |resource|
+    feed.entry(resource) do |entry|
+      entry.title 'title'
+      entry.summary 'summary'
+      # Optional: entry.content 'content', :type => 'html'
+      # Optional: entry.updated resource.try(:updated_at).strftime('%Y-%m-%dT%H:%M:%SZ')
+      # Optional: entry.link :href => resource_url(resource, :atom)
+      
+      resource.author do |author|
+        author.name 'author_name'
+      end
+    end
+  end
+end

data/generators/dry_scaffold/prototypes/views/builder/index.rss.builder

@@ -0,0 +1,21 @@
+xml.instruct! :xml, :version => '1.0'
+xml.rss(:version => '2.0') do
+  xml.channel do
+    xml.title 'Resources'
+    xml.description 'Index of all resources.'
+    xml.link resources_url(:rss)
+    xml.lastBuildDate (@resources.first.created_at rescue Time.now.utc).to_s(:rfc822)
+    xml.language I18n.locale
+    
+    @resources.each do |resource|
+      xml.item do
+        xml.title 'title'
+        xml.description 'summary'
+        xml.pubDate resource.try(:created_at).to_s(:rfc822)
+        xml.link resource_url(resource, :rss)
+        
+        xml.author 'author_name'
+      end
+    end
+  end
+end

data/generators/dry_scaffold/templates/{controller_standard.rb → controllers/action_controller.rb}

@@ -24,6 +24,12 @@ class <%= controller_class_name %>Controller < ApplicationController
       format.yaml { render :text => @<%= plural_name %>.to_yaml, :content_type => :'text/yaml' }
 <% when :txt, :text then -%>
       format.txt  { render :text => @<%= plural_name %>.to_s, :content_type => :text }
+<% when :atom, :rss then -%>
+<% unless options[:skip_builders] -%>
+      format.<%= _format %> # index.<%= _format %>.builder
+<% else -%>
+      format.<%= _format %> { }
+<% end -%>
 <% else -%>
       format.<%= _format %>  { }
 <% end -%>
@@ -62,7 +68,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   # GET /<%= plural_name %>/new<%= ".#{_format}" unless _format == :html %>
 <% end -%>
   def new
-    @<%= singular_name %> = <%= class_name %>.new
+    <%= resource_instance %> = <%= class_name %>.new
     
     respond_to do |format|
 <% formats.each do |_format| -%>
@@ -71,11 +77,11 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% when :js then -%>
       format.js   # new.js.rjs
 <% when :xml, :json then -%>
-      format.<%= _format %>  { render :<%= _format %> => @<%= singular_name %> }
+      format.<%= _format %>  { render :<%= _format %> => <%= resource_instance %> }
 <% when :yml, :yaml then -%>
-      format.yaml { render :text => @<%= singular_name %>.to_yaml, :content_type => :'text/yaml' }
+      format.yaml { render :text => <%= resource_instance %>.to_yaml, :content_type => :'text/yaml' }
 <% when :txt, :text then -%>
-      format.txt  { render :text => @<%= singular_name %>.to_s, :content_type => :text }
+      format.txt  { render :text => <%= resource_instance %>.to_s, :content_type => :text }
 <% else -%>
       format.<%= _format %>  { }
 <% end -%>
@@ -95,22 +101,22 @@ class <%= controller_class_name %>Controller < ApplicationController
   # POST /<%= plural_name %><%= ".#{_format}" unless _format == :html %>
 <% end -%>
   def create
-    @<%= singular_name %> = <%= class_name %>.new(params[:<%= singular_name %>])
+    <%= resource_instance %> = <%= class_name %>.new(params[:<%= singular_name %>])
     
     respond_to do |format|
-      if @<%= singular_name %>.save
+      if <%= resource_instance %>.save
         flash[:notice] = '<%= singular_name.humanize %> was successfully created.'
 <% formats.each do |_format| -%>
 <% case _format when :html then -%>
-        format.html { redirect_to(@<%= singular_name %>) }
+        format.html { redirect_to(<%= resource_instance %>) }
 <% when :js then -%>
         format.js   # create.js.rjs
 <% when :xml, :json then -%>
-        format.<%= _format %>  { render :<%= _format %> => @<%= singular_name %>, :status => :created, :location => @<%= singular_name %> }
+        format.<%= _format %>  { render :<%= _format %> => <%= resource_instance %>, :status => :created, :location => <%= resource_instance %> }
 <% when :yml, :yaml then -%>
-      format.yaml { render :text => @<%= singular_name %>.to_yaml, :content_type => :'text/yaml', :status => :created, :location => @<%= singular_name %> }
+      format.yaml { render :text => <%= resource_instance %>.to_yaml, :content_type => :'text/yaml', :status => :created, :location => <%= resource_instance %> }
 <% when :txt, :text then -%>
-        format.txt  { render :text => @<%= singular_name %>.to_s, :content_type => :text, :status => :created, :location => @<%= singular_name %> }
+        format.txt  { render :text => <%= resource_instance %>.to_s, :content_type => :text, :status => :created, :location => <%= resource_instance %> }
 <% else -%>
         format.<%= _format %>  { }
 <% end -%>
@@ -123,11 +129,11 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% when :js then -%>
         format.js   # create.js.rjs
 <% when :xml, :json then -%>
-        format.<%= _format %>  { render :<%= _format %> => @<%= singular_name %>.errors, :status => :unprocessable_entity }
+        format.<%= _format %>  { render :<%= _format %> => <%= resource_instance %>.errors, :status => :unprocessable_entity }
 <% when :yml, :yaml then -%>
-      format.yaml { render :text => @<%= singular_name %>.errors.to_yaml, :content_type => :'text/yaml', :status => :unprocessable_entity }
+      format.yaml { render :text => <%= resource_instance %>.errors.to_yaml, :content_type => :'text/yaml', :status => :unprocessable_entity }
 <% when :txt, :text then -%>
-        format.txt  { render :text => @<%= singular_name %>.errors.to_s, :content_type => :text, :status => :unprocessable_entity }
+        format.txt  { render :text => <%= resource_instance %>.errors.to_s, :content_type => :text, :status => :unprocessable_entity }
 <% else -%>
         format.<%= _format %>  { }
 <% end -%>
@@ -143,10 +149,10 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% end -%>
   def update
     respond_to do |format|
-      if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
+      if <%= resource_instance %>.update_attributes(params[:<%= singular_name %>])
 <% formats.each do |_format| -%>
 <% case _format when :html then -%>
-        format.html { redirect_to(@<%= singular_name %>) }
+        format.html { redirect_to(<%= resource_instance %>) }
 <% when :js then -%>
         format.js   # update.js.rjs
 <% when :xml, :json, :yml, :yaml, :txt, :text then -%>
@@ -163,11 +169,11 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% when :js then -%>
         format.js   # update.js.rjs
 <% when :xml, :json then -%>
-        format.<%= _format %>  { render :<%= _format %> => @<%= singular_name %>.errors, :status => :unprocessable_entity }
+        format.<%= _format %>  { render :<%= _format %> => <%= resource_instance %>.errors, :status => :unprocessable_entity }
 <% when :yml, :yaml then -%>
-        format.yaml { render :text => @<%= singular_name %>.errors.to_yaml, :status => :unprocessable_entity }
+        format.yaml { render :text => <%= resource_instance %>.errors.to_yaml, :status => :unprocessable_entity }
 <% when :txt, :text then -%>
-        format.txt  { render :text => @<%= singular_name %>.errors.to_s, :status => :unprocessable_entity }
+        format.txt  { render :text => <%= resource_instance %>.errors.to_s, :status => :unprocessable_entity }
 <% else -%>
         format.<%= _format %>  { head :unprocessable_entity }
 <% end -%>
@@ -183,7 +189,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% end -%>
   def destroy
     respond_to do |format|
-      if @<%= singular_name %>.destroy
+      if <%= resource_instance %>.destroy
         flash[:notice] = '<%= singular_name.humanize %> was successfully destroyed.'
 <% formats.each do |_format| -%>
 <% case _format when :html then -%>
@@ -200,7 +206,7 @@ class <%= controller_class_name %>Controller < ApplicationController
         flash[:error] = '<%= singular_name.humanize %> could not be destroyed.'
 <% formats.each do |_format| -%>
 <% case _format when :html then -%>
-        format.html { redirect_to(<%= singular_name %>_url(@<%= singular_name %>)) }
+        format.html { redirect_to(<%= singular_name %>_url(<%= resource_instance %>)) }
 <% when :js then -%>
         format.js   # destroy.js.rjs
 <% when :xml, :json, :yml, :yaml, :txt, :text then -%>
@@ -236,7 +242,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     alias :load_and_paginate_resources :collection
     
     def resource
-      @resource = @<%= singular_name %> ||= <%= class_name %>.find(params[:id])
+      @resource = <%= resource_instance %> ||= <%= class_name %>.find(params[:id])
     end
     alias :load_resource :resource
     

data/generators/dry_scaffold/templates/{controller_inherited_resources.rb → controllers/inherited_resources_controller.rb}

@@ -14,6 +14,7 @@ class <%= controller_class_name %>Controller < InheritedResources::Base
   before_filter :load_and_paginate_resources, :only => [<%= symbol_array_to_expression(actions & DryScaffoldGenerator::DEFAULT_COLLECTION_AUTOLOAD_ACTIONS) %>]
   
 <% end -%>
+
 <% (actions - DryScaffoldGenerator::DEFAULT_CONTROLLER_ACTIONS).each do |action| -%>
   # GET /<%= plural_name %>/<%= action.to_s %>
   def <%= action.to_s %>
@@ -30,12 +31,12 @@ class <%= controller_class_name %>Controller < InheritedResources::Base
       paginate_options[:per_page] ||= (params[:per_page] || 20)
       @<%= plural_name %> = @<%= model_plural_name %> ||= end_of_association_chain.paginate(paginate_options)
 <% else -%>
-      @<%= plural_name %> = @<%= model_plural_name %> ||= end_of_association_chain.all
+      @collection = @<%= model_plural_name %> ||= end_of_association_chain.all
 <% end -%>
     end
     
     def resource
-      @<%= singular_name %> = @<%= model_singular_name %> ||= end_of_association_chain.find(params[:id])
+      @resource = @<%= model_singular_name %> ||= end_of_association_chain.find(params[:id])
     end
     
 end

data/generators/dry_scaffold/templates/{functional_test_standard.rb → controllers/tests/test_unit/functional_test.rb}

@@ -20,7 +20,7 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   test "destroy" do
     <%= class_name %>.any_instance.expects(:destroy).returns(true)
     delete :destroy, :id => <%= table_name %>(:one).to_param
-    assert_not_nil flash[:notice]
+    assert_not_nil flash[:notice] 
     assert_response :redirect
   end
   

data/generators/dry_scaffold/templates/views/builder/index.atom.builder

@@ -0,0 +1,20 @@
+atom_feed(:language => I18n.locale) do |feed|
+  feed.title '<%= class_name.pluralize %>'
+  feed.subtitle 'Index of all <%= plural_name %>.'
+  # Optional: feed.link <%= feed_link(:atom) %>
+  feed.updated <%= feed_date(:atom) %>
+  
+  <%= collection_instance %>.each do |<%= singular_name %>|
+    feed.entry(<%= singular_name %>) do |entry|
+      entry.title 'title'
+      entry.summary 'summary'
+      # Optional: entry.content 'content', :type => 'html'
+      # Optional: entry.updated <%= feed_entry_date(:atom) %>
+      # Optional: entry.link <%= feed_entry_link(:atom) %>
+      
+      <%= singular_name %>.author do |author|
+        author.name 'author_name'
+      end
+    end
+  end
+end

data/generators/dry_scaffold/templates/views/builder/index.rss.builder

@@ -0,0 +1,21 @@
+xml.instruct! :xml, :version => '1.0'
+xml.rss(:version => '2.0') do
+  xml.channel do
+    xml.title '<%= class_name.pluralize %>'
+    xml.description 'Index of all <%= plural_name %>.'
+    xml.link <%= feed_link(:rss) %>
+    xml.lastBuildDate <%= feed_date(:rss) %>
+    xml.language I18n.locale
+    
+    <%= collection_instance %>.each do |<%= singular_name %>|
+      xml.item do
+        xml.title 'title'
+        xml.description 'summary'
+        xml.pubDate <%= feed_entry_date(:rss) %>
+        xml.link <%= feed_entry_link(:rss) %>
+        
+        xml.author 'author_name'
+      end
+    end
+  end
+end

data/generators/dry_scaffold/templates/{view__item.html.haml → views/haml/_item.html.haml}

@@ -3,8 +3,8 @@
   %td.<%= attribute.name %>= h <%= singular_name %>.try(:<%= attribute.name %>)
 <% end -%>
   %td.actions
-    = link_to 'Show', <%= singular_name %>
+    = link_to 'Show', <%= show_link(singular_name) %>
     |
-    = link_to 'Edit', edit_<%= singular_name %>_url(<%= singular_name %>)
+    = link_to 'Edit', <%= edit_link(singular_name) %>
     |
-    = link_to 'Destroy', <%= singular_name %>, :confirm => 'Are you sure?', :method => :delete
+    = link_to 'Destroy', <%= destroy_link(singular_name) %>, :confirm => 'Are you sure?', :method => :delete

data/generators/dry_scaffold/templates/{view_edit.html.haml → views/haml/edit.html.haml}

@@ -1,13 +1,13 @@
 %h1.heading
-  = "Editing <%= singular_name %> %s" % @<%= singular_name %>.id
+  = "Editing <%= singular_name %> %s" % <%= resource_instance %>.id
   
 <% if options[:formtastic] -%>
-- semantic_form_for(@<%= singular_name %>) do |form|
+- semantic_form_for(<%= resource_instance %>) do |form|
   = render 'form', :form => form
   - form.buttons do
     = form.commit_button 'Update'
 <% else -%>
-- form_for(@<%= singular_name %>) do |form|
+- form_for(<%= resource_instance %>) do |form|
   = form.error_messages
   = render 'form', :form => form
   %p.buttons
@@ -15,4 +15,4 @@
 <% end -%>
     
 %p.actions
-  = link_to 'Cancel', <%= collection_name %>_url
+  = link_to 'Cancel', <%= index_link %>

data/generators/dry_scaffold/templates/{view_index.html.haml → views/haml/index.html.haml}

@@ -2,7 +2,7 @@
   = "<%= plural_name.humanize %>"
   
 %p.actions
-  = link_to 'New <%= singular_name.humanize %>', new_<%= singular_name %>_url
+  = link_to 'New <%= singular_name.humanize %>', <%= new_link %>
   
 %table
   %thead.header
@@ -12,9 +12,9 @@
 <% end -%>
       %th.actions= 'Actions'
   %tbody.items.<%= plural_name %>
-    - @<%= collection_name -%>.each do |<%= singular_name %>|
+    - <%= collection_instance %>.each do |<%= singular_name %>|
       = render 'item', :<%= singular_name %> => <%= singular_name %>
       
 <% if options[:pagination] -%>
-= will_paginate(@<%= collection_name %>)
+= will_paginate(<%= collection_instance %>)
 <% end -%>

data/generators/dry_scaffold/templates/{view_new.html.haml → views/haml/new.html.haml}

@@ -2,12 +2,12 @@
   = 'New <%= singular_name.humanize %>'
   
 <% if options[:formtastic] -%>
-- semantic_form_for(@<%= singular_name %>) do |form|
+- semantic_form_for(<%= resource_instance %>) do |form|
   = render 'form', :form => form
   - form.buttons do
     = form.commit_button 'Create'
 <% else -%>
-- form_for(@<%= singular_name %>) do |form|
+- form_for(<%= resource_instance %>) do |form|
   = form.error_messages
   = render 'form', :form => form
   %p.buttons
@@ -15,4 +15,4 @@
 <% end -%>
     
 %p.actions
-  = link_to 'Cancel', <%= collection_name %>_url
+  = link_to 'Cancel', <%= index_link %>

data/generators/dry_scaffold/templates/views/haml/show.html.haml

@@ -0,0 +1,13 @@
+%h1.heading
+  = "<%= singular_name.humanize %> %s" % <%= resource_instance %>.id
+  
+- content_tag_for(:dl, <%= resource_instance %>) do
+<% attributes.each do |attribute| -%>
+  %dt.label= '<%= attribute.name.humanize %>'
+  %dd.<%= attribute.name -%>= h <%= resource_instance %>.try(:<%= attribute.name %>)
+<% end -%>
+  
+%p.actions
+  = link_to 'Edit', <%= edit_link %>
+  |
+  = link_to 'Index', <%= index_link %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grimen-dry_scaffold
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-03 00:00:00 -07:00
+date: 2009-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,38 +29,48 @@ files:
 - 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_model/prototypes/active_record_migration.rb
+- generators/dry_model/prototypes/active_record_model.rb
+- generators/dry_model/prototypes/test_data/active_record_fixtures.yml
+- generators/dry_model/prototypes/test_data/factory_girl_factories.rb
+- generators/dry_model/prototypes/test_data/machinist_factories.rb
+- generators/dry_model/prototypes/tests/test_unit/unit_test.rb
+- generators/dry_model/templates/models/active_record_migration.rb
+- generators/dry_model/templates/models/active_record_model.rb
+- generators/dry_model/templates/models/test_data/active_record_fixtures.yml
+- generators/dry_model/templates/models/test_data/factory_girl_factories.rb
+- generators/dry_model/templates/models/test_data/machinist_factories.rb
+- generators/dry_model/templates/models/tests/test_unit/unit_test.rb
 - generators/dry_scaffold/USAGE
 - generators/dry_scaffold/dry_scaffold_generator.rb
-- generators/dry_scaffold/templates/controller_inherited_resources.rb
-- generators/dry_scaffold/templates/controller_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/controller_inherited_resources.rb
-- generators/dry_scaffold/templates/prototypes/controller_standard.rb
-- generators/dry_scaffold/templates/prototypes/controller_test_standard.rb
-- generators/dry_scaffold/templates/prototypes/helper_standard.rb
-- generators/dry_scaffold/templates/prototypes/helper_test_standard.rb
-- generators/dry_scaffold/templates/prototypes/layout.html.haml
-- generators/dry_scaffold/templates/prototypes/view__form.html.haml
-- generators/dry_scaffold/templates/prototypes/view__item.html.haml
-- generators/dry_scaffold/templates/prototypes/view_edit.html.haml
-- generators/dry_scaffold/templates/prototypes/view_index.html.haml
-- generators/dry_scaffold/templates/prototypes/view_new.html.haml
-- generators/dry_scaffold/templates/prototypes/view_show.html.haml
-- generators/dry_scaffold/templates/view__form.html.haml
-- generators/dry_scaffold/templates/view__item.html.haml
-- generators/dry_scaffold/templates/view_edit.html.haml
-- generators/dry_scaffold/templates/view_index.html.haml
-- 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/prototypes/controllers/action_controller.rb
+- generators/dry_scaffold/prototypes/controllers/inherited_resources_controller.rb
+- generators/dry_scaffold/prototypes/controllers/tests/unit_test/functional_test.rb
+- generators/dry_scaffold/prototypes/helpers/helper.rb
+- generators/dry_scaffold/prototypes/helpers/tests/test_unit/unit_test.rb
+- generators/dry_scaffold/prototypes/views/builder/index.atom.builder
+- generators/dry_scaffold/prototypes/views/builder/index.rss.builder
+- generators/dry_scaffold/prototypes/views/haml/_form.html.haml
+- generators/dry_scaffold/prototypes/views/haml/_item.html.haml
+- generators/dry_scaffold/prototypes/views/haml/edit.html.haml
+- generators/dry_scaffold/prototypes/views/haml/index.html.haml
+- generators/dry_scaffold/prototypes/views/haml/layout.html.haml
+- generators/dry_scaffold/prototypes/views/haml/new.html.haml
+- generators/dry_scaffold/prototypes/views/haml/show.html.haml
+- generators/dry_scaffold/templates/controllers/action_controller.rb
+- generators/dry_scaffold/templates/controllers/inherited_resources_controller.rb
+- generators/dry_scaffold/templates/controllers/tests/test_unit/functional_test.rb
+- generators/dry_scaffold/templates/helpers/helper.rb
+- generators/dry_scaffold/templates/helpers/tests/test_unit/unit_test.rb
+- generators/dry_scaffold/templates/views/builder/index.atom.builder
+- generators/dry_scaffold/templates/views/builder/index.rss.builder
+- generators/dry_scaffold/templates/views/haml/_form.html.haml
+- generators/dry_scaffold/templates/views/haml/_item.html.haml
+- generators/dry_scaffold/templates/views/haml/edit.html.haml
+- generators/dry_scaffold/templates/views/haml/index.html.haml
+- generators/dry_scaffold/templates/views/haml/layout.html.haml
+- generators/dry_scaffold/templates/views/haml/new.html.haml
+- generators/dry_scaffold/templates/views/haml/show.html.haml
 - generators/dscaffold/dscaffold_generator.rb
 - rails/init.rb
 - tasks/dry_scaffold.rake

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

@@ -1,13 +0,0 @@
-%h1.heading
-  = "<%= singular_name.humanize %> %s" % @<%= singular_name %>.id
-  
-- content_tag_for(:dl, @<%= singular_name %>) do
-<% attributes.each do |attribute| -%>
-  %dt.label= '<%= attribute.name.humanize %>'
-  %dd.<%= attribute.name -%>= h @<%= singular_name %>.try(:<%= attribute.name %>)
-<% end -%>
-  
-%p.actions
-  = link_to 'Edit', edit_<%= singular_name %>_url(@<%= singular_name %>)
-  |
-  = link_to 'Index', <%= collection_name %>_url