data-table 1.0.1 → 2.0

data/lib/data-table/version.rb

@@ -1,3 +1,3 @@
-class DataTable
-  VERSION = "1.0.1"
+module DataTable
+  VERSION = '2.0'.freeze
 end

data/rebuild_gem.rb

@@ -0,0 +1,11 @@
+puts "Removing old gem file"
+`rm data-table*.gem`
+
+puts "Building new data-table gem"
+`gem build ./data-table.gemspec`
+
+puts "Uninstalling old data-table gem"
+`gem uninstall -a data-table`
+
+puts "Installing new build of data-table gem"
+`gem install ./data-table*.gem`

data/spec/column_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe DataTable::Column do
+  it "should store the name" do
+    column = DataTable::Column.new(:thing)
+    expect(column.name).to eq(:thing)
+  end
+
+  it "should add the column name as a css class" do
+    column = DataTable::Column.new(:thing)
+    expect(column.css_class_names).to include('thing')
+  end
+
+  it "should render a td tag" do
+    column = DataTable::Column.new(:thing)
+    expect(column.render_cell("Data")).to eq(%(<td class='thing text' >Data</td>))
+  end
+
+  it "should render the column header" do
+    column = DataTable::Column.new(:thing, 'Thing')
+    expect(column.render_column_header).to eq(%(<th class='thing ' >Thing</th>))
+  end
+
+  it "should add custom attributes to the td tag" do
+    options = {
+      attributes: {
+        'data-type' => 'text',
+        'data-id' => 1
+      }
+    }
+    column = DataTable::Column.new(:thing, 'Thing', options)
+    expect(column.custom_attributes).to eq("data-type='text' data-id='1'")
+    expect(column.render_cell('Data')).to  include("data-type='text'")
+  end
+
+  it "should use the block for rendering" do
+    square = lambda { |v| v.to_i ** 2 }
+    column = DataTable::Column.new(:amount, 'Amount', &square)
+    expect(column.render_cell(5, amount: 5)).to eq(%(<td class='amount numeric' >25</td>))
+  end
+end

data/spec/data_table_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe DataTable do
+  let(:collection) {
+      [
+        {:name => 'Luke Skywalker', :class => 'Jedi Knight'},
+        {:name => 'Emporer Palpatine', :class => 'Sith Lord'},
+        {:name => 'Mithrander', :class => 'Wizard'},
+        {:name => 'Aragorn', :class => 'Ranger'}
+      ]
+    }
+
+
+  it "should render the collection" do
+    html = DataTable.render(collection) do |t|
+      t.column :name, 'Name'
+      t.column :class, 'Class'
+    end
+
+    expect(html).to eq(%{<table id='' class='data_table ' cellspacing='0' cellpadding='0'><caption></caption><thead><tr><th class='name ' >Name</th><th class='class ' >Class</th></tr></thead><tbody><tr class='row_0 ' ><td class='name text' >Luke Skywalker</td><td class='class text' >Jedi Knight</td></tr><tr class='row_1 alt ' ><td class='name text' >Emporer Palpatine</td><td class='class text' >Sith Lord</td></tr><tr class='row_2 ' ><td class='name text' >Mithrander</td><td class='class text' >Wizard</td></tr><tr class='row_3 alt ' ><td class='name text' >Aragorn</td><td class='class text' >Ranger</td></tr></tbody></table>})
+  end
+end

data/spec/enum_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Enumerable do
+  context "with a non-empty collection of hashes" do
+    let(:collection) {
+      [
+        {name: 'Luke Skywalker', class: 'Jedi Knight', world: 'Star Wars', power_level: 50},
+        {name: 'Emporer Palpatine', class: 'Sith Lord', world: 'Star Wars', power_level: 95},
+        {name: 'Mithrander', class: 'Wizard', world: 'Middle Earth', power_level: 9001},
+        {name: 'Aragorn', class: 'Ranger', world: 'Middle Earth', power_level: 80}
+      ]
+    }
+
+    let(:groupings) { [:class] }
+
+    it "should transform a collection into nested hash based on and array of groups" do
+      expect(
+        collection.group_by_recursive(groupings)
+      ).to eq(
+        {
+          "Jedi Knight"=>[{:name=>"Luke Skywalker", :class=>"Jedi Knight", :world=>"Star Wars", :power_level=>50}],
+          "Sith Lord"=>[{:name=>"Emporer Palpatine", :class=>"Sith Lord", :world=>"Star Wars", :power_level=>95}],
+          "Wizard"=>[{:name=>"Mithrander", :class=>"Wizard", :world=>"Middle Earth", :power_level=>9001}],
+          "Ranger"=>[{:name=>"Aragorn", :class=>"Ranger", :world=>"Middle Earth", :power_level=>80}]
+        }
+      )
+    end
+
+    it "should traverse a nested hash" do
+      grouped_collection = collection.group_by_recursive(groupings)
+      ungrouped = []
+      grouped_collection.each_pair_recursive { |_k, v| ungrouped.concat(v) }
+      expect(ungrouped).to eq(collection)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,18 @@
+require 'data-table'
+require 'pry'
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

data/spec/table_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+describe DataTable::Table do
+  context "with a non-empty collection of hashes" do
+    let(:collection) {
+      [
+        {:name => 'Luke Skywalker', :class => 'Jedi Knight', :world => 'Star Wars', :power_level => 50},
+        {:name => 'Emporer Palpatine', :class => 'Sith Lord', :world => 'Star Wars', :power_level => 95},
+        {:name => 'Mithrander', :class => 'Wizard', :world => 'Middle Earth', :power_level => 9001},
+        {:name => 'Aragorn', :class => 'Ranger', :world => 'Middle Earth', :power_level => 80}
+      ]
+    }
+
+    let(:data_table) {DataTable::Table.new(collection)}
+
+    it "should add a column do @columns" do
+      data_table.column(:name, 'Name')
+      expect(data_table.columns).to_not be_empty
+      expect(data_table.columns.first.class).to be(DataTable::Column)
+    end
+
+    it "should render the collection" do
+      data_table.column(:name, 'Name')
+      data_table.column(:class, 'Class')
+      expect(data_table.render).to \
+        eq(%{<table id='' class='data_table ' cellspacing='0' cellpadding='0'><caption></caption><thead><tr><th class='name ' >Name</th><th class='class ' >Class</th></tr></thead><tbody><tr class='row_0 ' ><td class='name text' >Luke Skywalker</td><td class='class text' >Jedi Knight</td></tr><tr class='row_1 alt ' ><td class='name text' >Emporer Palpatine</td><td class='class text' >Sith Lord</td></tr><tr class='row_2 ' ><td class='name text' >Mithrander</td><td class='class text' >Wizard</td></tr><tr class='row_3 alt ' ><td class='name text' >Aragorn</td><td class='class text' >Ranger</td></tr></tbody></table>})
+    end
+
+    it "should group the records" do
+      grouping_column = :world
+
+      data_table.group_by grouping_column, level: 0
+      data_table.column(:name, 'Name')
+      data_table.column(:class, 'Class')
+      expect(data_table.grouped_data).to be true
+      data_table.prepare_data
+      expect(data_table.collection).to eq(collection.group_by {|g| g[grouping_column]})
+      expect(data_table.render).to eq(%{<table id='' class='data_table ' cellspacing='0' cellpadding='0'><caption></caption><thead><tr><th class='name ' >Name</th><th class='class ' >Class</th></tr></thead><tbody class='star_wars'><tr class='group_header level_0'><th colspan='2'>Star Wars</th></tr><tr class='row_0 ' ><td class='name text' >Luke Skywalker</td><td class='class text' >Jedi Knight</td></tr><tr class='row_1 alt ' ><td class='name text' >Emporer Palpatine</td><td class='class text' >Sith Lord</td></tr></tbody><tbody class='middle_earth'><tr class='group_header level_0'><th colspan='2'>Middle Earth</th></tr><tr class='row_0 ' ><td class='name text' >Mithrander</td><td class='class text' >Wizard</td></tr><tr class='row_1 alt ' ><td class='name text' >Aragorn</td><td class='class text' >Ranger</td></tr></tbody></table>})
+    end
+
+    it "should do totaling" do
+      data_table.column :power_level
+      data_table.total :power_level, :sum, 0
+      data_table.calculate_totals!
+      expect(data_table.total_calculations).to eq([{:power_level=>9226.0}])
+    end
+
+    it "should do custom formatting for the total" do
+      data_table.column :power_level
+      data_table.total :power_level, :avg, 0 do |average|
+        "#{average / 100.0}%"
+      end
+      data_table.calculate_totals!
+      expect(data_table.total_calculations).to eq([{:power_level=>"23.065%"}])
+    end
+
+    it "should do custom totalling" do
+      data_table.column :power_level
+      data_table.total :power_level do |collection|
+        collection.inject(0) { |sum, c| sum + c[:power_level] }
+      end
+      data_table.calculate_totals!
+      expect(data_table.total_calculations).to eq([{:power_level=>9226}])
+    end
+
+    it "should do sub-totaling" do
+      data_table.group_by :world, level: 0
+      data_table.column :power_level
+      data_table.subtotal :power_level, :sum, 0
+
+      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 render a custom header" do
+      data_table.custom_header do
+        th 'Two Columns', :colspan => 2
+        th 'One Column', :colspan => 1
+      end
+      expect(data_table.render_custom_table_header).to eq(%{<tr class='custom-header'><th class="" colspan="2" style="">Two Columns</th><th class="" colspan="1" style="">One Column</th></tr>})
+    end
+  end
+
+	context "with an empty collection" do
+    let(:collection) {Array.new}
+    let(:data_table) {DataTable::Table.new(collection)}
+
+    it "should render a table with the 'no records' message" do
+      expect(data_table.render).to \
+        eq(%{<table id='' class='data_table ' cellspacing='0' cellpadding='0'><caption></caption><thead><tr></tr></thead><tr><td class='empty_data_table' colspan='0'>No records found</td></tr></table>})
+    end
+
+    it "should render a custom empty text notice" do
+      text = "Nothing to see here"
+      data_table.empty_text = text
+      expect(data_table.render).to \
+      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
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data-table
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: '2.0'
 platform: ruby
 authors:
 - Steve Erickson
@@ -10,47 +9,122 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000Z
-dependencies: []
-description: data-table is a simple gem that provides a DSL for allowing you do turn
-  an array of hashes or ActiveRecord objects into an HTML table.
+date: 2017-04-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+description: |-
+  data-table is a simple gem that provides a DSL for
+                      turning an array of hashes or ActiveRecord objects into an
+                      HTML table.
 email:
 - sixfeetover@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
+- assigments_table.html
 - data-table.gemspec
+- examples/all_features.rb
 - lib/data-table.rb
-- lib/data-table/data_table.rb
-- lib/data-table/data_table_column.rb
+- lib/data-table/column.rb
+- lib/data-table/enum.rb
+- lib/data-table/table.rb
 - lib/data-table/version.rb
+- rebuild_gem.rb
+- spec/column_spec.rb
+- spec/data_table_spec.rb
+- spec/enum_spec.rb
+- spec/spec_helper.rb
+- spec/table_spec.rb
 homepage: https://github.com/sixfeetover/data-table
-licenses: []
+licenses:
+- Nonstandard
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: data-table
-rubygems_version: 1.8.8
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Turn arrays of hashes or models in to an HTML table.
-test_files: []
+test_files:
+- spec/column_spec.rb
+- spec/data_table_spec.rb
+- spec/enum_spec.rb
+- spec/spec_helper.rb
+- spec/table_spec.rb

data/lib/data-table/data_table.rb

@@ -1,385 +0,0 @@
-## 
-# Config Options
-# 
-# id: the html id 
-# title: the title of the data table
-# subtitle: the subtitle of the data table
-# css_class: an extra css class to get applied to the table
-# empty_text: the text to display of the collection is empty
-# display_header => false: hide the column headers for the data table
-# alternate_rows => false: turn off alternating of row css classes
-# alternate_cols => true: turn on alternating of column classes, defaults to false
-#
-# columns: an array of hashes of the column specs for this table
-#
-# group_by: an array of columns to group on
-# pivot_on: an array of columns to pivot on
-#
-# subtotals: an array of hashes that contain the subtotal information for each column that should be subtotaled
-# totals: an array of hashes that contain the total information for each column that should be totaled
-#
-##
-
-class DataTable
-  
-  #############
-  # CONFIG 
-  #############
-  attr_reader :grouped_data, :pivoted_data, :subtotals, :totals, :subtotal_calculations, :total_calculations
-  attr_accessor :id, :title, :css_class, :empty_text, :alternate_rows, :alternate_cols, :display_header, :hide_if_empty, :repeat_headers_for_groups, :custom_headers
-  
-  def initialize(collection)
-    @collection = collection
-    default_options!
-    
-    @columns = []
-    
-    @groupings, @pivot_columns = [], []
-    @pivoted_data, @grouped_data = false, false
-    @subtotals, @totals = {}, {}
-  end
-  
-  def default_options!
-    @id = ''
-    @title = ''
-    @subtitle = ''
-    @css_class = ''
-    @empty_text = 'No records found'
-    @hide_if_empty = false
-    @display_header = true
-    @alternate_rows = true
-    @alternate_cols = false
-    @subtotal_title = "Subtotal:"
-    @total_title = "Total:"
-    @repeat_headers_for_groups = false
-    @custom_headers = []
-    @row_attributes = nil
-  end
-  
-  def self.default_css_styles
-    <<-CSS_STYLE
-      .data_table {width: 100%; empty-cells: show}
-      .data_table td, .data_table th {padding: 3px}
-      
-      .data_table caption {font-size: 2em; font-weight: bold}
-      
-      .data_table thead {}
-      .data_table thead th {background-color: #ddd; border-bottom: 1px solid #bbb;}
-      
-      .data_table tbody {}
-      .data_table tbody tr.alt {background-color: #eee;}
-      
-      .data_table .group_header th {text-align: left;}
-      
-      .data_table .subtotal {}
-      .data_table .subtotal td {border-top: 1px solid #000;}
-      
-      .data_table tfoot {}
-      .data_table tfoot td {border-top: 1px solid #000;}
-      
-      .empty_data_table {text-align: center; background-color: #ffc;}
-      
-      /* Data Types */
-      .data_table .number, .data_table .money {text-align: right}
-      .data_table .text {text-align: left}
-    CSS_STYLE
-  end
-  
-  # Define a new column for the table
-  def column(id, title="", opts={}, &b)
-    @columns << DataTableColumn.new(id, title, opts, &b)
-  end
-  
-  def prepare_data
-    self.pivot_data! if @pivoted_data
-    self.group_data! if @grouped_data
-    
-    self.calculate_subtotals! if has_subtotals?
-    self.calculate_totals! if has_totals?
-  end
-  
-  #############
-  # GENERAL RENDERING 
-  #############
-
-  def self.render(collection, &blk)
-    # make a new table
-    t = self.new(collection)
-    
-    # yield it to the block for configuration
-    yield t
-    
-    # modify the data structure if necessary and do calculations
-    t.prepare_data
-    
-    # render the table
-    t.render.html_safe
-  end
-  
-  def render
-    render_data_table
-  end
-  
-  def render_data_table
-    html = "<table id='#{@id}' class='data_table #{@css_class}' cellspacing='0' cellpadding='0'>"
-      html << "<caption>#{@title}</caption>" if @title
-      html << render_data_table_header if @display_header
-      if @collection.any?
-        html << render_data_table_body(@collection)
-        html << render_totals if has_totals?
-      else
-        html << "<tr><td class='empty_data_table' colspan='#{@columns.size}'>#{@empty_text}</td></tr>"
-      end
-    html << "</table>"
-  end
-
-  def render_data_table_header
-    html = "<thead>"
-    
-    html << render_custom_table_header unless @custom_headers.empty?
-    
-    html << "<tr>"
-      @columns.each do |col|
-        html << col.render_column_header
-      end
-    html << "</tr></thead>"
-  end
-  
-  def render_custom_table_header
-    html = "<tr>"
-      @custom_headers.each do |h|
-        html << "<th class=\"#{h[:css]}\" colspan=\"#{h[:colspan]}\">#{h[:text]}</th>"
-      end
-    html << "</tr>"
-  end
-
-  def render_data_table_body(collection)
-    if @grouped_data
-      render_grouped_data_table_body(collection)
-    else
-      "<tbody>#{render_rows(collection)}</tbody>"
-    end
-  end
-  
-  def render_rows(collection)
-    html = ""
-    collection.each_with_index do |row, row_index|
-      css_class = @alternate_rows && row_index % 2 == 1 ? 'alt ' : ''
-      if @row_style && style = @row_style.call(row, row_index)
-        css_class << style
-      end
-
-      attributes = @row_attributes.nil? ? {} : @row_attributes.call(row)
-      html << render_row(row, row_index, css_class, attributes)
-    end
-    html
-  end
-  
-  def render_row(row, row_index, css_class='', row_attributes={})
-    if row_attributes.nil?
-      attributes = ''
-    else
-      attributes = row_attributes.map {|attr, val| "#{attr}='#{val}'"}.join " "
-    end
-    
-    html = "<tr class='row_#{row_index} #{css_class}' #{attributes}>"
-      @columns.each_with_index do |col, col_index|
-        cell = row[col.name] rescue nil
-        html << col.render_cell(cell, row, row_index, col_index)
-      end
-    html << "</tr>"
-  end
-  
-  # define a custom block to be used to determine the css class for a row.
-  def row_style(&b)
-    @row_style = b
-  end
-  
-  def custom_header(&blk)
-    instance_eval(&blk)
-  end
-  
-  def th(header_text, options)
-    @custom_headers << options.merge(:text => header_text)
-  end
-  
-  def row_attributes(&b)
-    @row_attributes = b
-  end
-  
-  #############
-  # GROUPING 
-  #############
-  
-  # TODO: allow for group column only, block only and group column and block
-  def group_by(group_column, &blk)
-    @grouped_data = true
-    @groupings = group_column
-    @columns.reject!{|c| c.name == group_column}
-  end
-  
-  def group_data!
-    @collection = @collection.group_by {|row| row[@groupings] }
-  end
-  
-  def render_grouped_data_table_body(collection)
-    html = ""
-    collection.keys.each do |group_name|
-      html << render_group(group_name, collection[group_name])
-    end
-    html
-  end
-  
-  def render_group_header(group_header)
-    html = "<tr class='group_header'>"
-    if @repeat_headers_for_groups 
-      @columns.each_with_index do |col, i|
-        html << (i == 0 ? "<th>#{group_header}</th>" : col.render_column_header)
-      end
-    else
-      html << "<th colspan='#{@columns.size}'>#{group_header}</th>"
-    end
-    html << "</tr>"
-    html
-  end
-  
-  def render_group(group_header, group_data)
-    html = "<tbody class='#{group_header.to_s.downcase.gsub(/[^A-Za-z0-9]+/, '_')}'>" #replace non-letters and numbers with '_'
-      html << render_group_header(group_header)
-      html << render_rows(group_data)
-      html << render_subtotals(group_header, group_data) if has_subtotals?
-    html << "</tbody>"
-  end
-  
-  
-  #############
-  # PIVOTING 
-  #############
-  
-  def pivot_on(pivot_column)
-    @pivoted_data = true
-    @pivot_column = pivot_column
-  end
-  
-  def pivot_data!
-    @collection.pivot_on
-  end
-
-  #############
-  # TOTALS AND SUBTOTALS 
-  #############
-  def render_totals
-    html = "<tfoot><tr>"
-      @columns.each do |col|
-        html << col.render_cell(@total_calculations[col.name])
-      end
-    html << "</tr></tfoot>"
-  end
-  
-  def render_subtotals(group_header, group_data)
-    html = "<tr class='subtotal'>"
-      @columns.each do |col|
-        html << col.render_cell(@subtotal_calculations[group_header][col.name])
-      end
-    html << "</tr>"
-  end
-  
-  # define a new total column definition.
-  # total columns take the name of the column that should be totaled
-  # they also take a default aggregate function name and/or a block
-  # if only a default function is given, then it is used to calculate the total
-  # if only a block is given then only it is used to calculated the total
-  # if both a block and a function are given then the default aggregate function is called first
-  # then its result is passed into the block for further processing.
-  def subtotal(column_name, function=nil, &b)
-    function_or_block = function || b
-    f = function && block_given? ? [function, b] : function_or_block
-    @subtotals.merge!({column_name => f})
-  end
-  
-  def has_subtotals?
-    !@subtotals.empty?
-  end
-  
-  # define a new total column definition.
-  # total columns take the name of the column that should be totaled
-  # they also take a default aggregate function name and/or a block
-  # if only a default function is given, then it is used to calculate the total
-  # if only a block is given then only it is used to calculated the total
-  # if both a block and a function are given then the default aggregate function is called first
-  # then its result is passed into the block for further processing.
-  def total(column_name, function=nil, &b)
-    function_or_block = function || b
-    f = function && block_given? ? [function, b] : function_or_block
-    @totals.merge!({column_name => f})
-  end
-  
-  def has_totals?
-    !@totals.empty?
-  end
-  
-  def calculate_totals!
-    @total_calculations = {}
-    
-    @totals.each do |column_name, function|
-      collection = @collection.is_a?(Hash) ? @collection.values.flatten : @collection
-      result = calculate(collection, column_name, function)
-      @total_calculations[column_name] = result
-    end
-  end
-  
-  def calculate_subtotals!
-    @subtotal_calculations = Hash.new { |h,k| h[k] = {} }
-    
-    #ensure that we are dealing with a grouped results set.
-    unless @grouped_data
-      raise 'Subtotals only work with grouped results sets'
-    end
-    
-    @collection.each do |group_name, group_data|
-      @subtotals.each do |column_name, function|
-        result = calculate(group_data, column_name, function)
-        @subtotal_calculations[group_name][column_name] = result
-      end
-    end
-    
-  end
-  
-  def calculate(data, column_name, function)
-    
-    col = @columns.select { |column| column.name == column_name }
-    
-    if function.is_a?(Proc)
-      case function.arity
-        when 1; function.call(data)
-        when 2; function.call(data, col.first)
-      end
-    elsif function.is_a?(Array)
-      result = self.send("calculate_#{function[0].to_s}", data, column_name)
-      case function[1].arity
-        when 1; function[1].call(result)
-        when 2; function[1].call(result, col.first)
-      end
-    else
-      self.send("calculate_#{function.to_s}", data, column_name)
-    end
-  end
-  
-  def calculate_sum(collection, column_name)
-    collection.inject(0) {|sum, row| sum += row[column_name].to_f }
-  end
-  
-  def calculate_avg(collection, column_name)
-    sum = calculate_sum(collection, column_name)
-    sum / collection.size
-  end
-  
-  def calculate_max(collection, column_name)
-    collection.collect{|r| r[column_name].to_f }.max
-  end
-  
-  def calculate_min(collection, column_name)
-    collection.collect{|r| r[column_name].to_f }.min
-  end
-
-end