leonardo 1.8.3 → 1.8.4

data/CHANGELOG

@@ -1,6 +1,7 @@
-1.8.3 (November 8th, 2011) Marco Mastrodonato
-* Controller/sort_column => Fixed an issue with multiple tables
-* Dev users are now added by rake db:seed, no more by migration
+1.8.4 (November 9th, 2011) Marco Mastrodonato
+* Fixed a bug in the list view when was used option --under
+* Now is possible to sort also by ID
+* Specs updated, all green
 
 TODO:
 * Lists: Multiple selection and multiple operation
@@ -10,6 +11,12 @@ TODO:
 
 
 
+1.8.3 (November 8th, 2011) Marco Mastrodonato
+* Controller/sort_column => Fixed an issue with multiple tables
+* Dev users are now added by rake db:seed, no more by migration
+
+
+
 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

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

@@ -6,10 +6,10 @@
 <table class='user' cellspacing='0'>
   <thead>
   <tr>
-    <th>#</th>
+    <th><%%= sortable :id, '#', remote<%= ", '#{underscore_resource_path(:parent_singular_resource_plural)}_path', '#{formatted_parent_resources("@")}'" if nested? %> %></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>
+    <th><%%= sortable :<%= attr_name %>, t('attributes.<%= singular_table_name %>.<%= attribute.name %>'), remote<%= ", '#{underscore_resource_path(:parent_singular_resource_plural)}_path', '#{formatted_parent_resources("@")}'" if nested? %> %></th>
 <%- end -%>
     <th></th>
     <th></th>

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

@@ -2,6 +2,6 @@ var $dialog = $('<div></div>')
     .html("<%%= escape_javascript(render('show'))%>")
     .dialog({
         autoOpen: false,
-        title: '<%%= "#{t('models.<%= singular_table_name %>')} #{@<%= singular_table_name %>.try(:name) || @<%= singular_table_name %>.try(:id)}"%>'
+        title: '<%%= "#{t('models.<%= singular_table_name %>')} #{@<%= singular_table_name %>.id}"%>'
     });
 $dialog.dialog('open');

data/lib/generators/leolay/leolay_generator.rb

@@ -108,12 +108,14 @@ class LeolayGenerator < Rails::Generators::Base
       inject_into_file file, :after => "module ApplicationHelper" do
         <<-FILE.gsub(/^      /, '')
 
-        def sortable(column, title = nil, remote = nil)
+        def sortable(column, title = nil, remote = nil, path = nil, *params)
           column = column.to_s
           title ||= column.titleize
-          css_class = (column == sort_column) ? "sorted \#{sort_direction}" : nil
+          css_class = (column == sort_column) ? "sorted #{sort_direction}" : nil
           direction = (column == sort_column && sort_direction == "asc") ? "desc" : "asc"
-          link_to(title, {:sort => column, :direction => direction}, :remote => true, :disable_with => t(:loading), :class => css_class)
+          params << "{:sort => column, :direction => direction}"
+          path = path ? eval("#{path}(#{params.join(',')})") : {:sort => column, :direction => direction}
+          link_to(title, path, :remote => true, :disable_with => t(:loading), :class => css_class)
         end
         FILE
       end
@@ -162,36 +164,6 @@ class LeolayGenerator < Rails::Generators::Base
     end
   end
 
-
-  #def create_admin_migration
-  #  file = "db/migrate/*_create_admin.rb"
-  #  return unless options.authentication? and Dir[file].empty?
-  #  file = file.sub('*', Time.now.strftime("%Y%m%d%H%M99"))
-  #  create_file file do
-  #    <<-FILE.gsub(/^      /, '')
-  #    class CreateAdmin < ActiveRecord::Migration
-  #      def self.up
-  #        add_column :users, :roles_mask, :integer
-  #        user=User.new :email => 'admin@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
-  #        user.roles=['admin']
-  #        user.save
-  #        user=User.new :email => 'manager@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
-  #        user.roles=['manager']
-  #        user.save
-  #        user=User.new :email => 'user@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
-  #        user.roles=['user']
-  #        user.save
-  #      end
-  #      def self.down
-  #        User.delete User.find_all_by_email(['admin@#{app_name.downcase}.com',
-  #                                            'manager@#{app_name.downcase}.com',
-  #                                            'user@#{app_name.downcase}.com']).map(&:id)
-  #        remove_column :users, :roles_mask
-  #      end
-  #    end
-  #    FILE
-  #  end
-  #end
   def create_users_for_development
     return unless options.authentication?
     file = "db/seeds.rb"

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) || \"#\#{#{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} %>"
@@ -84,10 +84,13 @@ module Leonardo
     end
     def get_attr_to_match(view=:list)
       attributes.each do |attribute|
-        return  "have_content(#{singular_table_name}.#{attribute.name})",
-                "have_no_content(#{singular_table_name}.#{attribute.name})" if attribute.type==:string
+        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
-      #If there are not string attributes
+      #If there are not string or text attributes
       case view
       when :list
         return  "have_xpath('//table/tbody/tr')", "have_no_xpath('//table/tbody/tr')"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leonardo
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 1
   - 8
-  - 3
-  version: 1.8.3
+  - 4
+  version: 1.8.4
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 Z
+date: 2011-11-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