authorized_rails_scaffolds 0.0.14 → 0.0.15

data/lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/helper.rb

@@ -0,0 +1,25 @@
+<% module_namespacing do -%>
+<%-
+
+t_helper = AuthorizedRailsScaffolds::RailsHelperHelper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name
+)
+
+resource_name = t_helper.resource_name
+
+-%>
+module <%= class_name %>Helper
+
+  # Returns the form arguments required to create or update the <%= resource_name %>
+  def <%= resource_name %>_form_values(<%= resource_name %>)
+    <%- if t_helper.shallow_routes? -%>
+    <%= resource_name %>.persisted? ? <%= t_helper.scoped_values_for_form resource_name, true %> : <%= t_helper.scoped_values_for_form resource_name, false %>
+    <%- else -%>
+    <%= t_helper.scoped_values_for_form resource_name %>
+    <%- end -%>
+  end
+
+end
+<% end -%>

data/lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/index.html.erb

@@ -7,7 +7,7 @@ t_helper = AuthorizedRailsScaffolds::RailsErbScaffoldHelper.new(
 )
 
 resource_class = t_helper.resource_class
-resource_table_name = t_helper.resource_table_name # Non-namespaced variable name
+resource_name = t_helper.resource_name # Non-namespaced variable name
 
 -%>
 <%%- model_class = <%= resource_class %> -%>
@@ -17,7 +17,7 @@ resource_table_name = t_helper.resource_table_name # Non-namespaced variable nam
 <table class="table table-striped">
   <thead>
     <tr>
-      <th>&nbsp;</th>
+      <th class="id-column">&nbsp;</th>
   <%- attributes.each do |attribute| -%>
     <%- if attribute.type == :references -%>
       <%% unless @<%= attribute.name %> %>
@@ -32,36 +32,36 @@ resource_table_name = t_helper.resource_table_name # Non-namespaced variable nam
     </tr>
   </thead>
   <tbody>
-    <%% <%= t_helper.resources_var %>.each do |<%= resource_table_name %>| %>
-      <tr class="<%= resource_table_name %>_<%%= <%= resource_table_name %>.id %>">
-        <td class="id-column"><%%= <%= resource_table_name %>.id %></td>
+    <%% <%= t_helper.resource_array_var %>.each do |<%= resource_name %>| %>
+      <tr class="<%= resource_name %>_<%%= <%= resource_name %>.id %>">
+        <td class="id-column"><%%= <%= resource_name %>.id %></td>
   <%- if attributes.any? -%>
-        <td class="title-column"><%%= link_to <%= resource_table_name %>.<%= attributes[0].name %>, <%= t_helper.controller_show_route(resource_table_name) %> %></td>
+        <td class="title-column"><%%= link_to <%= resource_name %>.<%= attributes[0].name %>, <%= t_helper.controller_show_route(resource_name) %> %></td>
     <%- attributes[1..-1].each do |attribute| -%>
       <%- if attribute.type == :references -%>
         <%% unless @<%= attribute.name %> %>
-          <td><%%= <%= resource_table_name %>.<%= attribute.name %> %></td>
+          <td><%%= <%= resource_name %>.<%= attribute.name %> %></td>
         <%% end %>
       <%- elsif [:datetime, :timestamp, :time, :date].include? attribute.type -%>
-        <td><%% unless <%= resource_table_name %>.<%= attribute.name %>.nil? %><%%=l <%= resource_table_name %>.<%= attribute.name %><% if attribute.type == :datetime %>, :format => :long<% end %><% if attribute.type == :time %>, :format => :short<% end %> %><%% end %></td>
+        <td><%% unless <%= resource_name %>.<%= attribute.name %>.nil? %><%%=l <%= resource_name %>.<%= attribute.name %><% if attribute.type == :datetime %>, :format => :long<% end %><% if attribute.type == :time %>, :format => :short<% end %> %><%% end %></td>
       <%- else -%>
-        <td><%%= <%= resource_table_name %>.<%= attribute.name %> %></td>
+        <td><%%= <%= resource_name %>.<%= attribute.name %> %></td>
       <%- end -%>
     <%- end -%>
   <%- end -%>
-        <td><%%=l <%= resource_table_name %>.created_at, :format => :long %></td>
+        <td><%%=l <%= resource_name %>.created_at, :format => :long %></td>
         <td class="table-actions">
           <%%= link_to t('.edit', :default => t("helpers.links.edit")),
-                      edit_<%= t_helper.controller_show_route resource_table_name %>,
+                      <%= t_helper.controller_edit_route resource_name %>,
                       :class => 'btn btn-mini',
-                      :disabled => !can?(:update, <%= resource_table_name %>)
+                      :disabled => !can?(:update, <%= resource_name %>)
           %>
           <%%= link_to t('.destroy', :default => t("helpers.links.destroy")),
-                      <%= t_helper.controller_show_route resource_table_name %>,
+                      <%= t_helper.controller_show_route resource_name %>,
                       :method => :delete,
                       :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) },
                       :class => 'btn btn-mini btn-danger',
-                      :disabled => !can?(:destroy, <%= resource_table_name %>)
+                      :disabled => !can?(:destroy, <%= resource_name %>)
           %>
         </td>
       </tr>
@@ -71,6 +71,6 @@ resource_table_name = t_helper.resource_table_name # Non-namespaced variable nam
 
 <%% if can?(:create, <%= resource_class %>) %>
   <%%= link_to t('.new', :default => t("helpers.links.new")),
-            new_<%= t_helper.controller_show_route %>,
+            <%= t_helper.controller_new_route %>,
             :class => 'btn btn-primary' %>
 <%% end %>

data/lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/show.html.erb

@@ -46,7 +46,7 @@ resource_var = t_helper.resource_var
               <%= t_helper.controller_index_path %>, :class => 'btn'  %>
   <%% if can? :update, <%= resource_var %> %>
     <%%= link_to t('.edit', :default => t("helpers.links.edit")),
-              edit_<%= t_helper.controller_show_route resource_var %>,
+              <%= t_helper.controller_edit_route resource_var %>,
               :class => 'btn'
     %>
   <%% end %>

data/lib/generators/authorized_rails_scaffolds/install_templates/templates/spec/controller_spec.rb

@@ -28,6 +28,7 @@ require 'spec_helper'
 #   controller_class_name
 #   singular_table_name
 #   file_name
+#   human_name
 #   attributes
 #
 
@@ -36,16 +37,18 @@ t_helper = AuthorizedRailsScaffolds::RSpecScaffoldControllerHelper.new(
   :controller_class_name => controller_class_name,
   :singular_table_name => singular_table_name,
   :file_name => file_name,
+  :human_name => human_name,
   :attributes => attributes
 )
 
 resource_class = t_helper.resource_class
+resource_human_name = t_helper.resource_human_name
 resource_var = t_helper.resource_var
 resource_symbol = t_helper.resource_symbol
 resource_test_var = t_helper.resource_test_var
-resource_table_name = t_helper.resource_table_name
+resource_name = t_helper.resource_name
 
-parent_model_tables = t_helper.parent_model_tables
+parent_model_names = t_helper.parent_model_names
 
 -%>
 describe <%= t_helper.controller_class_name %> do
@@ -62,24 +65,24 @@ describe <%= t_helper.controller_class_name %> do
     FactoryGirl.attributes_for(<%= resource_symbol %>)
   end
 
-<%- if parent_model_tables.any? -%>
-<%- parent_model_tables.each do |parent_model| -%>
+<%- if parent_model_names.any? -%>
+<%- parent_model_names.each do |parent_model| -%>
   let(<%= t_helper.references_test_sym(parent_model) %>) { <%= t_helper.create_parent_resource_from_factory parent_model %> }
 <%- end -%>
 
 <%- end -%>
 <% unless options[:singleton] -%>
   describe "GET index" do
-    context <% if parent_model_tables.any? %>"within <%= parent_model_tables.join('/') %> nesting"<% end %> do<%- unless parent_model_tables.any? -%> # Within default nesting<% end %>
+    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
       <%- t_helper.parent_models.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
 
       context 'without a user session' do
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            get :index, {<%= t_helper.build_example_request_params %>}
+            get :index, {<%= t_helper.build_example_index_params %>}
           end
           it { should redirect_to(new_user_session_path) }
           it { should set_the_flash[:alert].to("You need to sign in or sign up before continuing.") }
@@ -88,10 +91,10 @@ describe <%= t_helper.controller_class_name %> do
       context 'as an unauthorized user' do
         login_unauthorized_user
 
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            get :index, {<%= t_helper.build_example_request_params %>}
+            get :index, {<%= t_helper.build_example_index_params %>}
           end
           it { should redirect_to(root_url) }
           it { should set_the_flash[:alert].to("You are not authorized to access this page.") }
@@ -100,16 +103,16 @@ describe <%= t_helper.controller_class_name %> do
       context 'as user with read ability' do
         login_user_with_ability :read, <%= resource_class %>
 
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            get :index, {<%= t_helper.build_example_request_params %>}
+            get :index, {<%= t_helper.build_example_index_params %>}
           end
           it { should respond_with(:success) }
           it { should render_template(:index) }
           it { should render_with_layout(:application) }
-          it "assigns all <%= t_helper.resource_plural_name %> as <%= t_helper.resources_var %>" do
-            assigns(:<%= t_helper.resource_plural_name %>).should eq([<%= resource_test_var %>])
+          it "assigns all <%= t_helper.resource_array_name %> as <%= t_helper.resource_array_var %>" do
+            assigns(<%= t_helper.resource_array_sym %>).should eq([<%= resource_test_var %>])
           end
         end
       end
@@ -118,16 +121,16 @@ describe <%= t_helper.controller_class_name %> do
 
 <% end -%>
   describe "GET show" do
-    context <% if parent_model_tables.any? %>"within <%= parent_model_tables.join('/') %> nesting"<% end %> do<%- unless parent_model_tables.any? -%> # Within default nesting<% end %>
-      <%- parent_model_tables.each do |parent_model| -%>
+    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+      <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
 
       context 'without a user session' do
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            get :show, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param" %>}
+            get :show, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param" %>}
           end
           it { should redirect_to(new_user_session_path) }
           it { should set_the_flash[:alert].to("You need to sign in or sign up before continuing.") }
@@ -136,10 +139,10 @@ describe <%= t_helper.controller_class_name %> do
       context 'as an unauthorized user' do
         login_unauthorized_user
 
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            get :show, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param" %>}
+            get :show, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param" %>}
           end
           it { should redirect_to(<%= t_helper.controller_index_route %>) }
           it { should set_the_flash[:alert].to("You are not authorized to access this page.") }
@@ -148,15 +151,15 @@ describe <%= t_helper.controller_class_name %> do
       context 'as user with read ability' do
         login_user_with_ability :read, <%= resource_class %>
 
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            get :show, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param" %>}
+            get :show, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param" %>}
           end
           it { should respond_with(:success) }
           it { should render_template(:show) }
           it { should render_with_layout(:application) }
-          it "assigns the requested <%= resource_table_name %> as <%= resource_var %>" do
+          it "assigns the requested <%= resource_name %> as <%= resource_var %>" do
             assigns(<%= resource_symbol %>).should eq(<%= resource_test_var %>)
           end
         end
@@ -165,15 +168,15 @@ describe <%= t_helper.controller_class_name %> do
   end
 
   describe "GET new" do
-    context <% if parent_model_tables.any? %>"within <%= parent_model_tables.join('/') %> nesting"<% end %> do<%- unless parent_model_tables.any? -%> # Within default nesting<% end %>
-      <%- parent_model_tables.each do |parent_model| -%>
+    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+      <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
 
       context 'without a user session' do
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
-            get :new, {<%= t_helper.build_example_request_params %>}
+            get :new, {<%= t_helper.build_example_index_params %>}
           end
           it { should redirect_to(new_user_session_path) }
           it { should set_the_flash[:alert].to("You need to sign in or sign up before continuing.") }
@@ -182,9 +185,9 @@ describe <%= t_helper.controller_class_name %> do
       context 'as an unauthorized user' do
         login_unauthorized_user
 
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
-            get :new, {<%= t_helper.build_example_request_params %>}
+            get :new, {<%= t_helper.build_example_index_params %>}
           end
           it { should redirect_to(<%= t_helper.controller_index_route %>) }
           it { should set_the_flash[:alert].to("You are not authorized to access this page.") }
@@ -193,14 +196,14 @@ describe <%= t_helper.controller_class_name %> do
       context 'as user with create ability' do
         login_user_with_ability :create, <%= resource_class %>
 
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
-            get :new, {<%= t_helper.build_example_request_params %>}
+            get :new, {<%= t_helper.build_example_index_params %>}
           end
           it { should respond_with(:success) }
           it { should render_template(:new) }
           it { should render_with_layout(:application) }
-          it "assigns a new <%= resource_table_name %> as <%= resource_var %>" do
+          it "assigns a new <%= resource_name %> as <%= resource_var %>" do
             assigns(<%= resource_symbol %>).should be_a_new(<%= resource_class %>)
           end
         end
@@ -209,16 +212,16 @@ describe <%= t_helper.controller_class_name %> do
   end
 
   describe "GET edit" do
-    context <% if parent_model_tables.any? %>"within <%= parent_model_tables.join('/') %> nesting"<% end %> do<%- unless parent_model_tables.any? -%> # Within default nesting<% end %>
-      <%- parent_model_tables.each do |parent_model| -%>
+    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+      <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
 
       context 'without a user session' do
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            get :edit, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param" %>}
+            get :edit, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param" %>}
           end
           it { should redirect_to(new_user_session_path) }
           it { should set_the_flash[:alert].to("You need to sign in or sign up before continuing.") }
@@ -227,10 +230,10 @@ describe <%= t_helper.controller_class_name %> do
       context 'as an unauthorized user' do
         login_unauthorized_user
 
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            get :edit, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param" %>}
+            get :edit, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param" %>}
           end
           it { should redirect_to(<%= t_helper.controller_index_route %>) }
           it { should set_the_flash[:alert].to("You are not authorized to access this page.") }
@@ -239,15 +242,15 @@ describe <%= t_helper.controller_class_name %> do
       context 'as user with update ability' do
         login_user_with_ability :update, <%= resource_class %>
 
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            get :edit, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param" %>}
+            get :edit, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param" %>}
           end
           it { should respond_with(:success) }
           it { should render_template(:edit) }
           it { should render_with_layout(:application) }
-          it "assigns the requested <%= resource_table_name %> as <%= resource_var %>" do
+          it "assigns the requested <%= resource_name %> as <%= resource_var %>" do
             assigns(<%= resource_symbol %>).should eq(<%= resource_test_var %>)
           end
         end
@@ -256,15 +259,15 @@ describe <%= t_helper.controller_class_name %> do
   end
 
   describe "POST create" do
-    context <% if parent_model_tables.any? %>"within <%= parent_model_tables.join('/') %> nesting"<% end %> do<%- unless parent_model_tables.any? -%> # Within default nesting<% end %>
-      <%- parent_model_tables.each do |parent_model| -%>
+    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+      <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
 
       context 'without a user session' do
-        describe 'with valid params' do
+        describe 'with a valid request' do
           before(:each) do
-            post :create, {<%= t_helper.build_example_request_params "#{resource_symbol} => valid_update_attributes" %>}
+            post :create, {<%= t_helper.build_example_index_params "#{resource_symbol} => valid_create_attributes" %>}
           end
           it { should redirect_to(new_user_session_path) }
           it { should set_the_flash[:alert].to("You need to sign in or sign up before continuing.") }
@@ -273,9 +276,9 @@ describe <%= t_helper.controller_class_name %> do
       context 'as an unauthorized user' do
         login_unauthorized_user
 
-        describe "with valid params" do
+        describe "with a valid request" do
           before(:each) do
-            post :create, {<%= t_helper.build_example_request_params "#{resource_symbol} => valid_update_attributes" %>}
+            post :create, {<%= t_helper.build_example_index_params "#{resource_symbol} => valid_create_attributes" %>}
           end
           it { should redirect_to(<%= t_helper.controller_index_route %>) }
           it { should set_the_flash[:alert].to("You are not authorized to access this page.") }
@@ -287,36 +290,37 @@ describe <%= t_helper.controller_class_name %> do
         describe "with valid params" do
           it "creates a new <%= resource_class %>" do
             expect {
-              post :create, {<%= t_helper.build_example_request_params "#{resource_symbol} => valid_update_attributes" %>}
+              post :create, {<%= t_helper.build_example_index_params "#{resource_symbol} => valid_create_attributes" %>}
             }.to change(<%= resource_class %>, :count).by(1)
           end
         end
-        describe 'with valid params' do
+        describe 'with a valid request' do
           before(:each) do
-            post :create, {<%= t_helper.build_example_request_params "#{resource_symbol} => valid_update_attributes" %>}
+            post :create, {<%= t_helper.build_example_index_params "#{resource_symbol} => valid_create_attributes" %>}
           end
-          it "assigns a newly created <%= resource_table_name %> as <%= resource_var %>" do
+          it "assigns a newly created <%= resource_name %> as <%= resource_var %>" do
             assigns(<%= resource_symbol %>).should be_a(<%= resource_class %>)
             assigns(<%= resource_symbol %>).should be_persisted
           end
-<% if parent_model_tables.any? -%>
-          it "assigns the parent <%= t_helper.parent_models[-1] %> to <%= resource_table_name %>" do
-            assigns(<%= resource_symbol %>).<%= parent_model_tables[-1] %>.should eq(<%= t_helper.references_test_property(parent_model_tables[-1]) %>)
+<% if parent_model_names.any? -%>
+          it "assigns the parent <%= t_helper.parent_models[-1] %> to <%= resource_name %>" do
+            assigns(<%= resource_symbol %>).<%= parent_model_names[-1] %>.should eq(<%= t_helper.references_test_name(parent_model_names[-1]) %>)
           end
 <% end -%>
-          it "redirects to the created <%= resource_table_name %>" do
+          it { should set_the_flash[:notice].to('<%= resource_human_name %> was successfully created.') }
+          it "redirects to the created <%= resource_name %>" do
             response.should redirect_to(<%= t_helper.controller_show_route "#{resource_class}.last" %>)
           end
         end
-        describe "with invalid params" do
+        describe "with an invalid request" do
           before(:each) do
             # Trigger the behavior that occurs when invalid params are submitted
             <%= resource_class %>.any_instance.stub(:save).and_return(false)
-            post :create, {<%= t_helper.build_example_request_params "#{resource_symbol} => #{formatted_hash(example_invalid_attributes)}" %>}
+            post :create, {<%= t_helper.build_example_index_params "#{resource_symbol} => #{formatted_hash(example_invalid_attributes)}" %>}
           end
           it { should render_template(:new) }
           it { should render_with_layout(:application) }
-          it "assigns a newly created but unsaved <%= resource_table_name %> as <%= resource_var %>" do
+          it "assigns a newly created but unsaved <%= resource_name %> as <%= resource_var %>" do
             assigns(<%= resource_symbol %>).should be_a_new(<%= resource_class %>)
           end
         end
@@ -325,16 +329,16 @@ describe <%= t_helper.controller_class_name %> do
   end
 
   describe "PUT update" do
-    context <% if parent_model_tables.any? %>"within <%= parent_model_tables.join('/') %> nesting"<% end %> do<%- unless parent_model_tables.any? -%> # Within default nesting<% end %>
-      <%- parent_model_tables.each do |parent_model| -%>
+    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+      <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
 
       context 'without a user session' do
-        describe 'with valid params' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            put :update, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param", "#{resource_symbol} => valid_update_attributes" %>}
+            put :update, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param", "#{resource_symbol} => valid_update_attributes" %>}
           end
           it { should redirect_to(new_user_session_path) }
           it { should set_the_flash[:alert].to("You need to sign in or sign up before continuing.") }
@@ -343,10 +347,10 @@ describe <%= t_helper.controller_class_name %> do
       context 'as an unauthorized user' do
         login_unauthorized_user
 
-        describe "with valid params" do
+        describe "with a valid request" do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            put :update, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param", "#{resource_symbol} => valid_update_attributes" %>}
+            put :update, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param", "#{resource_symbol} => valid_update_attributes" %>}
           end
           it { should redirect_to(<%= t_helper.controller_index_route %>) }
           it { should set_the_flash[:alert].to("You are not authorized to access this page.") }
@@ -356,9 +360,9 @@ describe <%= t_helper.controller_class_name %> do
         login_user_with_ability :update, <%= resource_class %>
 
         describe "with valid params" do
-          it "updates the requested <%= resource_table_name %>" do
+          it "updates the requested <%= resource_name %>" do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            # Assuming there are no other <%= resource_table_name %> in the database, this
+            # Assuming there are no other <%= resource_name %> in the database, this
             # specifies that the <%= resource_class %> created on the previous line
             # receives the :update_attributes message with whatever params are
             # submitted in the request.
@@ -367,31 +371,32 @@ describe <%= t_helper.controller_class_name %> do
             <%- else -%>
             <%= resource_class %>.any_instance.should_receive(:update_attributes).with(<%= formatted_hash(example_params_for_update) %>)
             <%- end -%>
-            put :update, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param", "#{resource_symbol} => #{formatted_hash(example_params_for_update)}" %>}
+            put :update, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param", "#{resource_symbol} => #{formatted_hash(example_params_for_update)}" %>}
           end
         end
-        describe "with valid params" do
+        describe "with a valid request" do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            put :update, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param", "#{resource_symbol} => valid_update_attributes" %>}
+            put :update, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param", "#{resource_symbol} => valid_update_attributes" %>}
           end
-          it "assigns the requested <%= resource_table_name %> as <%= resource_var %>" do
+          it "assigns the requested <%= resource_name %> as <%= resource_var %>" do
             assigns(<%= resource_symbol %>).should eq(<%= resource_test_var %>)
           end
-          it "redirects to the <%= resource_table_name %>" do
+          it { should set_the_flash[:notice].to('<%= resource_human_name %> was successfully updated.') }
+          it "redirects to the <%= resource_name %>" do
             response.should redirect_to(<%= t_helper.controller_show_route resource_test_var %>)
           end
         end
-        describe "with invalid params" do
+        describe "with an invalid request" do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
             # Trigger the behavior that occurs when invalid params are submitted
             <%= resource_class %>.any_instance.stub(:save).and_return(false)
-            put :update, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param", "#{resource_symbol} => #{formatted_hash(example_invalid_attributes)}" %>}
+            put :update, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param", "#{resource_symbol} => #{formatted_hash(example_invalid_attributes)}" %>}
           end
           it { should render_template(:edit) }
           it { should render_with_layout(:application) }
-          it "assigns the <%= resource_table_name %> as <%= resource_var %>" do
+          it "assigns the <%= resource_name %> as <%= resource_var %>" do
             assigns(<%= resource_symbol %>).should eq(<%= resource_test_var %>)
           end
         end
@@ -400,16 +405,16 @@ describe <%= t_helper.controller_class_name %> do
   end
 
   describe "DELETE destroy" do
-    context <% if parent_model_tables.any? %>"within <%= parent_model_tables.join('/') %> nesting"<% end %> do<%- unless parent_model_tables.any? -%> # Within default nesting<% end %>
-      <%- parent_model_tables.each do |parent_model| -%>
+    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+      <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
 
       context 'without a user session' do
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            delete :destroy, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param" %>}
+            delete :destroy, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param" %>}
           end
           it { should redirect_to(new_user_session_path) }
           it { should set_the_flash[:alert].to("You need to sign in or sign up before continuing.") }
@@ -418,10 +423,10 @@ describe <%= t_helper.controller_class_name %> do
       context 'as an unauthorized user' do
         login_unauthorized_user
 
-        describe "with valid request" do
+        describe "with a valid request" do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            delete :destroy, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param" %>}
+            delete :destroy, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param" %>}
           end
           it { should redirect_to(<%= t_helper.controller_index_route %>) }
           it { should set_the_flash[:alert].to("You are not authorized to access this page.") }
@@ -430,18 +435,19 @@ describe <%= t_helper.controller_class_name %> do
       context 'as user with destroy ability' do
         login_user_with_ability :destroy, <%= resource_class %>
 
-        it "destroys the requested <%= resource_table_name %>" do
+        it "destroys the requested <%= resource_name %>" do
           <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
           expect {
-            delete :destroy, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param" %>}
+            delete :destroy, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param" %>}
           }.to change(<%= resource_class %>, :count).by(-1)
         end
-        describe 'with valid request' do
+        describe 'with a valid request' do
           before(:each) do
             <%= resource_test_var %> = <%= t_helper.create_resource_from_factory %>
-            delete :destroy, {<%= t_helper.build_example_request_params ":id => #{resource_test_var}.to_param" %>}
+            delete :destroy, {<%= t_helper.build_example_show_params ":id => #{resource_test_var}.to_param" %>}
           end
-          it "redirects to the <%= resource_table_name %> list" do
+          it { should set_the_flash[:notice].to('<%= resource_human_name %> was successfully deleted.') }
+          it "redirects to the <%= resource_name %> list" do
             response.should redirect_to(<%= t_helper.controller_index_route %>)
           end
         end