leonardo 1.8.1 → 1.8.2

data/CHANGELOG

@@ -1,7 +1,6 @@
-1.8.1 (October 10th, 2011) Marco Mastrodonato
-* Updated rspec to pass index view test with two new controller helpers
-* Date managed with datepicker are now in year-month-day format and now works with sqlite3
-* Added autosubmit class by default. A new function in custom.js let you to autosubmit searches on filter fields change event
+1.8.2 (October 10th, 2011) Marco Mastrodonato
+* List: Added id as first column
+* Replaced String.any? with String.size>0 for ruby 1.9.2 support
 
 TODO:
 * Lists: Multiple selection and multiple operation
@@ -12,6 +11,13 @@ TODO:
 
 
 
+1.8.1 (October 10th, 2011) Marco Mastrodonato
+* Updated rspec to pass index view test with two new controller helpers
+* Date managed with datepicker are now in year-month-day format and now works with sqlite3
+* Added autosubmit class by default. A new function in custom.js let you to autosubmit searches on filter fields change event
+
+
+
 1.8.0 (October 7th, 2011) Marco Mastrodonato
 * Added sortable columns
 

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

@@ -6,6 +6,7 @@
 <table class='user' cellspacing='0'>
   <thead>
   <tr>
+    <th>#</th>
 <%- attributes.each do |attribute| -%>
 <%- attr_name = case attribute.type when :references, :belongs_to then "#{attribute.name}_id" else attribute.name end -%>
     <th><%%= sortable :<%= attr_name %>, t('attributes.<%= singular_table_name %>.<%= attribute.name %>'), remote %></th>
@@ -18,6 +19,7 @@
   <tbody>
 <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| -%>
   <tr id="tr<%%= <%= singular_table_name %>.id %>" class="<%%= cycle("odd", "even")%>">
+    <td><%%= number_with_delimiter <%= singular_table_name %>.id %></td>
 <%- attributes.each do |attribute| -%>
     <td><%= attribute_to_erb(attribute, singular_table_name) -%></td>
 <%- end -%>

data/lib/generators/leolay/templates/lib/utility.rb

@@ -4,7 +4,7 @@ module Utility
   def self.export(params={})
     require 'fastercsv'
 
-    return "" unless params[:collection] && params[:collection].any?
+    return "" unless params[:collection] && params[:collection].size>0
     collection = add_collection params[:collection]
 
     head = params[:head]

data/lib/generators/leonardo.rb

@@ -72,7 +72,7 @@ module Leonardo
     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) || \"\#{t('models.#{attribute.name}')} \#{#{object}.#{attribute.name}.try(:id)}\"), #{object}.#{attribute.name}, :remote => @remote) %>"
+      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} %>"
@@ -193,7 +193,7 @@ module Leonardo
         resource = singular_table_name
       end
 
-      prefix_namespace = ":" if prefix_namespace.empty? && prefix_parent.any?
+      prefix_namespace = ":" if prefix_namespace.empty? && prefix_parent.size>0
 
       if nested?
         (base_namespaces(prefix_namespace) + parent_resources(prefix_parent)) << "#{prefix_resource}#{resource}"

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

@@ -53,7 +53,7 @@ end
 
     end
 
-    conditions = conditions_fields.join(' and ').to_a + conditions_values
+    conditions = [conditions_fields.join(' and ')] + conditions_values
 
     request.format = :csv if params[:commit] == 'Csv'
     

data/template.rb

@@ -6,6 +6,7 @@
 # USAGE: rails new yourappname -m template.rb
 # 
 # -------------------------------------------------------
+# 27-10-2011: Replaced String.any? with String.size>0 for ruby 1.9.2 support
 # 05-10-2011: Added ajax option
 # 25-08-2011: Added rspec generation
 #########################################################
@@ -121,8 +122,8 @@ end
 if leolay
   generate  "leolay",
             "cloudy",
-            ("--main_color=#{leolay_main_color}" if leolay_main_color.any?),
-            ("--second_color=#{leolay_second_color}" if leolay_second_color.any?),
+            ("--main_color=#{leolay_main_color}" if leolay_main_color.size>0),
+            ("--second_color=#{leolay_second_color}" if leolay_second_color.size>0),
             (cancan ? "" : "--skip-authorization"),
             (devise ? "" : "--skip-authentication"),
             (ajax ? "" : "--skip-jquery_ui"),

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leonardo
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 1
   - 8
-  - 1
-  version: 1.8.1
+  - 2
+  version: 1.8.2
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-10 00:00:00 Z
+date: 2011-10-27 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