html_tables 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e0bae9b4cbf7907485ab3be3a13d8ca01682a9b
-  data.tar.gz: e525363a740bf4af8a7e8b865a4c3a37ae1c3d0a
+  metadata.gz: 2b67f1b4e5bf53dd37f9abd90e0263ba0fa4360c
+  data.tar.gz: c9466435747a950ed58afacc6555b83c94d64cb4
 SHA512:
-  metadata.gz: 5f69ca9e6d5df648a5bbfe1482424714d6971364cb050afa59f106275ae107201f893d5334c741c126eacda5375aa6022594fa833df34d3a11a2e985b49d44c9
-  data.tar.gz: c8af413fa4c711a9e16f235392ce79d0b72f2633f45f9014003e0d7bbcc98e928d7a2af3897107ac8cc973262d8f3ad4a6c497a50bf4b7a7192afd25b9c10e67
+  metadata.gz: 4f4a0899ab44d8f12dfb971d60e221997bb0e247f819e56afa9912b54915c808222f799a4149396d1c229f6aa68a808778617dbbf2f2732476b299030298cdc7
+  data.tar.gz: db2503a835c7d40c4bd1e10290734b227df2782e7873cc23511e7d7435195ec9e831f349d039fd80b458727d2bf1baa608334e4dc3e38077bcff71077d38fdfd

data/README.md

@@ -18,21 +18,24 @@ Or install it yourself as:
 
 ## Usage
 
-HAML example:
+Slim example:
 
     = data_table_for(@products, name: :products_table, html: { class: 'custom_table' }) do |t|
       - t.group_by(:category) do |cat|
-        %em= cat.name
+        em= cat.name
       - t.column(:code, align: :center, width: '9em')
       - t.column(:description) { |p| p.descriptions.first }
-      - t.column(:pricing)
+      - t.column(:pricing, footer: :sum) do |item, total_in_footer|
+        - if item
+          = number_to_currency(item.pricing)
+        - else
+          blink = number_to_currency(total_in_footer)
       - t.column(:quantity, width: '9em') do |p|
         - if p.quantity == 0
-          %span.label.label-important.stack-right(title = 'Out of stock')
-            %i.icon-flag.icon-white
+          span title='Out of stock' *
         - else
-          .c= number_with_delimiter p.quantity
-      - t.column(:situation, align: :center, width: '9em')
+          = number_with_delimiter p.quantity
+      - t.column(:status, align: :center, width: '3em', header: { text: 'St.', class: 'status-header' })
       - t.nodata 'No product found.'
 
 ## Contributing

data/html_tables.gemspec

@@ -2,17 +2,17 @@
 require File.expand_path('../lib/html_tables/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Fábio David Batista"]
-  gem.email         = ["fabio@elementarsistemas.com.br"]
+  gem.authors       = ['Fábio David Batista']
+  gem.email         = ['fabio@elementarsistemas.com.br']
   gem.description   = %q{Simple DSL for HTML data tables}
   gem.summary       = %q{This gem was extracted from some projects on my company. Everyone is welcome to use and improve upon.}
-  gem.homepage      = "http://elementarsistemas.com.br/"
+  gem.homepage      = 'http://elementarsistemas.com.br/'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "html_tables"
-  gem.require_paths = ["lib"]
+  gem.name          = 'html_tables'
+  gem.require_paths = ['lib']
   gem.version       = HtmlTables::VERSION
 
   gem.add_dependency 'i18n'

data/lib/html_tables/data_table.rb

@@ -49,7 +49,6 @@ module HtmlTables
 
     def header_for(column_id)
       return nil if column_id.nil?
-      return columns[column_id][:header] if columns[column_id][:header]
       return @builder.content_tag(:i, nil, class: 'icon-check') if columns[column_id][:checkbox]
       v ||= I18n.t(column_id, scope: [:tables, options[:name] || :default], raise: true) rescue nil
       v ||= I18n.t(column_id, scope: [:tables, :default], raise: true) rescue nil

data/lib/html_tables/data_table_helper.rb

@@ -5,124 +5,14 @@ module HtmlTables
     def data_table_for(collection, options = {})
       config = HtmlTables::Configuration.instance
 
-      t = DataTable.new(self, collection, options)
+      table = DataTable.new(self, collection, options)
       if block_given?
-        yield t.object_to_yield
+        yield table.object_to_yield
       else
-        t.auto_generate_columns!
+        table.auto_generate_columns!
       end
 
-      cls = config.default_table_classes.dup
-      cls << 'table-condensed' if options[:condensed]
-      cls << options[:class] if options[:class]
-      table_html_options = { class: cls }
-      table_html_options.merge!(options[:html]) { |_, v1, v2| [v1, v2].flatten } if options[:html]
-      content_tag(:table, table_html_options) do
-        content_tag(:caption, options[:caption] || controller_name, class: ('hidden' unless options[:caption])) +
-        content_tag(:colgroup) do
-          b = ''.html_safe
-          t.columns.each do |_, opts|
-            col_opts = { }
-            col_opts[:style] = "width: #{opts[:width]}" if opts[:width]
-            b << content_tag(:col, col_opts) { }
-          end
-          b
-        end +
-        content_tag(:thead) do
-          content_tag(:tr) do
-            t.columns.map do |name, opts|
-              header_opts = {}
-              header_opts[:class] = 'check' if opts[:checkbox]
-              header_opts[:header_title] = opts[:header_title] if opts[:header_title]
-              content_tag(:th, t.header_for(name), header_opts)
-            end.join.html_safe
-          end
-        end +
-        content_tag(:tbody) do
-          b = ''.html_safe
-          rows = if options[:group]
-            collection.group_by {|i| options[:group][:proc].call(i) }.each do |g, l|
-              b << content_tag(:tr, class: 'group') do
-                content_tag(:th, capture(g, &options[:group][:block]), colspan: t.columns.size)
-              end
-              render_data_rows(b, l, t)
-            end
-            collection
-          else
-            render_data_rows(b, collection, t)
-          end
-          if rows.size == 0 then
-            b << content_tag(:tr, class: 'nodata') do
-              content_tag(:td, colspan: t.columns.size) { t.nodata_message }
-            end unless t.nodata_message.nil?
-          end
-          b
-        end
-      end
-    end
-
-    def render_data_rows(b, collection, t)
-      collection.each do |item|
-        b << content_tag(:tr, t.row_options_for(item)) do
-          t.columns.map do |name, opts|
-            render_td(item, name, opts)
-          end.join.html_safe
-        end
-      end
-    end
-
-    def render_td(item, column, opts)
-      td_options = {}
-
-      if opts[:align] == :center
-        td_options[:class] = 'c'
-      end
-
-      if opts[:title]
-        td_options[:title] = if opts[:title].respond_to?(:call)
-          opts[:title].call(item)
-        else
-          opts[:title].to_s
-        end
-      end
-
-      v = if opts[:checkbox]
-        checked = opts[:checked]
-        checked = opts[:block].call(item) if opts[:block]
-        check_box_tag "#{column}[]", item.public_send(opts.fetch(:value_method, :id)), checked, extract_check_box_tag_options(opts)
-      elsif opts[:radio]
-        radio_button_tag "#{column}[]", item.public_send(opts.fetch(:value_method, :id))
-      elsif opts[:block]
-        capture(item, &opts[:block])
-      else
-        tmp = item.public_send(column)
-        tmp = item.public_send("#{column}_text") rescue tmp if tmp.is_a?(Symbol)
-        tmp
-      end
-
-      if config.use_entity_shortcuts && v.is_a?(ActiveRecord::Base)
-        btn = content_tag(:div, class: 'entity-shortcut') do
-          link_to(config.url_generator_proc.(v), class: 'btn btn-small') do
-            content_tag(:i, nil, class: 'icon-share')
-          end
-        end rescue nil
-      end
-
-      v = if v.is_a?(Enumerable)
-        v.inject(''.html_safe) { |b, i| b << ', ' unless b.blank?; b << i.format_for_output }
-      else
-        v.format_for_output
-      end
-      v = v.to_s unless v.nil? || v.is_a?(String)
-
-      v = ''.html_safe << btn << v if btn
-
-      content_tag(:td, v, td_options)
-    end
-
-    def extract_check_box_tag_options(opts)
-      valid_options = [:disabled]
-      opts.select { |k, _| valid_options.include?(k) }
+      Renderer.new(self, table, collection, options).to_html
     end
   end
 end

data/lib/html_tables/renderer.rb

@@ -0,0 +1,178 @@
+module HtmlTables
+  class Renderer
+    def initialize(helper, table, collection, options = {})
+      @helper = helper
+      @t = table
+      @collection = collection
+      @options = options
+      @config = HtmlTables::Configuration.instance
+    end
+
+    def to_html
+      cls = config.default_table_classes.dup
+      cls << 'table-condensed' if options[:condensed]
+      cls << options[:class] if options[:class]
+      table_html_options = { class: cls }
+      table_html_options.merge!(options[:html]) { |_, v1, v2| [v1, v2].flatten } if options[:html]
+
+      content_tag(:table, table_html_options) do
+        content = ''.html_safe
+        content << caption << colgroup << thead << tfoot << tbody
+      end
+    end
+
+    private
+
+    attr_reader :t, :collection, :options, :config
+    delegate :content_tag, :check_box_tag, :capture, to: :@helper
+
+    def caption
+      return ''.html_safe unless options.has_key?(:caption)
+      content_tag(:caption, options[:caption])
+    end
+
+    def colgroup
+      content_tag(:colgroup) do
+        b = ''.html_safe
+        t.columns.each do |_, opts|
+          col_opts = { }
+          col_opts[:style] = "width: #{opts[:width]}" if opts[:width]
+          b << content_tag(:col, col_opts) { }
+        end
+        b
+      end
+    end
+
+    def thead
+      content_tag(:thead) do
+        content_tag(:tr) do
+          t.columns.map do |name, opts|
+            header_opts = opts.fetch(:header, {})
+            header_opts = { text: header_opts } unless header_opts.is_a?(Hash)
+            header_opts[:text] ||= opts[:header_title] if opts[:header_title]
+            (header_opts[:class] ||= '') << ' check' if opts[:checkbox]
+
+            header_text = header_opts.delete(:text) { t.header_for(name) }
+            content_tag(:th, header_text, header_opts)
+          end.join.html_safe
+        end
+      end
+    end
+
+    def tfoot
+      return ''.html_safe unless t.columns.any? { |_, c| c.has_key?(:footer) }
+
+      content_tag(:tfoot) do
+        content_tag(:tr) do
+          t.columns.map do |id, opts|
+            if opts.has_key?(:footer)
+              value =
+                case opts[:footer]
+                when Symbol
+                  collection.map(&id.to_proc).public_send(opts[:footer])
+                when Proc
+                  opts[:footer].call(collection)
+                end
+              content = opts[:block] ? capture(nil, value, &opts[:block]) : value.to_s
+              content_tag(:th, content, extract_td_options(opts, nil))
+            else
+              content_tag(:th)
+            end
+          end.join.html_safe
+        end
+      end
+    end
+
+    def tbody
+      content_tag(:tbody) do
+        b = ''.html_safe
+        rows = if options[:group]
+          collection.group_by {|i| options[:group][:proc].call(i) }.each do |g, l|
+            b << content_tag(:tr, class: 'group') do
+              content_tag(:th, capture(g, &options[:group][:block]), colspan: t.columns.size)
+            end
+            render_data_rows(b, l, t)
+          end
+          collection
+        else
+          render_data_rows(b, collection, t)
+        end
+        b << no_data if rows.size.zero?
+        b
+      end
+    end
+
+    def no_data
+      return '' if t.nodata_message.nil?
+      content_tag(:tr, class: 'nodata') do
+        content_tag(:td, colspan: t.columns.size) { t.nodata_message }
+      end
+    end
+
+    def render_data_rows(b, collection, t)
+      collection.each do |item|
+        b << content_tag(:tr, t.row_options_for(item)) do
+          t.columns.map do |name, opts|
+            render_td(item, name, opts)
+          end.join.html_safe
+        end
+      end
+    end
+
+    def render_td(item, column, opts)
+      v = if opts[:checkbox]
+        checked = opts[:checked]
+        checked = opts[:block].call(item) if opts[:block]
+        check_box_tag "#{column}[]", item.public_send(opts.fetch(:value_method, :id)), checked, extract_check_box_tag_options(opts)
+      elsif opts[:radio]
+        radio_button_tag "#{column}[]", item.public_send(opts.fetch(:value_method, :id))
+      elsif opts[:block]
+        args = [item, nil].first(opts[:block].arity)
+        capture(*args, &opts[:block])
+      else
+        tmp = item.public_send(column)
+        tmp = item.public_send("#{column}_text") rescue tmp if tmp.is_a?(Symbol)
+        tmp
+      end
+
+      if config.use_entity_shortcuts && v.is_a?(ActiveRecord::Base)
+        btn = content_tag(:div, class: 'entity-shortcut') do
+          link_to(config.url_generator_proc.(v), class: 'btn btn-small') do
+            content_tag(:i, nil, class: 'icon-share')
+          end
+        end rescue nil
+      end
+
+      v = if v.is_a?(Enumerable)
+        v.inject(''.html_safe) { |b, i| b << ', ' unless b.blank?; b << i.format_for_output }
+      else
+        v.format_for_output
+      end
+      v = v.to_s unless v.nil? || v.is_a?(String)
+
+      v = ''.html_safe << btn << v if btn
+
+      content_tag(:td, v, extract_td_options(opts, item))
+    end
+
+    def extract_check_box_tag_options(opts)
+      valid_options = [:disabled]
+      opts.select { |k, _| valid_options.include?(k) }
+    end
+
+    def extract_td_options(opts, item)
+      retval = {}
+      retval[:class] = 'c' if opts[:align] == :center
+
+      if opts[:title]
+        retval[:title] = if opts[:title].respond_to?(:call)
+          opts[:title].call(item).format_for_output
+        else
+          opts[:title].format_for_output
+        end
+      end
+
+      retval
+    end
+  end
+end

data/lib/html_tables/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module HtmlTables
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/lib/html_tables/yielded_object.rb

@@ -27,7 +27,7 @@ module HtmlTables
     end
 
     # Adds a regular column to the DataTable.
-    def column(id, options = { }, &block)
+    def column(id, options = {}, &block)
       options[:block] = block if block_given?
       t.columns[id] = options
       nil

data/lib/html_tables.rb

@@ -7,5 +7,6 @@ require 'html_tables/to_label'
 require 'html_tables/format_for_output'
 require 'html_tables/yielded_object'
 require 'html_tables/data_table'
+require 'html_tables/renderer'
 require 'html_tables/data_table_helper'
 require 'html_tables/railtie' if defined?(Rails::Railtie)

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: html_tables
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Fábio David Batista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple DSL for HTML data tables
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -86,6 +86,7 @@ files:
 - lib/html_tables/data_table_helper.rb
 - lib/html_tables/format_for_output.rb
 - lib/html_tables/railtie.rb
+- lib/html_tables/renderer.rb
 - lib/html_tables/to_label.rb
 - lib/html_tables/version.rb
 - lib/html_tables/yielded_object.rb
@@ -98,17 +99,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: This gem was extracted from some projects on my company. Everyone is welcome