data-table 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a93c19ba22c5c189c7eb7c2523776ce2b97f3c62
-  data.tar.gz: d31df8fbf78d197cd174a48ff1aff84ed1f3d465
+  metadata.gz: '0460569bde89f23e217c746e8a389733bf116696'
+  data.tar.gz: 29c4b0d8de0f82967dff15baa783011a94e74a68
 SHA512:
-  metadata.gz: e58f9dd66a62c8b84d5ca9155775d887499b60526846652def4dbd277da321b5fecb19602c4a2382f296192823b7049623a32712703d8e08a0ab3d0fdaa7083a
-  data.tar.gz: ce764c8ec13fcd513a7e7c21148da825128b7f4802f8873749acb5216c6c0362d8d73d8fd3f9bf9cef84519b6018722d6cf767ce2a01e99d71f58e07e0428be3
+  metadata.gz: d3330d311d3a62f0c42a431bdc19c307a283e3cdf4504c30371e311ad3b5330ad1c7d5ac96218dadfa25f6b3fc60efdbabc26137e1b470a8aa10cbc9b6e070fe
+  data.tar.gz: a817743f3b98df6fbed75e32172d969da426b33941bf6d4ab06909afa296d8d12cb337541b111c6dfd944074eb8983b9314330e2abbc9a77f34fc5cef034c0f6

data/data-table.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.licenses    = ['Nonstandard']
   s.authors     = ['Steve Erickson', 'Jeff Fraser']
   s.email       = ['sixfeetover@gmail.com']
-  s.homepage    = 'https://github.com/sixfeetover/data-table'
+  s.homepage    = 'https://github.com/veracross/data-table'
   s.summary     = %(Turn arrays of hashes or models in to an HTML table.)
   s.description = %(data-table is a simple gem that provides a DSL for
                     turning an array of hashes or ActiveRecord objects into an

data/lib/data-table/table.rb

@@ -268,6 +268,8 @@ module DataTable
     def render_parent_subtotals(group_array)
       html = ''
       @parent_subtotals[group_array].each_with_index do |group, index|
+        next if group.nil?
+
         html << "<tr class='parent_subtotal "
         html << "index_#{index} #{group_array.join('_').gsub(/\s/, '_').downcase}'>"
         @columns.each do |col|

data/lib/data-table/version.rb

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

data/spec/table_spec.rb

@@ -139,4 +139,136 @@ describe DataTable::Table do
       eq(%{<table id='' class='data_table ' cellspacing='0' cellpadding='0'><caption></caption><thead><tr></tr></thead><tr><td class='empty_data_table' colspan='0'>#{text}</td></tr></table>})
     end
   end
+
+  context 'with a more complicated setup' do
+    it 'renders okay' do
+      raw_results = [
+        { 'class' => 'Basketball', 'grade_level' => '9', 'points' => 50 },
+        { 'class' => 'Basketball', 'grade_level' => '9', 'points' => 51 },
+        { 'class' => 'Basketball', 'grade_level' => '10', 'points' => 52 },
+        { 'class' => 'Basketball', 'grade_level' => '10', 'points' => 53 },
+        { 'class' => 'Basketball', 'grade_level' => '10', 'points' => 54 },
+        { 'class' => 'Basketball', 'grade_level' => '12', 'points' => 55 }
+      ]
+
+      fields = [{
+        field_name: 'class',
+        display_description: 'Class',
+        column_width: 1.23,
+        data_type: 2
+      }, {
+        field_name: 'grade_level',
+        display_description: 'Grade Level',
+        column_width: 2.34,
+        data_type: 2
+      }, {
+        field_name: 'points',
+        display_description: 'Points',
+        column_width: 3.45,
+        data_type: 4
+      }]
+
+      column_groups = {}
+
+      subtotal_headers = [
+        { field_name: 'class' },
+        { field_name: 'grade_level' }
+      ]
+
+      subtotal_aggregates = {
+        sum: [],
+        avg: [{
+          field_name: 'points',
+          data_type: 4
+        }],
+        min: [],
+        max: []
+      }
+
+      total_aggregates = {
+        sum: [],
+        avg: [],
+        min: [],
+        max: []
+      }
+
+      has_aggregates = true
+
+      raw_results.each_with_index do |record, index|
+        record[:___data_table_index___] = index
+      end
+
+      html = DataTable.render(raw_results) do |t|
+        if has_aggregates
+          t.column :__subtotal_header__, '&nbsp;', width: '30px' do |_v|
+            '&nbsp;'
+          end
+        end
+
+        # COLUMN GROUPS
+        if column_groups.any?
+          t.custom_header do
+            th '', colspan: 1, css: 'column-group', style: 'width: 30px;' unless subtotal_headers.empty?
+
+            column_groups.each do |_column_group_index, column_group|
+              th column_group[:description], colspan: column_group[:column_count], css: 'column-group', style: "width: #{column_group_width}in;"
+            end
+
+            # spacer column
+            th '', colspan: 1, css: 'column-group'
+          end
+        end
+
+        # COLUMNS
+        fields.each do |field|
+          t.column field[:field_name], field[:display_description], css_class: "data-type-#{field[:data_type]}", width: field[:column_width] do |_v, record|
+            record[field[:field_name]]
+          end
+        end
+
+        # SUBTOTAL HEADERS
+        subtotal_headers.each_with_index do |subtotal_header, index|
+          t.group_by subtotal_header[:field_name], level: index
+        end
+
+        # SUBTOTAL AGGREGATES
+        unless subtotal_headers.empty?
+          subtotal_aggregates.each_with_index do |(aggregate_function, columns), index|
+            next if columns.empty?
+
+            t.subtotal :__subtotal_header__, nil, index do |_records, _column, path|
+              "#{path}: #{aggregate_function.to_s.upcase}"
+            end
+
+            columns.each do |column|
+              t.subtotal column[:field_name], aggregate_function, index do |value|
+                value
+              end
+            end
+          end
+        end
+
+        # TOTAL AGGREGATES
+        total_aggregates.each_with_index do |(aggregate_function, columns), index|
+          next if columns.empty?
+
+          t.total :__subtotal_header__, nil, index do |_records|
+            aggregate_function.to_s.upcase
+          end
+
+          columns.each do |column|
+            t.total column[:field_name], aggregate_function, index do |value|
+              value
+            end
+          end
+        end
+
+        # spacer column
+        t.column :_empty_space, ''
+      end
+
+      expected_html = %(<table id='' class='data_table ' cellspacing='0' cellpadding='0'><caption></caption><thead><tr><th class='__subtotal_header__ ' style='width: 30px'>&nbsp;</th><th class='points  data-type-4' style='width: 3.45'>Points</th><th class='_empty_space ' ></th></tr></thead><tbody class='basketball'><tr class='group_header level_0'><th colspan='3'>Basketball</th></tr><tr class='group_header level_1'><th colspan='3'>9</th></tr><tr class='row_0 ' ><td class='__subtotal_header__ nilclass' >&nbsp;</td><td class='points numeric data-type-4' >50</td><td class='_empty_space nilclass' ></td></tr><tr class='row_1 alt ' ><td class='__subtotal_header__ nilclass' >&nbsp;</td><td class='points numeric data-type-4' >51</td><td class='_empty_space nilclass' ></td></tr><tr class='subtotal index_1 first'><td class='__subtotal_header__ nilclass' >9: AVG</td><td class='points numeric data-type-4' >50.5</td><td class='_empty_space nilclass' ></td></tr><tr class='group_header level_1'><th colspan='3'>10</th></tr><tr class='row_0 ' ><td class='__subtotal_header__ nilclass' >&nbsp;</td><td class='points numeric data-type-4' >52</td><td class='_empty_space nilclass' ></td></tr><tr class='row_1 alt ' ><td class='__subtotal_header__ nilclass' >&nbsp;</td><td class='points numeric data-type-4' >53</td><td class='_empty_space nilclass' ></td></tr><tr class='row_2 ' ><td class='__subtotal_header__ nilclass' >&nbsp;</td><td class='points numeric data-type-4' >54</td><td class='_empty_space nilclass' ></td></tr><tr class='subtotal index_1 first'><td class='__subtotal_header__ nilclass' >10: AVG</td><td class='points numeric data-type-4' >53.0</td><td class='_empty_space nilclass' ></td></tr><tr class='group_header level_1'><th colspan='3'>12</th></tr><tr class='row_0 ' ><td class='__subtotal_header__ nilclass' >&nbsp;</td><td class='points numeric data-type-4' >55</td><td class='_empty_space nilclass' ></td></tr><tr class='subtotal index_1 first'><td class='__subtotal_header__ nilclass' >12: AVG</td><td class='points numeric data-type-4' >55.0</td><td class='_empty_space nilclass' ></td></tr><tr class='parent_subtotal index_1 basketball'><td class='__subtotal_header__ nilclass' >Basketball: AVG</td><td class='points numeric data-type-4' >52.5</td><td class='_empty_space nilclass' ></td></tr></tbody></table>)
+      expect(html).to eq(expected_html)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data-table
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Steve Erickson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,7 +98,7 @@ files:
 - spec/enum_spec.rb
 - spec/spec_helper.rb
 - spec/table_spec.rb
-homepage: https://github.com/sixfeetover/data-table
+homepage: https://github.com/veracross/data-table
 licenses:
 - Nonstandard
 metadata: {}
@@ -122,9 +122,4 @@ rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Turn arrays of hashes or models in to an HTML table.
-test_files:
-- spec/column_spec.rb
-- spec/data_table_spec.rb
-- spec/enum_spec.rb
-- spec/spec_helper.rb
-- spec/table_spec.rb
+test_files: []