leonardo 1.7.2 → 1.8.0

data/CHANGELOG

@@ -1,3 +1,16 @@
+1.8.0 (October 7th, 2011) Marco Mastrodonato
+* Added sortable columns
+
+TODO:
+* Pass spec index view with new sortable helpers
+* Lists: Multiple selection and multiple operation
+* Lists: Add id as first column
+* Model: Create name attribute for every one that does not have
+* Handle eager loading including child resources
+* Add user management
+
+
+
 1.7.2 (October 5th, 2011) Marco Mastrodonato
 * Updated formtastic support to version 2.0
 * Updated template.rb

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

@@ -7,7 +7,8 @@
   <thead>
   <tr>
 <%- attributes.each do |attribute| -%>
-    <th><%%= t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %></th>
+<%- 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>
 <%- end -%>
     <th></th>
     <th></th>

data/lib/generators/leolay/leolay_generator.rb

@@ -87,7 +87,6 @@ class LeolayGenerator < Rails::Generators::Base
         FILE
       end if options.authorization?
 
-      #{options.authentication? ? ", :authenticate_user!" : ""}
       inject_into_class file, ApplicationController do
         <<-FILE.gsub(/^      /, '')
         before_filter :localizate
@@ -103,6 +102,22 @@ class LeolayGenerator < Rails::Generators::Base
         FILE
       end
     end
+
+    file = "app/helpers/application_helper.rb"
+    if File.exists?(file)
+      inject_into_file file, :after => "module ApplicationHelper" do
+        <<-FILE.gsub(/^      /, '')
+
+        def sortable(column, title = nil, remote = nil)
+          column = column.to_s
+          title ||= column.titleize
+          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)
+        end
+        FILE
+      end
+    end
   end
 
   def setup_authentication

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

@@ -253,4 +253,5 @@ en:
   radio-yes: "Yes"
   radio-no: "No"
   radio-all: "All"
+  loading: "Loading..."
   choose_language: "Choose language"

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

@@ -278,4 +278,5 @@ it:
   radio-yes: "Si"
   radio-no: "No"
   radio-all: "Tutto"
+  loading: "Attendere..."
   choose_language: "Scegli la lingua"

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

@@ -251,9 +251,13 @@ table.user
   width: 100%
   thead
     tr
-      &:hover
+      & :hover
         background-color: inherit
       th
+        & :link, & :visited
+          color: $title_color
+        & :hover, & :active
+          color: $text_color
         //background-color: $main_bg
         color: $title_color
         padding: 0.2em 0.4em
@@ -261,6 +265,15 @@ 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/leonardo.rb

@@ -37,12 +37,15 @@ module Leonardo
       " #{name} => #{value}"
     end
     def attribute_to_factories(attribute)
-      str_space = " " * (20-attribute.name.size).abs
+      spaces = 34
+      space_association = " " * (spaces-11).abs
+      space_sequence = " " * (spaces-attribute.name.size-11).abs
+      space_other = " " * (spaces-attribute.name.size).abs
       name = case attribute.type
-      when :references, :belongs_to   then "#{singular_table_name[0..0]}.association        #{str_space}"
+      when :references, :belongs_to   then "#{singular_table_name[0..0]}.association#{space_association}"
       when :boolean, :datetime, :time, :timestamp
-                                      then "#{singular_table_name[0..0]}.#{attribute.name}           #{str_space}"
-      else                                 "#{singular_table_name[0..0]}.sequence(:#{attribute.name})#{str_space}"
+                                      then "#{singular_table_name[0..0]}.#{attribute.name}#{space_other}"
+      else                                 "#{singular_table_name[0..0]}.sequence(:#{attribute.name})#{space_sequence}"
       end
       value = case attribute.type
         when :boolean                 then "true"
@@ -54,7 +57,7 @@ module Leonardo
         when :time, :timestamp        then "#{Time.now.strftime("%H:%M:%S.000")}".inspect
         else                               "{|n| \"#{attribute.name.titleize}\#{n}\" }"
       end
-      "    #{name} #{value}"
+      "    #{name}#{value}"
     end
     def attribute_to_requests(attribute)
       case attribute.type

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

@@ -1,5 +1,6 @@
 <% module_namespacing do -%>
 class <%= leospaced? ? (base_namespaces << controller_class_name).join('/').camelize : controller_class_name %>Controller < ApplicationController
+  helper_method :sort_column, :sort_direction
   <%= "before_filter :authenticate_user!#{CRLF}" if authentication? -%>
   <%= "load_and_authorize_resource#{CRLF}" if authorization? -%>
   <%#= "before_filter :load_parents#{CRLF}" if nested? -%>
@@ -58,7 +59,7 @@ end
     
     @<%= plural_table_name %> = case request.format
     when 'text/html', 'text/javascript'
-      <%= class_name %>.where(conditions).order(:id)<%= ".page(params[:page])" if pagination? %>
+      <%= class_name %>.where(conditions).order("#{sort_column} #{sort_direction}")<%= ".page(params[:page])" if pagination? %>
     else
       <%= class_name %>.where(conditions)
     end
@@ -156,5 +157,13 @@ end
       format.js
     end
   end
+
+  private
+    def sort_direction
+      %w[asc desc].include?(params[:direction]) ?  params[:direction] : "asc"
+    end
+    def sort_column
+      <%= class_name %>.column_names.include?(params[:sort]) ? params[:sort] : "id"
+    end
 end
 <% end -%>

data/template.rb

@@ -100,7 +100,6 @@ generate "autocomplete:install" if ajax
 ####################################################################
 #     F   I   X
 ####################################################################
-p "Update source path #{File.join(File.dirname(__FILE__), app_name)}"
 source_paths << File.join(File.dirname(__FILE__), app_name)
 
 if formtastic

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leonardo
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 55
   prerelease: 
   segments: 
   - 1
-  - 7
-  - 2
-  version: 1.7.2
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 Z
+date: 2011-10-07 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
@@ -81,6 +81,8 @@ files:
 - lib/generators/leolay/templates/styles/cloudy/images/jquery-ui/ui-icons_ffd27a_256x240.png
 - lib/generators/leolay/templates/styles/cloudy/images/jquery-ui/ui-icons_ffffff_256x240.png
 - lib/generators/leolay/templates/styles/cloudy/images/kaminari/nav.png
+- lib/generators/leolay/templates/styles/cloudy/images/style/arrow_down.png
+- lib/generators/leolay/templates/styles/cloudy/images/style/arrow_up.png
 - lib/generators/leolay/templates/styles/cloudy/images/style/bg_but_gray.png
 - lib/generators/leolay/templates/styles/cloudy/images/style/bg_top.png
 - lib/generators/leolay/templates/styles/cloudy/images/style/button_170_126.png