greentable 0.9.1 → 0.9.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    greentable (0.9.1)
+    greentable (0.9.2)
 
 GEM
   remote: https://rubygems.org/

data/Guardfile

@@ -2,6 +2,7 @@
 # More info at https://github.com/guard/guard#readme
 
 guard :test, :drb => false, :all_on_start => true do
+  watch(%r{^lib/greentable/(.+)\.rb$})     { |m| "test/#{m[1]}_test.rb" }
   watch(%r{^test/.+_test\.rb$})
 end
 

data/README.md

@@ -78,6 +78,8 @@ will produce
 
 A comprehensive example:
 
+*note how gt.col(class: 'h') below is applied to both TH and TD elements*
+
 ```haml
 =greentable(array, class: 'a aa', style: 'b:c', tr: {class: 'd'}, th: {onclick: 'e();'}, td: {class: 'f', 'data-target' => 'g'} ) do |gt, el|
   -gt.col('col0', class: 'h', th: {class: 'i'}) do
@@ -122,10 +124,10 @@ will produce
 <table>
     <thead>
         <tr>
-          <th>Year</th>
-          <th>An even week</th>
-          <th>An odd week</th>
-          <th>An even week</th>
+            <th>Year</th>
+            <th>An even week</th>
+            <th>An odd week</th>
+            <th>An even week</th>
         </tr>
     </thead>
     <tbody>
@@ -148,6 +150,109 @@ will produce
 </table>
 ```
 
+## Counter Object
+Sometimes, you'll need to know what row you're currently on. For that purpose Greentable exposes a counter object:
+
+```haml
+=greentable([x,y,z]) do |gt, el|
+  -gt.col('i') do
+    =gt.counter.i
+  -gt.col('first?') do
+    =gt.counter.first?
+  -gt.col('last?') do
+    =gt.counter.last?
+  -gt.col('odd?') do
+    =gt.counter.odd?
+  -gt.col('even?') do
+    =gt.counter.even?
+```
+
+will produce
+
+```html
+<table>
+    <thead>
+        <tr>
+            <th>i</th>
+            <th>first?</th>
+            <th>last?</th>
+            <th>odd?</th>
+            <th>even?</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>0</td>
+            <td>true</td>
+            <td>false</td>
+            <td>true</td>
+            <td>false</td>
+        </tr>
+        <tr>
+            <td>1</td>
+            <td>false</td>
+            <td>false</td>
+            <td>false</td>
+            <td>true</td>
+        </tr>
+        <tr>
+            <td>2</td>
+            <td>false</td>
+            <td>true</td>
+            <td>true</td>
+            <td>false</td>
+        </tr>
+    </tbody>
+</table>
+```
+
+
+## Greentable Footer
+
+Sometime, you'll need to display a total (or whathaveyou) at the end:
+
+```haml
+=greentable(products) do |gt, product|
+  -gt.footer(class: 'a', style: 'border-top: 2px solid black;', tr: {class: 'footer_tr_class'}) do |footer|
+    -footer.col do
+      Total
+    -footer.col(style: 'font-weight: bold;') do
+      $3.14
+
+  -gt.col('name') do
+    =product
+  -gt.col('price') do
+    =product.price
+```
+
+will produce
+
+```html
+<table>
+    <thead>
+        <tr>
+            <th>name</th>
+            <th>price</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>ProductA</td>
+            <td>$2.11</td>
+        </tr>
+        <tr>
+            <td>ProductB</td>
+            <td>$1.03</td>
+        </tr>
+    </tbody>
+    <tfoot>
+        <tr class='footer_tr_class'>
+            <td class='a' style: 'border-top: 2px solid black;'>Total</td>
+            <td class='a' style='border-top: 2px solid black; font-weight: bold;'>$3.14</td>
+        </tr>
+    </tfoot>
+</table>
+```
 
 ## Global Defaults
 You can configure global defaults for all your greentables.

data/lib/greentable/greentable_table.rb

@@ -7,6 +7,8 @@ module Greentable
     def initialize(parent, records, opts)
       @parent = parent
       @records = records
+      @row_counter = Counter.new(@records.size)
+
       defaults = Greentable.configuration.defaults.dup rescue {}
       @defaults_tr = deep_merge(defaults.delete(:tr), opts.delete(:tr))
       @defaults_th = deep_merge(defaults.delete(:th), opts.delete(:th))
@@ -22,20 +24,19 @@ module Greentable
       @td_attributes = []
       @td_html = []
 
+      @tfoot = ""
     end
 
-    def subrow(opts = {}, &block)
-      return if capture_headers
-      return if opts[:display_on] == :first && !@row_counter.first?
-      return if opts[:display_on] == :last && !@row_counter.last?
+    def counter
+      @row_counter
     end
 
     def col(th = nil, opts = {}, &block)
       @th_html[@current_col] = th
       th_opts = opts.delete(:th) || {}
       td_opts = opts.delete(:td) || {}
-      @th_attributes[@current_col] = deep_merge(th_opts, opts)
-      @td_attributes[@current_col] = deep_merge(td_opts, opts)
+      @th_attributes[@current_col] = deep_merge(opts, th_opts)
+      @td_attributes[@current_col] = deep_merge(opts, td_opts)
 
       @td_html[@row_counter.i] ||= []
       @td_html[@row_counter.i][@current_col] = @parent.capture(&block)
@@ -44,15 +45,22 @@ module Greentable
       return nil
     end
 
-    def process(&block)
-      @row_counter = Counter.new(@records.size)
+    def footer(opts = {}, &block)
+      return unless @tfoot.empty?
+      @tfoot << '<tfoot>'
+      tr_opts = deep_merge(@defaults_tr, opts.delete(:tr))
+      td_opts = deep_merge(opts, opts.delete(:td))
+      td_opts = deep_merge(@defaults_td, td_opts)
+      TableGroup.new(@parent, [nil], {td: td_opts, tr: tr_opts}).process(&block).send(:to_s_tbody_content, @tfoot)
+      @tfoot << '</tfoot>'
+    end
 
+    def process(&block)
       @records.each do |record|
         @current_col = 0
         block.call(self, record)
         @row_counter.inc
       end
-
       self
     end
 
@@ -60,6 +68,24 @@ module Greentable
       ret = ""
       return ret if @td_html.empty?
       ret << "<table#{do_attributes(nil,@opts)}>"
+      to_s_thead_content(ret)
+      ret << "<tbody>"
+      to_s_tbody_content(ret)
+      ret << "</tbody>"
+      ret << @tfoot
+      ret << "</table>"
+      ret.html_safe
+    end
+
+    class TableGroup < Table
+      def col(th = nil, opts = {}, &block)
+        super(nil, th || {}, &block)
+      end
+    end
+
+    private
+
+    def to_s_thead_content(ret)
       unless @th_html.compact.empty?
         ret << "<thead>"
         ret << "<tr#{do_attributes(nil, @defaults_tr)}>"
@@ -69,22 +95,19 @@ module Greentable
         ret << "</tr>"
         ret << "</thead>"
       end
-      ret << "<tbody>"
+    end
 
+    def to_s_tbody_content(ret)
       @row_counter.i.times do |row|
         ret << "<tr#{do_attributes(row, deep_merge(@defaults_tr, @tr_attributes[row]))}>"
-        @td_html[row].each_with_index do |td,col|
+        @td_html[row].each_with_index do |td, col|
           ret << "<td#{do_attributes(row, deep_merge(@defaults_td, @td_attributes[col]))}>#{td}</td>"
         end
         ret << "</tr>"
       end
-      ret << "</tbody>"
-      ret << "</table>"
-      ret.html_safe
     end
 
-    private
-    def do_attributes(i,o)
+    def do_attributes(i, o)
       instance = i.nil? ? nil : @records[i]
       return "" if o.nil? || o.empty?
       ret = o.map{|k,v| "#{k.is_a?(Proc) ? instance.instance_eval(&k).to_s : k.to_s}=\"#{v.is_a?(Proc) ? instance.instance_eval(&v).to_s : v.to_s}\""}.join(" ").strip
@@ -105,7 +128,7 @@ module Greentable
             deep_merge(source_hash[rkey], rval)
           elsif rval == source_hash[rkey] then
           elsif rval.is_a?(String) and lval.is_a?(String)
-            source_hash[rkey] = "#{rval} #{lval}"
+            source_hash[rkey] = "#{lval} #{rval}"
           else
             source_hash[rkey] = rval
           end

data/lib/greentable/version.rb

@@ -1,3 +1,3 @@
 module Greentable
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/greentable/view_helpers.rb

@@ -3,7 +3,7 @@ require 'greentable/greentable_table'
 module Greentable
   module ViewHelpers
     def greentable(records, opts = {}, &block)
-      gt = Table.new(self,records, opts)
+      gt = Table.new(self, records, opts)
       gt.process(&block)
     end
   end

data/test/dummy/app/views/application/home.html.erb

@@ -5,12 +5,32 @@ hello world
 <a href="/?greentable_export=csv&greentable_id=greentable_id">Export CSV</a>
 |
 <a href="/?greentable_export=print&greentable_id=greentable_id">Print</a>
-<%= greentable([0], :id => 'greentable_id') do |gt, el| %>
-    <% gt.col('i') do %>
+<%= greentable([100, 101, 102], :id => 'greentable_id') do |gt, el| %>
+    <% gt.footer(style: 'border-top: 2px solid red;') do |footer| %>
+        <% footer.col(style: 'background-color: #ccc;') do %>
+            footer td
+        <% end %>
+    <% end %>
+    <% gt.col('x') do %>
         <%= el %>
     <% end %>
-    <% gt.col('i+1') do %>
+    <% gt.col('x+1') do %>
         <%= el + 1 %>
     <% end %>
+    <% gt.col('i') do %>
+        <%= gt.counter.i %>
+    <% end %>
+    <% gt.col('first?') do %>
+        <%= gt.counter.first? %>
+    <% end %>
+    <% gt.col('last?') do %>
+        <%= gt.counter.last? %>
+    <% end %>
+    <% gt.col('odd?') do %>
+        <%= gt.counter.odd? %>
+    <% end %>
+    <% gt.col('even?') do %>
+        <%= gt.counter.even? %>
+    <% end %>
 <% end %>
 

data/test/{greentable_test.rb → greentable_table_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class GreentableTest < ActiveSupport::TestCase
+class GreentableTableTest < ActiveSupport::TestCase
 
   class String
     def html_safe
@@ -72,7 +72,7 @@ class GreentableTest < ActiveSupport::TestCase
         x
       end
     end
-    assert_equal '<table><thead><tr><th class="proc1">proc0</th></tr></thead><tbody><tr><td style="proc2" class="proc1">0</td></tr></tbody></table>', gt.to_s
+    assert_equal '<table><thead><tr><th class="proc1">proc0</th></tr></thead><tbody><tr><td class="proc1" style="proc2">0</td></tr></tbody></table>', gt.to_s
   end
 
   test "table_opts_comprehensive" do
@@ -85,7 +85,7 @@ class GreentableTest < ActiveSupport::TestCase
         x
       end
     end
-    assert_equal '<table class="a aa" style="b:c"><thead><tr class="d"><th onclick="e();" class="h i ee">col0</th><th onclick="e();" class="ee">col1</th></tr></thead><tbody><tr class="d"><td data-target="f" class="h ff">0</td><td data-target="f" class="j ff">0</td></tr></tbody></table>', gt.to_s
+    assert_equal '<table class="a aa" style="b:c"><thead><tr class="d"><th onclick="e();" class="ee h i">col0</th><th onclick="e();" class="ee">col1</th></tr></thead><tbody><tr class="d"><td data-target="f" class="ff h">0</td><td data-target="f" class="ff j">0</td></tr></tbody></table>', gt.to_s
   end
 
   test "global configuration" do
@@ -106,4 +106,76 @@ class GreentableTest < ActiveSupport::TestCase
       end
     end
   end
+
+  test "footer - outside process" do
+    gt = Greentable::Table.new(self,[1, 2], td: {class: 'a'})
+    gt.footer(class: 'b', :td => {:class => 'c'}) do |footer|
+      footer.col(colspan: 2) do
+        'total'
+      end
+      footer.col do
+        3
+      end
+    end
+    gt.process do |gt, x|
+      gt.col('name') do
+        "name#{x}"
+      end
+      gt.col('price') do
+        x
+      end
+    end
+    assert_equal "<table><thead><tr><th>name</th><th>price</th></tr></thead><tbody><tr><td class=\"a\">name1</td><td class=\"a\">1</td></tr><tr><td class=\"a\">name2</td><td class=\"a\">2</td></tr></tbody><tfoot><tr><td class=\"a b c\" colspan=\"2\">total</td><td class=\"a b c\">3</td></tr></tfoot></table>", gt.to_s
+  end
+
+  test "footer - inside process" do
+    gt = Greentable::Table.new(self, [0], {})
+    gt.process do |gt, x|
+      gt.footer(style: 'a', :tr => {:class => 'tr_class'}) do |footer|
+        footer.col(style: 'b') do
+          'peace'
+        end
+        footer.col(style: 'c') do
+          'out'
+        end
+      end
+      gt.col('col0') do
+        x
+      end
+    end
+    assert_equal "<table><thead><tr><th>col0</th></tr></thead><tbody><tr><td>0</td></tr></tbody><tfoot><tr class=\"tr_class\"><td style=\"a b\">peace</td><td style=\"a c\">out</td></tr></tfoot></table>", gt.to_s
+  end
+
+  test "row_counter" do
+    gt = Greentable::Table.new(self, [0, 1, 2], {})
+    gt.process do |gt, x|
+      gt.col do
+        case x
+          when 0
+            assert_equal "0", gt.counter.to_s
+            assert_equal 0, gt.counter.i
+            assert gt.counter.first?
+            refute gt.counter.last?
+            assert gt.counter.odd?
+            refute gt.counter.even?
+          when 1
+            assert_equal "1", gt.counter.to_s
+            assert_equal 1, gt.counter.i
+            refute gt.counter.first?
+            refute gt.counter.last?
+            refute gt.counter.odd?
+            assert gt.counter.even?
+          when 2
+            assert_equal "2", gt.counter.to_s
+            assert_equal 2, gt.counter.i
+            refute gt.counter.first?
+            assert gt.counter.last?
+            assert gt.counter.odd?
+            refute gt.counter.even?
+          else
+            fail("should not come here. x=#{x}")
+        end
+      end
+    end
+  end
 end

data/test/test_helper.rb

@@ -1,7 +1,8 @@
-require 'simplecov'
-SimpleCov.start('rails')
+unless ARGV.any? {|e| e =~ /guard/ }
+  require 'simplecov'
+  SimpleCov.start('rails')
+end
 
-# Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
@@ -9,18 +10,12 @@ require "rails/test_help"
 
 Rails.backtrace_cleaner.remove_silencers!
 
-# Load support files
-#Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-# Load fixtures from the engine
-#if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-#  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-#end
-
-
 require 'greentable'
-require 'coveralls'
-Coveralls.wear!
+
+unless ARGV.any? {|e| e =~ /guard/ }
+  require 'coveralls'
+  Coveralls.wear!
+end
 
 public
 

data/todo.txt

@@ -6,4 +6,6 @@
     greentable_id
     greentable_export_filename
 * assets/greentable.css
-
+* add table caption support
+* add colgroup support
+* add col support

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greentable
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -216,7 +216,7 @@ files:
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
 - test/export_test.rb
-- test/greentable_test.rb
+- test/greentable_table_test.rb
 - test/test_helper.rb
 - todo.txt
 - test/dummy/log/development.log
@@ -247,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3809614129295099888
+      hash: 2946809728237935580
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3809614129295099888
+      hash: 2946809728237935580
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -307,6 +307,6 @@ test_files:
 - test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - test/dummy/tmp/cache/assets/E21/3E0/sprockets%2Ff9530da0d9bbb15351aef3eb378bddbc
 - test/export_test.rb
-- test/greentable_test.rb
+- test/greentable_table_test.rb
 - test/test.iml
 - test/test_helper.rb