leonardo 1.9.0 → 1.10.0

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

@@ -82,10 +82,27 @@ module Erb
         file = "app/views/#{plural_last_parent}/_row_index.html.erb"
         inject_into_file file, :before => "<!-- Manage section, do not remove this tag -->" do
           <<-FILE.gsub(/^          /, '')
-          <td><%= link_to t('models.#{plural_table_name}'), #{list_resources_path_back} %></td>
+          <td><%= link_to t('models.#{plural_table_name}'), #{list_resources_path_back} %><%= link_to "", #{last_parent}_with_#{plural_table_name}_path(#{last_parent}), :id => "a_#{singular_table_name[0..5]}_\#{#{last_parent}.id}", :class =>"toggle_#{plural_table_name} desc", :remote => true %></td>
 
           FILE
         end if File.exists?(file)
+        available_nested_views.each do |view|
+          filenames = filenames_all_formats(view, source_paths)
+          filenames.each do |filename|
+            #Looking for custom filename into subfolder
+            filename_source = "#{"formtastic/" if formtastic?}#{filename}"
+            search_into_subfolder = nil
+            source_paths.each do |path|
+              if File.exists?(File.join(path,filename_source))
+                search_into_subfolder = true
+                break
+              end
+            end
+            filename_source = filename unless search_into_subfolder
+
+            template filename_source, File.join("app/views", base_namespaces, plural_last_parent, filename.sub('nested', plural_table_name))
+          end
+        end
       end
 
     protected
@@ -95,6 +112,10 @@ module Erb
         %w(index edit edit_multiple copy show new _form _form_multiple _fields destroy _show _list _row_index select)
       end
 
+      def available_nested_views
+        %w(_nested with_nested)
+      end
+
       def filenames_all_formats(name, paths=[], formats=[:html, :js, nil])
         filenames = []
         paths.each do |path|

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

@@ -22,7 +22,7 @@
   </thead>
   <tbody>
 <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| -%>
-  <tr id="tr<%%= <%= singular_table_name %>.id %>" class="<%%= cycle("odd", "even")%>">
+  <tr id="tr_<%= singular_table_name[0..5] %>_<%%= <%= singular_table_name %>.id %>" class="<%%= cycle("odd", "even")%>">
 <%%= render 'row_index', :<%= singular_table_name %> => <%= singular_table_name %>, :remote => remote, :message => "" %>
   </tr>
 <%% end -%>
@@ -30,7 +30,8 @@
 </table>
 
 <div class="separator"></div>
-<div style="clear:both;">
+<div class="clear"></div>
+<div>
 <%- if authorization? -%>
 <%%- if can? :destroy, <%= class_name %> -%>
 <%- end -%>

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

@@ -0,0 +1,15 @@
+<tr id="th_<%= singular_table_name[0..5] %>_<%%= @<%= last_parent %>.id %>" style="display: none;text-align: left;" class="header <%= plural_table_name %> tr_<%= singular_table_name[0..5] %>_<%%= @<%= last_parent %>.id %>">
+    <th></th>
+<%- attributes.first(5).each do |attribute| -%>
+    <th><%%= t('attributes.transaction.<%= attribute.name %>') -%></th>
+<%- end -%>
+</tr>
+
+<%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| -%>
+<tr id="tr_<%= singular_table_name[0..5] %>_<%%= <%= singular_table_name %>.id %>" style="display: none;" class="tr_<%= singular_table_name[0..5] %>_<%%= @<%= last_parent %>.id %> <%%= cycle("odd", "even")%>">
+    <td style="text-align: center;">└</td>
+<%- attributes.first(5).each do |attribute| -%>
+    <td><%= attribute_to_erb(attribute, singular_table_name) -%></td>
+<%- end -%>
+</tr>
+<%% end -%>

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

@@ -1,6 +1,5 @@
 <table>
 <%- attributes.each do |attribute| -%>
-
 <tr>
     <td><b><%%= t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %>:</b></td>
     <td><%= attribute_to_erb(attribute, "@#{singular_table_name}") %></td>

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

@@ -1,16 +1,21 @@
 <%%= f.inputs do %>
 <%- attributes.each do |attribute| -%>
-    <%- case attribute.type
-        when :references, :belongs_to  -%>
-    <%% if <%= singular_table_name %>.new_record? -%>
-        <%%= f.input :<%= attribute.name %> if can?(:manage, <%=class_name %>) %>
-    <%% else -%>
+    <%- case attribute.name
+        when 'state'  -%>
+        <%%= f.input :<%= attribute.name %>, :as => :select, :collection => <%= class_name %>.state_machine.states.map{|s| [t("states.generic.#{s.name.to_s}"), s.value]} %>
+        <%-	else -%>
+        <%- case attribute.type
+            when :references, :belongs_to  -%>
+        <%% if <%= singular_table_name %>.new_record? -%>
+            <%%= f.input :<%= attribute.name %> if can?(:manage, <%=class_name %>) %>
+        <%% else -%>
+            <%%= f.input :<%= attribute.name %> %>
+        <%% end -%>
+        <%-	when :date -%>
+        <%%= f.input :<%= attribute.name %>, :as => :string, :input_html => { :class => 'calendar', :maxlength => 10 } %>
+        <%-	else -%>
         <%%= f.input :<%= attribute.name %> %>
-    <%% end -%>
-    <%-	when :date -%>
-    <%%= f.input :<%= attribute.name %>, :as => :string, :input_html => { :class => 'calendar', :maxlength => 10 } %>
-    <%-	else -%>
-    <%%= f.input :<%= attribute.name %> %>
+        <%- end -%>
     <%- end -%>
 <%- end -%>
 <%% end %>

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

@@ -5,8 +5,16 @@
 <%% title t('attributes.<%= singular_table_name %>.op_index'<%= ", {:parent => \"#{last_parent}\", :name => @#{last_parent}.try(:name) || @#{last_parent}.try(:id)}" if nested? -%>) %>
 
 <%% remote = @remote %>
+
+<div id="index_wrapper">
+
+<div id="list">
+  <%%= render 'list', :remote => remote %>
+</div>
+
+<div id="filter_container">
 <%%= form_for <%= show_resource_path("@") %>, :remote => remote, :html => { :method => :get, :id => "form_search" } do |f| %>
-<div class="filter-container">
+  <div class="filter-container">
   <%- attributes.each do |attribute| -%>
   <div class="filter-field">
     <%- case attribute.type -%>
@@ -28,21 +36,23 @@
         <%%= radio_button("<%= singular_table_name %>", "<%= attribute.name %>", "0", {:checked => (!@<%= singular_table_name %>.<%= attribute.name %>), :class => 'autosubmit'}) %><%%= label_tag "<%= singular_table_name %>_<%= attribute.name %>_0", t(:no) %><br />
         <%%= radio_button("<%= singular_table_name %>", "<%= attribute.name %>", "", {:class => 'autosubmit'}) %><%%= label_tag "<%= singular_table_name %>_<%= attribute.name %>_", t(:all) %>
     <%-	when :text -%>
-        <%%= f.text_field :<%= attribute.name %> %>
+        <%%= f.text_field :<%= attribute.name %>, :size => 15 %>
     <%-	when :date -%>
-        <%%= f.text_field :<%= attribute.name %>, :class => "autosubmit<%=" calendar" if jquery_ui? %>" %>
+        <%%= f.text_field :<%= attribute.name %>, :class => "autosubmit<%=" calendar" if jquery_ui? %>", :size => 15 %>
     <%-	else -%>
-        <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+        <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :size => 15 %>
     <%- end -%>
   </div>
+  <div class="clear"></div>
   <%- end -%>
-  <div style="clear:both;">
-      <%%= f.submit t(:search), {:class=>'button medium'} %>
-      <%%= f.submit 'Csv', {:class=>'button medium csv'} %>
   </div>
-</div>
+  <div class="clear"></div>
+  <div>
+      <%%= f.submit t(:search), {:class=>'button small'} %>
+      <%%#= f.submit 'Csv', {:class=>'button small csv'} %>
+  </div>
 <%% end %>
-
-<div id="list">
-    <%%= render 'list', :remote => remote %>
 </div>
+<div class="clear"></div>
+
+</div>

data/lib/generators/erb/leosca/templates/with_nested.js.erb

@@ -0,0 +1,9 @@
+if ($("#a_<%= singular_table_name[0..5] %>_<%%= @<%= last_parent %>.id %>").hasClass('asc')) {
+    $("#a_<%= singular_table_name[0..5] %>_<%%= @<%= last_parent %>.id %>").removeClass('asc').addClass('desc');
+    $(".tr_<%= singular_table_name[0..5] %>_<%%= @<%= last_parent %>.id %>").slideUp();
+} else {
+    $("#a_<%= singular_table_name[0..5] %>_<%%= @<%= last_parent %>.id %>").removeClass('desc').addClass('asc');
+    $(".tr_<%= singular_table_name[0..5] %>_<%%= @<%= last_parent %>.id %>").remove();
+    $("#tr_<%= last_parent[0..5] %>_<%%= @<%= last_parent %>.id %>").after("<%%= escape_javascript(render('<%= plural_table_name %>', :remote => true))%>");
+    $(".tr_<%= singular_table_name[0..5] %>_<%%= @<%= last_parent %>.id %>").show('fast');
+}

data/lib/generators/leolay/leolay_generator.rb

@@ -15,6 +15,7 @@ class LeolayGenerator < Rails::Generators::Base
     template "config.rb", "config/initializers/config.rb"
 
     template "styles/#{style_name}/stylesheets/app/stylesheet.sass", "app/assets/stylesheets/#{style_name}.sass"
+    copy_file "styles/#{style_name}/stylesheets/app/states.sass", "app/assets/stylesheets/states.sass"
 
     copy_file "app/helpers/layout_helper.rb", "app/helpers/layout_helper.rb"
 
@@ -99,6 +100,13 @@ class LeolayGenerator < Rails::Generators::Base
           end
           I18n.locale = session[:lang]
         end
+        def get_operator(str, default='=')
+          m = str.match(/^(\<|\>|\=)(\>|\=|)/)
+          m ? m.to_s : default
+        end
+        def get_value(str)
+          str.sub(get_operator(str), '').strip
+        end
         FILE
       end
     end

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

@@ -35,16 +35,15 @@ en:
       confirmed: 'Your account was successfully confirmed. You are now signed in.'
     registrations:
       signed_up: 'Welcome! You have signed up successfully.'
-      inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
+      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
       updated: 'You updated your account successfully.'
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
       destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
-      reasons:
-        inactive: 'inactive'
-        unconfirmed: 'unconfirmed'
-        locked: 'locked'
     unlocks:
       send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
-      unlocked: 'Your account was successfully unlocked. You are now signed in.'
+      unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'
       send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
     omniauth_callbacks:
       success: 'Successfully authorized from %{kind} account.'

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

@@ -1,3 +1,5 @@
+
+
 it:
   errors:
     messages:
@@ -33,24 +35,23 @@ it:
       confirmed: "Il tuo account è stato correttamente confermato. Ora sei collegato."
     registrations:
       signed_up: "Iscrizione correttamente eseguita."
-      inactive_signed_up: 'Ti sei registrato, ma non sei collegato perchè il tuo account è %{reason}.'
+      signed_up_but_unconfirmed: "Un messaggio con il link di conferma è stato inviato al tuo indirizzo email. Dovresti cliccare su quel link per attivare il tuo account."
+      signed_up_but_inactive: "Ti sei registrato con successo. Tuttavia, non è stato possibile effettuare il login perché il tuo account non è ancora stato attivato."
+      signed_up_but_locked: "Ti sei registrato con successo. Tuttavia, non è stato possibile effettuare il login perché il tuo account è bloccato."
       updated: "Il tuo account è stato aggiornato."
+      update_needs_confirmation: "È stato aggiornato il tuo account con successo, ma abbiamo bisogno di verificare il tuo nuovo indirizzo email. Controlla la tua email e clicca sul link per confermare il nuovo indirizzo email."
       destroyed: "Arrivederci! L'account è stato cancellato. Speriamo di rivederti presto."
-      reasons:
-        inactive: "Inattivo"
-        unconfirmed: "Non confermato"
-        locked: "Bloccato"
     unlocks:
       send_instructions: "Riceverai un messaggio email con le istruzioni per sbloccare il tuo account entro qualche minuto."
       unlocked: "Il tuo account è stato correttamente sbloccato. Ora sei collegato."
       send_paranoid_instructions: "Se il tuo indirizzo e-mail esiste nel nostro database, fra pochi minuti riceverai un link con le istruzioni per sbloccare il tuo account."
     omniauth_callbacks:
       success: "Sei stato autorizzato dall'account di %{kind}."
-      failure: 'Non siamo riusciti ad autoruzzarti da %{kind} perchè "%{reason}".'
+      failure: "Non siamo riusciti ad autoruzzarti da %{kind} perchè '%{reason}'."
     mailer:
       confirmation_instructions:
         subject: "Istruzioni per la conferma"
       reset_password_instructions:
         subject: "Istruzioni per reimpostare la password"
       unlock_instructions:
-        subject: "Istruzioni per sbloccare l'account"
+        subject: "Istruzioni per sbloccare l'account"

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

@@ -215,6 +215,14 @@ en:
     change_password: "Change password"
     current_password: "Current password"
     new_password: "New password"
+  states:
+    generic:
+      new: "New"
+      waiting: "Waiting"
+      working: "Working"
+      canceled: "Canceled"
+      completed: "Completed"
+      closed: "Closed"
 
   unknown_request: "Sorry, this request is unknown and cannot be processed"
   generic_error: "An error was occured and doesn't permit to execute this operation"

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

@@ -244,7 +244,14 @@ it:
     change_password: "Cambia la password"
     current_password: "Password attuale"
     new_password: "Nuova password"
-
+  states:
+    generic:
+      new: "Nuovo"
+      waiting: "Attesa"
+      working: "Lavorazione"
+      canceled: "Eliminato"
+      completed: "Completato"
+      closed: "Chiuso"
 
   unknown_request: "Spiacente, richiesta sconosciuta, non è possibile eseguirla"
   generic_error: "Un errore impedisce di svolgere questa operazione"

data/lib/generators/leolay/templates/styles/cloudy/stylesheets/app/states.sass

@@ -0,0 +1,60 @@
+$color_new: rgb(140,140,140)
+$bg_new: inherit
+
+$bg_waiting: rgb(240,180,120)
+$color_waiting: lighten($bg_waiting, 50%)
+
+$bg_working: rgb(140,160,230)
+$color_working: lighten($bg_working, 50%)
+
+$bg_canceled: rgb(220,140,140)
+$color_canceled: white
+
+$bg_completed: rgb(110,160,110)
+$color_completed: lighten($bg_completed, 50%)
+
+$bg_closed: rgb(80,70,80)
+$color_closed: lighten($bg_closed, 50%)
+
+@mixin rounded-corners($radius: 4px)
+  border-radius: $radius
+  -moz-border-radius: $radius
+  -webkit-border-radius: $radius
+
+.state
+  margin: 0px auto
+  padding: 4px
+  font-size: 0.7em
+  letter-spacing: 0.15em
+  text-transform: uppercase
+  &.generic
+    &.new
+      color: $color_new
+      border: 1px $color_new solid
+      background-color: $bg_new
+      @include rounded-corners
+    &.waiting, &.wait
+      color: $color_waiting
+      background-color: $bg_waiting
+      border: 1px $color_waiting solid
+      @include rounded-corners
+    &.working
+      color: $color_working
+      background-color: $bg_working
+      border: 1px $color_working solid
+      @include rounded-corners
+    &.canceled, &.deleted
+      color: $color_canceled
+      background-color: $bg_canceled
+      border: 1px darker($bg_canceled, 30%) dotted
+      @include rounded-corners
+    &.completed, &.complete
+      color: $color_completed
+      background-color: $bg_completed
+      border: 1px darker($bg_completed, 30%) solid
+      @include rounded-corners
+    &.closed
+      color: $color_closed
+      background-color: $bg_closed
+      border: 1px $color_closed dotted
+      @include rounded-corners

data/lib/generators/leolay/templates/styles/cloudy/stylesheets/app/stylesheet.sass

@@ -20,13 +20,14 @@ $textbox_bg: #f5f5f5          //related to the textbox image
 $table_row_selection_color: rgb(255,255,210)
 
 $style_path: styles/<%= style_name %>
+@import "states"
 
 *
   margin: 0
 
 body
   font-family: Tahoma, Verdana, Arial
-  font-size: 18px
+  font-size: 16px
   background-color: $main_color
   color: $text_color
 
@@ -84,7 +85,22 @@ div#container
   border-radius: 0px 10px 10px 10px
   //-webkit-border-radius: 0px 10px 10px 10px
 
+div#list
+  margin-right: 260px
+  float: left
+  min-width: 60%
 
+#filter_container
+  float: left
+  margin-left: -250px
+  margin-top: 80px
+  width: 250px
+
+.filter-container
+  padding-bottom: 8px
+  .filter-field
+    float: left
+    padding: 4px
 
 div#footer
   p
@@ -92,7 +108,6 @@ div#footer
     font-size: 0.8em
     text-align: center
 
-
 input, select, textarea
   background: $textbox_bg url($style_path + '/input_background_bn.png') repeat-x scroll 0 0
   color: $textbox_color
@@ -234,13 +249,6 @@ h3
     border-color: #C00
     color: #C00
 
-
-.filter-container
-  padding-bottom: 8px
-  .filter-field
-    float: left
-    padding: 4px
-
 form
   div.field
     padding: 5px 0
@@ -258,6 +266,18 @@ form
 
 table.user
   width: 100%
+  & .sorted
+    color: $text_color
+  & .asc
+    padding-right: 10px
+    background-repeat: no-repeat
+    background-position: right center
+    background-image: url($style_path + '/arrow_up.png')
+  & .desc
+    padding-right: 10px
+    background-repeat: no-repeat
+    background-position: right center
+    background-image: url($style_path + '/arrow_down.png')
   thead
     tr
       & :hover
@@ -274,15 +294,6 @@ table.user
         &.main
           font-weight: bold
           text-align: center
-        & .sorted
-          color: $text_color
-          padding-right: 10px
-          background-repeat: no-repeat
-          background-position: right center
-        & .asc
-          background-image: url($style_path + '/arrow_up.png')
-        & .desc
-          background-image: url($style_path + '/arrow_down.png')
   tbody
     tr
       line-height: 1.2em

data/lib/generators/leolay/templates/styles/cloudy/views/layout/_layout.html.erb

@@ -33,6 +33,6 @@
 </div>
 
 <div id="footer">
-  <p><%%= style_image_tag("logo.png", {:style=>"border: gray 1px solid"}) %></p>
+  <p><%%= style_image_tag("logo.png") %></p>
   <p><%%= CONFIG[:application][:name] %> 2011, all rights reserved.</p>
 </div>

data/lib/generators/leonardo.rb

@@ -72,16 +72,20 @@ module Leonardo
       end
     end
     def attribute_to_erb(attribute, object)
-      case attribute.type
-      when :boolean                   then "<%= #{object}.#{attribute.name} ? style_image_tag(\"ico_v.png\", :class => \"ico_true\") : style_image_tag(\"ico_x.png\", :class => \"ico_false\") %>"
-      when :references, :belongs_to   then "<%= link_to(#{object}.#{attribute.name}.try(:name) || \"#\#{#{object}.#{attribute.name}.try(:id)}\", #{object}.#{attribute.name}, :remote => @remote) %>"
-      when :integer                   then "<%= number_with_delimiter #{object}.#{attribute.name} %>"
-      when :decimal                   then "<%= number_to_currency #{object}.#{attribute.name} %>"
-      when :float                     then "<%= number_with_precision #{object}.#{attribute.name} %>"
-      when :date                      then "<%= #{object}.#{attribute.name}.strftime('%d-%m-%Y') if #{object}.#{attribute.name} %>"
-      when :datetime                  then "<%= #{object}.#{attribute.name}.strftime('%d-%m-%Y %H:%M:%S') if #{object}.#{attribute.name} %>"
-      when :time, :timestamp          then "<%= #{object}.#{attribute.name}.strftime('%H:%M:%S') if #{object}.#{attribute.name} %>"
-      else                                 "<%= #{object}.#{attribute.name} %>"
+      case attribute.name
+      when "state"                      then "<span class=\"state generic <%= #{object}.state_name.to_s %>\"><%= t(\"states.generic.\#{#{object}.state_name.to_s}\") %></span><span style=\"display:block;\"></span>"
+      else
+        case attribute.type
+        when :boolean                   then "<%= #{object}.#{attribute.name} ? style_image_tag(\"ico_v.png\", :class => \"ico_true\") : style_image_tag(\"ico_x.png\", :class => \"ico_false\") %>"
+        when :references, :belongs_to   then "<%= link_to(#{object}.#{attribute.name}.try(:name) || \"#\#{#{object}.#{attribute.name}.try(:id)}\", #{object}.#{attribute.name}, :remote => @remote) %>"
+        when :integer                   then "<%= number_with_delimiter #{object}.#{attribute.name} %>"
+        when :decimal                   then "<%= number_to_currency #{object}.#{attribute.name} %>"
+        when :float                     then "<%= number_with_precision #{object}.#{attribute.name} %>"
+        when :date                      then "<%= #{object}.#{attribute.name}.strftime('%d-%m-%Y') if #{object}.#{attribute.name} %>"
+        when :datetime                  then "<%= #{object}.#{attribute.name}.strftime('%d-%m-%Y %H:%M:%S') if #{object}.#{attribute.name} %>"
+        when :time, :timestamp          then "<%= #{object}.#{attribute.name}.strftime('%H:%M:%S') if #{object}.#{attribute.name} %>"
+        else                                 "<%= #{object}.#{attribute.name} %>"
+        end
       end
     end
     def get_attr_to_match(view=:list)

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

@@ -18,18 +18,35 @@ module Rails
         return if options[:actions].present?
 
         route_config = ""
-        route_config << plural_parent_resources.map{|m| "resources :#{m} do " }.join(" ") if nested?
+        iparent = 0
+
+        if nested?
+          plural_parent_resources.each do |m|
+            iparent += 2
+            indent = eval "/^\s{#{16 - iparent}}/"
+            route_config << <<-FILE.gsub(indent, '')
+              resources :#{m} do
+                  get :with_#{file_name.pluralize}
+                  post :select,           :on => :collection
+                  post :edit_multiple,    :on => :collection
+                  put  :update_multiple,  :on => :collection
+                  put  :create_multiple,  :on => :collection
+            FILE
+          end
+        end
         route_config << base_namespaces.map{|m| "namespace :#{m} do " }.join(" ") if leospaced?
         route_config << regular_class_path.map{|m| "namespace :#{m} do " }.join(" ")
-        route_config << <<-FILE.gsub(/^          /, '')
+        indent = eval "/^\s{#{8 - iparent}}/"
+        route_config << <<-FILE.gsub(indent, '')
+
           resources :#{file_name.pluralize} do
-              post :select,           :on => :collection
-              post :edit_multiple,    :on => :collection
-              put  :update_multiple,  :on => :collection
-              put  :create_multiple,  :on => :collection
-            end
+            post :select,           :on => :collection
+            post :edit_multiple,    :on => :collection
+            put  :update_multiple,  :on => :collection
+            put  :create_multiple,  :on => :collection
+          end
         FILE
-        route_config << " end" * (regular_class_path.size + plural_parent_resources.size + base_namespaces.size)
+        route_config << "  end" * (regular_class_path.size + plural_parent_resources.size + base_namespaces.size)
         route route_config
       end
 

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

@@ -155,7 +155,20 @@ module Rails
           end
           FILE
         end if File.exists?(file)
+      end
+
+      def update_parent_controller
+        return unless nested?
+        file = "app/controllers/#{plural_last_parent}_controller.rb"
+        inject_into_file file, :before => "  private" do
+          <<-FILE.gsub(/^          /, '')
+            def with_#{plural_table_name}
+              @#{last_parent} = #{last_parent.classify}.find params[:#{last_parent}_id]
+              @#{plural_table_name} = #{class_name}.where(:#{last_parent}_id => params[:#{last_parent}_id)
+            end
 
+          FILE
+        end if File.exists?(file)
       end
 
     end

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

@@ -35,7 +35,7 @@ end
               end -%>
       <%- conditions_operator_sign = case attribute.type
         when :string, :text then "LIKE"
-        else "="
+        else "\#{get_operator(params[:#{singular_table_name}][:#{attr_name}])}"
       end -%>
       <%- conditions_operator_value = case attribute.type
          when :string, :text then "%"
@@ -45,7 +45,7 @@ end
 
       if params[:<%= singular_table_name %>][:<%= attr_name %>] && params[:<%= singular_table_name %>][:<%= attr_name %>].length>0
         conditions_fields << "#{<%= class_name %>.table_name}.<%= attr_name %> <%= conditions_operator_sign %> ?"
-        conditions_values << "<%= conditions_operator_value %>#{params[:<%= singular_table_name %>][:<%= attr_name %>]}<%= conditions_operator_value %>"
+        conditions_values << "<%= conditions_operator_value %>#{get_value(params[:<%= singular_table_name %>][:<%= attr_name %>])}<%= conditions_operator_value %>"
         @<%= singular_table_name %>.<%= attr_name %> = params[:<%= singular_table_name %>][:<%= attr_name %>]
       end
       <%- end -%>

data/template.rb

@@ -1,12 +1,13 @@
 #########################################################
 # 2011 Marco Mastrodonato(c)
-# This is a Rails 3.1 template to use with leonardo gem
+# This is a Rails 3.1+ template to use with leonardo gem
 # https://rubygems.org/gems/leonardo
 # 
 # USAGE: rails new yourappname -m template.rb
 # 
 # -------------------------------------------------------
-# 08-11-2011: Add roles_mask migration for cancan gem
+# 21-02-2012: Removed validation_reflection, added activeadmin and bundle install folder 
+# 08-11-2011: Added roles_mask migration for cancan gem
 # 27-10-2011: Replaced String.any? with String.size>0 for ruby 1.9.2 support
 # 21-10-2011: Davide L. - Added folder creation 'vendor/assets/javascripts/include/' for linux compatibility
 # 05-10-2011: Added ajax option
@@ -43,7 +44,7 @@ gem 'state_machine' if yes?("Do you have to handle states ?")
 formtastic = yes?("Formtastic ?")
 if formtastic
   gem 'formtastic'
-  gem 'validation_reflection'
+  #gem 'validation_reflection'
 end
 
 rspec = yes?("Add rspec as testing framework ?")
@@ -69,6 +70,12 @@ gem 'cancan' if cancan
 ajax = yes?("Would you enhance ajax ?")
 gem "rails3-jquery-autocomplete" if ajax
 
+activeadmin = yes?("Would install Active Admin ?")
+if activeadmin
+  gem "activeadmin"
+  gem "meta_search"
+end
+
 #home = yes?("Generate controller home ? (raccomanded)")
 home = true
 
@@ -82,7 +89,10 @@ if leolay
   leolay_second_color = ask(" Choose secondary color [blank=default color]:")
 end
 
-run "bundle install" if yes?("Bundle install ?")
+if yes?("Bundle install ?")
+  dir = ask(" Insert folder name to install locally: [blank=default gems path]")
+  run "bundle install #{dir}"
+end
 
 generate "kaminari:config" if pagination
 
@@ -101,6 +111,8 @@ if cancan
   generate "migration", "AddRolesMaskToUsers", "roles_mask:integer"
 end
 
+generate "active_admin:install" if activeadmin
+
 generate "autocomplete:install" if ajax
 
 ####################################################################

metadata

@@ -1,32 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: leonardo
-version: !ruby/object:Gem::Version 
-  hash: 51
+version: !ruby/object:Gem::Version
+  version: 1.10.0
   prerelease: 
-  segments: 
-  - 1
-  - 9
-  - 0
-  version: 1.9.0
 platform: ruby
-authors: 
+authors:
 - Marco Mastrodonato
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-13 00:00:00 Z
+date: 2012-02-23 00:00:00.000000000 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
+description: A generator for creating Rails 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
 email: m.mastrodonato@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/generators/erb/leosca/leosca_generator.rb
 - lib/generators/erb/leosca/templates/copy.html.erb
 - lib/generators/erb/leosca/templates/destroy.js.erb
@@ -41,10 +34,12 @@ files:
 - lib/generators/erb/leosca/templates/select.js.erb
 - lib/generators/erb/leosca/templates/show.html.erb
 - lib/generators/erb/leosca/templates/show.js.erb
+- lib/generators/erb/leosca/templates/with_nested.js.erb
 - lib/generators/erb/leosca/templates/_fields.html.erb
 - lib/generators/erb/leosca/templates/_form.html.erb
 - lib/generators/erb/leosca/templates/_form_multiple.html.erb
 - lib/generators/erb/leosca/templates/_list.erb
+- lib/generators/erb/leosca/templates/_nested.erb
 - lib/generators/erb/leosca/templates/_row_index.html.erb
 - lib/generators/erb/leosca/templates/_show.erb
 - lib/generators/leolay/install_generator.rb
@@ -104,6 +99,7 @@ files:
 - lib/generators/leolay/templates/styles/cloudy/images/style/msg_error.gif
 - lib/generators/leolay/templates/styles/cloudy/images/style/msg_notice.gif
 - lib/generators/leolay/templates/styles/cloudy/images/style/Thumbs.db
+- lib/generators/leolay/templates/styles/cloudy/stylesheets/app/states.sass
 - lib/generators/leolay/templates/styles/cloudy/stylesheets/app/stylesheet.sass
 - lib/generators/leolay/templates/styles/cloudy/stylesheets/vendor/jquery-ui/jquery-ui-1.8.16.redcarpet.css
 - lib/generators/leolay/templates/styles/cloudy/views/kaminari/_next_page.html.erb
@@ -146,36 +142,27 @@ files:
 - template.rb
 homepage: http://github.com/marcomd/Leonardo
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
-- Start a new app with the template.rb from github or inside root folder
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
+- Start a new app with the template.rb inside root folder
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: A layout and customized scaffold generator for Rails 3.1
+summary: A layout and customized scaffold generator for Rails 3.1+
 test_files: []
-