greentable 0.9.3 → 0.9.4

data/Gemfile.lock

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

data/README.md

@@ -209,7 +209,7 @@ will produce
 
 ## Greentable Footer
 
-Sometime, you'll need to display a total (or whathaveyou) at the end:
+Sometimes, you'll need to display a total (or whathaveyou) at the end:
 
 ```haml
 =greentable(products) do |gt, product|
@@ -254,6 +254,63 @@ will produce
 </table>
 ```
 
+Subtotal, shipping, tax, total? No problem:
+
+```haml
+=greentable(order.order_line_items) do |gt, order_line_item|
+  -gt.footer([:subtotal, :shipping, :tax, :total], class: 'klass') do |footer, attr|
+    -footer.col do
+      =attr
+    -footer.col do
+      =order.send(attr)
+
+  -gt.col('name') do
+    =order_line_item.name
+  -gt.col('price') do
+    =order_line_item.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>
+            <td class='klass'>subtotal</td>
+            <td class='klass'>xyz</td>
+        </tr>
+        <tr>
+            <td class='klass'>shipping</td>
+            <td class='klass'>xyz</td>
+        </tr>
+        <tr>
+            <td class='klass'>tax</td>
+            <td class='klass'>xyz</td>
+        </tr>
+        <tr>
+            <td class='klass'>total</td>
+            <td class='klass'>xyz</td>
+        </tr>
+    </tfoot>
+</table>
+```
+
 ## Global Defaults
 You can configure global defaults for all your greentables.
 

data/lib/greentable/greentable_table.rb

@@ -45,13 +45,23 @@ module Greentable
       return nil
     end
 
-    def footer(opts = {}, &block)
+    def footer(*args, &block)
       return unless @tfoot.empty?
+      if args.size == 1
+        rows = [nil]
+        opts = args[0]
+      elsif args.size == 2
+        rows = args[0]
+        opts = args[1]
+      else
+        raise 'greentable footer: number of arguments must be either 1 or two'
+      end
+
       @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)
+      TableGroup.new(@parent, rows, {td: td_opts, tr: tr_opts}).process(&block).send(:to_s_tbody_content, @tfoot)
       @tfoot << '</tfoot>'
     end
 

data/lib/greentable/version.rb

@@ -1,3 +1,3 @@
 module Greentable
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/test/greentable_table_test.rb

@@ -146,6 +146,42 @@ class GreentableTableTest < ActiveSupport::TestCase
     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 "footer - with empty table" do
+    gt = Greentable::Table.new(self, [], {})
+    gt.process do |gt, x|
+      gt.footer do |footer|
+        footer.col do
+          'peace'
+        end
+        footer.col do
+          'out'
+        end
+      end
+      gt.col('col0') do
+        x
+      end
+    end
+    assert_equal "", gt.to_s
+  end
+
+  test "footer - with multiple rows" do
+    gt = Greentable::Table.new(self, [0], {})
+    gt.process do |gt, x|
+      gt.footer(['f1', 'f2'], :class => 'klass') do |footer, row|
+        footer.col do
+          'Total'
+        end
+        footer.col do
+          row
+        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><td class=\"klass\">Total</td><td class=\"klass\">f1</td></tr><tr><td class=\"klass\">Total</td><td class=\"klass\">f2</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|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greentable
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -247,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3412082307347015687
+      hash: -125976970667350695
 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: -3412082307347015687
+      hash: -125976970667350695
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25