leonardo 1.9.0.beta2 → 1.9.0

data/CHANGELOG

@@ -1,18 +1,26 @@
-1.9.0.beta2 (December 12th, 2011) Marco Mastrodonato
+1.9.0 (December 13th, 2011) Marco Mastrodonato
+* Specs updated, all green.
+
+
+TODO:
+* Model: Create name attribute for every one that does not have
+* Handle eager loading including child resources
+* Add user management
+
+
+
+1.9.0.beta2 (December 9th, 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
-* Handle eager loading including child resources
-* Add user management
-
 
 
 1.8.4 (November 9th, 2011) Marco Mastrodonato

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

@@ -79,10 +79,10 @@ module Erb
 
       def update_parent_views
         return unless nested?
-        file = "app/views/#{plural_last_parent}/_list.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} %></td>
 
           FILE
         end if File.exists?(file)

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

@@ -3,7 +3,7 @@
 <%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| %>
+<%%= form_for :select, :url => select_<%= list_resources_path %>, :remote => false, :html => { :method => :post, :id => "form_select" } do |f| %>
 <table class='user' cellspacing='0'>
   <thead>
   <tr>

data/lib/generators/leonardo.rb

@@ -61,10 +61,10 @@ module Leonardo
     end
     def attribute_to_requests(attribute, object_id=nil)
       object_id ||= "#{singular_table_name}_#{attribute.name}"
-      object_id = object_id.gsub('#', "\#{#{singular_table_name}.id}")
+      object_id = object_id.gsub('#', "\#{#{singular_table_name}.id}").gsub('name', attribute.name)
       case attribute.type
         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 :references, :belongs_to then "select #{singular_table_name}.#{attribute.name}.name, :from => \"#{object_id}_id\""
         when :datetime, :time, :timestamp
                                       then ""
         when :date                    then "fill_in \"#{object_id}\", :with => #{singular_table_name}.#{attribute.name}.strftime('%d-%m-%Y')"
@@ -105,22 +105,12 @@ module Leonardo
       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
+        attributes.each{|a| case a.type when :string, :text then return a.name end}
+        attributes.each{|a| case a.type when :references, :belongs_to, :datetime then nil else return a.name end}
       end
-      attribute
     end
     def fill_form_with_values(object_id=nil)
       items = []
@@ -304,7 +294,7 @@ module Leonardo
       #product under brand/category => brand_category_products_path(product.brand, product.category)
       def list_resources_path_test(resource=nil, prefix_parent=nil)
         unless prefix_parent
-          resource = resource || singular_table_name
+          resource ||= singular_table_name
           prefix_parent = "#{resource}."
         end
         "#{underscore_resource_path(:parent_singular_resource_plural)}_path(#{formatted_parent_resources(prefix_parent, "", resource)})"
@@ -314,7 +304,7 @@ module Leonardo
       #product under category => "[category, product]" or "[product.category, product]"
       #product under brand/category => "[brand, category, product]" or "[product.brand, product.category, product]"
       def show_resource_path_test(resource=nil, prefix_parent=nil, prefix_resource="")
-        resource = resource || singular_table_name
+        resource ||= singular_table_name
         prefix_parent = prefix_parent || "#{resource}."
         formatted_resource_path(prefix_parent, prefix_resource, "[]", resource)
       end
@@ -323,7 +313,7 @@ module Leonardo
       #product under category => new_category_product_path(product.category)
       #product under brand/category => new_brand_category_product_path(product.brand, product.category)
       def new_resource_path_test(resource=nil, prefix_parent=nil)
-        resource = resource || singular_table_name
+        resource ||= singular_table_name
         prefix_parent = prefix_parent || "#{resource}."
         "new_#{underscore_resource_path}_path(#{formatted_parent_resources(prefix_parent, "",resource)})"
       end

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

@@ -40,8 +40,14 @@ describe "<%= class_name.pluralize %>" do
       end
 
       it "copy several <%= plural_table_name %>" do
-        <%= plural_table_name %> = FactoryGirl.create_list(:<%= singular_table_name %>, 2)
-        visit <%= list_resources_path_test %>
+        <%- parents = []; str_parents_create = str_parents_where = "" -%>
+        <%- base_parent_resources.each do |parent| -%>
+        <%= parent %> = Factory(:<%= parent %>)
+        <%- parents << ":#{parent}_id => #{parent}.id" -%>
+        <%- end -%>
+        <%- str_parents_create = ", #{parents.join(', ')}" if parents.any? -%>
+        <%= plural_table_name %> = FactoryGirl.create_list(:<%= singular_table_name %>, 2<%= str_parents_create %>)
+        visit <%= list_resources_path_test("#{plural_table_name}[0]") %>
         <%= "login_view_as(:user_manager)" if authentication? -%>
         #save_and_open_page #uncomment to debug
         <%= plural_table_name %>.each do |<%= singular_table_name %>|
@@ -52,7 +58,7 @@ describe "<%= class_name.pluralize %>" do
         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) %>
+<%= 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 %>')}"))
@@ -74,8 +80,14 @@ describe "<%= class_name.pluralize %>" do
       end
 
       it "edit several <%= plural_table_name %>" do
-        <%= plural_table_name %> = FactoryGirl.create_list(:<%= singular_table_name %>, 2)
-        visit <%= list_resources_path_test %>
+        <%- parents = []; str_parents_create = str_parents_where = "" -%>
+        <%- base_parent_resources.each do |parent| -%>
+        <%= parent %> = Factory(:<%= parent %>)
+        <%- parents << ":#{parent}_id => #{parent}.id" -%>
+        <%- end -%>
+        <%- str_parents_create = ", #{parents.join(', ')}" if parents.any? -%>
+        <%= plural_table_name %> = FactoryGirl.create_list(:<%= singular_table_name %>, 2<%= str_parents_create %>)
+        visit <%= list_resources_path_test("#{plural_table_name}[0]") %>
         <%= "login_view_as(:user_manager)" if authentication? -%>
         #save_and_open_page #uncomment to debug
         <%= plural_table_name %>.each do |<%= singular_table_name %>|
@@ -105,8 +117,14 @@ describe "<%= class_name.pluralize %>" do
       end
 
       it "destroy several <%= plural_table_name %>" do
-        <%= plural_table_name %> = FactoryGirl.create_list(:<%= singular_table_name %>, 2)
-        visit <%= list_resources_path_test %>
+        <%- parents = []; str_parents_create = str_parents_where = "" -%>
+        <%- base_parent_resources.each do |parent| -%>
+        <%= parent %> = Factory(:<%= parent %>)
+        <%- parents << ":#{parent}_id => #{parent}.id" -%>
+        <%- end -%>
+        <%- str_parents_create = ", #{parents.join(', ')}" if parents.any? -%>
+        <%= plural_table_name %> = FactoryGirl.create_list(:<%= singular_table_name %>, 2<%= str_parents_create %>)
+        visit <%= list_resources_path_test("#{plural_table_name}[0]") %>
         <%= "login_view_as(:user_manager)" if authentication? -%>
         #save_and_open_page #uncomment to debug
         <%= plural_table_name %>.each do |<%= singular_table_name %>|

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leonardo
 version: !ruby/object:Gem::Version 
-  hash: 62196247
-  prerelease: 6
+  hash: 51
+  prerelease: 
   segments: 
   - 1
   - 9
   - 0
-  - beta
-  - 2
-  version: 1.9.0.beta2
+  version: 1.9.0
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 Z
+date: 2011-12-13 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
@@ -166,14 +164,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: 
 - Start a new app with the template.rb from github or inside root folder
 rubyforge_project: