authorized_rails_scaffolds 0.0.10 → 0.0.11

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

@@ -2,72 +2,77 @@ require 'spec_helper'
 
 <%-
 
-t_helper = AuthorizedRailsScaffolds::RSpecScaffoldGeneratorViewHelper.new(
+t_helper = AuthorizedRailsScaffolds::RSpecScaffoldViewHelper.new(
   :class_name => class_name,
   :singular_table_name => singular_table_name,
   :file_name => file_name,
   :attributes => attributes
 )
 
-local_class_name = t_helper.local_class_name # Non-Namespaced class name
-var_name = t_helper.var_name # Non-namespaced variable name
+resource_symbol = t_helper.resource_symbol
+resource_test_var = t_helper.resource_test_var
+resource_table_name = t_helper.resource_table_name
+resource_test_property = t_helper.resource_test_property
 
-controller_directory = t_helper.controller_directory
+resource_directory = t_helper.resource_directory
 parent_model_tables = t_helper.parent_model_tables
 
 output_attributes = t_helper.output_attributes
-standard_attributes = t_helper.standard_attributes
 datetime_attributes = t_helper.datetime_attributes
+references_attributes = t_helper.references_attributes
+standard_attributes = t_helper.standard_attributes
 
 -%>
-describe "<%= controller_directory %>/edit" do
+describe "<%= resource_directory %>/edit" do
 
 <% parent_model_tables.each_with_index do |parent_model, index| -%>
 <%- if index == 0 -%>
-  let(:<%= parent_model %>) { FactoryGirl.build_stubbed(:<%= parent_model %>) }
+  let(<%= t_helper.references_test_sym(parent_model) %>) { FactoryGirl.build_stubbed(:<%= parent_model %>) }
 <%- else -%>
-  let(:<%= parent_model %>) { FactoryGirl.build_stubbed(:<%= parent_model %>, :<%= parent_model_tables[index - 1] %> => <%= parent_model_tables[index - 1] %>) }
+  let(<%= t_helper.references_test_sym(parent_model) %>) { FactoryGirl.build_stubbed(:<%= parent_model %>, :<%= parent_model_tables[index - 1] %> => <%= parent_model_tables[index - 1] %>) }
 <%- end -%>
 <%- end -%>
-  let(:<%= var_name %>) do
-    FactoryGirl.build_stubbed(:<%= var_name %><%= output_attributes.empty? ? ')' : ',' %>
+<% references_attributes.each do |parent_attribute| -%>
+  <%- next if parent_model_tables.include? parent_attribute.name -%>
+  let(<%= t_helper.references_test_sym(parent_attribute.name) %>) { FactoryGirl.build_stubbed(:<%= parent_attribute.name %>) }
+<% end -%>
+  let(<%= t_helper.resource_test_sym %>) do
+    FactoryGirl.build_stubbed(<%= resource_symbol %><%= output_attributes.empty? ? ')' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-      :<%= attribute.name %> => <% if attribute.type == :references && parent_model_tables.include?(attribute.name) %><%= attribute.name %><% else %><%= t_helper.factory_attribute_value attribute.type, value_for(attribute) %><% end %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+      :<%= attribute.name %> => <% if attribute.type == :references %><%= t_helper.references_test_property(attribute.name) %><% else %><%= t_helper.factory_attribute_value attribute.type, value_for(attribute) %><% end %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <%= output_attributes.empty? ? "" : "    )\n" -%>
   end
 
-  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_tables.any? %> "within <%= parent_model_tables.join('/') %> nesting"<% end %> do<%- unless parent_model_tables.any? -%> # Within default nesting<% end %>
     before(:each) do
       # Add Properties for view scope
 <%- parent_model_tables.each do |parent_model| -%>
-      assign(:<%= parent_model %>, @<%= parent_model %> = <%= parent_model %>)
+      assign(<%= t_helper.parent_sym(parent_model) %>, <%= t_helper.references_test_property(parent_model) %>)
 <%- end -%>
-      assign(:<%= var_name %>, @<%= var_name %> = <%= var_name %>)
+      assign(<%= resource_symbol %>, <%= t_helper.resource_test_property %>)
     end
 
-    it "renders the edit <%= var_name %> form" do
+    it "renders the edit <%= resource_table_name %> form" do
       render
 
 <% if webrat? -%>
-      rendered.should have_selector("form", :action => <%= t_helper.controller_show_route "@#{var_name}" %>, :method => "post") do |form|
+      rendered.should have_selector("form", :action => <%= t_helper.controller_show_route resource_test_property %>, :method => "post") do |form|
 <% for attribute in standard_attributes -%>
-  <%- if attribute.type == :references -%>
-        form.should have_selector("select#<%= var_name %>_<%= attribute.name %>_id", :name => "<%= var_name %>[<%= attribute.name %>_id]")
-  <%- else -%>
-        form.should have_selector("<%= attribute.input_type -%>#<%= var_name %>_<%= attribute.name %>", :name => "<%= var_name %>[<%= attribute.name %>]")
-  <%- end -%>
+        form.should have_selector("<%= attribute.input_type -%>#<%= resource_table_name %>_<%= attribute.name %>", :name => "<%= resource_table_name %>[<%= attribute.name %>]")
+<% end -%>
+<% for attribute in references_attributes -%>
+        form.should have_selector("select#<%= resource_table_name %>_<%= attribute.name %>_id", :name => "<%= resource_table_name %>[<%= attribute.name %>_id]")
 <% end -%>
       end
 <% else -%>
       # Run the generator again with the --webrat flag if you want to use webrat matchers
-      assert_select "form[action=?][method=?]", <%= t_helper.controller_show_route "@#{var_name}" %>, "post" do
+      assert_select "form[action=?][method=?]", <%= t_helper.controller_show_route resource_test_property %>, "post" do
 <% for attribute in standard_attributes -%>
-  <%- if attribute.type == :references -%>
-        assert_select "select#<%= var_name %>_<%= attribute.name %>_id[name=?]", "<%= var_name %>[<%= attribute.name %>_id]"
-  <%- else -%>
-        assert_select "<%= attribute.input_type -%>#<%= var_name %>_<%= attribute.name %>[name=?]", "<%= var_name %>[<%= attribute.name %>]"
-  <%- end -%>
+        assert_select "<%= attribute.input_type -%>#<%= resource_table_name %>_<%= attribute.name %>[name=?]", "<%= resource_table_name %>[<%= attribute.name %>]"
+<% end -%>
+<% for attribute in references_attributes -%>
+        assert_select "select#<%= resource_table_name %>_<%= attribute.name %>_id[name=?]", "<%= resource_table_name %>[<%= attribute.name %>_id]"
 <% end -%>
       end
 <% end -%>
@@ -78,40 +83,40 @@ describe "<%= controller_directory %>/edit" do
       render
 
 <% if webrat? -%>
-      rendered.should have_selector("form", :action => <%= t_helper.controller_show_route "@#{var_name}" %>, :method => "post") do |form|
+      rendered.should have_selector("form", :action => <%= t_helper.controller_show_route resource_test_property %>, :method => "post") do |form|
 <% for attribute in datetime_attributes -%>
   <%- if [:date, :datetime].include? attribute.type -%>
-      form.should have_selector("select#<%= var_name %>_<%= attribute.name %>", :name => "<%= var_name %>[<%= attribute.name %>]")
-      form.should have_selector("select#<%= var_name %>_<%= attribute.name %>", :name => "<%= var_name %>[<%= attribute.name %>]")
-      form.should have_selector("select#<%= var_name %>_<%= attribute.name %>", :name => "<%= var_name %>[<%= attribute.name %>]")
+      form.should have_selector("select#<%= resource_table_name %>_<%= attribute.name %>", :name => "<%= resource_table_name %>[<%= attribute.name %>]")
+      form.should have_selector("select#<%= resource_table_name %>_<%= attribute.name %>", :name => "<%= resource_table_name %>[<%= attribute.name %>]")
+      form.should have_selector("select#<%= resource_table_name %>_<%= attribute.name %>", :name => "<%= resource_table_name %>[<%= attribute.name %>]")
   <%- end -%>
   <%- if [:time, :datetime].include? attribute.type -%>
-      form.should have_selector("select#<%= var_name %>_<%= attribute.name %>", :name => "<%= var_name %>[<%= attribute.name %>]")
-      form.should have_selector("select#<%= var_name %>_<%= attribute.name %>", :name => "<%= var_name %>[<%= attribute.name %>]")
+      form.should have_selector("select#<%= resource_table_name %>_<%= attribute.name %>", :name => "<%= resource_table_name %>[<%= attribute.name %>]")
+      form.should have_selector("select#<%= resource_table_name %>_<%= attribute.name %>", :name => "<%= resource_table_name %>[<%= attribute.name %>]")
   <%- end -%>
 <% end -%>
       end
 <% else -%>
       # Run the generator again with the --webrat flag if you want to use webrat matchers
-      assert_select "form[action=?][method=?]", <%= t_helper.controller_show_route "@#{var_name}" %>, "post" do
+      assert_select "form[action=?][method=?]", <%= t_helper.controller_show_route resource_test_property %>, "post" do
 <% for attribute in datetime_attributes -%>
         # <%= attribute.name %> values
   <%- if [:date, :datetime].include? attribute.type -%>
-        assert_select "select#<%= var_name %>_<%= attribute.name %>_1i[name=?]", "<%= var_name %>[<%= attribute.name %>(1i)]" do
+        assert_select "select#<%= resource_table_name %>_<%= attribute.name %>_1i[name=?]", "<%= resource_table_name %>[<%= attribute.name %>(1i)]" do
           assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_year_value attribute.default %>", :count => 1
         end
-        assert_select "select#<%= var_name %>_<%= attribute.name %>_2i[name=?]", "<%= var_name %>[<%= attribute.name %>(2i)]" do
+        assert_select "select#<%= resource_table_name %>_<%= attribute.name %>_2i[name=?]", "<%= resource_table_name %>[<%= attribute.name %>(2i)]" do
           assert_select "option[selected=selected][value=?]", "<%= t_helper.date_select_month_value attribute.default %>", :text => "<%= t_helper.date_select_month_text attribute.default %>", :count => 1
         end
-        assert_select "select#<%= var_name %>_<%= attribute.name %>_3i[name=?]", "<%= var_name %>[<%= attribute.name %>(3i)]" do
+        assert_select "select#<%= resource_table_name %>_<%= attribute.name %>_3i[name=?]", "<%= resource_table_name %>[<%= attribute.name %>(3i)]" do
           assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_day_value attribute.default %>", :count => 1
         end
   <%- end -%>
   <%- if [:time, :datetime].include? attribute.type -%>
-        assert_select "select#<%= var_name %>_<%= attribute.name %>_4i[name=?]", "<%= var_name %>[<%= attribute.name %>(4i)]" do
+        assert_select "select#<%= resource_table_name %>_<%= attribute.name %>_4i[name=?]", "<%= resource_table_name %>[<%= attribute.name %>(4i)]" do
           assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_hour_value attribute.default %>", :count => 1
         end
-        assert_select "select#<%= var_name %>_<%= attribute.name %>_5i[name=?]", "<%= var_name %>[<%= attribute.name %>(5i)]" do
+        assert_select "select#<%= resource_table_name %>_<%= attribute.name %>_5i[name=?]", "<%= resource_table_name %>[<%= attribute.name %>(5i)]" do
           assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_minute_value attribute.default %>", :count => 1
         end
   <%- end -%>

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

@@ -2,54 +2,58 @@ require 'spec_helper'
 
 <%-
 
-t_helper = AuthorizedRailsScaffolds::RSpecScaffoldGeneratorViewHelper.new(
+t_helper = AuthorizedRailsScaffolds::RSpecScaffoldViewHelper.new(
   :class_name => class_name,
   :singular_table_name => singular_table_name,
   :file_name => file_name,
   :attributes => attributes
 )
 
-controller_directory = t_helper.controller_directory
+resource_directory = t_helper.resource_directory
 parent_model_tables = t_helper.parent_model_tables
 
-local_class_name = t_helper.local_class_name # Non-Namespaced class name
-var_name = t_helper.var_name # Non-namespaced variable name
-plural_var_name = t_helper.plural_var_name # Pluralized non-namespaced variable name
+resource_class = t_helper.resource_class # Non-Namespaced class name
+resource_symbol = t_helper.resource_symbol
+resource_table_name = t_helper.resource_table_name
 
 output_attributes = t_helper.output_attributes
+datetime_attributes = t_helper.datetime_attributes
+references_attributes = t_helper.references_attributes
+standard_attributes = t_helper.standard_attributes
 
 -%>
-describe "<%= controller_directory %>/index" do
+describe "<%= resource_directory %>/index" do
 
 <% parent_model_tables.each_with_index do |parent_model, index| -%>
 <%- if index == 0 -%>
-  let(:<%= parent_model %>) { FactoryGirl.build_stubbed(:<%= parent_model %>) }
+  let(<%= t_helper.references_test_sym(parent_model) %>) { FactoryGirl.build_stubbed(:<%= parent_model %>) }
 <%- else -%>
-  let(:<%= parent_model %>) { FactoryGirl.build_stubbed(:<%= parent_model %>, :<%= parent_model_tables[index - 1] %> => <%= parent_model_tables[index - 1] %>) }
+  let(<%= t_helper.references_test_sym(parent_model) %>) { FactoryGirl.build_stubbed(:<%= parent_model %>, :<%= parent_model_tables[index - 1] %> => <%= parent_model_tables[index - 1] %>) }
 <%- end -%>
 <%- end -%>
+<% references_attributes.each do |parent_attribute| -%>
+  <%- next if parent_model_tables.include? parent_attribute.name -%>
+  let(<%= t_helper.references_test_sym(parent_attribute.name) %>) { FactoryGirl.build_stubbed(:<%= parent_attribute.name %>) }
+<% end -%>
 <% [1,2].each_with_index do |id, model_index| -%>
-  let(:<%= var_name %>_<%= id %>) do
-    FactoryGirl.build_stubbed(:<%= var_name %><%= output_attributes.empty? ? ')' : ',' %>
+  let(<%= t_helper.resource_test_sym(id) %>) do
+    FactoryGirl.build_stubbed(<%= resource_symbol %><%= output_attributes.empty? ? ')' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-      :<%= attribute.name %> => <% if attribute.type == :references && parent_model_tables.include?(attribute.name) %><%= attribute.name %><% else %><%= t_helper.factory_attribute_value attribute.type, value_for(attribute) %><% end %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+      :<%= attribute.name %> => <% if attribute.type == :references %><%= t_helper.references_test_property(attribute.name) %><% else %><%= t_helper.factory_attribute_value attribute.type, value_for(attribute) %><% end %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <%= output_attributes.empty? ? "" : "    )\n" -%>
   end
 <% end -%>
 
-  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_tables.any? %> "within <%= parent_model_tables.join('/') %> nesting"<% end %> do<%- unless parent_model_tables.any? -%> # Within default nesting<% end %>
     before(:each) do
       # Add Properties for view scope
 <%- parent_model_tables.each do |parent_model| -%>
-      assign(:<%= parent_model %>, @<%= parent_model %> = <%= parent_model %>)
+      assign(<%= t_helper.parent_sym(parent_model) %>, <%= t_helper.references_test_property(parent_model) %>)
 <%- end -%>
+      assign(<%= t_helper.resource_plural_sym %>, [
 <% [1,2].each_with_index do |id, model_index| -%>
-      @<%= var_name %>_<%= id %> = <%= var_name %>_<%= id %>
-<% end -%>
-      assign(:<%= plural_var_name %>, [
-<% [1,2].each_with_index do |id, model_index| -%>
-        @<%= var_name %>_<%= id %><%= model_index == 1 ? '' : ',' %>
+        <%= t_helper.resource_test_property(id) %><%= model_index == 1 ? '' : ',' %>
 <% end -%>
       ])
 
@@ -62,137 +66,141 @@ describe "<%= controller_directory %>/index" do
       it 'includes a h1 title' do
         render
 <% if webrat? -%>
-        rendered.should have_selector(".page-header>h1", :content => <%= var_name.humanize.pluralize.dump %>, :count => 1)
+        rendered.should have_selector(".page-header>h1", :content => <%= resource_table_name.humanize.pluralize.dump %>, :count => 1)
 <% else -%>
-        assert_select ".page-header>h1", :text => <%= var_name.humanize.pluralize.dump %>, :count => 1
+        assert_select ".page-header>h1", :text => <%= resource_table_name.humanize.pluralize.dump %>, :count => 1
 <% end -%>
       end
     end
 
-    describe "<%= plural_var_name %> table" do
-      it 'includes a row for each <%= var_name %>' do
+    describe "<%= t_helper.resource_plural_name %> table" do
+      it 'includes a row for each <%= resource_table_name %>' do
         render
 <% unless webrat? -%>
         # Run the generator again with the --webrat flag if you want to use webrat matchers
 <% end -%>
 <% [1,2].each do |model_index| -%>
 <% if webrat? -%>
-        rendered.should have_selector("table>tbody>tr.<%= var_name %>_#{@<%= var_name %>_<%= model_index %>.id}", :count => 1)
+        rendered.should have_selector("table>tbody>tr.<%= resource_table_name %>_#{<%= t_helper.resource_test_property(model_index) %>.id}", :count => 1)
 <% else -%>
-        assert_select "table>tbody>tr.<%= var_name %>_#{@<%= var_name %>_<%= model_index %>.id}", :count => 1
+        assert_select "table>tbody>tr.<%= resource_table_name %>_#{<%= t_helper.resource_test_property(model_index) %>.id}", :count => 1
 <% end -%>
 <% end -%>
       end
 
-      it "contains a list of <%= plural_var_name %>" do
+      it "contains a list of <%= t_helper.resource_plural_name %>" do
         render
-<% unless webrat? -%>
-        # Run the generator again with the --webrat flag if you want to use webrat matchers
-<% end -%>
-<% [1,2].each do |model_index| -%>
-  <%- if webrat? -%>
-        rendered.should have_selector("tr>td.id-column", :content => @<%= var_name %>_<%= model_index %>.id.to_s, :count => 1)
-  <%- else -%>
-        assert_select "tr>td.id-column", :text => @<%= var_name %>_<%= model_index %>.id.to_s, :count => 1
+<% if webrat? -%>
+  <%- [1,2].each do |model_index| -%>
+        rendered.should have_selector("tr>td.id-column", :content => <%= t_helper.resource_test_property(model_index) %>.id.to_s, :count => 1)
   <%- end -%>
-<% end -%>
-<% output_attributes.each_with_index do |attribute, attribute_index| -%>
-  <%- next if attribute.type == :references -%>
-  <%- if webrat? -%>
+  <%- standard_attributes.each_with_index do |attribute, attribute_index| -%>
         rendered.should have_selector("tr>td", :content => <%= factory_attribute_string attribute.type, value_for(attribute) %>.to_s, :count => 2)
-  <%- else -%>
+  <%- end -%>
+  <%- datetime_attributes.each_with_index do |attribute, attribute_index| -%>
+        rendered.should have_selector("tr>td", :content => <%= factory_attribute_string attribute.type, value_for(attribute) %>.to_s, :count => 2)
+  <%- end -%>
+<% else -%>
+        # Run the generator again with the --webrat flag if you want to use webrat matchers
+  <%- [1,2].each do |model_index| -%>
+        assert_select "tr>td.id-column", :text => <%= t_helper.resource_test_property(model_index) %>.id.to_s, :count => 1
+  <%- end -%>
+  <%- standard_attributes.each_with_index do |attribute, attribute_index| -%>
+        assert_select "tr>td", :text => <%= t_helper.factory_attribute_string attribute.type, value_for(attribute) %>.to_s, :count => 2
+  <%- end -%>
+  <%- datetime_attributes.each_with_index do |attribute, attribute_index| -%>
         assert_select "tr>td", :text => <%= t_helper.factory_attribute_string attribute.type, value_for(attribute) %>.to_s, :count => 2
   <%- end -%>
 <% end -%>
       end
-<% output_attributes.each_with_index do |attribute, attribute_index| -%>
-  <%- next unless attribute.type == :references && !parent_model_tables.include?(attribute.name.to_s) -%>
+<% references_attributes.each_with_index do |attribute, attribute_index| -%>
+  <%- next if parent_model_tables.include?(attribute.name.to_s) -%>
 
-      it "displays the <%= attribute.name %> belonging to <%= var_name %>" do
+      it "displays the <%= attribute.name %> belonging to <%= resource_table_name %>" do
         render
   <%- if webrat? -%>
-        rendered.should have_selector("tr>td", :content => <%= attribute.name %>.to_s, :count => 2)
+        rendered.should have_selector("tr>td", :content => <%= t_helper.references_test_property(attribute.name) %>.to_s, :count => 2)
   <%- else -%>
-        assert_select "tr>td", :text => <%= attribute.name %>.to_s, :count => 2
+        assert_select "tr>td", :text => <%= t_helper.references_test_property(attribute.name) %>.to_s, :count => 2
   <%- end -%>
       end
 <% end -%>
-<% output_attributes.each_with_index do |attribute, attribute_index| -%>
-  <%- next unless attribute.type == :references && parent_model_tables.include?(attribute.name.to_s) -%>
+<% references_attributes.each_with_index do |attribute, attribute_index| -%>
+  <%- next unless parent_model_tables.include?(attribute.name.to_s) -%>
 
-      it "does not display the <%= attribute.name %> belonging to <%= var_name %>" do
+      it "does not display the <%= attribute.name %> belonging to <%= resource_table_name %>" do
         render
   <%- if webrat? -%>
-        rendered.should have_selector("tr>td", :content => <%= attribute.name %>.to_s, :count => 0)
+        rendered.should have_selector("tr>td", :content => <%= t_helper.references_test_property(attribute.name) %>.to_s, :count => 0)
   <%- else -%>
-        assert_select "tr>td", :text => <%= attribute.name %>.to_s, :count => 0
+        assert_select "tr>td", :text => <%= t_helper.references_test_property(attribute.name) %>.to_s, :count => 0
   <%- end -%>
       end
 <% end -%>
 
-      describe 'show <%= var_name %> link' do
+      describe 'show <%= resource_table_name %> link' do
         it "renders a link to <%= ns_file_name %>_path" do
           render
 <% [1,2].each do |model_index| -%>
   <%- if webrat? -%>
-          rendered.should have_selector("td>a[href]:not([data-method])", :href => <%= t_helper.controller_show_route "@#{var_name}_#{model_index}" %>, :count => 1)
+          rendered.should have_selector("td>a[href]:not([data-method])", :href => <%= t_helper.controller_show_route t_helper.resource_test_property(model_index) %>, :count => 1)
   <%- else -%>
-          assert_select "td>a[href=?]:not([data-method])", <%= t_helper.controller_show_route "@#{var_name}_#{model_index}" %>, :count => 1
+          assert_select "td>a[href=?]:not([data-method])", <%= t_helper.controller_show_route t_helper.resource_test_property(model_index) %>, :count => 1
   <%- end -%>
 <% end -%>
         end
       end
 
-      describe 'edit <%= var_name %> link' do
+      describe 'edit <%= resource_table_name %> link' do
         context 'without update permissions' do
           it "renders a disabled link to edit_<%= ns_file_name %>_path" do
             render
 <% [1,2].each do |model_index| -%>
   <%- if webrat? -%>
-            rendered.should_not have_selector("td>a[href][disabled=disabled]", :href => edit_<%= t_helper.controller_show_route "@#{var_name}_#{model_index}" %>, :count => 1)
+            rendered.should_not have_selector("td>a[href][disabled=disabled]", :href => edit_<%= t_helper.controller_show_route t_helper.resource_test_property(model_index) %>, :count => 1)
   <%- else -%>
-            assert_select "td>a[href=?][disabled=disabled]", edit_<%= t_helper.controller_show_route "@#{var_name}_#{model_index}" %>, :count => 1
+            assert_select "td>a[href=?][disabled=disabled]", edit_<%= t_helper.controller_show_route t_helper.resource_test_property(model_index) %>, :count => 1
   <%- end -%>
 <% end -%>
           end
         end
         context 'with update permissions' do
           it "renders a link to edit_<%= ns_file_name %>_path" do
-            @ability.can :update, <%= local_class_name %>
+            @ability.can :update, <%= resource_class %>
             render
 <% [1,2].each do |model_index| -%>
   <%- if webrat? -%>
-            rendered.should have_selector("td>a[href]:not([disabled])", :href => edit_<%= t_helper.controller_show_route "@#{var_name}_#{model_index}" %>, :count => 1)
+            rendered.should have_selector("td>a[href]:not([disabled])", :href => edit_<%= t_helper.controller_show_route t_helper.resource_test_property(model_index) %>, :count => 1)
   <%- else -%>
-            assert_select "td>a[href=?]:not([disabled])", edit_<%= t_helper.controller_show_route "@#{var_name}_#{model_index}" %>, :count => 1
+            assert_select "td>a[href=?]:not([disabled])", edit_<%= t_helper.controller_show_route t_helper.resource_test_property(model_index) %>, :count => 1
   <%- end -%>
 <% end -%>
           end
         end
       end
 
-      describe 'destroy <%= var_name %> link' do
+      describe 'destroy <%= resource_table_name %> link' do
         context 'without destroy permissions' do
           it "renders a disabled link to <%= ns_file_name %>_path" do
             render
 <% [1,2].each do |model_index| -%>
   <%- if webrat? -%>
-            rendered.should_not have_selector("td>a[href][data-method=delete][disabled=disabled]", :href => <%= t_helper.controller_show_route "@#{var_name}_#{model_index}" %>, :count => 1)
+            rendered.should_not have_selector("td>a[href][data-method=delete][disabled=disabled]", :href => <%= t_helper.controller_show_route t_helper.resource_test_property(model_index) %>, :count => 1)
   <%- else -%>
-            assert_select "td>a[href=?][data-method=delete][disabled=disabled]", <%= t_helper.controller_show_route "@#{var_name}_#{model_index}" %>, :count => 1
+            assert_select "td>a[href=?][data-method=delete][disabled=disabled]", <%= t_helper.controller_show_route t_helper.resource_test_property(model_index) %>, :count => 1
   <%- end -%>
 <% end -%>
           end
         end
         context 'with destroy permissions' do
           it "renders a link to <%= ns_file_name %>_path" do
-            @ability.can :destroy, <%= local_class_name %>
+            @ability.can :destroy, <%= resource_class %>
             render
 <% [1,2].each do |model_index| -%>
   <%- if webrat? -%>
-            rendered.should have_selector("td>a[href][data-method=delete]:not([disabled])", :href => <%= t_helper.controller_show_route "@#{var_name}_#{model_index}" %>, :count => 1)
+            rendered.should have_selector("td>a[href][data-method=delete]:not([disabled])", :href => <%= t_helper.controller_show_route t_helper.resource_test_property(model_index) %>, :count => 1)
   <%- else -%>
-            assert_select "td>a[href=?][data-method=delete]:not([disabled])", <%= t_helper.controller_show_route "@#{var_name}_#{model_index}" %>, :count => 1
+            assert_select "td>a[href=?][data-method=delete]:not([disabled])", <%= t_helper.controller_show_route t_helper.resource_test_property(model_index) %>, :count => 1
   <%- end -%>
 <% end -%>
           end
@@ -200,7 +208,7 @@ describe "<%= controller_directory %>/index" do
       end
     end
 
-    describe 'new <%= var_name %> link' do
+    describe 'new <%= resource_table_name %> link' do
       context 'without create permissions' do
         it "does not render a link to new_<%= ns_file_name %>_path" do
           render
@@ -213,7 +221,7 @@ describe "<%= controller_directory %>/index" do
       end
       context 'with create permissions' do
         it "renders a link to new_<%= ns_file_name %>_path" do
-          @ability.can :create, <%= local_class_name %>
+          @ability.can :create, <%= resource_class %>
           render
 <% if webrat? -%>
           rendered.should have_selector("a[href=?]", new_<%= t_helper.controller_show_route %>, :count => 1)

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

@@ -2,20 +2,21 @@ require 'spec_helper'
 
 <% module_namespacing do -%>
 describe <%= class_name %> do
-<%- attributes.each do |attribute| -%>
-  <%- unless attribute.type == :references -%>
-  it { should allow_mass_assignment_of(:<%= attribute.name %>)}
-  <%- end -%>
-<%- end -%>
 <%- attributes.each_with_index do |attribute, attribute_index| -%>
 
   # <%= attribute.name %>:<%= attribute.type %>
-  <%- if attribute_index == 0 -%>
-  it { should validate_presence_of(:<%= attributes[0].name %>) }
+  <%- if attribute.type == :references -%>
+  it { should allow_mass_assignment_of(:<%= attribute.name %>_id)}
+  <%- else -%>
+  it { should allow_mass_assignment_of(:<%= attribute.name %>)}
   <%- end -%>
   <%- if attribute.type == :references -%>
   it { should belong_to(:<%= attribute.name %>) }
-  <%- elsif attribute.type == :boolean -%>
+  <%- end -%>
+  <%- if attribute_index == 0 -%>
+  it { should validate_presence_of(:<%= attributes[0].name %>) }
+  <%- end -%>
+  <%- if attribute.type == :boolean -%>
   it { should allow_value(true).for(:<%= attribute.name %>) }
   it { should allow_value(false).for(:<%= attribute.name %>) }
   <%- elsif [:double, :decimal].include? attribute.type -%>