leonardo 1.9.0.beta1 → 1.9.0.beta2

data/CHANGELOG

@@ -1,7 +1,12 @@
+1.9.0.beta2 (December 12th, 2011) Marco Mastrodonato
+* Specs updated
+* Little improvements
+
 1.9.0.beta1 (November 30th, 2011) Marco Mastrodonato
 * Lists: Added multiple selection to combine with massive operation
 * Lists: Added copy operation to create new items from existing. It works for multiple rows as well.
 * Data forms: fields moved into new partial to share with multiple operation
+* Little improvements
 
 TODO:
 * Model: Create name attribute for every one that does not have

data/lib/generators/erb/leosca/templates/_fields.html.erb

@@ -3,13 +3,13 @@
     <%%= f.label :<%= attribute.name %>, t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %><br />
     <%- case attribute.type
         when :references, :belongs_to  -%>
-    <%% if @<%= singular_table_name %>.new_record? -%>
+    <%% if <%= singular_table_name %>.new_record? -%>
         <%%= f.collection_select :<%= attribute.name %>_id, <%= attribute.name.classify %>.all, :id, :name, :prompt => true if can?(:manage, <%=class_name %>) %>
     <%% else -%>
         <%%= f.collection_select :<%= attribute.name %>_id, <%= attribute.name.classify %>.all, :id, :name, :prompt => true %>
     <%% end -%>
     <%-	when :date -%>
-    <%%= f.<%= attribute.field_type %> :<%= attribute.name %> <%=", :class => \"calendar\"" if jquery_ui?%> %>
+    <%%= f.text_field :<%= attribute.name %> <%=", :class => \"calendar\"" if jquery_ui?%> %>
     <%-	else -%>
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
     <%- end -%>

data/lib/generators/erb/leosca/templates/_form.html.erb

@@ -2,7 +2,6 @@
   <%% if @<%= singular_table_name %>.errors.any? %>
     <div id="error_explanation">
       <h2><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
-
       <ul>
       <%% @<%= singular_table_name %>.errors.full_messages.each do |msg| %>
         <li><%%= msg %></li>
@@ -11,7 +10,7 @@
     </div>
   <%% end %>
 
-<%%= render 'fields', :f => f %>
+<%%= render 'fields', :f => f, :<%= singular_table_name %> => @<%= singular_table_name %> %>
   <div class="actions">
     <%%= f.submit :class => 'button large' %>
   </div>

data/lib/generators/erb/leosca/templates/_form_multiple.html.erb

@@ -1,9 +1,10 @@
 <%%= form_for(:<%= plural_table_name %>, :url => path, :method => :put) do |f| %>
-    <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-        <%%= f.fields_for "#{<%= singular_table_name %>.id}", <%= singular_table_name %> do |f_<%= singular_table_name %>| %>
-          <%%= render 'fields', :f => f_<%= singular_table_name %> %>
-        <%% end %>
+  <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| -%>
+    <%%= f.fields_for "#{<%= singular_table_name %>.id}", <%= singular_table_name %> do |ff| %>
+      <%%= render 'fields', :f => ff, :<%= singular_table_name %> => <%= singular_table_name %> %>
     <%% end %>
+    <div class="separator"></div>
+  <%% end -%>
   <div class="actions">
     <%%= f.submit :class => 'button large' %>
   </div>

data/lib/generators/erb/leosca/templates/_list.erb

@@ -2,7 +2,7 @@
 <%%= paginate @<%= plural_table_name %>, :remote => remote %>
 <%end%>
 <%%= page_entries_info @<%= plural_table_name %>, t('models.<%= singular_table_name %>'), t('models.<%= plural_table_name %>') %>
-
+<%% if @<%= plural_table_name %>.any? -%>
 <%%= form_for :select, :url => select_<%= plural_table_name %>_path, :remote => false, :html => { :method => :post, :id => "form_select" } do |f| %>
 <table class='user' cellspacing='0'>
   <thead>
@@ -55,7 +55,7 @@
 </div>
 <%% end -%>
 <div class="separator"></div>
-
+<%% end -%>
 <%- if pagination? -%>
 <%%= paginate @<%= plural_table_name %>, :remote => remote %>
 <%- end -%>

data/lib/generators/erb/leosca/templates/_row_index.html.erb

@@ -1,12 +1,11 @@
 <td>
   <%%= check_box_tag "ids[]", <%= singular_table_name %>.id, false, {:id =>"check#{<%= singular_table_name %>.id}", :class => "selectable"} %>
-  <%%= number_with_delimiter <%= singular_table_name %>.id %>
+  <%%= link_to number_with_delimiter(<%= singular_table_name %>.id), <%= show_resource_path %><%= ", :remote => remote" if jquery_ui? %> %>
 </td>
 <%- attributes.each do |attribute| -%>
 <td><%= attribute_to_erb(attribute, singular_table_name) -%></td>
 <%- end -%>
 <!-- Manage section, do not remove this tag -->
-<td><%%= link_to t(:show), <%= show_resource_path %><%= ", :remote => remote" if jquery_ui? %> %></td>
 <%- if authorization? -%>
 <%%- if can? :update, <%= singular_table_name %> -%>
 <%- end -%>

data/lib/generators/erb/leosca/templates/formtastic/_fields.html.erb

@@ -2,7 +2,7 @@
 <%- attributes.each do |attribute| -%>
     <%- case attribute.type
         when :references, :belongs_to  -%>
-    <%% if @<%= singular_table_name %>.new_record? -%>
+    <%% if <%= singular_table_name %>.new_record? -%>
         <%%= f.input :<%= attribute.name %> if can?(:manage, <%=class_name %>) %>
     <%% else -%>
         <%%= f.input :<%= attribute.name %> %>

data/lib/generators/erb/leosca/templates/formtastic/_form.html.erb

@@ -1,5 +1,5 @@
 <%%= semantic_form_for(<%= form_resource_path %>) do |f| %>
-    <%%= render 'fields', :f => f %>
+    <%%= render 'fields', :f => f, :<%= singular_table_name %> => @<%= singular_table_name %> %>
     <%%= f.buttons do %>
       <%%= f.commit_button :button_html => { :class => "button large" } %>
     <%% end %>

data/lib/generators/erb/leosca/templates/formtastic/_form_multiple.html.erb

@@ -1,8 +1,9 @@
 <%%= semantic_form_for(:<%= plural_table_name %>, :url => path, :method => :put) do |f| %>
     <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-        <%%= f.semantic_fields_for "#{<%= singular_table_name %>.id}", <%= singular_table_name %> do |f_<%= singular_table_name %>| %>
-          <%%= render 'fields', :f => f_<%= singular_table_name %> %>
+        <%%= f.semantic_fields_for "#{<%= singular_table_name %>.id}", <%= singular_table_name %> do |ff| %>
+          <%%= render 'fields', :f => ff, :<%= singular_table_name %> => <%= singular_table_name %> %>
         <%% end %>
+        <div class="separator"></div>
     <%% end %>
     <%%= f.buttons do %>
       <%%= f.commit_button :button_html => { :class => "button large" } %>

data/lib/generators/erb/leosca/templates/index.html.erb

@@ -30,7 +30,7 @@
     <%-	when :text -%>
         <%%= f.text_field :<%= attribute.name %> %>
     <%-	when :date -%>
-        <%%= f.text_field :<%= attribute.name %>, :class => "autosubmit<%=" calendar" if jquery_ui? %>"
+        <%%= f.text_field :<%= attribute.name %>, :class => "autosubmit<%=" calendar" if jquery_ui? %>" %>
     <%-	else -%>
         <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
     <%- end -%>

data/lib/generators/leolay/templates/config/locales/en.yml

@@ -178,9 +178,9 @@ en:
       # Default value for :prompt => true in FormOptionsHelper
       prompt: "Please select"
     # Default translation keys for submit FormHelper
-    submit:
+    submit: &actions
       create: "Create %{model}"
-      update: "Update %{model}"
+      update: "Update"
       submit: "Proceed"
 
   activerecord: &activerecord
@@ -196,10 +196,8 @@ en:
     labels:
       <<: *attributes
     hints:
-    actions: &actions
-      create: "Create %{model}"
-      update: "Save changes"
-      submit: "Proceed"
+    actions:
+      <<: *actions
   authentication:
     sign_in: "Sign in"
     sign_in_with: "Sign in with"
@@ -230,6 +228,7 @@ en:
   updated_multiple: "%{model} were successfully updated."
   updated_multiple_ko: "An error prohibited %{model} to be updated."
   deleted: "%{model} was successfully deleted."
+  deleted_ko: "An error prohibited %{model} to be deleted."
   deleted_multiple: "%{model} were successfully deleted."
   deleted_multiple_ko: "An error prohibited %{model} to be deleted."
   search_found: "%{found} found"

data/lib/generators/leolay/templates/config/locales/it.yml

@@ -176,9 +176,9 @@ it:
       # Default value for :prompt => true in FormOptionsHelper
       prompt: "Seleziona ..."
     # Default translation keys for submit FormHelper
-    submit:
+    submit: &actions
       create: "Crea %{model}"
-      update: "Aggiorna %{model}"
+      update: "Aggiorna"
       submit: "Procedi"
 
   activerecord: &activerecord
@@ -225,10 +225,8 @@ it:
     labels:
       <<: *attributes
     hints:
-    actions: &actions
-      create: "Crea %{model}"
-      update: "Aggiorna"
-      submit: "Procedi"
+    actions:
+      <<: *actions
   authentication:
     sign_in: "Accedi"
     sign_in_with: "Accedi con"
@@ -260,6 +258,7 @@ it:
   updated_multiple: "La modifica di %{model} è avvenuta con successo."
   updated_multiple_ko: "Un errore ha impedito la modifica di %{model}."
   deleted: "L'oggetto %{model} è stato eliminato."
+  updated_ko: "Un errore ha impedito l'eliminazione dell'oggetto %{model}."
   deleted_multiple: "L'eliminazione di %{model} è avvenuta con successo."
   deleted_multiple_ko: "Un errore ha impedito l'eliminazione di %{model}."
   search_found: "La ricerca ha trovato %{found}"

data/lib/generators/leonardo.rb

@@ -59,14 +59,16 @@ module Leonardo
       end
       "    #{name}#{value}"
     end
-    def attribute_to_requests(attribute)
+    def attribute_to_requests(attribute, object_id=nil)
+      object_id ||= "#{singular_table_name}_#{attribute.name}"
+      object_id = object_id.gsub('#', "\#{#{singular_table_name}.id}")
       case attribute.type
-        when :boolean                 then "check '#{singular_table_name}_#{attribute.name}' if #{singular_table_name}.#{attribute.name}"
-        when :references, :belongs_to then "select #{singular_table_name}.#{attribute.name}.name, :from => '#{singular_table_name}_#{attribute.name}_id'"
+        when :boolean                 then "check \"#{object_id}\" if #{singular_table_name}.#{attribute.name}"
+        when :references, :belongs_to then "select #{singular_table_name}.#{attribute.name}.name, :from => \"#{object_id}\""
         when :datetime, :time, :timestamp
                                       then ""
-        when :date                    then "fill_in '#{singular_table_name}_#{attribute.name}', :with => #{singular_table_name}.#{attribute.name}.strftime('%d-%m-%Y')"
-        else                               "fill_in '#{singular_table_name}_#{attribute.name}', :with => #{singular_table_name}.#{attribute.name}"
+        when :date                    then "fill_in \"#{object_id}\", :with => #{singular_table_name}.#{attribute.name}.strftime('%d-%m-%Y')"
+        else                               "fill_in \"#{object_id}\", :with => #{singular_table_name}.#{attribute.name}"
       end
     end
     def attribute_to_erb(attribute, object)
@@ -83,13 +85,17 @@ module Leonardo
       end
     end
     def get_attr_to_match(view=:list)
-      attributes.each do |attribute|
-        case attribute.type
-        when :string, :text then
-          return  "have_content(#{singular_table_name}.#{attribute.name})",
-                  "have_no_content(#{singular_table_name}.#{attribute.name})"
-        end
-      end
+      #attributes.each do |attribute|
+      #  case attribute.type
+      #  when :string, :text then
+      #    return  "have_content(#{singular_table_name}.#{attribute.name})",
+      #            "have_no_content(#{singular_table_name}.#{attribute.name})"
+      #  end
+      #end
+      attr = get_attr_to_check(view)
+      return  "have_content(#{singular_table_name}.#{attr})",
+              "have_no_content(#{singular_table_name}.#{attr})" if attr
+
       #If there are not string or text attributes
       case view
       when :list
@@ -98,6 +104,29 @@ module Leonardo
         return  "have_xpath('//table/tbody/tr')", "have_no_xpath('//table/tbody/tr')"
       end
     end
+    def get_attr_to_check(view=:list)
+      attribute = nil
+      case view
+      when :something
+      else
+        attributes.each{|a| attribute = case a.type when :string, :text then a.name end}
+        attributes.each{|a| attribute = case a.type when :references, :belongs_to, :datetime then nil else a.name end} unless attribute
+        #attributes.each do |attribute|
+        #  case attribute.type
+        #  when :references, :belongs_to, :datetime
+        #  else
+        #    selected_attr = attribute.name
+        #    break
+        #  end
+        #end
+      end
+      attribute
+    end
+    def fill_form_with_values(object_id=nil)
+      items = []
+      attributes.each{|a|items << "        #{attribute_to_requests(a, object_id)}"}
+      items
+    end
   end
 
   module Nested

data/lib/generators/rails/leosca/leosca_generator.rb

@@ -26,7 +26,6 @@ module Rails
               post :select,           :on => :collection
               post :edit_multiple,    :on => :collection
               put  :update_multiple,  :on => :collection
-              post :copy,             :on => :collection
               put  :create_multiple,  :on => :collection
             end
         FILE

data/lib/generators/rails/leosca_controller/leosca_controller_generator.rb

@@ -19,6 +19,7 @@ module Rails
       class_option :remote, :type => :boolean, :default => true, :desc => "Enable ajax. You can also do later set remote to true into index view."
       class_option :under, :type => :string, :default => "", :banner => "brand/category", :desc => "To nest a resource under another(s)"
       class_option :leospace, :type => :string, :default => "", :banner => ":admin", :desc => "To nest a resource under namespace(s)"
+      class_option :auth_class, :type => :boolean, :default => 'user', :desc => "Set the authentication class name"
 
       #Override
       def create_controller_files
@@ -92,18 +93,25 @@ module Rails
         return unless File.exists?(file)
         inject_into_file file, :before => "  end\nend" do
           <<-FILE.gsub(/^      /, '')
-          #can :read, #{class_name} if user.new_record? #Guest
-          can :read, #{class_name} if user.role? :guest #Registered guest
-          if user.role? :user
+          #can :read, #{class_name} if #{options[:auth_class]}.new_record? #Guest
+          can :read, #{class_name} if #{options[:auth_class]}.role? :guest #Registered guest
+          if #{options[:auth_class]}.role? :user
             can :read, #{class_name}
-            can :update, #{class_name}
             can :create, #{class_name}
+            can [:update, :destroy, :select, :create_multiple, :update_multiple], #{class_name} do |#{singular_table_name}|
+              if defined?(#{singular_table_name}.#{options[:auth_class]}_id)
+                #{singular_table_name}.#{options[:auth_class]}_id == #{options[:auth_class]}.id
+              else
+                true
+              end
+            end
           end
-          if user.role? :manager
+          if #{options[:auth_class]}.role? :manager
             can :read, #{class_name}
             can :update, #{class_name}
             can :create, #{class_name}
             can :destroy, #{class_name}
+            can [:select, :create_multiple, :update_multiple], #{class_name}
           end
 
           FILE

data/lib/generators/rails/leosca_controller/templates/controller.rb

@@ -132,7 +132,8 @@ end
   def create_multiple
     respond_to do |format|
       if <%= class_name %>.create(params[:<%= plural_table_name %>].values)
-        format.html { redirect_to <%= list_resources_path %>, :notice => I18n.t(:created_multiple, :model => I18n.t('models.<%= plural_table_name %>')) }
+        num = params[:<%= plural_table_name %>].values.size
+        format.html { redirect_to <%= list_resources_path %>, :notice => (num == 1 ? I18n.t(:created, :model => I18n.t('models.<%= singular_table_name %>')) : I18n.t(:created_multiple, :model => "#{num} #{I18n.t('models.<%= plural_table_name %>')}") ) }
       else
         format.html { render :action => "copy" }
       end
@@ -158,7 +159,8 @@ end
   def update_multiple
     respond_to do |format|
       if <%= class_name %>.update(params[:<%= plural_table_name %>].keys, params[:<%= plural_table_name %>].values)
-        format.html { redirect_to <%= list_resources_path %>, :notice => I18n.t(:updated_multiple, :model => I18n.t('models.<%= plural_table_name %>')) }
+        num = params[:<%= plural_table_name %>].values.size
+        format.html { redirect_to <%= list_resources_path %>, :notice => (num == 1 ? I18n.t(:updated, :model => I18n.t('models.<%= singular_table_name %>')) : I18n.t(:updated_multiple, :model => "#{num} #{I18n.t('models.<%= plural_table_name %>')}") ) }
       else
         format.html { render :action => "edit_multiple" }
       end
@@ -209,8 +211,12 @@ end
       respond_to do |format|
         format.js
         format.html do
+          num_ok = num_ko = 0
+          @results.each {|k, v| result, msg = v; result ? num_ok +=1 : num_ko +=1}
           case @operation
           when :destroy
+            flash[:notice] = (num_ok == 1 ? I18n.t(:deleted, :model => I18n.t('models.<%= singular_table_name %>')) : I18n.t(:deleted_multiple, :model => "#{num_ok} #{I18n.t('models.<%= plural_table_name %>')}") ) if num_ok > 0
+            flash[:error] = (num_ko == 1 ? I18n.t(:deleted_ko, :model => I18n.t('models.<%= singular_table_name %>')) : I18n.t(:deleted_multiple_ko, :model => "#{num_ko} #{I18n.t('models.<%= plural_table_name %>')}") ) if num_ko > 0
             redirect_to <%= list_resources_path %> and return
           when :edit
             render :edit_multiple and return

data/lib/generators/rspec/leointegration/templates/request_spec.rb

@@ -1,11 +1,5 @@
 require 'spec_helper'
-<%-
-items = []
-attributes.each do |attribute|
-  items << "        #{attribute_to_requests(attribute)}"
-end
-check_attr_to_have, check_attr_to_not_have = get_attr_to_match
--%>
+<%- check_attr_to_have, check_attr_to_not_have = get_attr_to_match -%>
 
 describe "<%= class_name.pluralize %>" do
   describe "GET /<%= table_name %>" do
@@ -23,12 +17,106 @@ describe "<%= class_name.pluralize %>" do
         <%= singular_table_name %> = Factory.build(:<%= singular_table_name %>)
         visit <%= new_resource_path_test %>
         <%= "login_view_as(:user_admin)" if authentication? %>
-<%= items.join(CRLF) %>
+<%= fill_form_with_values.join(CRLF) %>
         click_button "Create #{I18n.t('models.<%= singular_table_name %>')}"
         #save_and_open_page #uncomment to debug
         page.should have_content(I18n.t(:created, :model => I18n.t('models.<%= singular_table_name %>')))
         page.should <%= check_attr_to_have %>
       end
+
+      it "copy one <%= singular_table_name %>" do
+        <%= singular_table_name %> = Factory(:<%= singular_table_name %>)
+        visit <%= list_resources_path_test %>
+        <%= "login_view_as(:user_manager)" if authentication? -%>
+        #save_and_open_page #uncomment to debug
+        page.should <%= check_attr_to_have %>
+        assert page.find("#tr#{<%= singular_table_name %>.id}").visible?
+        check("check#{<%= singular_table_name %>.id}")
+        click_button I18n.t(:copy).upcase
+        page.should have_content(I18n.t('attributes.<%= singular_table_name %>.op_copy'))
+<%= fill_form_with_values("#{plural_table_name}_#_name").join(CRLF) %>
+        click_button I18n.t(:submit)
+        page.should have_content(I18n.t(:created, :model => I18n.t('models.<%= singular_table_name %>')))
+      end
+
+      it "copy several <%= plural_table_name %>" do
+        <%= plural_table_name %> = FactoryGirl.create_list(:<%= singular_table_name %>, 2)
+        visit <%= list_resources_path_test %>
+        <%= "login_view_as(:user_manager)" if authentication? -%>
+        #save_and_open_page #uncomment to debug
+        <%= plural_table_name %>.each do |<%= singular_table_name %>|
+          page.should <%= check_attr_to_have %>
+          assert page.find("#tr#{<%= singular_table_name %>.id}").visible?
+          check "check#{<%= singular_table_name %>.id}"
+        end
+        click_button I18n.t(:copy).upcase
+        page.should have_content(I18n.t('attributes.<%= singular_table_name %>.op_copy'))
+        <%= plural_table_name %>.each do |<%= singular_table_name %>|
+  <%= fill_form_with_values("#{plural_table_name}_#_name").join(CRLF) %>
+        end
+        click_button I18n.t(:submit)
+        page.should have_content(I18n.t(:created_multiple, :model => "#{<%= plural_table_name %>.size} #{I18n.t('models.<%= plural_table_name %>')}"))
+      end
+
+      it "edit one <%= singular_table_name %>" do
+        <%= singular_table_name %> = Factory(:<%= singular_table_name %>)
+        visit <%= list_resources_path_test %>
+        <%= "login_view_as(:user_manager)" if authentication? -%>
+        #save_and_open_page #uncomment to debug
+        page.should <%= check_attr_to_have %>
+        assert page.find("#tr#{<%= singular_table_name %>.id}").visible?
+        check("check#{<%= singular_table_name %>.id}")
+        click_button I18n.t(:edit).upcase
+        page.should have_content(I18n.t('attributes.<%= singular_table_name %>.op_edit_multiple'))
+<%= fill_form_with_values("#{plural_table_name}_#_name").join(CRLF) %>
+        click_button I18n.t(:submit)
+        page.should have_content(I18n.t(:updated, :model => I18n.t('models.<%= singular_table_name %>')))
+      end
+
+      it "edit several <%= plural_table_name %>" do
+        <%= plural_table_name %> = FactoryGirl.create_list(:<%= singular_table_name %>, 2)
+        visit <%= list_resources_path_test %>
+        <%= "login_view_as(:user_manager)" if authentication? -%>
+        #save_and_open_page #uncomment to debug
+        <%= plural_table_name %>.each do |<%= singular_table_name %>|
+          page.should <%= check_attr_to_have %>
+          assert page.find("#tr#{<%= singular_table_name %>.id}").visible?
+          check "check#{<%= singular_table_name %>.id}"
+        end
+        click_button I18n.t(:edit).upcase
+        page.should have_content(I18n.t('attributes.<%= singular_table_name %>.op_edit_multiple'))
+        <%= plural_table_name %>.each do |<%= singular_table_name %>|
+  <%= fill_form_with_values("#{plural_table_name}_#_name").join(CRLF) %>
+        end
+        click_button I18n.t(:submit)
+        page.should have_content(I18n.t(:updated_multiple, :model => "#{<%= plural_table_name %>.size} #{I18n.t('models.<%= plural_table_name %>')}"))
+      end
+
+      it "destroy one <%= singular_table_name %>" do
+        <%= singular_table_name %> = Factory(:<%= singular_table_name %>)
+        visit <%= list_resources_path_test %>
+        <%= "login_view_as(:user_manager)" if authentication? -%>
+        #save_and_open_page #uncomment to debug
+        page.should <%= check_attr_to_have %>
+        assert page.find("#tr#{<%= singular_table_name %>.id}").visible?
+        check("check#{<%= singular_table_name %>.id}")
+        click_button I18n.t(:destroy).upcase
+        page.should have_content(I18n.t(:deleted, :model => I18n.t('models.<%= singular_table_name %>')))
+      end
+
+      it "destroy several <%= plural_table_name %>" do
+        <%= plural_table_name %> = FactoryGirl.create_list(:<%= singular_table_name %>, 2)
+        visit <%= list_resources_path_test %>
+        <%= "login_view_as(:user_manager)" if authentication? -%>
+        #save_and_open_page #uncomment to debug
+        <%= plural_table_name %>.each do |<%= singular_table_name %>|
+          page.should <%= check_attr_to_have %>
+          assert page.find("#tr#{<%= singular_table_name %>.id}").visible?
+          check "check#{<%= singular_table_name %>.id}"
+        end
+        click_button I18n.t(:destroy).upcase
+        page.should have_content(I18n.t(:deleted_multiple, :model => "#{<%= plural_table_name %>.size} #{I18n.t('models.<%= plural_table_name %>')}"))
+      end
     end
 
     describe "Check ajax /<%= plural_table_name %>" do
@@ -37,7 +125,7 @@ describe "<%= class_name.pluralize %>" do
         visit <%= list_resources_path_test %>
         <%= "login_view_as(:user_manager)" if authentication? %>            #authentication
         page.find("div#list").should <%= check_attr_to_have %>
-        click_link I18n.t(:show)
+        click_link "#{<%= singular_table_name %>.id}"
         page.find("div.ui-dialog").should <%= check_attr_to_have %>         #checks if dialog is appeared
         click_link "close"                                              #close dialog
         !page.find("div.ui-dialog").visible?                            #checks if dialog has been closed

data/lib/generators/rspec/leosca/templates/controller_spec.rb

@@ -168,7 +168,7 @@ describe <%= leospaced? ? (base_namespaces << controller_class_name).join('/').c
     <%- if authorization? -%>
     describe "without authorization" do
       it "destroys the requested <%= ns_file_name %>" do
-        <%= "login_controller_as(:user)" if authentication? %>
+        <%= "login_controller_as(:user_guest)" if authentication? %>
         <%= file_name %> = Factory(:<%= file_name %>)
         expect {
           delete :destroy, :id => <%= file_name %>.id.to_s<%= nested_params_http_request %>

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: leonardo
 version: !ruby/object:Gem::Version 
-  hash: 62196241
+  hash: 62196247
   prerelease: 6
   segments: 
   - 1
   - 9
   - 0
   - beta
-  - 1
-  version: 1.9.0.beta1
+  - 2
+  version: 1.9.0.beta2
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2011-12-09 00:00:00 Z
 dependencies: []
 
 description: A generator for creating Rails 3.1 applications ready to go. It generates the layout, the style, the internationalization and manage external gems for authentication, authorization and other. It also provides a customized scaffold to generates cool sites ajax ready in few minutes. If you find a bug please report to m.mastrodonato@gmail.com