ryanb-nifty-generators 0.1.4 → 0.1.5

data/CHANGELOG

@@ -1,3 +1,9 @@
+*0.1.5* (August 7th, 2008)
+
+* adding option to nifty layout to generate HAML views and SASS stylesheets
+
+* adding option to nifty scaffold to generate HAML views
+
 *0.1.4* (July 21st, 2008)
 
 * using same logic as model spec in model test for scaffold

data/Manifest

@@ -9,23 +9,11 @@ rails_generators/nifty_config/USAGE
 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/layout.html.haml
 rails_generators/nifty_layout/templates/stylesheet.css
+rails_generators/nifty_layout/templates/stylesheet.sass
 rails_generators/nifty_layout/USAGE
 rails_generators/nifty_scaffold/nifty_scaffold_generator.rb
-rails_generators/nifty_scaffold/templates/action_specs/create.rb
-rails_generators/nifty_scaffold/templates/action_specs/destroy.rb
-rails_generators/nifty_scaffold/templates/action_specs/edit.rb
-rails_generators/nifty_scaffold/templates/action_specs/index.rb
-rails_generators/nifty_scaffold/templates/action_specs/new.rb
-rails_generators/nifty_scaffold/templates/action_specs/show.rb
-rails_generators/nifty_scaffold/templates/action_specs/update.rb
-rails_generators/nifty_scaffold/templates/action_tests/create.rb
-rails_generators/nifty_scaffold/templates/action_tests/destroy.rb
-rails_generators/nifty_scaffold/templates/action_tests/edit.rb
-rails_generators/nifty_scaffold/templates/action_tests/index.rb
-rails_generators/nifty_scaffold/templates/action_tests/new.rb
-rails_generators/nifty_scaffold/templates/action_tests/show.rb
-rails_generators/nifty_scaffold/templates/action_tests/update.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
@@ -34,19 +22,38 @@ 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/controller_spec.rb
-rails_generators/nifty_scaffold/templates/controller_test.rb
 rails_generators/nifty_scaffold/templates/fixtures.yml
 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/model_spec.rb
-rails_generators/nifty_scaffold/templates/model_test.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/templates/tests/rspec/actions/create.rb
+rails_generators/nifty_scaffold/templates/tests/rspec/actions/destroy.rb
+rails_generators/nifty_scaffold/templates/tests/rspec/actions/edit.rb
+rails_generators/nifty_scaffold/templates/tests/rspec/actions/index.rb
+rails_generators/nifty_scaffold/templates/tests/rspec/actions/new.rb
+rails_generators/nifty_scaffold/templates/tests/rspec/actions/show.rb
+rails_generators/nifty_scaffold/templates/tests/rspec/actions/update.rb
+rails_generators/nifty_scaffold/templates/tests/rspec/controller.rb
+rails_generators/nifty_scaffold/templates/tests/rspec/model.rb
+rails_generators/nifty_scaffold/templates/tests/testunit/actions/create.rb
+rails_generators/nifty_scaffold/templates/tests/testunit/actions/destroy.rb
+rails_generators/nifty_scaffold/templates/tests/testunit/actions/edit.rb
+rails_generators/nifty_scaffold/templates/tests/testunit/actions/index.rb
+rails_generators/nifty_scaffold/templates/tests/testunit/actions/new.rb
+rails_generators/nifty_scaffold/templates/tests/testunit/actions/show.rb
+rails_generators/nifty_scaffold/templates/tests/testunit/actions/update.rb
+rails_generators/nifty_scaffold/templates/tests/testunit/controller.rb
+rails_generators/nifty_scaffold/templates/tests/testunit/model.rb
+rails_generators/nifty_scaffold/templates/views/erb/_form.html.erb
+rails_generators/nifty_scaffold/templates/views/erb/edit.html.erb
+rails_generators/nifty_scaffold/templates/views/erb/index.html.erb
+rails_generators/nifty_scaffold/templates/views/erb/new.html.erb
+rails_generators/nifty_scaffold/templates/views/erb/show.html.erb
+rails_generators/nifty_scaffold/templates/views/haml/_form.html.haml
+rails_generators/nifty_scaffold/templates/views/haml/edit.html.haml
+rails_generators/nifty_scaffold/templates/views/haml/index.html.haml
+rails_generators/nifty_scaffold/templates/views/haml/new.html.haml
+rails_generators/nifty_scaffold/templates/views/haml/show.html.haml
 rails_generators/nifty_scaffold/USAGE
 README
 tasks/deployment.rake

data/nifty-generators.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Nifty-generators-0.1.4
+# Gem::Specification for Nifty-generators-0.1.5
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{nifty-generators}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Bates"]
-  s.date = %q{2008-07-21}
+  s.date = %q{2008-08-07}
   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_config/nifty_config_generator.rb", "rails_generators/nifty_config/templates/config.yml", "rails_generators/nifty_config/templates/load_config.rb", "rails_generators/nifty_config/USAGE", "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/action_specs/create.rb", "rails_generators/nifty_scaffold/templates/action_specs/destroy.rb", "rails_generators/nifty_scaffold/templates/action_specs/edit.rb", "rails_generators/nifty_scaffold/templates/action_specs/index.rb", "rails_generators/nifty_scaffold/templates/action_specs/new.rb", "rails_generators/nifty_scaffold/templates/action_specs/show.rb", "rails_generators/nifty_scaffold/templates/action_specs/update.rb", "rails_generators/nifty_scaffold/templates/action_tests/create.rb", "rails_generators/nifty_scaffold/templates/action_tests/destroy.rb", "rails_generators/nifty_scaffold/templates/action_tests/edit.rb", "rails_generators/nifty_scaffold/templates/action_tests/index.rb", "rails_generators/nifty_scaffold/templates/action_tests/new.rb", "rails_generators/nifty_scaffold/templates/action_tests/show.rb", "rails_generators/nifty_scaffold/templates/action_tests/update.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/controller_spec.rb", "rails_generators/nifty_scaffold/templates/controller_test.rb", "rails_generators/nifty_scaffold/templates/fixtures.yml", "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/model_spec.rb", "rails_generators/nifty_scaffold/templates/model_test.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_config_generator.rb", "test/test_nifty_layout_generator.rb", "test/test_nifty_scaffold_generator.rb", "TODO", "nifty-generators.gemspec"]
+  s.files = ["CHANGELOG", "lib/nifty_generators.rb", "LICENSE", "Manifest", "rails_generators/nifty_config/nifty_config_generator.rb", "rails_generators/nifty_config/templates/config.yml", "rails_generators/nifty_config/templates/load_config.rb", "rails_generators/nifty_config/USAGE", "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/layout.html.haml", "rails_generators/nifty_layout/templates/stylesheet.css", "rails_generators/nifty_layout/templates/stylesheet.sass", "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/fixtures.yml", "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/tests/rspec/actions/create.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/edit.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/index.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/new.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/show.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/update.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/controller.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/model.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/create.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/edit.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/index.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/new.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/show.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/update.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/controller.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/model.rb", "rails_generators/nifty_scaffold/templates/views/erb/_form.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/edit.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/index.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/new.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/show.html.erb", "rails_generators/nifty_scaffold/templates/views/haml/_form.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/edit.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/index.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/new.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/show.html.haml", "rails_generators/nifty_scaffold/USAGE", "README", "tasks/deployment.rake", "test/test_helper.rb", "test/test_nifty_config_generator.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"]
@@ -42,7 +42,7 @@ end
 # begin
 #   require 'echoe'
 # 
-#   Echoe.new('nifty-generators', '0.1.4') do |p|
+#   Echoe.new('nifty-generators', '0.1.5') 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"

data/rails_generators/nifty_layout/nifty_layout_generator.rb

@@ -9,10 +9,16 @@ class NiftyLayoutGenerator < Rails::Generator::Base
       m.directory 'app/views/layouts'
       m.directory 'public/stylesheets'
       m.directory 'app/helpers'
-
-      m.template "layout.html.erb", "app/views/layouts/#{file_name}.html.erb"
-      m.file     "stylesheet.css",  "public/stylesheets/#{file_name}.css"
-      m.file     "helper.rb",       "app/helpers/layout_helper.rb"
+      
+      if options[:haml]
+        m.directory 'public/stylesheets/sass'
+        m.template "layout.html.haml", "app/views/layouts/#{file_name}.html.haml"
+        m.file     "stylesheet.sass",  "public/stylesheets/sass/#{file_name}.sass"
+      else
+        m.template "layout.html.erb", "app/views/layouts/#{file_name}.html.erb"
+        m.file     "stylesheet.css",  "public/stylesheets/#{file_name}.css"
+      end
+      m.file "helper.rb", "app/helpers/layout_helper.rb"
     end
   end
   
@@ -21,6 +27,13 @@ class NiftyLayoutGenerator < Rails::Generator::Base
   end
 
   protected
+
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+      opt.on("--haml", "Generate HAML for view, and SASS for stylesheet.") { |v| options[:haml] = v }
+    end
+
     def banner
       <<-EOS
 Creates generic layout, stylesheet, and helper files.

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

@@ -0,0 +1,19 @@
+!!! Strict
+%html{html_attrs}
+  
+  %head
+    %title
+      = h(yield(:title) || "Untitled")
+    %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
+    = stylesheet_link_tag '<%= file_name %>'
+    = yield(:head)
+  
+  %body
+    #container
+      - flash.each do |name, msg|
+        = content_tag :div, msg, :id => "flash_#{name}"
+      
+      - if show_title?
+        %h1=h yield(:title)
+      
+      = yield

data/rails_generators/nifty_layout/templates/stylesheet.css

@@ -1,5 +1,5 @@
 body {
-  background-color: #FFF;
+  background-color: #4B7399;
   font-family: Verdana, Helvetica, Arial;
   font-size: 14px;
 }
@@ -12,8 +12,10 @@ a {
   color: #0000FF;
 }
 
-body {
-  background-color: #4B7399;
+.clear {
+  clear: both;
+  height: 0px;
+  overflow: hidden;
 }
 
 #container {
@@ -40,10 +42,6 @@ body {
   border: solid 1px #C66;
 }
 
-.clear {
-  clear: both;
-}
-
 
 
 .fieldWithErrors {

data/rails_generators/nifty_layout/templates/stylesheet.sass

@@ -0,0 +1,66 @@
+!primary_color = #4B7399
+
+body
+  :background-color = !primary_color
+  :font
+    :family Verdana, Helvetica, Arial
+    :size 14px
+
+ul li
+  :list-style none
+
+a
+  :color #0000FF
+  img
+    :border none
+
+.clear
+  :clear both
+  :height 0px
+  :overflow hidden
+
+#container
+  :width 75%
+  :margin 0 auto
+  :background #fff
+  :padding 20px 40px
+  :border solid 1px black
+  :margin-top 20px
+
+#flash_notice,
+#flash_error
+  :padding 5px 8px
+  :margin 10px 0
+
+#flash_notice
+  :background-color #CFC
+  :border solid 1px #6C6
+
+#flash_error
+  :background-color #FCC
+  :border solid 1px #C66
+
+#errorExplanation
+  :width 400px
+  :border 2px solid #CF0000
+  :padding 0px
+  :padding-bottom 12px
+  :margin-bottom 20px
+  :background-color #f0f0f0
+  h2
+    :text-align left
+    :font-weight bold
+    :padding 5px 5px 5px 15px
+    :font-size 12px
+    :margin 0px
+    :background-color #c00
+    :color #fff
+  p
+    :color #333
+    :margin-bottom 0
+    :padding 8px
+  ul
+    :margin 2px 24px
+    li
+      :font-size 12px
+      :list-style disc

data/rails_generators/nifty_scaffold/nifty_scaffold_generator.rb

@@ -5,7 +5,6 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
     super
     usage if @args.empty?
     
-    
     @name = @args.first
     @controller_actions = []
     @attributes = []
@@ -52,12 +51,12 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
         
         if spec_dir?
           m.directory "spec/models"
-          m.template "model_spec.rb", "spec/models/#{singular_name}_spec.rb"
+          m.template "tests/rspec/model.rb", "spec/models/#{singular_name}_spec.rb"
           m.directory "spec/fixtures"
           m.template "fixtures.yml", "spec/fixtures/#{plural_name}.yml"
         else
           m.directory "test/unit"
-          m.template "model_test.rb", "test/unit/#{singular_name}_test.rb"
+          m.template "tests/testunit/model.rb", "test/unit/#{singular_name}_test.rb"
           m.directory "test/fixtures"
           m.template "fixtures.yml", "test/fixtures/#{plural_name}.yml"
         end
@@ -72,23 +71,23 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
       
         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"
+          if File.exist? source_path("views/#{view_language}/#{action}.html.#{view_language}")
+            m.template "views/#{view_language}/#{action}.html.#{view_language}", "app/views/#{plural_name}/#{action}.html.#{view_language}"
           end
         end
       
         if form_partial?
-          m.template "views/_form.html.erb", "app/views/#{plural_name}/_form.html.erb"
+          m.template "views/#{view_language}/_form.html.#{view_language}", "app/views/#{plural_name}/_form.html.#{view_language}"
         end
       
         m.route_resources plural_name
         
         if spec_dir?
           m.directory "spec/controllers"
-          m.template "controller_spec.rb", "spec/controllers/#{plural_name}_controller_spec.rb"
+          m.template "tests/rspec/controller.rb", "spec/controllers/#{plural_name}_controller_spec.rb"
         else
           m.directory "test/functional"
-          m.template "controller_test.rb", "test/functional/#{plural_name}_controller_test.rb"
+          m.template "tests/testunit/controller.rb", "test/functional/#{plural_name}_controller_test.rb"
         end
       end
     end
@@ -134,9 +133,13 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
   
   def render_form
     if form_partial?
-      "<%= render :partial => 'form' %>"
+      if options[:haml]
+        "= render :partial => 'form'"
+      else
+        "<%= render :partial => 'form' %>"
+      end
     else
-      read_template("views/_form.html.erb")
+      read_template("views/#{view_language}/_form.html.#{view_language}")
     end
   end
   
@@ -176,6 +179,10 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
   
 protected
 
+  def view_language
+    options[:haml] ? 'haml' : 'erb'
+  end
+
   def add_options!(opt)
     opt.separator ''
     opt.separator 'Options:'
@@ -184,6 +191,7 @@ protected
     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 }
+    opt.on("--haml", "Generate HAML views instead of ERB.") { |v| options[:haml] = v }
   end
 
   # is there a better way to do this? Perhaps with const_defined?

data/rails_generators/nifty_scaffold/templates/{controller_spec.rb → tests/rspec/controller.rb}

@@ -4,5 +4,5 @@ describe <%= plural_class_name %>Controller do
   fixtures :all
   integrate_views
   
-  <%= controller_methods :action_specs %>
+  <%= controller_methods 'tests/rspec/actions' %>
 end

data/rails_generators/nifty_scaffold/templates/{controller_test.rb → tests/testunit/controller.rb}

@@ -1,5 +1,5 @@
 require 'test_helper'
 
 class <%= plural_class_name %>ControllerTest < ActionController::TestCase
-  <%= controller_methods :action_tests %>
+  <%= controller_methods 'tests/testunit/actions' %>
 end

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

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

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

@@ -0,0 +1,14 @@
+- title "Edit <%= singular_name.titleize %>"
+
+<%= render_form %>
+
+<%- if actions? :show, :index -%>
+%p
+  <%- if action? :show -%>
+  = link_to "Edit", edit_<%= singular_name %>_path(@<%= singular_name %>)
+  |
+  <%- end -%>
+  <%- if action? :index -%>
+  = link_to "View All", <%= plural_name %>_path
+  <%- end -%>
+<%- end -%>

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

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

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

@@ -0,0 +1,7 @@
+- title "New <%= singular_name.titleize %>"
+
+<%= render_form %>
+
+<%- if action? :index -%>
+%p= link_to "Back to List", <%= plural_name %>_path
+<%- end -%>

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

@@ -0,0 +1,20 @@
+- title "<%= singular_name.titleize %>"
+
+<%- for attribute in attributes -%>
+%p
+  %strong <%= attribute.column.human_name.titleize %>:
+  =h @<%= singular_name %>.<%= attribute.name %>
+<%- 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 -%>

data/test/test_nifty_layout_generator.rb

@@ -33,4 +33,10 @@ class TestNiftyLayoutGenerator < Test::Unit::TestCase
     rails_generator :nifty_layout, "FooBar"
     should_generate_file 'app/views/layouts/foo_bar.html.erb'
   end
+  
+  context "generator with haml option" do
+    rails_generator :nifty_layout, "foobar", :haml => true
+    should_generate_file 'app/views/layouts/foobar.html.haml'
+    should_generate_file 'public/stylesheets/sass/foobar.sass'
+  end
 end

data/test/test_nifty_scaffold_generator.rb

@@ -476,6 +476,22 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
         end
       end
     end
+    
+    context "generator with haml option" do
+      rails_generator :nifty_scaffold, "LineItem", :haml => true
+      
+      %w[index show new edit _form].each do |action|
+        should_generate_file "app/views/line_items/#{action}.html.haml"
+      end
+    
+      should "render the form partial in views" do
+        %w[new edit].each do |action|
+          assert_generated_file "app/views/line_items/#{action}.html.haml" do |body|
+            assert_match /^= render :partial => 'form'$/, body
+          end
+        end
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ryanb-nifty-generators
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-21 00:00:00 -07:00
+date: 2008-08-07 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -38,23 +38,11 @@ files:
 - 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/layout.html.haml
 - rails_generators/nifty_layout/templates/stylesheet.css
+- rails_generators/nifty_layout/templates/stylesheet.sass
 - rails_generators/nifty_layout/USAGE
 - rails_generators/nifty_scaffold/nifty_scaffold_generator.rb
-- rails_generators/nifty_scaffold/templates/action_specs/create.rb
-- rails_generators/nifty_scaffold/templates/action_specs/destroy.rb
-- rails_generators/nifty_scaffold/templates/action_specs/edit.rb
-- rails_generators/nifty_scaffold/templates/action_specs/index.rb
-- rails_generators/nifty_scaffold/templates/action_specs/new.rb
-- rails_generators/nifty_scaffold/templates/action_specs/show.rb
-- rails_generators/nifty_scaffold/templates/action_specs/update.rb
-- rails_generators/nifty_scaffold/templates/action_tests/create.rb
-- rails_generators/nifty_scaffold/templates/action_tests/destroy.rb
-- rails_generators/nifty_scaffold/templates/action_tests/edit.rb
-- rails_generators/nifty_scaffold/templates/action_tests/index.rb
-- rails_generators/nifty_scaffold/templates/action_tests/new.rb
-- rails_generators/nifty_scaffold/templates/action_tests/show.rb
-- rails_generators/nifty_scaffold/templates/action_tests/update.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
@@ -63,19 +51,38 @@ 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/controller_spec.rb
-- rails_generators/nifty_scaffold/templates/controller_test.rb
 - rails_generators/nifty_scaffold/templates/fixtures.yml
 - 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/model_spec.rb
-- rails_generators/nifty_scaffold/templates/model_test.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/templates/tests/rspec/actions/create.rb
+- rails_generators/nifty_scaffold/templates/tests/rspec/actions/destroy.rb
+- rails_generators/nifty_scaffold/templates/tests/rspec/actions/edit.rb
+- rails_generators/nifty_scaffold/templates/tests/rspec/actions/index.rb
+- rails_generators/nifty_scaffold/templates/tests/rspec/actions/new.rb
+- rails_generators/nifty_scaffold/templates/tests/rspec/actions/show.rb
+- rails_generators/nifty_scaffold/templates/tests/rspec/actions/update.rb
+- rails_generators/nifty_scaffold/templates/tests/rspec/controller.rb
+- rails_generators/nifty_scaffold/templates/tests/rspec/model.rb
+- rails_generators/nifty_scaffold/templates/tests/testunit/actions/create.rb
+- rails_generators/nifty_scaffold/templates/tests/testunit/actions/destroy.rb
+- rails_generators/nifty_scaffold/templates/tests/testunit/actions/edit.rb
+- rails_generators/nifty_scaffold/templates/tests/testunit/actions/index.rb
+- rails_generators/nifty_scaffold/templates/tests/testunit/actions/new.rb
+- rails_generators/nifty_scaffold/templates/tests/testunit/actions/show.rb
+- rails_generators/nifty_scaffold/templates/tests/testunit/actions/update.rb
+- rails_generators/nifty_scaffold/templates/tests/testunit/controller.rb
+- rails_generators/nifty_scaffold/templates/tests/testunit/model.rb
+- rails_generators/nifty_scaffold/templates/views/erb/_form.html.erb
+- rails_generators/nifty_scaffold/templates/views/erb/edit.html.erb
+- rails_generators/nifty_scaffold/templates/views/erb/index.html.erb
+- rails_generators/nifty_scaffold/templates/views/erb/new.html.erb
+- rails_generators/nifty_scaffold/templates/views/erb/show.html.erb
+- rails_generators/nifty_scaffold/templates/views/haml/_form.html.haml
+- rails_generators/nifty_scaffold/templates/views/haml/edit.html.haml
+- rails_generators/nifty_scaffold/templates/views/haml/index.html.haml
+- rails_generators/nifty_scaffold/templates/views/haml/new.html.haml
+- rails_generators/nifty_scaffold/templates/views/haml/show.html.haml
 - rails_generators/nifty_scaffold/USAGE
 - README
 - tasks/deployment.rake