authorized_rails_scaffolds 0.0.4 → 0.0.5

data/lib/generators/authorized_rails_scaffolds/install_spec/templates/devise_can_can/USAGE

@@ -0,0 +1,7 @@
+#
+# Add the following to spec/spec_helper.rb
+#
+RSpec.configure do |config|
+  config.include Devise::TestHelpers, :type => :controller
+  config.extend DeviseCanCanControllerMacros, :type => :controller
+end

data/lib/generators/authorized_rails_scaffolds/install_spec/templates/devise_can_can/controller_macros.rb

@@ -0,0 +1,25 @@
+module DeviceCanCanControllerMacros
+  def login_unauthorized_user
+    before(:each) do
+      @ability = Object.new
+      @ability.extend(CanCan::Ability)
+      @controller.stubs(:current_ability).returns(@ability)
+
+      @request.env["devise.mapping"] = Devise.mappings[:user]
+      @logged_in_user = FactoryGirl.create(:user)
+      sign_in @logged_in_user
+    end
+  end
+  def login_user_with_ability(action, subject)
+    before(:each) do
+      @ability = Object.new
+      @ability.extend(CanCan::Ability)
+      @ability.can action, subject
+      @controller.stubs(:current_ability).returns(@ability)
+
+      @request.env["devise.mapping"] = Devise.mappings[:user]
+      @logged_in_admin = FactoryGirl.create(:user)
+      sign_in @logged_in_admin
+    end
+  end
+end

data/lib/generators/authorized_rails_scaffolds/install_spec/templates/edit_spec.rb

@@ -1,92 +1,106 @@
 require 'spec_helper'
 
-<% local_class_name = class_name.split('::')[-1] -%>
-<% output_attributes = attributes.reject{|attribute| [:timestamp].index(attribute.type) } -%>
-<% standard_attributes = output_attributes.reject{|attribute| [:time, :date, :datetime].index(attribute.type) } -%>
-<% date_attributes = output_attributes.reject{|attribute| ![:time, :date, :datetime].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/edit" do
-  before(:each) do
-    @<%= file_name %> = assign(:<%= file_name %>, FactoryGirl.build_stubbed(:<%= file_name %><%= output_attributes.empty? ? '))' : ',' %>
-<% output_attributes.each_with_index do |attribute, attribute_index| -%>
 <%-
-attribute_prefix = ''
-attribute_suffix = ')'
-if attribute.type == :datetime
-  attribute_value = value_for(attribute)
-  attribute_prefix = 'DateTime.parse('
-elsif attribute.type == :time
-  attribute_value = value_for(attribute).to_time.strftime('%T').dump
-  attribute_prefix = 'Time.parse('
-elsif attribute.type == :date
-  attribute_value = value_for(attribute)
-  attribute_prefix = 'Date.parse('
-else
-  attribute_value = value_for(attribute)
-  attribute_suffix = ''
+
+local_class_name = class_name.split('::')[-1] # Non-Namespaced class name
+var_name = file_name # Non-namespaced variable name
+
+output_attributes   = attributes.reject{|attribute| [:timestamp].include? attribute.type }
+standard_attributes = attributes.reject{|attribute| [:time, :date, :datetime].include? attribute.type }
+datetime_attributes = attributes.reject{|attribute| ![:time, :date, :datetime].include? attribute.type }
+
+# Returns code that will generate attribute_value as an attribute_type
+def factory_attribute_value(attribute_type, attribute_value)
+  case attribute_type
+  when :datetime
+    "DateTime.parse(#{attribute_value})"
+  when :time
+    value_as_time = attribute_value.to_time.strftime('%T')
+    "Time.parse(#{value_as_time.dump})"
+  when :date
+    value_as_date = attribute_value.to_time.strftime('%Y-%m-%d')
+    "Date.parse(#{value_as_date.dump})"
+  else
+    attribute_value
+  end
 end
+
 -%>
-      :<%= attribute.name %> => <%= attribute_prefix %><%= attribute_value %><%= attribute_suffix %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+describe "<%= ns_table_name %>/edit" do
+  before(:each) do
+    @<%= var_name %> = assign(:<%= var_name %>, FactoryGirl.build_stubbed(:<%= var_name %><%= output_attributes.empty? ? '))' : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= factory_attribute_value attribute.type, value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <%= output_attributes.empty? ? "" : "    ))\n" -%>
   end
 
-  it "renders the edit <%= file_name %> form" do
+  it "renders the edit <%= var_name %> form" do
     render
 
 <% if webrat? -%>
-    rendered.should have_selector("form", :action => <%= ns_file_name %>_path(@<%= file_name %>), :method => "post") do |form|
+    rendered.should have_selector("form", :action => <%= ns_file_name %>_path(@<%= var_name %>), :method => "post") do |form|
 <% for attribute in standard_attributes -%>
-    form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
+  <%- 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 -%>
 <% end -%>
     end
 <% else -%>
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form[action=?][method=?]", <%= ns_file_name %>_path(@<%= file_name %>), "post" do
+    assert_select "form[action=?][method=?]", <%= ns_file_name %>_path(@<%= var_name %>), "post" do
 <% for attribute in standard_attributes -%>
-      assert_select "<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]", "<%= file_name %>[<%= attribute.name %>]"
+  <%- 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 -%>
 <% end -%>
     end
 <% end -%>
   end
 
-<% if date_attributes.any? -%>
+<% if datetime_attributes.any? -%>
   it "renders all date/time form elements" do
     render
 
 <% if webrat? -%>
-    rendered.should have_selector("form", :action => <%= ns_file_name %>_path(@<%= file_name %>), :method => "post") do |form|
-<% for attribute in date_attributes -%>
+    rendered.should have_selector("form", :action => <%= ns_file_name %>_path(@<%= var_name %>), :method => "post") do |form|
+<% for attribute in datetime_attributes -%>
   <%- if [:date, :datetime].include? attribute.type -%>
-    form.should have_selector("select#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
-    form.should have_selector("select#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
-    form.should have_selector("select#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_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#<%= var_name %>_<%= attribute.name %>", :name => "<%= var_name %>[<%= attribute.name %>]")
   <%- end -%>
   <%- if [:time, :datetime].include? attribute.type -%>
-    form.should have_selector("select#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
-    form.should have_selector("select#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_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 %>]")
   <%- end -%>
 <% end -%>
     end
 <% else -%>
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form[action=?][method=?]", <%= ns_file_name %>_path(@<%= file_name %>), "post" do
-<% for attribute in date_attributes -%>
+    assert_select "form[action=?][method=?]", <%= ns_file_name %>_path(@<%= var_name %>), "post" do
+<% for attribute in datetime_attributes -%>
+      # <%= attribute.name %> values
   <%- if [:date, :datetime].include? attribute.type -%>
-      assert_select "select#<%= file_name %>_<%= attribute.name %>_1i[name=?]", "<%= file_name %>[<%= attribute.name %>(1i)]" do
+      assert_select "select#<%= var_name %>_<%= attribute.name %>_1i[name=?]", "<%= var_name %>[<%= attribute.name %>(1i)]" do
         assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%Y').dump %>, :count => 1
       end
-      assert_select "select#<%= file_name %>_<%= attribute.name %>_2i[name=?]", "<%= file_name %>[<%= attribute.name %>(2i)]" do
+      assert_select "select#<%= var_name %>_<%= attribute.name %>_2i[name=?]", "<%= var_name %>[<%= attribute.name %>(2i)]" do
         assert_select "option[selected=selected][value=?]", <%= DateTime.parse(attribute.default).strftime('%-m').dump %>, :text => <%= DateTime.parse(attribute.default).strftime('%B').dump %>, :count => 1
       end
-      assert_select "select#<%= file_name %>_<%= attribute.name %>_3i[name=?]", "<%= file_name %>[<%= attribute.name %>(3i)]" do
+      assert_select "select#<%= var_name %>_<%= attribute.name %>_3i[name=?]", "<%= var_name %>[<%= attribute.name %>(3i)]" do
         assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%d').dump %>, :count => 1
       end
   <%- end -%>
   <%- if [:time, :datetime].include? attribute.type -%>
-      assert_select "select#<%= file_name %>_<%= attribute.name %>_4i[name=?]", "<%= file_name %>[<%= attribute.name %>(4i)]" do
+      assert_select "select#<%= var_name %>_<%= attribute.name %>_4i[name=?]", "<%= var_name %>[<%= attribute.name %>(4i)]" do
         assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%H').dump %>, :count => 1
       end
-      assert_select "select#<%= file_name %>_<%= attribute.name %>_5i[name=?]", "<%= file_name %>[<%= attribute.name %>(5i)]" do
+      assert_select "select#<%= var_name %>_<%= attribute.name %>_5i[name=?]", "<%= var_name %>[<%= attribute.name %>(5i)]" do
         assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%M').dump %>, :count => 1
       end
   <%- end -%>

data/lib/generators/authorized_rails_scaffolds/install_spec/templates/index_spec.rb

@@ -1,38 +1,61 @@
 require 'spec_helper'
 
-<%- local_class_name = class_name.split('::')[-1] -%>
-<%- output_attributes = attributes.reject{|attribute| [:timestamp].index(attribute.type) } -%>
+<%-
+
+local_class_name = class_name.split('::')[-1] # Non-Namespaced class name
+var_name = file_name # Non-namespaced variable name
+plural_var_name = var_name.pluralize # Pluralized non-namespaced variable name
+
+output_attributes   = attributes.reject{|attribute| [:timestamp].include? attribute.type }
+
+# Returns code that will generate attribute_value as an attribute_type
+def factory_attribute_value(attribute_type, attribute_value)
+  case attribute_type
+  when :datetime
+    "DateTime.parse(#{attribute_value})"
+  when :time
+    value_as_time = attribute_value.to_time.strftime('%T')
+    "Time.parse(#{value_as_time.dump})"
+  when :date
+    value_as_date = attribute_value.to_time.strftime('%Y-%m-%d')
+    "Date.parse(#{value_as_date.dump})"
+  else
+    attribute_value
+  end
+end
+
+# Returns the expected output string of attribute_value if it is an attribute_type
+def factory_attribute_string(attribute_type, attribute_value)
+  case attribute_type
+  when :datetime
+    attribute_value_as_date = DateTime.parse(attribute_value)
+    I18n.l(attribute_value_as_date, :format => :long).dump
+  when :time
+    attribute_value_as_time = Time.parse(attribute_value)
+    I18n.l(attribute_value_as_time, :format => :short).dump
+  when :date
+    attribute_value_as_date = Date.parse(attribute_value)
+    I18n.l(attribute_value_as_date).dump
+  else
+    attribute_value
+  end
+end
+
+-%>
 describe "<%= ns_table_name %>/index" do
   before(:each) do
 <% [1,2].each_with_index do |id, model_index| -%>
-    @<%= file_name %>_<%= model_index + 1 %> = FactoryGirl.build_stubbed(:<%= file_name %><%= output_attributes.empty? ? ')' : ',' %>
+    @<%= var_name %>_<%= model_index + 1 %> = FactoryGirl.build_stubbed(:<%= var_name %><%= output_attributes.empty? ? ')' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-<%-
-attribute_prefix = ''
-attribute_suffix = ')'
-if attribute.type == :datetime
-  attribute_value = value_for(attribute)
-  attribute_prefix = 'DateTime.parse('
-elsif attribute.type == :time
-  attribute_value = value_for(attribute).to_time.strftime('%T').dump
-  attribute_prefix = 'Time.parse('
-elsif attribute.type == :date
-  attribute_value = value_for(attribute)
-  attribute_prefix = 'Date.parse('
-else
-  attribute_value = value_for(attribute)
-  attribute_suffix = ''
-end
--%>
-      :<%= attribute.name %> => <%= attribute_prefix %><%= attribute_value %><%= attribute_suffix %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+      :<%= attribute.name %> => <%= factory_attribute_value attribute.type, value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <% if !output_attributes.empty? -%>
     )
 <% end -%>
 <% end -%>
-    assign(:<%= file_name.pluralize %>, [
+    assign(:<%= plural_var_name %>, [
 <% [1,2].each_with_index do |id, model_index| -%>
-      @<%= file_name %>_<%= id %><%= model_index == 1 ? '' : ',' %>
+      @<%= var_name %>_<%= id %><%= model_index == 1 ? '' : ',' %>
 <% end -%>
     ])
     @ability = Object.new
@@ -44,72 +67,71 @@ end
     it 'includes a h1 title' do
       render
 <% if webrat? -%>
-      rendered.should have_selector(".page-header>h1", :content => <%= file_name.humanize.pluralize.dump %>, :count => 1)
+      rendered.should have_selector(".page-header>h1", :content => <%= var_name.humanize.pluralize.dump %>, :count => 1)
 <% else -%>
-      assert_select ".page-header>h1", :text => <%= file_name.humanize.pluralize.dump %>, :count => 1
+      assert_select ".page-header>h1", :text => <%= var_name.humanize.pluralize.dump %>, :count => 1
 <% end -%>
     end
   end
 
-  describe "<%= file_name.pluralize %> table" do
-    it 'includes a row for each <%= file_name %>' do
+  describe "<%= plural_var_name %> table" do
+    it 'includes a row for each <%= var_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.<%= file_name %>_#{@<%= file_name %>_<%= model_index %>.id}", :count => 1)
+      rendered.should have_selector("table>tbody>tr.<%= var_name %>_#{@<%= var_name %>_<%= model_index %>.id}", :count => 1)
 <% else -%>
-      assert_select "table>tbody>tr.<%= file_name %>_#{@<%= file_name %>_<%= model_index %>.id}", :count => 1
+      assert_select "table>tbody>tr.<%= var_name %>_#{@<%= var_name %>_<%= model_index %>.id}", :count => 1
 <% end -%>
 <% end -%>
     end
 
-    it "contains a list of <%= file_name.pluralize %>" do
+    it "contains a list of <%= plural_var_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 => @<%= file_name %>_<%= model_index %>.id.to_s, :count => 1)
+      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 => @<%= file_name %>_<%= model_index %>.id.to_s, :count => 1
+      assert_select "tr>td.id-column", :text => @<%= var_name %>_<%= model_index %>.id.to_s, :count => 1
 <% end -%>
 <% end -%>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-<%-
-if attribute.type == :datetime
-  date_time_value = DateTime.parse(value_for(attribute))
-  attribute_value = I18n.l(date_time_value, :format => :long).dump
-elsif attribute.type == :time
-  time_value = Time.parse(value_for(attribute))
-  attribute_value = I18n.l(time_value, :format => :short).dump
-elsif attribute.type == :date
-  date_value = Date.parse(value_for(attribute))
-  attribute_value = I18n.l(date_value).dump
-else
-  attribute_value = value_for(attribute)
-end
--%>
 <% if webrat? -%>
-      rendered.should have_selector("tr>td<% if attribute_index == 0 %>>a<% end %>", :content => <%= attribute_value %>.to_s, :count => 2)
+      rendered.should have_selector("tr>td", :content => <%= factory_attribute_string attribute.type, value_for(attribute) %>.to_s, :count => 2)
 <% else -%>
-      assert_select "tr>td<% if attribute_index == 0 %>>a<% end %>", :text => <%= attribute_value %>.to_s, :count => 2
+      assert_select "tr>td", :text => <%= factory_attribute_string attribute.type, value_for(attribute) %>.to_s, :count => 2
 <% end -%>
 <% end -%>
     end
 
-    describe 'edit <%= file_name %> link' do
+    describe 'show <%= var_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 => <%= ns_file_name %>_path(@<%= var_name %>_<%= model_index %>), :count => 1)
+<% else -%>
+        assert_select "td>a[href=?]:not([data-method])", <%= ns_file_name %>_path(@<%= var_name %>_<%= model_index %>), :count => 1
+<% end -%>
+<% end -%>
+      end
+    end
+
+    describe 'edit <%= var_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_<%= ns_file_name %>_path(@<%= file_name %>_<%= model_index %>), :count => 1)
+          rendered.should_not have_selector("td>a[href][disabled=disabled]", :href => edit_<%= ns_file_name %>_path(@<%= var_name %>_<%= model_index %>), :count => 1)
 <% else -%>
-          assert_select "td>a[href=?][disabled=disabled]", edit_<%= ns_file_name %>_path(@<%= file_name %>_<%= model_index %>), :count => 1
+          assert_select "td>a[href=?][disabled=disabled]", edit_<%= ns_file_name %>_path(@<%= var_name %>_<%= model_index %>), :count => 1
 <% end -%>
 <% end -%>
         end
@@ -120,24 +142,24 @@ end
           render
 <% [1,2].each do |model_index| -%>
 <% if webrat? -%>
-          rendered.should have_selector("td>a[href]:not([disabled])", :href => edit_<%= ns_file_name %>_path(@<%= file_name %>_<%= model_index %>), :count => 1)
+          rendered.should have_selector("td>a[href]:not([disabled])", :href => edit_<%= ns_file_name %>_path(@<%= var_name %>_<%= model_index %>), :count => 1)
 <% else -%>
-          assert_select "td>a[href=?]:not([disabled])", edit_<%= ns_file_name %>_path(@<%= file_name %>_<%= model_index %>), :count => 1
+          assert_select "td>a[href=?]:not([disabled])", edit_<%= ns_file_name %>_path(@<%= var_name %>_<%= model_index %>), :count => 1
 <% end -%>
 <% end -%>
         end
       end
     end
 
-    describe 'destroy <%= file_name %> link' do
+    describe 'destroy <%= var_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 => <%= ns_file_name %>_path(@<%= file_name %>_<%= model_index %>), :count => 1)
+          rendered.should_not have_selector("td>a[href][data-method=delete][disabled=disabled]", :href => <%= ns_file_name %>_path(@<%= var_name %>_<%= model_index %>), :count => 1)
 <% else -%>
-          assert_select "td>a[href=?][data-method=delete][disabled=disabled]", <%= ns_file_name %>_path(@<%= file_name %>_<%= model_index %>), :count => 1
+          assert_select "td>a[href=?][data-method=delete][disabled=disabled]", <%= ns_file_name %>_path(@<%= var_name %>_<%= model_index %>), :count => 1
 <% end -%>
 <% end -%>
         end
@@ -148,9 +170,9 @@ end
           render
 <% [1,2].each do |model_index| -%>
 <% if webrat? -%>
-          rendered.should have_selector("td>a[href][data-method=delete]:not([disabled])", :href => <%= ns_file_name %>_path(@<%= file_name %>_<%= model_index %>), :count => 1)
+          rendered.should have_selector("td>a[href][data-method=delete]:not([disabled])", :href => <%= ns_file_name %>_path(@<%= var_name %>_<%= model_index %>), :count => 1)
 <% else -%>
-          assert_select "td>a[href=?][data-method=delete]:not([disabled])", <%= ns_file_name %>_path(@<%= file_name %>_<%= model_index %>), :count => 1
+          assert_select "td>a[href=?][data-method=delete]:not([disabled])", <%= ns_file_name %>_path(@<%= var_name %>_<%= model_index %>), :count => 1
 <% end -%>
 <% end -%>
         end
@@ -158,7 +180,7 @@ end
     end
   end
 
-  describe 'new <%= file_name %> link' do
+  describe 'new <%= var_name %> link' do
     context 'without create permissions' do
       it "does not render a link to new_<%= ns_file_name %>_path" do
         render

data/lib/generators/authorized_rails_scaffolds/install_spec/templates/model_spec.rb

@@ -0,0 +1,28 @@
+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 %>) }
+  <%- end -%>
+  <%- if attribute.type == :references -%>
+  it { should belong_to(:<%= attribute.name %>) }
+  <%- elsif 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 -%>
+  it { should validate_numericality_of(:<%= attribute.name %>) }
+  <%- elsif attribute.type == :integer -%>
+  it { should validate_numericality_of(:<%= attribute.name %>).only_integer }
+  <%- end -%>
+<%- end -%>
+end
+<% end -%>

data/lib/generators/authorized_rails_scaffolds/install_spec/templates/new_spec.rb

@@ -1,91 +1,105 @@
 require 'spec_helper'
 
-<% local_class_name = class_name.split('::')[-1] -%>
-<% output_attributes = attributes.reject{|attribute| [:timestamp].index(attribute.type) } -%>
-<% standard_attributes = output_attributes.reject{|attribute| [:time, :date, :datetime].index(attribute.type) } -%>
-<% date_attributes = output_attributes.reject{|attribute| ![:time, :date, :datetime].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/new" do
-  before(:each) do
-    assign(:<%= file_name %>, FactoryGirl.build(:<%= file_name %><%= output_attributes.empty? ? '))' : ',' %>
-<% output_attributes.each_with_index do |attribute, attribute_index| -%>
 <%-
-attribute_prefix = ''
-attribute_suffix = ')'
-if attribute.type == :datetime
-  attribute_value = value_for(attribute)
-  attribute_prefix = 'DateTime.parse('
-elsif attribute.type == :time
-  attribute_value = value_for(attribute).to_time.strftime('%T').dump
-  attribute_prefix = 'Time.parse('
-elsif attribute.type == :date
-  attribute_value = value_for(attribute)
-  attribute_prefix = 'Date.parse('
-else
-  attribute_value = value_for(attribute)
-  attribute_suffix = ''
+
+local_class_name = class_name.split('::')[-1] # Non-Namespaced class name
+var_name = file_name # Non-namespaced variable name
+
+output_attributes   = attributes.reject{|attribute| [:timestamp].include? attribute.type }
+standard_attributes = attributes.reject{|attribute| [:time, :date, :datetime].include? attribute.type }
+datetime_attributes = attributes.reject{|attribute| ![:time, :date, :datetime].include? attribute.type }
+
+# Returns code that will generate attribute_value as an attribute_type
+def factory_attribute_value(attribute_type, attribute_value)
+  case attribute_type
+  when :datetime
+    "DateTime.parse(#{attribute_value})"
+  when :time
+    value_as_time = attribute_value.to_time.strftime('%T')
+    "Time.parse(#{value_as_time.dump})"
+  when :date
+    value_as_date = attribute_value.to_time.strftime('%Y-%m-%d')
+    "Date.parse(#{value_as_date.dump})"
+  else
+    attribute_value
+  end
 end
+
 -%>
-      :<%= attribute.name %> => <%= attribute_prefix %><%= attribute_value %><%= attribute_suffix %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+describe "<%= ns_table_name %>/new" do
+  before(:each) do
+    assign(:<%= var_name %>, FactoryGirl.build(:<%= var_name %><%= output_attributes.empty? ? '))' : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= factory_attribute_value attribute.type, value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <%= !output_attributes.empty? ? "    ))\n  end" : "  end" %>
 
-  it "renders new <%= file_name %> form" do
+  it "renders new <%= var_name %> form" do
     render
 
 <% if webrat? -%>
     rendered.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
 <% for attribute in standard_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
+    <%- 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 -%>
 <% end -%>
     end
 <% else -%>
     # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form[action=?][method=?]", <%= index_helper %>_path, "post" do
 <% for attribute in standard_attributes -%>
-      assert_select "<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]", "<%= file_name %>[<%= attribute.name %>]"
+  <%- 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 -%>
 <% end -%>
     end
 <% end -%>
   end
 
-<% if date_attributes.any? -%>
+<% if datetime_attributes.any? -%>
   it "renders all date/time form elements" do
     render
 
 <% if webrat? -%>
     rendered.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
-<% for attribute in date_attributes -%>
+<% for attribute in datetime_attributes -%>
   <%- if [:date, :datetime].include? attribute.type -%>
-    form.should have_selector("select#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
-    form.should have_selector("select#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
-    form.should have_selector("select#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_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#<%= var_name %>_<%= attribute.name %>", :name => "<%= var_name %>[<%= attribute.name %>]")
   <%- end -%>
   <%- if [:time, :datetime].include? attribute.type -%>
-    form.should have_selector("select#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
-    form.should have_selector("select#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_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 %>]")
   <%- end -%>
 <% end -%>
     end
 <% else -%>
     # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form[action=?][method=?]", <%= table_name %>_path, "post" do
-<% for attribute in date_attributes -%>
+<% for attribute in datetime_attributes -%>
+      # <%= attribute.name %> values
   <%- if [:date, :datetime].include? attribute.type -%>
-      assert_select "select#<%= file_name %>_<%= attribute.name %>_1i[name=?]", "<%= file_name %>[<%= attribute.name %>(1i)]" do
+      assert_select "select#<%= var_name %>_<%= attribute.name %>_1i[name=?]", "<%= var_name %>[<%= attribute.name %>(1i)]" do
         assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%Y').dump %>, :count => 1
       end
-      assert_select "select#<%= file_name %>_<%= attribute.name %>_2i[name=?]", "<%= file_name %>[<%= attribute.name %>(2i)]" do
+      assert_select "select#<%= var_name %>_<%= attribute.name %>_2i[name=?]", "<%= var_name %>[<%= attribute.name %>(2i)]" do
         assert_select "option[selected=selected][value=?]", <%= DateTime.parse(attribute.default).strftime('%-m').dump %>, :text => <%= DateTime.parse(attribute.default).strftime('%B').dump %>, :count => 1
       end
-      assert_select "select#<%= file_name %>_<%= attribute.name %>_3i[name=?]", "<%= file_name %>[<%= attribute.name %>(3i)]" do
+      assert_select "select#<%= var_name %>_<%= attribute.name %>_3i[name=?]", "<%= var_name %>[<%= attribute.name %>(3i)]" do
         assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%d').dump %>, :count => 1
       end
   <%- end -%>
   <%- if [:time, :datetime].include? attribute.type -%>
-      assert_select "select#<%= file_name %>_<%= attribute.name %>_4i[name=?]", "<%= file_name %>[<%= attribute.name %>(4i)]" do
+      assert_select "select#<%= var_name %>_<%= attribute.name %>_4i[name=?]", "<%= var_name %>[<%= attribute.name %>(4i)]" do
         assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%H').dump %>, :count => 1
       end
-      assert_select "select#<%= file_name %>_<%= attribute.name %>_5i[name=?]", "<%= file_name %>[<%= attribute.name %>(5i)]" do
+      assert_select "select#<%= var_name %>_<%= attribute.name %>_5i[name=?]", "<%= var_name %>[<%= attribute.name %>(5i)]" do
         assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%M').dump %>, :count => 1
       end
   <%- end -%>