usefull_table 1.0.4 → 1.0.8

data/CHANGELOG.md

@@ -7,9 +7,23 @@ ToDo
 - Add :if => Proc.new to condition column presence
 
 BugToFix
-- : link :name=> "pippo", body_type => icon, :url => "my_url" do not render default icons if not passed in yml
+- link :name=> "pippo", body_type => icon, :url => "my_url" do not render default icons if not passed in yml
+- Export: currency column must not be renderered as string
+- Export: unable to find local view if namespace are used. If I call export from /production/orders/index.html
+					contrllers.paths has only /orders/index.xlsx.maker
+
+1.0.8 (September 5, 2013)
+- Fixed Header Link localization, now localize association correctly
+
+1.0.7 (March 30, 2013)
+- Fixed data_type => Date, Time, DateTime crash with blank/empty values
+
+1.0.6 (October 11, 2012)
+- Added Percentage support to :data_field
+
+1.0.5
+- If Currency column is nil, must output 0 currency formatted
 
-BugToFix
 1.0.2 (July 13, 2012)
 - Update to Rails 3.0.14
 

data/Gemfile

@@ -3,8 +3,10 @@ source "http://rubygems.org"
 gem  "rails", "~>3.0.14"
 
 group :development, :test do
-	gem "acts_as_monitor", :path => "/home/www/gems/acts_as_monitor"
-  gem "acts_as_xls", :path => "/home/www/gems/acts_as_xls"
+	#gem "acts_as_monitor", :path => "/home/www/gems/acts_as_monitor"
+  #gem "acts_as_xls", :path => "/home/www/gems/acts_as_xls"
+  gem "acts_as_monitor"
+  gem "acts_as_xls"
   gem "meta_search"
   gem "will_paginate"
   gem "ruby-debug"

data/README.rdoc

@@ -1,6 +1,7 @@
 =UsefullTable
 table_for generate a full-optionals table, with excel export, columns ordering, links, inline editing and monitoring (ActsAsMonitor https://github.com/skylord73/acts_as_monitor)
-but don't warry because a rich set of defaults, make its use very simple!
+but don't worry because a rich set of defaults, make its use very simple!
+
 
 for a working sample please refer to test/dummy
 
@@ -125,6 +126,7 @@ Render column value
 - :Time 
 - :DateTime
 - :Currency
+- :Percentage   #transform float number in percentage with :precision => 0 ( 0.1 => 10%)
 - :Bool #Transform value in boolean
 - :Bool_reverse #Transform vale in boolean and reverse the vale
   
@@ -137,7 +139,8 @@ Render column value
 - true  #enable inline editing for the column, works also with nested fields (no controller add-on required)
 
 ==label
-Render static label
+- Render static label
+- <% t.label Proc.new {|item| item.id * 3}, :label => "Id * 3" %>
 
 ===Usage
  <% t.label object %>               #render object.inspect
@@ -230,4 +233,3 @@ Many thanks to :
 - WillPaginate
 - Spreadsheet
 - Axlsx
-

data/app/controllers/usefull_table/table_controller.rb

@@ -1,6 +1,6 @@
 module UsefullTable
   class TableController < ::ApplicationController
-    
+
     def create
       usefull_table = HashWithIndifferentAccess.new(ActiveSupport::JSON.decode(params[:usefull_table]))
       #Rails::logger.info("MonitorsController back=#{usefull_table[:paths].inspect}")
@@ -12,13 +12,13 @@ module UsefullTable
         end
         @params = usefull_table[:params]
       end
-      
+
       respond_to do |format|
         format.html
         format.xlsx { render :xlsx => "create", :template => select_path(usefull_table[:paths],"xlsx.maker") }
       end
     end
-    
+
     def update
       #usefull_table = HashWithIndifferentAccess.new(ActiveSupport::JSON.decode(params[:usefull_table]))
       Rails::logger.info("TableController#update params=#{params.inspect}")
@@ -28,7 +28,6 @@ module UsefullTable
         render :text => CGI::escapeHTML(@item.send(params[:attribute_name]).to_s)
       end
     end
-    
 
   end    
 end

data/app/helpers/usefull_table_helper.rb

@@ -1,7 +1,7 @@
 module UsefullTableHelper
   #=UsefullTable
   #table_for generate a full-optionals table, with excel export, columns ordering, links, inline edit and monitoring (ActsAsMonitor gem)
-  #but don't warry because of a rich set of defaults, make its use very simple
+  #but don't worry because of a rich set of defaults makes it very simple to use.
   #
   #==Setup
   #Add this line to your application's Gemfile:
@@ -55,7 +55,11 @@ module UsefullTableHelper
   # options[:export][:filter] = *true* | false   _note:_ false if @search not present
   # options[:export][:human] = *true* | false
   # options[:export][:worksheet] = *object.class.name.gsub(/::/,"#")*  _note:_ class name with namespace separator #
-  # options[:export][:url] = custom url
+  # options[:export][:url] = custom url 
+  # options[:export][:search] |= options[:export][:url] ? false : true 
+  # If you have a custom url and force :search = true, you have to manage the deserialization of params[:usefull_table]
+  # see app/controllers/usefull_table/table_controller for a pratical example.
+  # the option is used to manage the filter params in custom url files 
   #===Table
   # options[:table][:div_html] =  *{:class => "usefull_table"}*
   # options[:table][:header_html] = *{:class => "first_row"}*
@@ -119,8 +123,8 @@ module UsefullTableHelper
       out << stylesheet_link_tag('usefull_table.css')
       out << content_tag(:div, options[:html]) do
         ext = ''
-        ext << usefull_table_paginator_for(object, options[:paginator])
         ext << usefull_table_export_for(object,search,builder, options[:export])
+        ext << usefull_table_paginator_for(object, options[:paginator])
         ext << usefull_table_for(builder, object, search, options[:table])
         ext << usefull_table_paginator_for(object, options[:paginator])
         ext.html_safe
@@ -137,8 +141,12 @@ module UsefullTableHelper
   #
   #You can build a new table passing a block (see  ::table_for
   def export_for(object, params = nil, &block)
-    builder = UsefullTable::TableBuilder.new(object, nil, nil, self,  :params => params, &block)
-    builder.to_a
+    unless object.blank?
+      builder = UsefullTable::TableBuilder.new(object, nil, nil, self,  :params => params, &block)
+      builder.to_a
+    else
+      []
+    end
   end
   
   #Draw inline edit field
@@ -236,6 +244,8 @@ module UsefullTableHelper
     end
   end
   
+  #Return the first valid path af an xlsx.maker
+  #if nil default is used.
   def select_path(paths, extension)
     Rails::logger.info("select_path @path=#{paths.inspect}\n\n")
     paths.delete_if {|path| !File.exists?(path)}

data/lib/generators/usefull_table/install/templates/config/locales/usefull_table.it.yml

@@ -28,15 +28,4 @@ it:
       
   date:
     formats:
-      usefull_table_date: "%d/%m/%Y"
-      
-  number:
-    currency:
-      format:
-        format: "%n %u"
-        unit: "€"
-        separator: ","
-        delimiter: "."
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
+      usefull_table_date: "%d/%m/%Y"

data/lib/generators/usefull_table/install/templates/public/stylesheets/usefull_table.css

@@ -1,14 +1,21 @@
 /*Export*/
-div.usefull_table_export  input[type='submit']{
-	background: orange;
+  
+div.usefull_table_export {
+	background: gold;
 	border-width: 1px;
 	margin-top: 3px;
-	margin-bottom: 3px;
+	margin-bottom: 3px;	
+	top:35px;
+	right:300px
 }
 
+div.usefull_table_export  input[type='submit']{
+	background: orange;
+}
+  
 /*Paginator */
 div.usefull_table_paginator {
-	width: 100%;
+	width: 99%;
 	background: white;
 	cursor: default;
 	border: 2px solid #dddddd;
@@ -71,31 +78,43 @@ div.usefull_table_paginator {
     overflow: hidden; }
 
 /* Table*/
+div.usefull_table {width:100%;overflow:auto;}
 div.usefull_table table {
 	border-collapse:collapse;
 	border-spacing:0;
 	margin-bottom:1.4em;
 	width:100%;}
+
+div.usefull_table tbody {
+	width:100%;}
 div.usefull_table tbody tr.first_row {
-	background:#C3D934;}
+	background:#C3D934;
+  font-weight:bold;}
 div.usefull_table tbody tr.odd {
 	background-color: #FFFFFF;}
 div.usefull_table tbody tr.even {
 	background-color: #E5ECF9;}
 div.usefull_table td, .usefull_table th {
+	text-align: center;
 	padding:2px 4px;
-	text-align:left;
 	margin:0;
 	vertical-align:middle;
 	float:none !important;
-	max-width:500px;
-	border-collapse: collapse;}
-div.usefull_table th {
-	font-weight:bold;
-	border:0 none;}
+	max-width:400px;
+	border-collapse: collapse;
+	}
+.min30{
+min-width:30px !important;  
+}
+.min75{
+min-width:75px !important;
+}
+	
+/*div.usefull_table th {
+	border:0 none;}*/
 div.usefull_table td {
 	border-bottom:1px solid red;
 	text-overflow:ellipsis;
 	overflow:hidden;
 	white-space:nowrap;
-	font-weight:normal;}
+	font-weight:normal;}

data/lib/generators/usefull_table/scaffold/templates/lib/templates/erb/scaffold/index.html.erb

@@ -10,6 +10,4 @@
   <% end -%>
 <%% end %>
 
-
-
 <%%= link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path %>

data/lib/usefull_table/table_builder.rb

@@ -9,11 +9,13 @@ module UsefullTable
   #[ {column1}, {column2} ...]
   #where {column} is an hash with the following options:
   #*  {
-  #*    :nome => column name (ActiveRecord) int the form :column or "collection.column"
+  #*    :nome => column name (ActiveRecord) in the form :column or "collection.column"
   #*    :type => :column | :link
-  #*    :label =>  "wath you want" | column name if not specified
+  #*    :label =>  "what you want" | column name if not specified
   #*    :header_type => :sort | :plain | :human | :nil
-  #*    :body_type => :value (column value) | :plain (wathever you write as column name)
+  #*    :body_type => :value (column value) | :plain (whatever you write as column name)
+  #*    :td_html => html <td> tag attributes
+  #*  }
   class TableBuilder
     DATE = [:date, :datetime]
     LINK = [:show, :edit, :destroy, :download, :link]
@@ -106,7 +108,9 @@ module UsefullTable
     #   
     # :url => "static_path" or Proc       #Proc expose the object instance of the current row
     #
-    # :inline => true (default false) enable inline edit
+    # :inline => true (default false) enable inline edit      
+    #
+    # :if => evaluate a Proc to show colum value or not
     #
     def col(attribute, *args)
       options = args.extract_options!
@@ -116,6 +120,8 @@ module UsefullTable
       options[:header_type] ||= options[:label].nil? ? :sort : :plain
       options[:body_type] ||= options[:url].blank? ? :value : :link
       options[:label] ||= attribute
+      options[:td_html] ||= ''
+      options[:wrap] ||= false
       @data << options
     end
     
@@ -245,7 +251,8 @@ module UsefullTable
       num = 1
       data.delete_if { |element| element[:method_name] == :link || element[:body].kind_of?(Proc)}
       data.each do |element|
-        element[:url] = "/" if element[:url].present?
+        element[:url] = "/" if element[:url].present? 
+        element.delete(:if)
       end if data.present?
       #Rails::logger.info("TableBuilder#_sanitize_data(fine) data=#{data.inspect}")
       data
@@ -266,10 +273,10 @@ module UsefullTable
       @options[:paginator] ||= {}
       @options[:paginator][:visible] = true if @options[:paginator][:visible].nil?
       @options[:paginator][:visible] = false if !@object.respond_to? :total_pages
-      @options[:paginator][:class] = "usefull_table_paginator"
+      @options[:paginator][:class] = "usefull_table_paginator span-24"
       
       #Container
-      @options[:html] ||= {:class => "usefull_table_container"}
+      @options[:html] ||= {:class => "usefull_table_container span-24"}
       
       #Excel
       @options[:export] ||= {}
@@ -279,13 +286,13 @@ module UsefullTable
       @options[:export][:human] = true if @options[:export][:human].nil?
       @options[:export][:worksheet] ||= @object.first.class.name.gsub(/::/,"#")
       #remove search options if custom url is passed
-      @options[:export][:search] = @options[:export][:url] ? false : true
+      @options[:export][:search] |= @options[:export][:url] ? false : true
       @options[:export][:url] ||= @template.url_for(:action => "create", :controller => "usefull_table/table") + ".xlsx"
-      @options[:export][:class] = "usefull_table_export"
+      @options[:export][:class] = "usefull_table_export span-24"
       
       #Table
       @options[:table] ||= {}
-      @options[:table][:div_html] ||=  {:class => "usefull_table"}
+      @options[:table][:div_html] ||=  {:class => "usefull_table span-24"}
       @options[:table][:header_html] ||= {:class => "first_row"}
       #Ususally column_type is  :sort, but is search is not present I cannot render a sort_link...
       @options[:table][:header_type] = :human if @search.nil?
@@ -320,7 +327,7 @@ module UsefullTable
           @data.each do |element| 
             b = body(obj,element)
             row << b[:plain]
-            @template.concat @template.content_tag(:td, b[:html]) 
+            @template.concat @template.content_tag(:td, b[:html],b[:td_html]) 
           end
         end
         @excel << row.compact
@@ -335,13 +342,21 @@ module UsefullTable
       case attribute[:header_type]
         when :sort then
           value = nestize(attribute)
-          out_html = @template.sort_link(@search, value)
+          title = localize_title(attribute)
+          # out_html = @template.sort_link(@search, value)
+          
+          # Set column Header default sorting to 'desc' (at the first click).
+          # If in the controller you specified a default filter for a column which already sets
+          # the default order to "desc", then the first click will sort by ascending order this time,
+          # only for that column/field.
+          out_html = @template.sort_link(@search, value, title, :default_order => :desc)
           out = value
         when :plain then
           out_html = out = attribute[:label] = localize(attribute[:label])
         when :human then
           #UserSession.log("TableHelper#h: object.first.class.human_attribute_name(#{attribute[:label]})")
           out_html = out = @object.first.class.human_attribute_name(attribute[:label].to_s.gsub(/\./,"_"))
+          #out_html = out = @object.first.class.human_attribute_name(attribute[:label])
         when :nil then
           out_html = out = ""
         else
@@ -357,7 +372,8 @@ module UsefullTable
     def body(obj, attribute)
       #Rails::logger.info("TableBuilder#body")
       out = ""
-      out_html = ""
+      out_html = ""  
+      if_value = attribute[:if].kind_of?(Proc) ? attribute[:if].call(obj) : true
       case attribute[:type]
         when :link then
           out_html = attribute_link(obj, attribute)
@@ -391,10 +407,22 @@ module UsefullTable
           end
       else
         out_html = out = I18n.t(:body_error, :scope => :usefull_table, :default => "Body Error")
-      end
-      {:html => out_html.to_s.html_safe, :plain =>  out}
+      end if if_value == true                                                                                      
+      {:html => out_html.to_s.html_safe, :plain =>  out, :td_html => attribute[:td_html]}
     end
     
+    #Localize attribute through associations
+    #association.association1.attribute => association1.klass.attribute
+    def localize_title(attribute)
+      associations = attribute[:name].to_s.split(".")
+      klass = @object.respond_to?(:klass) ? @object.klass : @object.class
+      while associations.size > 1
+        klass = klass.reflect_on_association(associations.shift.to_sym).klass
+      end 
+      #ass= associations.shift
+      #klass = klass.reflect_on_association(ass).klass 
+      klass.human_attribute_name(associations)
+    end
     
     #Localize if Symbol, print if String
     def localize(value)
@@ -418,13 +446,18 @@ module UsefullTable
       true_values = [1, true, "vero", "true", "yes", "si", "s"]
       case type
         when :Date then
-          @template.l(attribute_value(obj,attribute[:name]), :format => :usefull_table_date)
+          #@template.l(attribute_value(obj,attribute[:name]), :format => :usefull_table_date)
+          l(attribute_value(obj,attribute[:name]), :format => :usefull_table_date)
         when :Time then
-          @template.l(attribute_value(obj,attribute[:name]), :format => :usefull_table_time )
+          #@template.l(attribute_value(obj,attribute[:name]), :format => :usefull_table_time )
+          l(attribute_value(obj,attribute[:name]), :format => :usefull_table_time )
         when :DateTime then
-          @template.l(attribute_value(obj,attribute[:name]), :format => :usefull_table_datetime)
+          #@template.l(attribute_value(obj,attribute[:name]), :format => :usefull_table_datetime)
+          l(attribute_value(obj,attribute[:name]), :format => :usefull_table_datetime)
         when :Currency then
-          @template.number_to_currency(attribute_value(obj,attribute[:name]))
+          @template.number_to_currency(currency_attribute_value(obj,attribute[:name]))
+        when :Percentage then
+          @template.number_to_percentage(percentage_attribute_value(obj,attribute[:name]), :precision => 0)
         when :Bool then
           true_values.include?(attribute_value(obj,attribute[:name])) ? true : false
         when :Bool_reverse then
@@ -434,6 +467,11 @@ module UsefullTable
       end
     end
     
+    #Localize Times, Dates, etc.. and return "" if blank?
+    def l(value, *args)
+      value.blank? ? "" : @template.l(value, *args)
+    end
+    
     #Return attribute value if defined blank otherwise
     def attribute_value(obj, attribute_name)
       #Rails::logger.info("TableBuilder#attribute_value obj=#{obj.inspect}, attribute=#{attribute_name.inspect}")
@@ -444,6 +482,17 @@ module UsefullTable
       end
     end
     
+    #return attribute value if defined, 0.0 otherwise
+    def currency_attribute_value(obj, attribute_name)
+      attribute_value(obj, attribute_name).blank? ? 0.0 : attribute_value(obj, attribute_name)
+    end
+    
+    #return attribute value if defined, 0 otherwise
+    def percentage_attribute_value(obj, attribute_name)
+      attribute_value(obj, attribute_name).blank? ? 0.0 : attribute_value(obj, attribute_name) * 100
+    end
+    
+    
     #Render in_place_editor
     #
     #get Class and method name and send them to helper for rendering.
@@ -475,7 +524,7 @@ module UsefullTable
     #Render a red/green label 
     def attribute_bool(value)
       name = value ? :ok : :ko
-      @template.content_tag(:span, @template.image_tag(I18n.t(name, :scope => "usefull_table.icons", :defualt => "usefull_table_#{name.to_s}.png")), :align => :center )
+      @template.content_tag(:span, @template.image_tag(I18n.t(name, :scope => "usefull_table.icons", :default => "usefull_table_#{name.to_s}.png")), :align => :center )
     end
     
     
@@ -496,7 +545,7 @@ module UsefullTable
       icon_name = attribute[:body_type] == :icon ? @template.image_tag(I18n.t(attribute_name.to_s.underscore, :scope => "usefull_table.icons", :defualt => "usefull_table_#{attribute_name.to_s.underscore}.png") ): localize(attribute_name)
       @template.link_to(icon_name, url, attribute[:link_options])
     end
-    
+
     #Return attribute Type
     #works evenif the attribute is nested : document.activity.data_prevista => :Date
     #Time object in Rails is a DateTime object, so it is renamed

data/lib/usefull_table/version.rb

@@ -1,3 +1,3 @@
 module UsefullTable
-  VERSION = "1.0.4"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: usefull_table
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Andrea Bignozzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-13 00:00:00 Z
+date: 2013-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -29,12 +29,28 @@ dependencies:
         - 0
         - 14
         version: 3.0.14
-  type: :runtime
-  requirement: *id001
   prerelease: false
+  type: :runtime
   name: rails
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 3
+        - 6
+        version: 1.3.6
+  prerelease: false
+  type: :runtime
+  name: axlsx
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,10 +59,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  requirement: *id002
   prerelease: false
+  type: :runtime
   name: acts_as_xls
+  requirement: *id003
 description: Table Helper with Excel export, inline editing and monitoring funxtions
 email: 
 - skylord73@gmail.com
@@ -57,27 +73,27 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- app/views/usefull_table/table/create.xlsx.maker
-- app/helpers/usefull_table_helper.rb
 - app/controllers/usefull_table/table_controller.rb
-- lib/usefull_table.rb
+- app/helpers/usefull_table_helper.rb
+- app/views/usefull_table/table/create.xlsx.maker
 - lib/generators/usefull_table/install/install_generator.rb
-- lib/generators/usefull_table/install/templates/public/images/usefull_table_show.png
+- lib/generators/usefull_table/install/templates/config/locales/usefull_table.it.yml
 - lib/generators/usefull_table/install/templates/public/images/usefull_table_destroy.png
+- lib/generators/usefull_table/install/templates/public/images/usefull_table_download.png
 - lib/generators/usefull_table/install/templates/public/images/usefull_table_edit.png
-- lib/generators/usefull_table/install/templates/public/images/usefull_table_true.png
 - lib/generators/usefull_table/install/templates/public/images/usefull_table_false.png
-- lib/generators/usefull_table/install/templates/public/images/usefull_table_download.png
+- lib/generators/usefull_table/install/templates/public/images/usefull_table_show.png
+- lib/generators/usefull_table/install/templates/public/images/usefull_table_true.png
 - lib/generators/usefull_table/install/templates/public/stylesheets/usefull_table.css
-- lib/generators/usefull_table/install/templates/config/locales/usefull_table.it.yml
-- lib/generators/usefull_table/scaffold/templates/lib/templates/rails/scaffold_controller/controller.rb
-- lib/generators/usefull_table/scaffold/templates/lib/templates/erb/scaffold/show.html.erb
-- lib/generators/usefull_table/scaffold/templates/lib/templates/erb/scaffold/index.html.erb
 - lib/generators/usefull_table/scaffold/scaffold_generator.rb
+- lib/generators/usefull_table/scaffold/templates/lib/templates/erb/scaffold/index.html.erb
+- lib/generators/usefull_table/scaffold/templates/lib/templates/erb/scaffold/show.html.erb
+- lib/generators/usefull_table/scaffold/templates/lib/templates/rails/scaffold_controller/controller.rb
 - lib/usefull_table/engine.rb
-- lib/usefull_table/table_builder.rb
 - lib/usefull_table/exceptions.rb
+- lib/usefull_table/table_builder.rb
 - lib/usefull_table/version.rb
+- lib/usefull_table.rb
 - config/routes.rb
 - MIT-LICENSE
 - Rakefile