rorschart 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7076b6347dbe789e849121a6b3782c4f1155c33
-  data.tar.gz: 4d6771206d3564302ad9d1ffd708faa94a54f9b3
+  metadata.gz: 1796e18cfc48a16921780aaecd6d52d4d0512610
+  data.tar.gz: f4df16d9dfcfd300a31fc0009d231f59f042ba1e
 SHA512:
-  metadata.gz: 5642f0fe2f4dba943438e1d15b9be1fd47da107b077e3f2123e4b9bb444a0cba5ee528418a5e409d45f8f751bb060942905eeba287f91374b6dcbb3acdb17cae
-  data.tar.gz: 06b0d461066635aa45ca217918ef3852a8a40d1e8beb82d320aa24658b1ac5d71ca6a5c99e48b2b266bf544670e2c7b3875f7778e679b4464f66ced7435647d5
+  metadata.gz: 033abe8fa201b49fbdc8fa14b8b4b87123cfbf995110762a303994a7531399b6e56e4c68c73700b542718f52213f61b6d944d57a084c3eb039e02f8f5a2285a0
+  data.tar.gz: 170940cb189d42cbf961fbc9f748c6f783c365dd2e7684510466610bdb93e91ec1e9552bae68ebdb434df7c97abc13f0bd727f6d6c1e49284961aab01d699a69

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rorschart (0.10.3)
+    rorschart (0.11.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/rorschart.rb

@@ -1,4 +1,5 @@
 require "rorschart/version"
 require "rorschart/helper"
-require "rorschart/multiple_series"
+require "rorschart/data/multiple_series"
+require "rorschart/data/pivot_series"
 require "rorschart/rails" if defined?(Rails)

data/lib/rorschart/{multiple_series.rb → data/multiple_series.rb}

@@ -1,22 +1,21 @@
 module Rorschart
-  class MultipleSeries
+  class MultipleSeries < RorschartData
 
-    attr_accessor :raw_series, :pivot_series
+    attr_accessor :raw_series, :rorschart_series
 
     def initialize(raw_series)
       @raw_series = raw_series
-      @pivot_series = raw_series.collect { |serie|
-        PivotData.new(serie)
+      @rorschart_series = raw_series.collect { |serie|
+        RorschartData.new(serie)
       }
     end
 
     def cols
-      cols_with_dup = @pivot_series.inject([]) { |cols, series| 
-        cols + series.cols
+      cols_with_dup = @rorschart_series.inject([]) { |cols, series| 
+        cols + (series.cols || [])
       }
    
       cols_with_dup.uniq
-
     end
 
     def rows
@@ -25,8 +24,8 @@ module Rorschart
 
       # Preparation: store all series rows in a hash indexed by first column
       series_indexed = []
-      @pivot_series.each { |serie|
-        series_indexed << index_series_by_first_col(serie)
+      @rorschart_series.each { |serie|
+        series_indexed << index_series_by_first_col(serie) if !serie.cols.nil?
       }
 
       # The Merge:
@@ -46,12 +45,9 @@ module Rorschart
 
     private
 
-    def uniq_label(label)
-    end
-
     def union_of_first_columns
       (
-        @pivot_series.inject([]) { |union, serie|
+        @rorschart_series.inject([]) { |union, serie|
           union + serie.rows
         }
       ).collect{|r| r[0]}.uniq.sort
@@ -68,4 +64,4 @@ module Rorschart
     end
 
   end
-end
+end

data/lib/rorschart/data/pivot_series.rb

@@ -0,0 +1,44 @@
+module Rorschart
+  class PivotSeries < RorschartData
+
+    def initialize(raw_serie)
+      rorschart_serie = RorschartData.new(raw_serie)
+
+      # Initialiaze a default row with nil values
+      row_nil = init_cols_with_nil(rorschart_serie)
+
+      rows_by_x = {}
+      rorschart_serie.rows.each { |r|
+        rows_by_x[r[0]] = row_nil.dup if rows_by_x[r[0]].nil?
+        rows_by_x[r[0]][r[1]] = r[2]
+      }
+
+      # Flatten rows hash into array matrix
+      @rows = rows_by_x.collect { |row|
+          [row[0], row[1].values].flatten
+      }
+
+      #cols
+      type = rorschart_serie.cols[2][:type]
+      @cols = []
+      @cols << rorschart_serie.cols[0]
+      row_nil.keys.each { |r|
+        @cols << { :type => type, :label => r }
+      }
+
+      sort_by_date!
+    end
+
+    private
+
+    def init_cols_with_nil(rorschart_serie)
+      col_nil = {}
+      rorschart_serie.rows.collect{|r| r[1]}.uniq.each{ |c|
+        col_nil[c] = nil
+      }
+      return col_nil
+    end
+
+
+  end
+end

data/lib/rorschart/{pivot_data.rb → data/rorschart_data.rb}

@@ -1,13 +1,12 @@
 module Rorschart
 
-  class PivotData
+  class RorschartData
 
     attr_accessor :cols, :rows
 
     def initialize(raw_data)
 
         data = convert_objects_to_array_of_hash(raw_data)
-        data = data.to_pivot if data.is_a? Rorschart::MultipleSeries
 
         case data
         when Array          
@@ -29,7 +28,7 @@ module Rorschart
     def sort_by_date!
 
       if ['datetime', 'date'].include? @cols.first[:type]
-        @rows.sort!
+        @rows = @rows.sort_by{ |c| c.first }
       end
 
     end

data/lib/rorschart/google_chart_mapper.rb

@@ -2,7 +2,7 @@ module Rorschart
   module GoogleChart
     module Mapper
 
-      require 'rorschart/pivot_data'
+      require 'rorschart/data/rorschart_data'
 
       def format_if_needed(data_source)
         data_source.is_a?(String) ? data_source : to_datatable_format(data_source)
@@ -12,14 +12,14 @@ module Rorschart
 
         return data if is_already_converted? data
 
-        if (data.is_a? Rorschart::MultipleSeries)
-          pivot = data
+        if (data.is_a? RorschartData)
+          r_data = data
         else
-          pivot = PivotData.new(data)
-          pivot.sort_by_date!
+          r_data = RorschartData.new(data)
+          r_data.sort_by_date!
         end
 
-        return  {cols: pivot.cols, rows: add_rows(pivot.rows) }
+        return  {cols: r_data.cols, rows: add_rows(r_data.rows) }
       end
 
       def is_already_converted?(data)

data/lib/rorschart/google_chart_options.rb

@@ -62,8 +62,7 @@ module Rorschart
               tableRow: 'table_row',
               headerRow: 'header_row',
               headerCell: 'header_cel'
-            },
-            height: "auto"
+            }
           },
           "AreaChart" => {
             isStacked: true,

data/lib/rorschart/helper.rb

@@ -19,11 +19,6 @@ module Rorschart
 			rorschart_chart "ColumnChart", data_source, options
 		end
 
-		def stacked_column_chart(data_source, options = {})
-			options = {:isStacked => true}.merge(options)
-			rorschart_chart "ColumnChart", data_source, options
-		end
-
 		def bar_chart(data_source, options = {})
 			rorschart_chart "BarChart", data_source, options
 		end
@@ -77,4 +72,4 @@ JS
     end
 
   end
-end
+end

data/lib/rorschart/version.rb

@@ -1,3 +1,3 @@
 module Rorschart
-  VERSION = "0.10.3"
+  VERSION = "0.11.0"
 end

data/test/data/pivot_series_test.rb

@@ -0,0 +1,78 @@
+require "test_helper"
+require "rorschart/data/rorschart_data"
+
+module Rorschart
+
+    class TestPivotSeries  < Minitest::Unit::TestCase
+
+        def test_pivot
+
+            # 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)
+
+            # assert
+            expected_cols = [
+                                {:type=>"date", :label=>"collector_tstamp"},
+                                {:type=>"number", :label=>"A"},
+                                {:type=>"number", :label=>"B"},
+                                {:type=>"number", :label=>"C"},
+                                {:type=>"number", :label=>"D"}
+
+                            ]
+
+            expected_rows = [
+                                [Date.parse("2013-11-02"), 1, 2, 3, 4],
+                                [Date.parse("2013-12-01"), 5, 6, nil, 7]                                
+                            ]
+
+            assert_equal expected_cols, pivot_series.cols
+            assert_equal expected_rows, pivot_series.rows
+
+        end
+      
+  # def test_convert_numeric_grouped_dy_date_and_multiple_fields_into_multiseries
+
+  #   # 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-12-01"), "series" => "A", "count"=> 3},
+  #     {"collector_tstamp"=> Date.parse("2013-12-01"), "series" => "B", "count"=> 4}
+  #   ]
+
+  #   # When
+  #   dataTable = to_datatable_format(data)   
+
+  #   # Then
+  #   excepted = {
+  #      cols: [
+  #         {type: 'date', label: 'collector_tstamp'},
+  #         {type: 'number', label: 'A'},
+  #         {type: 'number', label: 'B'}          
+  #         ],
+  #      rows: [
+  #         {c:[{v: Date.parse("2013-11-02")}, {v: 1}, {v: 2}]},
+  #         {c:[{v: Date.parse("2013-12-01")}, {v: 3}, {v: 4}]}
+  #          ]
+  #   }
+
+  #   compare_dataTable excepted, dataTable
+  # end  
+
+
+    end
+
+end

data/test/{pivot_data_test.rb → data/rorschart_data_test.rb}

@@ -1,9 +1,9 @@
 require "test_helper"
-require "rorschart/pivot_data"
+require "rorschart/data/rorschart_data"
 
 module Rorschart
 
-    class TestPivotData  < Minitest::Unit::TestCase
+    class TestRorschartData  < Minitest::Unit::TestCase
 
     def test_flatten_data
 
@@ -16,8 +16,8 @@ module Rorschart
 
         # When
 
-        pivot_data = PivotData.new(nil)
-        flat = pivot_data.send(:flatten_array_hash, data)
+        rorschart_data = RorschartData.new(nil)
+        flat = rorschart_data.send(:flatten_array_hash, data)
 
         # flat = flatten_array_hash(data)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorschart
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Eric Pantera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,17 +97,19 @@ files:
 - app/assets/javascripts/rorschart.js
 - app/assets/stylesheets/rorschart.css
 - lib/rorschart.rb
+- lib/rorschart/data/multiple_series.rb
+- lib/rorschart/data/pivot_series.rb
+- lib/rorschart/data/rorschart_data.rb
 - lib/rorschart/engine.rb
 - lib/rorschart/google_chart_mapper.rb
 - lib/rorschart/google_chart_options.rb
 - lib/rorschart/helper.rb
-- lib/rorschart/multiple_series.rb
-- lib/rorschart/pivot_data.rb
 - lib/rorschart/rails.rb
 - lib/rorschart/version.rb
 - rorschart.gemspec
+- test/data/pivot_series_test.rb
+- test/data/rorschart_data_test.rb
 - test/google_chart_mapper_test.rb
-- test/pivot_data_test.rb
 - test/test_helper.rb
 homepage: https://github.com/epantera/rorschart
 licenses:
@@ -134,6 +136,7 @@ signing_key:
 specification_version: 4
 summary: Beautiful Google Charts from Rails data structures
 test_files:
+- test/data/pivot_series_test.rb
+- test/data/rorschart_data_test.rb
 - test/google_chart_mapper_test.rb
-- test/pivot_data_test.rb
 - test/test_helper.rb