pivot_table 0.1.1 → 0.1.3

data/.rvmrc

@@ -1,22 +1 @@
-#!/usr/bin/env bash
-
-environment_id="ruby-1.9.2-p290@pivot_table"
-
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
-  then
-    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
-  fi
-  echo "RVM environment: ${environment_id}"
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  if ! rvm --create  "$environment_id"
-  then
-    echo "Failed to create RVM environment '${environment_id}'."
-    exit 1
-  fi
-fi
+rvm use ruby-1.9.3-p125@pivot_table --create

data/.travis.yml

@@ -1,2 +1,2 @@
 rvm:
-  - 1.9.2
+  - 1.9.3

data/CHANGELOG.md

@@ -1,17 +1,17 @@
 Changelog
 =========
+0.1.2
+---
+Removed testing gems and updated Ruby version to 1.9.3
 
 0.0.3
------
-
+---
 Renamed gem to pivot_table
 
 0.0.2
------
-
+---
 Major refactoring to allow unbalanced dataset to be pivoted.
 
 0.0.1
------
-
+---
 Initial release.

data/Gemfile

@@ -6,12 +6,12 @@ gemspec
 gem 'rake'
 
 group :development, :test do
-  gem 'autotest'
+  #gem 'autotest'
   #gem 'autotest-growl'
-  gem 'autotest-notification'
+  #gem 'autotest-notification'
   gem 'bundler'
-  gem 'launchy'
-  gem 'rcov'
+  #gem 'launchy'
+  #gem 'rcov'
   gem 'rspec'
   gem 'shoulda-matchers'
 end

data/README.md

@@ -1,4 +1,4 @@
-Pivot Table  [![Build Status](https://secure.travis-ci.org/edjames/pivot_table.png)](http://travis-ci.org/edjames/pivot_table)
+Pivot Table  [![Build Status](https://secure.travis-ci.org/edjames/pivot_table.png)](http://travis-ci.org/edjames/pivot_table) [![Code Climate](https://codeclimate.com/github/edjames/pivot_table.png)](https://codeclimate.com/github/edjames/pivot_table)
 ===========
 
 A handy tool for transforming a dataset into a spreadsheet-style pivot table.
@@ -16,12 +16,12 @@ Couldn't be easier...
 
     gem install pivot_table
 
-There are no dependencies and pivot will work on any version of Ruby.
+There are no dependencies and pivot *should* work on any version of Ruby.
 
 Usage
 -----
 
-At the very least, you will need to provide four things to create a pivot table...
+At the very least, you will need to provide three things to create a pivot table...
 
 * a dataset (this doesn't necessarily have to be an ActiveRecord dataset, but it should at least behave like ActiveRecord e.g. OpenStruct)
 * the method to be used as column names
@@ -43,12 +43,16 @@ Let's say you have a collection of Order objects that looks like this:
 Instantiate a new PivotTable::Grid object like this...
 
     grid = PivotTable::Grid.new do |g|
-      g.sourcedata   = data
+      g.source_data   = data
       g.column_name  = :quarter
       g.row_name     = :city
+      g.value_name   = :sales
     end
 
 
+The `value_name` parameter is only required if you want to access totals;
+the others are required.
+
 All you have to do now is build the grid...
 
     g.build
@@ -93,6 +97,17 @@ E.g. The rows and columns collections make it very easy to produce horizontal, v
 
 Ah, that's better.
 
+If you want to get the totals for rows, columns, or the entire grid, you can pass a `value_name` as shown above, and then query the Grid like this:
+
+    g.column_totals
+    g.columns[0].total
+    g.columns[1].total
+    g.columns[2].total
+    g.row_totals
+    g.rows[0].total
+    g.rows[1].total
+    g.grand_total
+
 Still to come
 -------------
 
@@ -121,4 +136,4 @@ If you want to contribute:
 Copyright
 ---------
 
-Copyright (c) 2011 Ed James. See LICENSE for details.
+Copyright (c) 2011 Ed James. See LICENSE for details.

data/Rakefile

@@ -1,7 +1,7 @@
 require 'bundler/gem_tasks'
 Bundler::GemHelper.install_tasks
 
-desc "Fix the xml column types from a SqlServer database in schema.rb"
+desc "Run all specs"
 task :default do
   exec 'rspec spec'
 end

data/lib/pivot_table/column.rb

@@ -1,7 +1,7 @@
 module PivotTable
   class Column
 
-    ACCESSORS = [:header, :data, :total]
+    ACCESSORS = [:header, :data, :value_name]
 
     ACCESSORS.each do |a|
       self.send(:attr_accessor, a)
@@ -13,5 +13,9 @@ module PivotTable
       end
     end
 
+    def total
+      data.inject(0){|t,x| t + (x ? x.send(value_name) : 0)}
+    end
+
   end
-end
+end

data/lib/pivot_table/grid.rb

@@ -1,7 +1,7 @@
 module PivotTable
   class Grid
 
-    attr_accessor :source_data, :row_name, :column_name
+    attr_accessor :source_data, :row_name, :column_name, :value_name
     attr_reader :columns, :rows, :data_grid
 
     def initialize(&block)
@@ -18,14 +18,14 @@ module PivotTable
     def build_rows
       @rows = []
       @data_grid.each_with_index do |data, index|
-        @rows << Row.new(:header => row_headers[index], :data => data)
+        @rows << Row.new(:header => row_headers[index], :data => data, :value_name => value_name)
       end
     end
 
     def build_columns
       @columns = []
       @data_grid.transpose.each_with_index do |data, index|
-        @columns << Column.new(:header => column_headers[index], :data => data)
+        @columns << Column.new(:header => column_headers[index], :data => data, :value_name => value_name)
       end
     end
 
@@ -37,6 +37,18 @@ module PivotTable
       headers @row_name
     end
 
+    def column_totals
+      columns.map{|c| c.total}
+    end
+
+    def row_totals
+      rows.map{|r| r.total}
+    end
+
+    def grand_total
+      column_totals.inject(0){|t,x| t + x}
+    end
+
     def prepare_grid
       @data_grid = []
       row_headers.count.times do
@@ -63,4 +75,4 @@ module PivotTable
     end
 
   end
-end
+end

data/lib/pivot_table/row.rb

@@ -1,7 +1,7 @@
 module PivotTable
   class Row
 
-    ACCESSORS = [:header, :data, :total]
+    ACCESSORS = [:header, :data, :value_name]
 
     ACCESSORS.each do |a|
       self.send(:attr_accessor, a)
@@ -13,5 +13,9 @@ module PivotTable
       end
     end
 
+    def total
+      data.inject(0){|t,x| t + (x ? x.send(value_name) : 0)}
+    end
+
   end
-end
+end

data/lib/pivot_table.rb

@@ -5,5 +5,5 @@ require "pivot_table/column"
 require "pivot_table/row"
 
 module PivotTable
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/pivot_table.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>= 1.9'
-  
+
   s.rubyforge_project = "pivot_table"
   s.rubygems_version = ">= 1.6.1"
   s.files         = `git ls-files`.split("\n")

data/spec/pivot_table/column_spec.rb

@@ -16,8 +16,7 @@ module PivotTable
 
       its(:header) { should == 'header' }
       its(:data) { should == 'data' }
-      its(:total) { should == 'total' }
     end
 
   end
-end
+end

data/spec/pivot_table/grid_spec.rb

@@ -22,12 +22,16 @@ module PivotTable
     let(:column_0) { [d1, d4] }
     let(:column_1) { [d2, d5] }
     let(:column_2) { [d3, d6] }
+    let(:column_totals) { [d1.id + d4.id, d2.id + d5.id, d3.id + d6.id] }
+    let(:row_totals) { [d1.id + d2.id + d3.id, d4.id + d5.id + d6.id] }
+    let(:grand_total) { d1.id + d2.id + d3.id + d4.id + d5.id + d6.id }
 
     let(:instance) do
       Grid.new do |g|
         g.source_data = data
         g.row_name    = :row_name
         g.column_name = :column_name
+        g.value_name  = :id
       end
     end
 
@@ -38,6 +42,7 @@ module PivotTable
       it { should respond_to :column_name }
       it { should respond_to :columns }
       it { should respond_to :rows }
+      it { should respond_to :grand_total }
     end
 
     describe 'build' do
@@ -57,19 +62,22 @@ module PivotTable
       context '1st column' do
         subject { build_result.columns[0] }
         its(:header) { should == column_headers[0] }
-        its(:data) { should = column_0 }
+        its(:data) { should == column_0 }
+        its(:total) { should == column_totals[0] }
       end
 
       context '2nd column' do
         subject { build_result.columns[1] }
         its(:header) { should == column_headers[1] }
-        its(:data) { should = column_1 }
+        its(:data) { should == column_1 }
+        its(:total) { should == column_totals[1] }
       end
 
       context '3rd column' do
         subject { build_result.columns[2] }
         its(:header) { should == column_headers[2] }
-        its(:data) { should = column_2 }
+        its(:data) { should == column_2 }
+        its(:total) { should == column_totals[2] }
       end
     end
 
@@ -85,13 +93,15 @@ module PivotTable
       context '1st row' do
         subject { build_result.rows[0] }
         its(:header) { should == row_headers[0] }
-        its(:data) { should = row_0 }
+        its(:data) { should == row_0 }
+        its(:total) { should == row_totals[0] }
       end
 
       context '2nd row' do
         subject { build_result.rows[1] }
         its(:header) { should == row_headers[1] }
-        its(:data) { should = row_1 }
+        its(:data) { should == row_1 }
+        its(:total) { should == row_totals[1] }
       end
     end
 
@@ -107,6 +117,13 @@ module PivotTable
         subject { build_result.data_grid }
         it { should == [[d1, d2, d3], [d4, d5, d6]] }
       end
+
+      context 'totals' do
+        subject { build_result }
+        its(:column_totals) { should == column_totals }
+        its(:row_totals) { should == row_totals }
+        its(:grand_total) { should == grand_total }
+      end
     end
   end
-end
+end

data/spec/pivot_table/row_spec.rb

@@ -12,12 +12,11 @@ module PivotTable
     it { should respond_to :total }
 
     context 'initialize with hash' do
-      subject { klass.new(header: 'header', data: 'data', total: 'total')}
+      subject { klass.new(header: 'header', data: 'data')}
 
       its(:header) { should == 'header' }
       its(:data) { should == 'data' }
-      its(:total) { should == 'total' }
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivot_table
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-28 00:00:00.000000000Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies: []
 description: Transform an ActiveRecord-ish data set into a pivot table of objects
-email: ed.james.email@gmail.com
+email: !binary |-
+  ZWQuamFtZXMuZW1haWxAZ21haWwuY29t
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -55,8 +56,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pivot_table
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: pivot_table-0.1.1
-test_files: []
+summary: pivot_table-0.1.3
+test_files:
+- spec/pivot_table/column_spec.rb
+- spec/pivot_table/grid_spec.rb
+- spec/pivot_table/row_spec.rb
+- spec/spec_helper.rb