rorschart 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8338cccb4eb12fd8f27b2545ba1faed1fc25446b
-  data.tar.gz: 3d028514499cd58bed636e4ae650941d74805e22
+  metadata.gz: f26133cc6ad3859df0eb644c82fff9f1b88912d3
+  data.tar.gz: 86098cf6b4a8f2985e011b1dff71ddefa9871eb9
 SHA512:
-  metadata.gz: 6a49bb6d41b963b115298aa302a539bf2402ccbd7254576b0c8d0a39b26e8b399f4a28d68b9245dc1e82c422a282e4efe2808438c314f39542d6ed9eea68ddd4
-  data.tar.gz: 2b0972e87e6f15ac1aa521c1aed5650566ddb09892428714baedc1207011a8c0be4aea00907ebfdde7ed68fbe68d011d70e46469b8469f358671a1c932cddc7e
+  metadata.gz: a787c04ad195a014d741590594e99399e737a6eec6d23cbfc528e5e6733ee34ba4cc8a956c136c0a934804329b2ef6afeacfd8cb7df5de4a7fd62f985e597d99
+  data.tar.gz: 5e20caf3a71e46a0987695a5504f1bda616571905a3504e66b5b838ccb81787dcac009dc9b47bd726d480181147a96ab870543cd2d6b429e5b67c1dcfd86dcf0

data/lib/rorschart/data/pivot_series.rb

@@ -3,7 +3,7 @@ module Rorschart
 
     attr_accessor :to_sql
 
-    def initialize(raw_serie)
+    def initialize(raw_serie, options = {})
       @to_sql = raw_serie.to_sql rescue nil
       rorschart_serie = RorschartData.new(raw_serie)
 
@@ -29,6 +29,15 @@ module Rorschart
         @cols << { :type => type, :label => r }
       }
 
+      if (options[:add_total_column])
+        @cols.insert(1, {:type=>"number", :label=>"Total"})
+        @rows.each { |row|
+          total_value = row[1..-1].inject { |sum,x| sum + x rescue sum + 0}
+
+          row.insert(1, total_value)
+        }
+      end
+
       sort_by_date!
     end
 

data/lib/rorschart/version.rb

@@ -1,3 +1,3 @@
 module Rorschart
-  VERSION = "0.14.1"
+  VERSION = "0.15.0"
 end

data/test/data/pivot_series_test.rb

@@ -43,6 +43,45 @@ module Rorschart
 
         end
 
+        def test_pivot_with_sum_column
+
+            # Given
+            data = [
+              {"collector_tstamp"=> Date.parse("2013-11-02"), "series" => "A", "count"=> 1},
+              {"collector_tstamp"=> Date.parse("2013-11-02"), "series" => "B", "count"=> 2},
+              {"collector_tstamp"=> Date.parse("2013-11-02"), "series" => "C", "count"=> 3},
+              {"collector_tstamp"=> Date.parse("2013-11-02"), "series" => "D", "count"=> 4},
+              {"collector_tstamp"=> Date.parse("2013-12-01"), "series" => "A", "count"=> 5},
+              {"collector_tstamp"=> Date.parse("2013-12-01"), "series" => "B", "count"=> 6},
+              {"collector_tstamp"=> Date.parse("2013-12-01"), "series" => "D", "count"=> 7}
+
+            ]
+
+            # When
+
+            pivot_series = PivotSeries.new(data, add_total_column: true)
+
+            # assert
+            expected_cols = [
+                                {:type=>"date", :label=>"collector_tstamp"},
+                                {:type=>"number", :label=>"Total"},
+                                {:type=>"number", :label=>"A"},
+                                {:type=>"number", :label=>"B"},
+                                {:type=>"number", :label=>"C"},
+                                {:type=>"number", :label=>"D"}
+
+                            ]
+
+            expected_rows = [
+                                [Date.parse("2013-11-02"), 10, 1, 2, 3, 4],
+                                [Date.parse("2013-12-01"), 18, 5, 6, nil, 7]                                
+                            ]
+
+            assert_equal expected_cols, pivot_series.cols
+            assert_equal expected_rows, pivot_series.rows
+
+        end
+
         def test_pivot_with_empty_data
 
             # Given

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorschart
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Eric Pantera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler