data-table 2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39eba54db8dd1c599476d714baf1245cd7517333
-  data.tar.gz: cbf63f58a76943fa40793161c0a6e5813bc3290a
+  metadata.gz: a93c19ba22c5c189c7eb7c2523776ce2b97f3c62
+  data.tar.gz: d31df8fbf78d197cd174a48ff1aff84ed1f3d465
 SHA512:
-  metadata.gz: '0509df5140e6bcd65a0ca07c04db40e7722161ee898c6a41552ec550a982a991e694f970479a9a70e8cf40b24cb442d1483cf6c6ff2199391b0aabae32319eb5'
-  data.tar.gz: 1d19797af22349f05d6a811bb97dc06f235bba096bff0dc7637e180dc866aaf4e16fc3e9ef445c45b463f018023b4080ad2e530855cd004431d43f4a2597eb49
+  metadata.gz: e58f9dd66a62c8b84d5ca9155775d887499b60526846652def4dbd277da321b5fecb19602c4a2382f296192823b7049623a32712703d8e08a0ab3d0fdaa7083a
+  data.tar.gz: ce764c8ec13fcd513a7e7c21148da825128b7f4802f8873749acb5216c6c0362d8d73d8fd3f9bf9cef84519b6018722d6cf767ce2a01e99d71f58e07e0428be3

data/lib/data-table.rb

@@ -32,8 +32,8 @@ module DataTable
 
       .data_table .group_header th {text-align: left;}
 
-      .data_table .subtotal.index_0 td,
-      .data_table .parent_subtotal.index_0 td
+      .data_table .subtotal.first td,
+      .data_table .parent_subtotal.first td
       {
         border-top: 1px solid #000;
       }

data/lib/data-table/table.rb

@@ -284,13 +284,20 @@ module DataTable
       html = ''
       path = ancestors.nil? ? [] : ancestors.dup
       path << group_header
+
+      is_first_subtotal = true
+
       @subtotal_calculations[path].each_with_index do |group, index|
-        html << "<tr class='subtotal index_#{index}'>"
+        next if group.empty?
+        
+        html << "<tr class='subtotal index_#{index} #{'first' if is_first_subtotal}'>"
         @columns.each do |col|
           value = group[col.name] ? group[col.name].values[0] : nil
           html << col.render_cell(value)
         end
         html << '</tr>'
+
+        is_first_subtotal = false
       end
       html
     end
@@ -339,7 +346,9 @@ module DataTable
           @collection.each_pair_with_parents(@groupings.count) do |group_name, group_data, parents|
             path = parents + [group_name]
             result = calculate(group_data, subtotal[0], subtotal[1], path)
-            @subtotal_calculations[path][index] ||= {}
+            (0..index).each do |index|
+              @subtotal_calculations[path][index] ||= {}
+            end
             @subtotal_calculations[path][index][subtotal[0]] = {subtotal[1] => result}
           end
         end
@@ -436,7 +445,9 @@ module DataTable
     def total_row(collection, column_name, function = nil, index = nil, &block)
       function_or_block = function || block
       f = function && block_given? ? [function, block] : function_or_block
-      collection[index] = {} if collection[index].nil?
+      (0..index).each do |index|
+        collection[index] = {} if collection[index].nil?
+      end
       collection[index][column_name] = f
     end
   end

data/lib/data-table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = '2.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/spec/table_spec.rb

@@ -72,6 +72,48 @@ describe DataTable::Table do
       expect(data_table.subtotal_calculations).to eq({["Star Wars"]=>[{:power_level=>{:sum=>145.0}}], ["Middle Earth"]=>[{:power_level=>{:sum=>9081.0}}]})
     end
 
+    it "should do sub-totaling starting with indexes > 0" do
+      data_table.group_by :world, level: 0
+      data_table.column :power_level
+      data_table.subtotal :power_level, :sum, 1
+
+      data_table.prepare_data
+
+      expect(data_table.subtotal_calculations).to eq({
+        ["Star Wars"] => [{}, {:power_level => {:sum => 145.0}}],
+        ["Middle Earth"] => [{}, {:power_level => {:sum => 9081.0}}]
+      })
+    end
+
+    it "should not render empty sub-total aggregate rows" do
+      data_table.group_by :world, level: 0
+      data_table.column :power_level
+      data_table.subtotal :power_level, nil, 1 do |_records, _column, path|
+        path
+      end
+
+      data_table.prepare_data
+      subtotal_calculations = data_table.subtotal_calculations
+
+      # this is convoluted because it's hard to assert a nested structure that includes procs
+      # [
+      #   ["Middle Earth"] => [{}, {:power_level=>{#<Proc:0x03dbead8@table_spec.rb:78>=>"Middle Earth"}}],
+      #   ["Star Wars"] => [{}, {:power_level=>{#<Proc:0x03dbead8@table_spec.rb:78>=>"Star Wars"}}]
+      # ]
+      expect(subtotal_calculations.keys).to eq([["Star Wars"], ["Middle Earth"]])
+      expect(subtotal_calculations.values.flatten.map(&:keys)).to eq([[], [:power_level], [], [:power_level]])
+      subtotal_calculations.values.flatten.map(&:values).flatten.map(&:keys).each do |k|
+        expect(k).to be_a(Array)
+        expect(k.length).to eq(1)
+        expect(k[0]).to be_a(Proc)
+      end
+      expect(subtotal_calculations.values.flatten.map(&:values).flatten.map(&:values)).to eq([["Star Wars"], ["Middle Earth"]])
+
+      # note how the rows are index_1, and there is no index_0 row
+      expect(data_table.render).to \
+      eq(%{<table id='' class='data_table ' cellspacing='0' cellpadding='0'><caption></caption><thead><tr><th class='power_level ' ></th></tr></thead><tbody class='star_wars'><tr class='group_header level_0'><th colspan='1'>Star Wars</th></tr><tr class='row_0 ' ><td class='power_level numeric' >50</td></tr><tr class='row_1 alt ' ><td class='power_level numeric' >95</td></tr><tr class='subtotal index_1 first'><td class='power_level numeric' >Star Wars</td></tr></tbody><tbody class='middle_earth'><tr class='group_header level_0'><th colspan='1'>Middle Earth</th></tr><tr class='row_0 ' ><td class='power_level numeric' >9001</td></tr><tr class='row_1 alt ' ><td class='power_level numeric' >80</td></tr><tr class='subtotal index_1 first'><td class='power_level numeric' >Middle Earth</td></tr></tbody></table>})
+    end
+
     it "should render a custom header" do
       data_table.custom_header do
         th 'Two Columns', :colspan => 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data-table
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.1
 platform: ruby
 authors:
 - Steve Erickson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: data-table
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Turn arrays of hashes or models in to an HTML table.