nifty-generators 0.4.3 → 0.4.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.4.4 (January 17, 2011)
+
+* adding namespaces to nifty:scaffold (thanks DouglasMeyer) - issue #63
+
+* adding .rvmrc file
+
+
 0.4.3 (December 28, 2010)
 
 * display usage documentation when given an invalid model name with nifty:scaffold - issue #76

data/Gemfile.lock

@@ -7,40 +7,39 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.1)
-      actionpack (= 3.0.1)
-      mail (~> 2.2.5)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    bcrypt-ruby (2.1.2)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.7)
+    bcrypt-ruby (2.1.4)
     builder (2.1.2)
-    cucumber (0.9.2)
+    cucumber (0.9.4)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.5)
+      gherkin (~> 2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     diff-lcs (1.1.2)
@@ -49,53 +48,56 @@ GEM
     gherkin (2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
-    i18n (0.4.1)
+    i18n (0.5.0)
     json (1.4.6)
-    mail (2.2.7)
+    mail (2.2.14)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
-    mocha (0.9.8)
+    mocha (0.9.10)
       rake
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.1)
-      actionmailer (= 3.0.1)
-      actionpack (= 3.0.1)
-      activerecord (= 3.0.1)
-      activeresource (= 3.0.1)
-      activesupport (= 3.0.1)
-      bundler (~> 1.0.0)
-      railties (= 3.0.1)
-    railties (3.0.1)
-      actionpack (= 3.0.1)
-      activesupport (= 3.0.1)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
     rspec-rails (2.0.1)
       rspec (~> 2.0.0)
-    sqlite3-ruby (1.3.1)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.5)
-    thor (0.14.3)
-    treetop (1.4.8)
+    thor (0.14.6)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby

data/README.rdoc

@@ -100,3 +100,10 @@ Also, make sure you're using Rails 2.1 or greater.
 If you are having a problem with Nifty Generators, first look at the FAQs above. If you still cannot resolve it, please submit an issue here.
 
 http://github.com/ryanb/nifty-generators/issues
+
+
+== Development
+
+If you want to contribute to this project, you can download the Git repository and get the Cucumber features running by calling +bundle+ then +rake+. I normally develop this using Ruby 1.9.2 however it should work with 1.8.7 as well.
+
+The Rails 3 generators are located under <tt>lib/generators</tt> and are tested with Cucumber. The older Rails 2 generators are under <tt>rails_generators</tt> and are tested with Shoulda under the <tt>test</tt> directory.

data/features/nifty_scaffold.feature

@@ -42,3 +42,33 @@ Feature: Nifty Scaffold Generator
   Scenario: Report error when invalid model name
     Given a new Rails app
     Then I should see "Usage:" when running "rails g nifty:scaffold name:string parent_id:integer"
+
+  Scenario: Generate scaffold for namespaced resource
+    Given a new Rails app
+    When I run "rails g nifty:scaffold Admin::User name:string"
+    Then I should see the following files
+      | app/models/user.rb                        |
+      | app/controllers/admin/users_controller.rb |
+      | app/helpers/admin/users_helper.rb         |
+      | app/views/admin/users/index.html.erb      |
+      | app/views/admin/users/show.html.erb       |
+      | app/views/admin/users/new.html.erb        |
+      | app/views/admin/users/edit.html.erb       |
+      | db/migrate                                |
+    And I should see "class User" in file "app/models/user.rb"
+    And I should not see "set_table_name :" in file "app/models/user.rb"
+    And I should see "namespace(:admin){ resources :users }" in file "config/routes.rb"
+    When I run "rails g nifty:layout -f"
+    And I run "rake db:migrate"
+    And I should successfully run "rails g nifty:scaffold Admin::User -f"
+    Then I should successfully run "rake test"
+
+  Scenario: Generate scaffold with a namespaced model
+    Given a new Rails app
+    When I run "rails g nifty:scaffold Admin::User name:string --namespace_model"
+    Then I should see "class Admin::User" in file "app/models/admin/user.rb"
+    And I should see "set_table_name :admin_users" in file "app/models/admin/user.rb"
+    When I run "rails g nifty:layout -f"
+    And I run "rake db:migrate"
+    And I should successfully run "rails g nifty:scaffold Admin::User -f --namespace_model"
+    Then I should successfully run "rake test"

data/features/step_definitions/common_steps.rb

@@ -25,6 +25,12 @@ Then /^I should see "(.*)" in file "([^\"]*)"$/ do |content, short_path|
   File.readlines(path).join.should include(content)
 end
 
+Then /^I should not see "(.*)" in file "([^\"]*)"$/ do |content, short_path|
+  path = File.join(@current_directory, short_path)
+  File.should exist(path)
+  File.readlines(path).join.should_not include(content)
+end
+
 Then /^I should see the following files$/ do |table|
   table.raw.flatten.each do |path|
     File.should exist(File.join(@current_directory, path))

data/lib/generators/nifty/scaffold/scaffold_generator.rb

@@ -6,9 +6,9 @@ module Nifty
   module Generators
     class ScaffoldGenerator < Base
       include Rails::Generators::Migration
-      no_tasks { attr_accessor :model_name, :model_attributes, :controller_actions }
+      no_tasks { attr_accessor :scaffold_name, :model_attributes, :controller_actions }
 
-      argument :model_name, :type => :string, :required => true, :banner => 'ModelName'
+      argument :scaffold_name, :type => :string, :required => true, :banner => 'ModelName'
       argument :args_for_c_m, :type => :array, :default => [], :banner => 'controller_actions and model:attributes'
 
       class_option :skip_model, :desc => 'Don\'t generate a model or migration file.', :type => :boolean
@@ -16,6 +16,7 @@ module Nifty
       class_option :skip_timestamps, :desc => 'Don\'t add timestamps to migration file.', :type => :boolean
       class_option :skip_controller, :desc => 'Don\'t generate controller, helper, or views.', :type => :boolean
       class_option :invert, :desc => 'Generate all controller actions except these mentioned.', :type => :boolean
+      class_option :namespace_model, :desc => 'If the resource is namespaced, include the model in the namespace.', :type => :boolean
       class_option :haml, :desc => 'Generate HAML views instead of ERB.', :type => :boolean
 
       class_option :testunit, :desc => 'Use test/unit for test files.', :group => 'Test framework', :type => :boolean
@@ -25,11 +26,12 @@ module Nifty
       def initialize(*args, &block)
         super
 
-        print_usage unless model_name =~ /^[a-zA-Z_]+$/
+        print_usage unless scaffold_name.underscore =~ /^[a-z][a-z0-9_\/]+$/
 
         @controller_actions = []
         @model_attributes = []
         @skip_model = options.skip_model?
+        @namespace_model = options.namespace_model?
         @invert_actions = options.invert?
 
         args_for_c_m.each do |arg|
@@ -69,20 +71,20 @@ module Nifty
 
       def create_model
         unless @skip_model
-          template 'model.rb', "app/models/#{singular_name}.rb"
+          template 'model.rb', "app/models/#{model_path}.rb"
           if test_framework == :rspec
-            template "tests/rspec/model.rb", "spec/models/#{singular_name}_spec.rb"
-            template 'fixtures.yml', "spec/fixtures/#{plural_name}.yml"
+            template "tests/rspec/model.rb", "spec/models/#{model_path}_spec.rb"
+            template 'fixtures.yml', "spec/fixtures/#{model_path.pluralize}.yml"
           else
-            template "tests/#{test_framework}/model.rb", "test/unit/#{singular_name}_test.rb"
-            template 'fixtures.yml', "test/fixtures/#{plural_name}.yml"
+            template "tests/#{test_framework}/model.rb", "test/unit/#{model_path}_test.rb"
+            template 'fixtures.yml', "test/fixtures/#{model_path.pluralize}.yml"
           end
         end
       end
 
       def create_migration
         unless @skip_model || options.skip_migration?
-          migration_template 'migration.rb', "db/migrate/create_#{plural_name}.rb"
+          migration_template 'migration.rb', "db/migrate/create_#{model_path.pluralize.gsub('/', '_')}.rb"
         end
       end
 
@@ -102,7 +104,11 @@ module Nifty
             template "views/#{view_language}/_form.html.#{view_language}", "app/views/#{plural_name}/_form.html.#{view_language}"
           end
 
-          route "resources #{plural_name.to_sym.inspect}"
+          namespaces = plural_name.split('/')
+          resource = namespaces.pop
+          route namespaces.reverse.inject("resources :#{resource}") { |acc, namespace|
+            "namespace(:#{namespace}){ #{acc} }"
+          }
 
           if test_framework == :rspec
             template "tests/#{test_framework}/controller.rb", "spec/controllers/#{plural_name}_controller_spec.rb"
@@ -131,21 +137,47 @@ module Nifty
       end
 
       def singular_name
-        model_name.underscore
+        scaffold_name.underscore
       end
 
       def plural_name
-        model_name.underscore.pluralize
+        scaffold_name.underscore.pluralize
+      end
+
+      def table_name
+        if scaffold_name.include?('::') && @namespace_model
+          plural_name.gsub('/', '_')
+        end
       end
 
       def class_name
-        model_name.camelize
+        if @namespace_model
+          scaffold_name.camelize
+        else
+          scaffold_name.split('::').last.camelize
+        end
+      end
+
+      def model_path
+        class_name.underscore
       end
 
       def plural_class_name
         plural_name.camelize
       end
 
+      def instance_name
+        if @namespace_model
+          singular_name.gsub('/','_')
+        else
+          singular_name.split('/').last
+        end
+      end
+
+      def instances_name
+        instance_name.pluralize
+      end
+
       def controller_methods(dir_name)
         controller_actions.map do |action|
           read_template("#{dir_name}/#{action}.rb")
@@ -164,35 +196,73 @@ module Nifty
         end
       end
 
-      def items_path(suffix = 'path')
+      def item_resource
+        scaffold_name.underscore.gsub('/','_')
+      end
+
+      def items_path
         if action? :index
-          "#{plural_name}_#{suffix}"
+          "#{item_resource.pluralize}_path"
+        else
+          "root_path"
+        end
+      end
+
+      def item_path(options = {})
+        if action? :show
+          name = options[:instance_variable] ? "@#{instance_name}" : instance_name
+          if %w(new edit).include? options[:action].to_s
+            "#{options[:action].to_s}_#{item_resource}_path(#{name})"
+          else
+            if scaffold_name.include?('::') && !@namespace_model
+              namespace = singular_name.split('/')[0..-2]
+              "[ :#{namespace.join(', :')}, #{name} ]"
+            else
+              name
+            end
+          end
         else
-          "root_#{suffix}"
+          items_path
         end
       end
 
-      def item_path(suffix = 'path')
+      def item_url
         if action? :show
-          "@#{singular_name}"
+          item_resource + '_url'
+        else
+          items_url
+        end
+      end
+
+      def items_url
+        if action? :index
+          item_resource.pluralize + '_url'
         else
-          items_path(suffix)
+          "root_url"
         end
       end
 
       def item_path_for_spec(suffix = 'path')
         if action? :show
-          "#{singular_name}_#{suffix}(assigns[:#{singular_name}])"
+          "#{item_resource}_#{suffix}(assigns[:#{instance_name}])"
         else
-          items_path(suffix)
+          if suffix == 'path'
+            items_path
+          else
+            items_url
+          end
         end
       end
 
       def item_path_for_test(suffix = 'path')
         if action? :show
-          "#{singular_name}_#{suffix}(assigns(:#{singular_name}))"
+          "#{item_resource}_#{suffix}(assigns(:#{instance_name}))"
         else
-          items_path(suffix)
+          if suffix == 'path'
+            items_path
+          else
+            items_url
+          end
         end
       end
 

data/lib/generators/nifty/scaffold/templates/actions/create.rb

@@ -1,8 +1,8 @@
   def create
-    @<%= singular_name %> = <%= class_name %>.new(params[:<%= singular_name %>])
-    if @<%= singular_name %>.save
-      flash[:notice] = "Successfully created <%= model_name.underscore.humanize.downcase %>."
-      redirect_to <%= item_path('url') %>
+    @<%= instance_name %> = <%= class_name %>.new(params[:<%= instance_name %>])
+    if @<%= instance_name %>.save
+      flash[:notice] = "Successfully created <%= class_name.underscore.humanize.downcase %>."
+      redirect_to <%= item_path :instance_variable => true %>
     else
       render :action => 'new'
     end

data/lib/generators/nifty/scaffold/templates/actions/destroy.rb

@@ -1,6 +1,6 @@
   def destroy
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
-    @<%= singular_name %>.destroy
-    flash[:notice] = "Successfully destroyed <%= model_name.underscore.humanize.downcase %>."
-    redirect_to <%= items_path('url') %>
+    @<%= instance_name %> = <%= class_name %>.find(params[:id])
+    @<%= instance_name %>.destroy
+    flash[:notice] = "Successfully destroyed <%= class_name.underscore.humanize.downcase %>."
+    redirect_to <%= items_url %>
   end

data/lib/generators/nifty/scaffold/templates/actions/edit.rb

@@ -1,3 +1,3 @@
   def edit
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
+    @<%= instance_name %> = <%= class_name %>.find(params[:id])
   end

data/lib/generators/nifty/scaffold/templates/actions/index.rb

@@ -1,3 +1,3 @@
   def index
-    @<%= plural_name %> = <%= class_name %>.all
+    @<%= instances_name %> = <%= class_name %>.all
   end

data/lib/generators/nifty/scaffold/templates/actions/new.rb

@@ -1,3 +1,3 @@
   def new
-    @<%= singular_name %> = <%= class_name %>.new
+    @<%= instance_name %> = <%= class_name %>.new
   end

data/lib/generators/nifty/scaffold/templates/actions/show.rb

@@ -1,3 +1,3 @@
   def show
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
+    @<%= instance_name %> = <%= class_name %>.find(params[:id])
   end

data/lib/generators/nifty/scaffold/templates/actions/update.rb

@@ -1,8 +1,8 @@
   def update
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
-    if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
-      flash[:notice] = "Successfully updated <%= model_name.underscore.humanize.downcase %>."
-      redirect_to <%= item_path('url') %>
+    @<%= instance_name %> = <%= class_name %>.find(params[:id])
+    if @<%= instance_name %>.update_attributes(params[:<%= instance_name %>])
+      flash[:notice] = "Successfully updated <%= class_name.underscore.humanize.downcase %>."
+      redirect_to <%= item_url %>
     else
       render :action => 'edit'
     end

data/lib/generators/nifty/scaffold/templates/migration.rb

@@ -1,6 +1,6 @@
-class Create<%= plural_class_name %> < ActiveRecord::Migration
+class Create<%= class_name.pluralize.delete('::') %> < ActiveRecord::Migration
   def self.up
-    create_table :<%= plural_name %> do |t|
+    create_table :<%= table_name || plural_name.split('/').last %> do |t|
     <%- for attribute in model_attributes -%>
       t.<%= attribute.type %> :<%= attribute.name %>
     <%- end -%>
@@ -11,6 +11,6 @@ class Create<%= plural_class_name %> < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :<%= plural_name %>
+    drop_table :<%= table_name || plural_name.split('/').last %>
   end
 end

data/lib/generators/nifty/scaffold/templates/model.rb

@@ -1,3 +1,4 @@
 class <%= class_name %> < ActiveRecord::Base
+  <%= "set_table_name :#{table_name}\n" if table_name -%>
   attr_accessible <%= model_attributes.map { |a| ":#{a.name}" }.join(", ") %>
 end

data/lib/generators/nifty/scaffold/templates/tests/rspec/actions/destroy.rb

@@ -1,6 +1,6 @@
   it "destroy action should destroy model and redirect to index action" do
-    <%= singular_name %> = <%= class_name %>.first
-    delete :destroy, :id => <%= singular_name %>
-    response.should redirect_to(<%= items_path('url') %>)
-    <%= class_name %>.exists?(<%= singular_name %>.id).should be_false
+    <%= instance_name %> = <%= class_name %>.first
+    delete :destroy, :id => <%= instance_name %>
+    response.should redirect_to(<%= items_url %>)
+    <%= class_name %>.exists?(<%= instance_name %>.id).should be_false
   end

data/lib/generators/nifty/scaffold/templates/tests/shoulda/actions/destroy.rb

@@ -1,8 +1,8 @@
   context "destroy action" do
     should "destroy model and redirect to index action" do
-      <%= singular_name %> = <%= class_name %>.first
-      delete :destroy, :id => <%= singular_name %>
-      assert_redirected_to <%= items_path('url') %>
-      assert !<%= class_name %>.exists?(<%= singular_name %>.id)
+      <%= instance_name %> = <%= class_name %>.first
+      delete :destroy, :id => <%= instance_name %>
+      assert_redirected_to <%= items_url %>
+      assert !<%= class_name %>.exists?(<%= instance_name %>.id)
     end
   end

data/lib/generators/nifty/scaffold/templates/tests/testunit/actions/destroy.rb

@@ -1,6 +1,6 @@
   def test_destroy
-    <%= singular_name %> = <%= class_name %>.first
-    delete :destroy, :id => <%= singular_name %>
-    assert_redirected_to <%= items_path('url') %>
-    assert !<%= class_name %>.exists?(<%= singular_name %>.id)
+    <%= instance_name %> = <%= class_name %>.first
+    delete :destroy, :id => <%= instance_name %>
+    assert_redirected_to <%= items_url %>
+    assert !<%= class_name %>.exists?(<%= instance_name %>.id)
   end

data/lib/generators/nifty/scaffold/templates/views/erb/_form.html.erb

@@ -1,4 +1,4 @@
-<%%= form_for @<%= singular_name %> do |f| %>
+<%%= form_for <%= item_path :instance_variable => true %> do |f| %>
   <%%= f.error_messages %>
 <%- for attribute in model_attributes -%>
   <p>

data/lib/generators/nifty/scaffold/templates/views/erb/edit.html.erb

@@ -5,10 +5,10 @@
 <%- if actions? :show, :index -%>
 <p>
 <%- if action? :show -%>
-  <%%= link_to "Show", @<%= singular_name %> %> |
+  <%%= link_to "Show", <%= item_path :instance_variable => true %> %> |
 <%- end -%>
 <%- if action? :index -%>
-  <%%= link_to "View All", <%= plural_name %>_path %>
+  <%%= link_to "View All", <%= items_path %> %>
 <%- end -%>
 </p>
 <%- end -%>

data/lib/generators/nifty/scaffold/templates/views/erb/index.html.erb

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

data/lib/generators/nifty/scaffold/templates/views/erb/new.html.erb

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

data/lib/generators/nifty/scaffold/templates/views/erb/show.html.erb

@@ -3,18 +3,18 @@
 <%- for attribute in model_attributes -%>
 <p>
   <strong><%= attribute.human_name.titleize %>:</strong>
-  <%%= @<%= singular_name %>.<%= attribute.name %> %>
+  <%%= @<%= instance_name %>.<%= attribute.name %> %>
 </p>
 <%- end -%>
 
 <p>
 <%- if action? :edit -%>
-  <%%= link_to "Edit", edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
+  <%%= link_to "Edit", <%= item_path :action => :edit, :instance_variable => true %> %> |
 <%- end -%>
 <%- if action? :destroy -%>
-  <%%= link_to "Destroy", @<%= singular_name %>, :confirm => 'Are you sure?', :method => :delete %> |
+  <%%= link_to "Destroy", <%= item_path :instance_variable => true %>, :confirm => 'Are you sure?', :method => :delete %> |
 <%- end -%>
 <%- if action? :index -%>
-  <%%= link_to "View All", <%= plural_name %>_path %>
+  <%%= link_to "View All", <%= items_path %> %>
 <%- end -%>
 </p>

data/lib/generators/nifty/scaffold/templates/views/haml/_form.html.haml

@@ -1,4 +1,4 @@
-= form_for @<%= singular_name %> do |f|
+= form_for <%= item_path %> do |f|
   = f.error_messages
   <%- for attribute in model_attributes -%>
   %p

data/lib/generators/nifty/scaffold/templates/views/haml/edit.html.haml

@@ -5,10 +5,10 @@
 <%- if actions? :show, :index -%>
 %p
   <%- if action? :show -%>
-  = link_to "Show", <%= singular_name %>_path(@<%= singular_name %>)
+  = link_to "Show", <%= item_path %>
   |
   <%- end -%>
   <%- if action? :index -%>
-  = link_to "View All", <%= plural_name %>_path
+  = link_to "View All", <%= items_path %>
   <%- end -%>
 <%- end -%>

data/lib/generators/nifty/scaffold/templates/views/haml/index.html.haml

@@ -5,21 +5,21 @@
     <%- for attribute in model_attributes -%>
     %th <%= attribute.human_name %>
     <%- end -%>
-  - for <%= singular_name %> in @<%= plural_name %>
+  - for <%= instance_name %> in @<%= instances_name %>
     %tr
       <%- for attribute in model_attributes -%>
-      %td= <%= singular_name %>.<%= attribute.name %>
+      %td= <%= instance_name %>.<%= attribute.name %>
       <%- end -%>
       <%- if action? :show -%>
-      %td= link_to 'Show', <%= singular_name %>
+      %td= link_to 'Show', <%= item_path %>
       <%- end -%>
       <%- if action? :edit -%>
-      %td= link_to 'Edit', edit_<%= singular_name %>_path(<%= singular_name %>)
+      %td= link_to 'Edit', <%= item_path :action => :edit %>
       <%- end -%>
       <%- if action? :destroy -%>
-      %td= link_to 'Destroy', <%= singular_name %>, :confirm => 'Are you sure?', :method => :delete
+      %td= link_to 'Destroy', <%= item_path %>, :confirm => 'Are you sure?', :method => :delete
       <%- end -%>
 
 <%- if actions? :new -%>
-%p= link_to "New <%= singular_name.titleize %>", new_<%= singular_name %>_path
+%p= link_to "New <%= singular_name.titleize %>", <%= item_path :action => :new %>
 <%- end -%>

data/lib/generators/nifty/scaffold/templates/views/haml/new.html.haml

@@ -3,5 +3,5 @@
 <%= render_form %>
 
 <%- if action? :index -%>
-%p= link_to "Back to List", <%= plural_name %>_path
+%p= link_to "Back to List", <%= items_path %>
 <%- end -%>

data/lib/generators/nifty/scaffold/templates/views/haml/show.html.haml

@@ -3,18 +3,18 @@
 <%- for attribute in model_attributes -%>
 %p
   %strong <%= attribute.human_name.titleize %>:
-  = @<%= singular_name %>.<%= attribute.name %>
+  = @<%= instance_name %>.<%= attribute.name %>
 <%- end -%>
 
 %p
   <%- if action? :edit -%>
-  = link_to "Edit", edit_<%= singular_name %>_path(@<%= singular_name %>)
+  = link_to "Edit", <%= item_path :action => :edit, :instance_variable => true %>
   |
   <%- end -%>
   <%- if action? :destroy -%>
-  = link_to "Destroy", @<%= singular_name %>, :confirm => 'Are you sure?', :method => :delete
+  = link_to "Destroy", <%= item_path :instance_variable => true %>, :confirm => 'Are you sure?', :method => :delete
   |
   <%- end -%>
   <%- if action? :index -%>
-  = link_to "View All", <%= plural_name %>_path
+  = link_to "View All", <%= items_path %>
   <%- end -%>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Ryan Bates
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 -08:00
+date: 2011-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency