ryanb-nifty-generators 0.0.3 → 0.1.0

data/CHANGELOG

@@ -0,0 +1,3 @@
+*0.1.0* (May 8th, 2008)
+
+* initial release

data/Manifest

@@ -1,3 +1,5 @@
+CHANGELOG
+lib/nifty_generators.rb
 LICENSE
 Manifest
 rails_generators/nifty_layout/nifty_layout_generator.rb
@@ -24,6 +26,7 @@ rails_generators/nifty_scaffold/templates/views/new.html.erb
 rails_generators/nifty_scaffold/templates/views/show.html.erb
 rails_generators/nifty_scaffold/USAGE
 README
+tasks/deployment.rake
 test/test_helper.rb
 test/test_nifty_layout_generator.rb
 test/test_nifty_scaffold_generator.rb

data/README

@@ -1,49 +1,36 @@
 = nifty-generator
 
-* http://github.com/ryanb/nifty-generators/
+A collection of useful Rails generator scripts by Ryan Bates.
 
-== DESCRIPTION:
+== Install
 
-A collection of Ryan's generator scripts for Rails.
+  gem install ryanb-nifty-generators --source=http://gems.github.com
+  
+== Usage
 
-== FEATURES/PROBLEMS:
+Once you install the gem, the generators will be available to all Rails
+applications on your system. If you run script/generate without any
+additional arguments you should see the available generators listed.
 
-* Still in very early development
+To run the generator, go to your rails project directory and call it
+using the script/generate or script/destroy command.
 
-== SYNOPSIS:
+  script/generate nifty_scaffold Recipe name:string index new
+  
+== Included Generators
 
-  script/generate nifty_layout
+* nifty_layout: generates generic layout, stylesheet, and helper files.
+* nifty_scaffold: generates a controller and optional model/migration.
 
-== REQUIREMENTS:
+Run the command with the --help option to learn more.
 
-* Rails
-* Similar opinions as me
+  script/generate nifty_layout --help
 
-== INSTALL:
+== Development
 
-* gem install ryanb-nifty-generators --source=http://gems.github.com
+This project can be found on github at the following URL.
 
-== LICENSE:
+http://github.com/ryanb/nifty-generators/
 
-(The MIT License)
-
-Copyright (c) 2008 Ryan Bates
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+If you wish the generators behaved differently, please consider
+forking the project and modifying to your heart's content.

data/TODO

@@ -1,4 +1,4 @@
 
 Nifty Scaffold Generator
   - generate tests/specs
-  + support custom actions
+  - add some validation for attributes/action names

data/lib/nifty_generators.rb

@@ -0,0 +1,3 @@
+module NiftyGenerators
+  # nothing to see here, the real action is under rails_generators
+end

data/nifty-generators.gemspec

@@ -1,27 +1,27 @@
 
-# Gem::Specification for Nifty-generators-0.0.3
+# Gem::Specification for Nifty-generators-0.1.0
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{nifty-generators}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Bates"]
-  s.date = %q{2008-05-07}
-  s.description = %q{A collection of Ryan's generator scripts for Rails.}
-  s.email = %q{ryan@railscasts.com}
-  s.extra_rdoc_files = ["LICENSE", "README", "TODO"]
-  s.files = ["LICENSE", "Manifest", "rails_generators/nifty_layout/nifty_layout_generator.rb", "rails_generators/nifty_layout/templates/helper.rb", "rails_generators/nifty_layout/templates/layout.html.erb", "rails_generators/nifty_layout/templates/stylesheet.css", "rails_generators/nifty_layout/USAGE", "rails_generators/nifty_scaffold/nifty_scaffold_generator.rb", "rails_generators/nifty_scaffold/templates/actions/create.rb", "rails_generators/nifty_scaffold/templates/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/actions/edit.rb", "rails_generators/nifty_scaffold/templates/actions/index.rb", "rails_generators/nifty_scaffold/templates/actions/new.rb", "rails_generators/nifty_scaffold/templates/actions/show.rb", "rails_generators/nifty_scaffold/templates/actions/update.rb", "rails_generators/nifty_scaffold/templates/controller.rb", "rails_generators/nifty_scaffold/templates/migration.rb", "rails_generators/nifty_scaffold/templates/model.rb", "rails_generators/nifty_scaffold/templates/views/_form.html.erb", "rails_generators/nifty_scaffold/templates/views/edit.html.erb", "rails_generators/nifty_scaffold/templates/views/index.html.erb", "rails_generators/nifty_scaffold/templates/views/new.html.erb", "rails_generators/nifty_scaffold/templates/views/show.html.erb", "rails_generators/nifty_scaffold/USAGE", "README", "test/test_helper.rb", "test/test_nifty_layout_generator.rb", "test/test_nifty_scaffold_generator.rb", "TODO", "nifty-generators.gemspec"]
+  s.date = %q{2008-05-08}
+  s.description = %q{A collection of useful generator scripts for Rails.}
+  s.email = %q{ryan (at) railscasts (dot) com}
+  s.extra_rdoc_files = ["CHANGELOG", "lib/nifty_generators.rb", "LICENSE", "README", "tasks/deployment.rake", "TODO"]
+  s.files = ["CHANGELOG", "lib/nifty_generators.rb", "LICENSE", "Manifest", "rails_generators/nifty_layout/nifty_layout_generator.rb", "rails_generators/nifty_layout/templates/helper.rb", "rails_generators/nifty_layout/templates/layout.html.erb", "rails_generators/nifty_layout/templates/stylesheet.css", "rails_generators/nifty_layout/USAGE", "rails_generators/nifty_scaffold/nifty_scaffold_generator.rb", "rails_generators/nifty_scaffold/templates/actions/create.rb", "rails_generators/nifty_scaffold/templates/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/actions/edit.rb", "rails_generators/nifty_scaffold/templates/actions/index.rb", "rails_generators/nifty_scaffold/templates/actions/new.rb", "rails_generators/nifty_scaffold/templates/actions/show.rb", "rails_generators/nifty_scaffold/templates/actions/update.rb", "rails_generators/nifty_scaffold/templates/controller.rb", "rails_generators/nifty_scaffold/templates/helper.rb", "rails_generators/nifty_scaffold/templates/migration.rb", "rails_generators/nifty_scaffold/templates/model.rb", "rails_generators/nifty_scaffold/templates/views/_form.html.erb", "rails_generators/nifty_scaffold/templates/views/edit.html.erb", "rails_generators/nifty_scaffold/templates/views/index.html.erb", "rails_generators/nifty_scaffold/templates/views/new.html.erb", "rails_generators/nifty_scaffold/templates/views/show.html.erb", "rails_generators/nifty_scaffold/USAGE", "README", "tasks/deployment.rake", "test/test_helper.rb", "test/test_nifty_layout_generator.rb", "test/test_nifty_scaffold_generator.rb", "TODO", "nifty-generators.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/ryanb/nifty-generators}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Nifty-generators", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{nifty-generators}
   s.rubygems_version = %q{1.0.0}
-  s.summary = %q{A collection of Ryan's generator scripts for Rails.}
+  s.summary = %q{A collection of useful generator scripts for Rails.}
   s.test_files = ["test/test_helper.rb", "test/test_nifty_layout_generator.rb", "test/test_nifty_scaffold_generator.rb"]
 end
 
@@ -34,12 +34,12 @@ end
 # begin
 #   require 'echoe'
 # 
-#   Echoe.new('nifty-generators', '0.0.3') do |p|
-#     p.summary        = "A collection of Ryan's generator scripts for Rails."
-#     p.description    = "A collection of Ryan's generator scripts for Rails."
+#   Echoe.new('nifty-generators', '0.1.0') do |p|
+#     p.summary        = "A collection of useful generator scripts for Rails."
+#     p.description    = "A collection of useful generator scripts for Rails."
 #     p.url            = "http://github.com/ryanb/nifty-generators"
 #     p.author         = 'Ryan Bates'
-#     p.email          = "ryan@railscasts.com"
+#     p.email          = "ryan (at) railscasts (dot) com"
 #     p.ignore_pattern = ["script/*", "*.gemspec"]
 #   end
 # 
@@ -48,5 +48,4 @@ end
 #   puts "#{boom.to_s.capitalize}."
 # end
 # 
-# desc "Build the manifest and gemspec files."
-# task :build => [:build_manifest, :build_gemspec]
+# Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/rails_generators/nifty_layout/USAGE

@@ -1,21 +1,25 @@
 Description:
-  The nifty_layout generator creates a basic stylesheet and layout
-	which will give some structure to a starting Rails app.
-
+  The nifty_layout generator creates a basic layout, stylesheet and
+  helper which will give some structure to a starting Rails app.
+  
   The generator takes one argument which will be the name of the
 	layout and stylesheet files. If no argument is passed then it defaults
 	to "application".
+  
+  The helper module includes some methods which can be called in any
+  template or partial to set variables to be used in the layout, such as
+  page title and javascript/stylesheet includes.
 
-Usage:
-  ./script/generate nifty_layout
+Examples:
+    script/generate nifty_layout
 
-    This will create two files:
-      Layout:     app/views/layouts/application.html.erb
-      Stylesheet: public/stylesheets/application.css
+        Layout:     app/views/layouts/application.html.erb
+        Stylesheet: public/stylesheets/application.css
+        Helper:     app/helpers/layout_helper.rb
 
 
-  ./script/generate nifty_layout admin
+    script/generate nifty_layout admin
 
-    This will create two files:
-      Layout:     app/views/layouts/admin.html.erb
-      Stylesheet: public/stylesheets/admin.css
+        Layout:     app/views/layouts/admin.html.erb
+        Stylesheet: public/stylesheets/admin.css
+        Helper:     app/helpers/layout_helper.rb

data/rails_generators/nifty_layout/nifty_layout_generator.rb

@@ -23,9 +23,9 @@ class NiftyLayoutGenerator < Rails::Generator::Base
   protected
     def banner
       <<-EOS
-Creates layout and stylesheet files.
+Creates generic layout, stylesheet, and helper files.
 
-USAGE: #{$0} #{spec.name} application
+USAGE: #{$0} #{spec.name} [layout_name]
 EOS
     end
 end

data/rails_generators/nifty_layout/templates/layout.html.erb

@@ -4,7 +4,6 @@
   <head>
     <title><%%= h(yield(:title) || "Untitled") %></title>
     <%%= stylesheet_link_tag '<%= file_name %>' %>
-    <%%= javascript_include_tag :defaults %>
     <%%= yield(:head) %>
   </head>
   <body>

data/rails_generators/nifty_scaffold/USAGE

@@ -1,5 +1,48 @@
 Description:
-  
-  
+    Scaffolds an entire resource, from model and migration to controller and
+    views. The resource is ready to use as a starting point for your restful,
+    resource-oriented application. Tests are not generated yet, but expect
+    them in future releases.
+
 Usage:
-  
+    Pass the name of the model, either CamelCased or under_scored, as the first
+    argument, and an optional list of attribute pairs and controller actions.
+    
+    If no controller actions are specified, they will default to index, show,
+    new, create, edit, update, and destroy.
+    
+    IMPORTANT: If no attribute pairs are specified, no model will be generated.
+    It will try to determine the attributes from an existing model.
+
+    Attribute pairs are column_name:sql_type arguments specifying the
+    model's attributes. Timestamps are added by default, so you don't have to
+    specify them by hand as 'created_at:datetime updated_at:datetime'.
+
+    For example, `nifty_scaffold post name:string content:text hidden:boolean`
+    gives you a model with those three attributes, a controller that handles
+    the create/show/update/destroy, forms to create and edit your posts, and
+    an index that lists them all, as well as a map.resources :posts
+    declaration in config/routes.rb.
+    
+    Adding an "!" in the mix of arguments will invert the passed controller
+    actions. This will include all 7 controller actitons except the ones
+    mentioned. This option doesn't effect model attributes.
+
+Examples:
+    script/generate nifty_scaffold post
+        
+        Will create a controller called "posts" it will contain all seven
+        CRUD actions along with the views. A model will NOT be created,
+        instead it will look for an existing model and use those attributes.
+    
+    script/generate nifty_scaffold post name:string content:text index new edit
+        
+        Will create a Post model and migration file with the name and content
+        attributes. It will also create a controller with index, new, create,
+        edit, and update actions. Notice the create and update actions are
+        added automatically with new and edit.
+    
+    script/generate nifty_scaffold post ! show new
+        
+        Creates a posts controller (no model) with index, edit, update, and
+        destroy actions.

data/rails_generators/nifty_scaffold/nifty_scaffold_generator.rb

@@ -11,20 +11,28 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
     @attributes = []
     
     @args[1..-1].each do |arg|
-      if arg.include? ':'
+      if arg == '!'
+        options[:invert] = true
+      elsif arg.include? ':'
         @attributes << Rails::Generator::GeneratedAttribute.new(*arg.split(":"))
       else
         @controller_actions << arg
+        @controller_actions << 'create' if arg == 'new'
+        @controller_actions << 'update' if arg == 'edit'
       end
     end
     
-    if @controller_actions.empty?
-      @controller_actions = %w[index show new create edit update destroy]
+    @controller_actions.uniq!
+    @attributes.uniq!
+    
+    if options[:invert] || @controller_actions.empty?
+      @controller_actions = all_actions - @controller_actions
     end
     
     if @attributes.empty?
+      options[:skip_model] = true # default to skipping model if no attributes passed
       if model_exists?
-        class_name.constantize.columns.each do |column|
+        model_columns_for_attributes.each do |column|
           @attributes << Rails::Generator::GeneratedAttribute.new(column.name.to_s, column.type.to_s)
         end
       else
@@ -32,38 +40,54 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
       end
     end
   end
-
+  
   def manifest
     record do |m|
-      m.directory "app/controllers"
-      m.directory "app/helpers"
-      m.directory "app/models"
-      m.directory "db/migrate"
-      m.directory "app/views/#{plural_name}"
-      m.template "controller.rb", "app/controllers/#{plural_name}_controller.rb"
-      m.template "helper.rb", "app/helpers/#{plural_name}_helper.rb"
-      
-      unless model_exists?
+      unless options[:skip_model]
+        m.directory "app/models"
         m.template "model.rb", "app/models/#{singular_name}.rb"
-        m.migration_template "migration.rb", "db/migrate", :migration_file_name => "create_#{plural_name}"
+        unless options[:skip_migration]
+          m.migration_template "migration.rb", "db/migrate", :migration_file_name => "create_#{plural_name}"
+        end
       end
       
-      controller_actions.each do |action|
-        if File.exist? source_path("views/#{action}.html.erb")
-          m.template "views/#{action}.html.erb", "app/views/#{plural_name}/#{action}.html.erb"
+      unless options[:skip_controller]
+        m.directory "app/controllers"
+        m.template "controller.rb", "app/controllers/#{plural_name}_controller.rb"
+      
+        m.directory "app/helpers"
+        m.template "helper.rb", "app/helpers/#{plural_name}_helper.rb"
+      
+        m.directory "app/views/#{plural_name}"
+        controller_actions.each do |action|
+          if File.exist? source_path("views/#{action}.html.erb")
+            m.template "views/#{action}.html.erb", "app/views/#{plural_name}/#{action}.html.erb"
+          end
         end
-      end
       
-      if form_partial?
-        m.template "views/_form.html.erb", "app/views/#{plural_name}/_form.html.erb"
-      end
+        if form_partial?
+          m.template "views/_form.html.erb", "app/views/#{plural_name}/_form.html.erb"
+        end
       
-      m.route_resources plural_name
+        m.route_resources plural_name
+      end
     end
   end
   
   def form_partial?
-    controller_actions.include?('new') && controller_actions.include?('edit')
+    actions? :new, :edit
+  end
+  
+  def all_actions
+    %w[index show new create edit update destroy]
+  end
+  
+  def action?(name)
+    controller_actions.include? name.to_s
+  end
+  
+  def actions?(*names)
+    names.all? { |n| action? n.to_s }
   end
   
   def singular_name
@@ -71,7 +95,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
   end
   
   def plural_name
-    name.pluralize
+    name.underscore.pluralize
   end
   
   def class_name
@@ -85,7 +109,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
   def controller_methods
     controller_actions.map do |action|
       controller_method(action)
-    end.join
+    end.join("\n")
   end
   
   def controller_method(name)
@@ -101,15 +125,31 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
   end
   
   def item_path
-    if controller_actions.include? 'show'
+    if action? :show
       "@#{singular_name}"
     else
       "#{plural_name}_path"
     end
   end
   
+  def model_columns_for_attributes
+    class_name.constantize.columns.reject do |column|
+      column.name.to_s =~ /^(id|created_at|updated_at)$/
+    end
+  end
+  
 protected
 
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+    opt.on("--skip-model", "Don't generate a model or migration file.") { |v| options[:skip_model] = v }
+    opt.on("--skip-migration", "Don't generate migration file for model.") { |v| options[:skip_migration] = v }
+    opt.on("--skip-timestamps", "Don't add timestamps to migration file.") { |v| options[:skip_timestamps] = v }
+    opt.on("--skip-controller", "Don't generate controller, helper, or views.") { |v| options[:skip_controller] = v }
+    opt.on("--invert", "Generate all controller actions except these mentioned.") { |v| options[:invert] = v }
+  end
+
   # is there a better way to do this? Perhaps with const_defined?
   def model_exists?
     File.exist? destination_path("app/models/#{singular_name}.rb")
@@ -121,9 +161,9 @@ protected
   
   def banner
     <<-EOS
-Creates a controller and model given the name and attributes.
+Creates a controller and optional model given the name, actions, and attributes.
 
-USAGE: #{$0} #{spec.name} name
+USAGE: #{$0} #{spec.name} ModelName [controller_actions and model:attributes] [options]
 EOS
   end
 end

data/rails_generators/nifty_scaffold/templates/actions/create.rb

@@ -1,6 +1,7 @@
   def create
     @<%= singular_name %> = <%= class_name %>.new(params[:<%= singular_name %>])
     if @<%= singular_name %>.save
+      flash[:notice] = "Successfully created <%= name.humanize.downcase %>."
       redirect_to <%= item_path %>
     else
       render :action => 'new'

data/rails_generators/nifty_scaffold/templates/actions/destroy.rb

@@ -1,5 +1,6 @@
   def destroy
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
     @<%= singular_name %>.destroy
+    flash[:notice] = "Successfully destroyed <%= name.humanize.downcase %>."
     redirect_to <%= plural_name %>_path
   end

data/rails_generators/nifty_scaffold/templates/actions/update.rb

@@ -1,6 +1,7 @@
   def update
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
     if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
+      flash[:notice] = "Successfully updated <%= name.humanize.downcase %>."
       redirect_to <%= item_path %>
     else
       render :action => 'edit'

data/rails_generators/nifty_scaffold/templates/controller.rb

@@ -1,3 +1,3 @@
 class <%= plural_class_name %>Controller < ApplicationController
-  <%= controller_methods.lstrip %>
+  <%= controller_methods.strip %>
 end

data/rails_generators/nifty_scaffold/templates/helper.rb

@@ -0,0 +1,3 @@
+module <%= plural_class_name %>Helper
+  
+end

data/rails_generators/nifty_scaffold/templates/migration.rb

@@ -4,7 +4,9 @@ class Create<%= plural_class_name %> < ActiveRecord::Migration
     <%- for attribute in attributes -%>
       t.<%= attribute.type %> :<%= attribute.name %>
     <%- end -%>
+    <%- unless options[:skip_timestamps] -%>
       t.timestamps
+    <%- end -%>
     end
   end
   

data/rails_generators/nifty_scaffold/templates/views/_form.html.erb

@@ -1,9 +1,9 @@
 <%% form_for @<%= singular_name %> do |f| %>
-<% for attribute in attributes %>
+<%- for attribute in attributes -%>
   <p>
-    <%%= f.label :<%= attribute.name %>%><br />
+    <%%= f.label :<%= attribute.name %> %><br />
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
   </p>
-<% end %>
+<%- end -%>
   <p><%%= f.submit "Submit" %></p>
 <%% end %>

data/rails_generators/nifty_scaffold/templates/views/edit.html.erb

@@ -2,7 +2,13 @@
 
 <%= render_form %>
 
+<%- if actions? :show, :index -%>
 <p>
+<%- if action? :show -%>
   <%%= link_to "Show", @<%= singular_name %> %> |
+<%- end -%>
+<%- if action? :index -%>
   <%%= link_to "View All", <%= plural_name %>_path %>
+<%- end -%>
 </p>
+<%- end -%>

data/rails_generators/nifty_scaffold/templates/views/index.html.erb

@@ -3,20 +3,27 @@
 <table>
   <tr>
   <%- for attribute in attributes -%>
-    <th><%= attribute.column.human_name %></th>
+    <th><%= attribute.column.human_name.titleize %></th>
   <%- end -%>
   </tr>
-
   <%% for <%= singular_name %> in @<%= plural_name %> %>
     <tr>
-      <%- for attribute in attributes -%>
-        <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
-      <%- end -%>
+    <%- for attribute in attributes -%>
+      <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
+    <%- end -%>
+    <%- if action? :show -%>
       <td><%%= link_to "Show", <%= singular_name %> %></td>
+    <%- end -%>
+    <%- if action? :edit -%>
       <td><%%= link_to "Edit", edit_<%= singular_name %>_path(<%= singular_name %>) %></td>
+    <%- end -%>
+    <%- if action? :destroy -%>
       <td><%%= link_to "Destroy", <%= singular_name %>, :confirm => 'Are you sure?', :method => :delete %></td>
+    <%- end -%>
     </tr>
   <%% end %>
 </table>
 
-<p><%%= link_to "New <%= singular_name %>", new_<%= singular_name %>_path %></p>
+<%- if action? :new -%>
+<p><%%= link_to "New <%= singular_name.titleize %>", new_<%= singular_name %>_path %></p>
+<%- end -%>

data/rails_generators/nifty_scaffold/templates/views/new.html.erb

@@ -2,4 +2,6 @@
 
 <%= render_form %>
 
+<%- if action? :index -%>
 <p><%%= link_to "Back to List", <%= plural_name %>_path %></p>
+<%- end -%>

data/rails_generators/nifty_scaffold/templates/views/show.html.erb

@@ -2,13 +2,19 @@
 
 <%- for attribute in attributes -%>
 <p>
-  <strong><%= attribute.column.human_name %>:</strong>
+  <strong><%= attribute.column.human_name.titleize %>:</strong>
   <%%=h @<%= singular_name %>.<%= attribute.name %> %>
 </p>
 <%- end -%>
 
 <p>
+<%- if action? :edit -%>
   <%%= link_to "Edit", edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
+<%- end -%>
+<%- if action? :destroy -%>
   <%%= link_to "Destroy", @<%= singular_name %>, :confirm => 'Are you sure?', :method => :delete %> |
+<%- end -%>
+<%- if action? :index -%>
   <%%= link_to "View All", <%= plural_name %>_path %>
+<%- end -%>
 </p>

data/tasks/deployment.rake

@@ -0,0 +1,2 @@
+desc "Build the manifest and gemspec files."
+task :build => [:build_manifest, :build_gemspec]

data/test/test_helper.rb

@@ -37,7 +37,7 @@ module NiftyGenerators
     protected
   
     def run_rails_generator(generator, *args)
-      options = args.shift! if args.last.kind_of? Hash
+      options = args.pop if args.last.kind_of? Hash
       options ||= {}
       run_generator(generator.to_s, args, generator_sources, options.reverse_merge(:quiet => true))
     end

data/test/test_nifty_scaffold_generator.rb

@@ -37,25 +37,8 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
       end
     end
   
-    context "generator with no options" do
-      rails_generator :nifty_scaffold, "line_item"
-    
-      should "generate model with class as camelcase name" do
-        assert_generated_file "app/models/line_item.rb" do |body|
-          assert_match "class LineItem < ActiveRecord::Base", body
-        end
-      end
-    
-      should "generate migration with default name column" do
-        file = Dir.glob("#{RAILS_ROOT}/db/migrate/*.rb").first
-        assert file, "migration file doesn't exist"
-        assert_match(/[0-9]+_create_line_items.rb$/, file)
-        assert_generated_file "db/migrate/#{File.basename(file)}" do |body|
-          assert_match "class CreateLineItems", body
-          assert_match "t.string :name", body
-          assert_match "t.timestamp", body
-        end
-      end
+    context "generator with no options and no existing model" do
+      rails_generator :nifty_scaffold, "LineItem"
     
       should_generate_file "app/helpers/line_items_helper.rb"
     
@@ -83,6 +66,30 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
           assert_match "map.resources :line_items", body
         end
       end
+      
+      should_not_generate_file "app/models/line_item.rb"
+    end
+    
+    context "generator with some attributes" do
+      rails_generator :nifty_scaffold, "line_item", "name:string", "description:text"
+      
+      should "generate migration with attribute columns" do
+        file = Dir.glob("#{RAILS_ROOT}/db/migrate/*.rb").first
+        assert file, "migration file doesn't exist"
+        assert_match(/[0-9]+_create_line_items.rb$/, file)
+        assert_generated_file "db/migrate/#{File.basename(file)}" do |body|
+          assert_match "class CreateLineItems", body
+          assert_match "t.string :name", body
+          assert_match "t.text :description", body
+          assert_match "t.timestamps", body
+        end
+      end
+    
+      should "generate model with class as camelcase name" do
+        assert_generated_file "app/models/line_item.rb" do |body|
+          assert_match "class LineItem < ActiveRecord::Base", body
+        end
+      end
     end
   
     context "generator with index action" do
@@ -131,6 +138,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
           assert_match "def create", body
           assert_match "@line_item = LineItem.new(params[:line_item])", body
           assert_match "if @line_item.save", body
+          assert_match "flash[:notice] = \"Successfully created line item.\"", body
           assert_match "redirect_to line_items_path", body
           assert_match "render :action => 'new'", body
         end
@@ -155,6 +163,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
           assert_match "@line_item = LineItem.find(params[:id])", body
           assert_match "def update", body
           assert_match "if @line_item.update_attributes(params[:line_item])", body
+          assert_match "flash[:notice] = \"Successfully updated line item.\"", body
           assert_match "redirect_to line_items_path", body
           assert_match "render :action => 'edit'", body
         end
@@ -171,6 +180,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
           assert_match "def destroy", body
           assert_match "@line_item = LineItem.find(params[:id])", body
           assert_match "@line_item.destroy", body
+          assert_match "flash[:notice] = \"Successfully destroyed line item.\"", body
           assert_match "redirect_to line_items_path", body
         end
       end
@@ -212,7 +222,84 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
         end
       end
     end
-  
+    
+    context "generator with attributes and skip model option" do
+      rails_generator :nifty_scaffold, "line_item", "foo:string", :skip_model => true
+      
+      should "use passed attribute" do
+        assert_generated_file "app/views/line_items/_form.html.erb" do |body|
+          assert_match "<%= f.text_field :foo %>", body
+        end
+      end
+      
+      should "not generate migration file" do
+        assert Dir.glob("#{RAILS_ROOT}/db/migrate/*.rb").empty?
+      end
+      
+      should_not_generate_file "app/models/line_item.rb"
+    end
+    
+    context "generator with no attributes" do
+      rails_generator :nifty_scaffold, "line_item"
+      
+      should "not generate migration file" do
+        assert Dir.glob("#{RAILS_ROOT}/db/migrate/*.rb").empty?
+      end
+      
+      should_not_generate_file "app/models/line_item.rb"
+    end
+    
+    context "generator with only new and edit actions" do
+      rails_generator :nifty_scaffold, "line_item", "new", "edit"
+      
+      should "included create and update actions in controller" do
+        assert_generated_file "app/controllers/line_items_controller.rb" do |body|
+          assert_match "def create", body
+          assert_match "def update", body
+        end
+      end
+    end
+    
+    context "generator with exclemation mark and show, new, and edit actions" do
+      rails_generator :nifty_scaffold, "line_item", "!", "show", "new", "edit"
+      
+      should "only include index and destroy actions" do
+        assert_generated_file "app/controllers/line_items_controller.rb" do |body|
+          %w[index destroy].each { |a| assert_match "def #{a}", body }
+          %w[show new create edit update].each do |a|
+            assert_no_match(/def #{a}/, body)
+          end
+        end
+      end
+    end
+    
+    context "generator with --skip-controller" do
+      rails_generator :nifty_scaffold, "line_item", :skip_controller => true
+      should_not_generate_file "app/controllers/line_items_controller.rb"
+      should_not_generate_file "app/helpers/line_items_helper.rb"
+      should_not_generate_file "app/views/line_items/index.html.erb"
+    end
+    
+    context "generator with --skip-migration" do
+      rails_generator :nifty_scaffold, "line_item", "name:string", :skip_migration => true
+      
+      should "not generate migration file" do
+        assert Dir.glob("#{RAILS_ROOT}/db/migrate/*.rb").empty?
+      end
+    end
+    
+    context "generator with --skip-timestamps" do
+      rails_generator :nifty_scaffold, "line_item", "name:string", :skip_timestamps => true
+      
+      should "generate migration with no timestamps" do
+        file = Dir.glob("#{RAILS_ROOT}/db/migrate/*.rb").first
+        assert file, "migration file doesn't exist"
+        assert_generated_file "db/migrate/#{File.basename(file)}" do |body|
+          assert_no_match(/t.timestamps/, body)
+        end
+      end
+    end
+    
     context "existing model" do
       setup do
         Dir.mkdir("#{RAILS_ROOT}/app") unless File.exists?("#{RAILS_ROOT}/app")
@@ -226,15 +313,23 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
         FileUtils.rm_rf "#{RAILS_ROOT}/app"
       end
     
-      context "generator with no options" do
-        rails_generator :nifty_scaffold, "recipe"
+      context "generator with skip model option" do
+        rails_generator :nifty_scaffold, "recipe", :skip_model => true
     
         should "use model columns for attributes" do
           assert_generated_file "app/views/recipes/_form.html.erb" do |body|
             assert_match "<%= f.text_field :foo %>", body
             assert_match "<%= f.text_field :bar %>", body
+            assert_match "<%= f.text_field :book_id %>", body
+            assert_no_match(/:id/, body)
+            assert_no_match(/:created_at/, body)
+            assert_no_match(/:updated_at/, body)
           end
         end
+        
+        should "not generate migration file" do
+          assert Dir.glob("#{RAILS_ROOT}/db/migrate/*.rb").empty?
+        end
       end
     
       context "generator with attribute specified" do
@@ -252,6 +347,10 @@ end
 
 # just an example model we can use
 class Recipe < ActiveRecord::Base
+  add_column :id, :integer
   add_column :foo, :string
   add_column :bar, :string
+  add_column :book_id, :integer
+  add_column :created_at, :datetime
+  add_column :updated_at, :datetime
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ryanb-nifty-generators
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,21 +9,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-07 00:00:00 -07:00
+date: 2008-05-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: A collection of Ryan's generator scripts for Rails.
-email: ryan@railscasts.com
+description: A collection of useful generator scripts for Rails.
+email: ryan (at) railscasts (dot) com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
+- CHANGELOG
+- lib/nifty_generators.rb
 - LICENSE
 - README
+- tasks/deployment.rake
 - TODO
 files: 
+- CHANGELOG
+- lib/nifty_generators.rb
 - LICENSE
 - Manifest
 - rails_generators/nifty_layout/nifty_layout_generator.rb
@@ -40,6 +45,7 @@ files:
 - rails_generators/nifty_scaffold/templates/actions/show.rb
 - rails_generators/nifty_scaffold/templates/actions/update.rb
 - rails_generators/nifty_scaffold/templates/controller.rb
+- rails_generators/nifty_scaffold/templates/helper.rb
 - rails_generators/nifty_scaffold/templates/migration.rb
 - rails_generators/nifty_scaffold/templates/model.rb
 - rails_generators/nifty_scaffold/templates/views/_form.html.erb
@@ -49,6 +55,7 @@ files:
 - rails_generators/nifty_scaffold/templates/views/show.html.erb
 - rails_generators/nifty_scaffold/USAGE
 - README
+- tasks/deployment.rake
 - test/test_helper.rb
 - test/test_nifty_layout_generator.rb
 - test/test_nifty_scaffold_generator.rb
@@ -84,7 +91,7 @@ rubyforge_project: nifty-generators
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: A collection of Ryan's generator scripts for Rails.
+summary: A collection of useful generator scripts for Rails.
 test_files: 
 - test/test_helper.rb
 - test/test_nifty_layout_generator.rb