rorschart 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6a2558e7dd34bd3e76bb9e5c5c4dfc80ffacf9e
-  data.tar.gz: 8bca368a3db203c73ba44763cf973bb60ee22276
+  metadata.gz: 6a74ccb096f456a6ede1d3842a61e149d6245b46
+  data.tar.gz: ac5be7dcb098e4501fe559d7866833e9a35ff92e
 SHA512:
-  metadata.gz: 605bf5e4478c349e5902af090fb50823b4e9c5122c056c139e46bf132582f93857a3094ecacd7b6bf8b27530e9a28c85099a73e03cdcaa406e9fba77112a219d
-  data.tar.gz: eefa5361b9c557f37e79372084f46442d96677181af5ddd9951d873ab89bb00c6a4e52821ec3b5dd090e3ce18a41cdb1583ea1790405c475b1ab486e18ae0a69
+  metadata.gz: 0a54a4e71280208bb2485d6f3da251e34c3bd22c1719d9672a41b9c74aa5a5f35cbd5c426f2d4cfaa02c1fada2dcf422c10e34f32eefce0cc12e0f5cb96cdfeb
+  data.tar.gz: 2168376181ca0e094c06d49ef0055db98747efa87419bf48d0a3b4d5a5506a29f59f9568b57d493b69823f46b40346637a43178ebe7f18b89dd3f5f8d5142bf9

data/Gemfile.lock

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

data/lib/rorschart/google_chart_mapper.rb

@@ -0,0 +1,45 @@
+module Rorschart
+  module GoogleChart
+    module Mapper
+
+      require 'rorschart/pivot_data'
+
+      def format_if_needed(data_source)
+        data_source.is_a?(String) ? data_source : to_datatable_format(data_source)
+      end
+
+      def to_datatable_format(data)
+
+        return data if is_already_converted? data
+
+        if (data.is_a? Rorschart::MultipleSeries)
+          pivot = data
+        else
+          pivot = PivotData.new(data)
+          pivot.sort_by_date!
+        end
+
+        return  {cols: pivot.cols, rows: add_rows(pivot.rows) }
+      end
+
+      def is_already_converted?(data)
+        (data.class == Hash) and (data.keys == ["cols", "rows"])
+      end
+
+      def add_rows(rows)
+        rows.map{|row|
+          {"c" => 
+            row.map{|col|
+              {"v" => col}
+            }
+          }
+        }
+      end
+
+      def chart_class_from_string(klass_symbol)
+        "google.visualization." + klass_symbol.to_s
+      end
+
+    end
+  end
+end

data/lib/rorschart/google_chart_options.rb

@@ -0,0 +1,81 @@
+module Rorschart
+  module GoogleChart
+    module Options
+      
+      def default_options
+        {
+          fontName: "'Helvetica Neue', Helvetica, Arial, sans-serif",
+          pointSize: 8,
+          lineWidth: 3,
+          chartArea: {
+            width: '100%',
+            height: '70%'
+          },
+          titlePosition: 'out',
+          axisTitlesPosition: 'in',
+          legend: {
+            textStyle: {
+              fontSize: 12,
+              color: "#444"
+            },
+            alignment: "end",
+            position: "top"
+          },
+          curveType: "function",
+          hAxis: {
+            textStyle: {
+              color: "#666",
+              fontSize: 12
+            },
+            gridlines: {
+              color: "transparent"
+            },
+            baselineColor: "#ccc",
+            viewWindow: {}
+          },
+            vAxis: {
+            textStyle: {
+              color: "#666",
+              fontSize: 12
+            },
+            textPosition: 'in',
+            baselineColor: "#ccc",
+            viewWindow: {}
+          },
+            tooltip: {
+            textStyle: {
+              color: "#666",
+              fontSize: 12
+            }
+          },
+          #A nice Color Scheme from http://www.colourlovers.com/palettes/top
+          colors: ['#00A0B0', '#6A4A3C', '#CC333F', '#EB6841', '#EDC951'],
+          # colors: ['#F8FCC1', '#CC0C39', '#E6781E', '#C8CF02', '#1693A7'],
+          allowHtml: true
+        }
+      end
+
+      def chart_options(klass_symbol)
+        {
+          "Table" => {
+            cssClassNames: {
+              tableRow: 'table_row',
+              headerRow: 'header_row',
+              headerCell: 'header_cel'
+            },
+            height: "100%"
+          },
+          "AreaChart" => {
+            isStacked: true,
+          },
+          "PieChart" => {
+            legend: {
+              alignment: "start",
+              position: "right"
+            }
+          }
+        }[klass_symbol] || {}
+      end
+    end
+  end
+end

data/lib/rorschart/helper.rb

@@ -1,125 +1,53 @@
 require "json"
 require "erb"
+require "rorschart/google_chart_mapper"
+require "rorschart/google_chart_options"
 
 module Rorschart
-  module Helper
-
-	def default_options
-		{
-			fontName: "'Helvetica Neue', Helvetica, Arial, sans-serif",
-			pointSize: 8,
-			lineWidth: 3,
-			chartArea: {
-				width: '100%',
-				height: '70%'
-			},
-			titlePosition: 'out',
-			axisTitlesPosition: 'in',
-			legend: {
-				textStyle: {
-					fontSize: 12,
-					color: "#444"
-				},
-				alignment: "end",
-				position: "top"
-			},
-			curveType: "function",
-			hAxis: {
-				textStyle: {
-					color: "#666",
-					fontSize: 12
-				},
-				gridlines: {
-					color: "transparent"
-				},
-				baselineColor: "#ccc",
-				viewWindow: {}
-			},
-			  vAxis: {
-				textStyle: {
-					color: "#666",
-					fontSize: 12
-				},
-				textPosition: 'in',
-				baselineColor: "#ccc",
-				viewWindow: {}
-			},
-			  tooltip: {
-				textStyle: {
-					color: "#666",
-					fontSize: 12
-				}
-			},
-			#A nice Color Scheme from http://www.colourlovers.com/palettes/top
-			colors: ['#00A0B0', '#6A4A3C', '#CC333F', '#EB6841', '#EDC951'],
-			# colors: ['#F8FCC1', '#CC0C39', '#E6781E', '#C8CF02', '#1693A7'],
-			allowHtml: true
-		}
-	end
-
-	def chart_options(klass_symbol)
-		{
-			"Table" => {
-				cssClassNames: {
-					tableRow: 'table_row',
-					headerRow: 'header_row',
-					headerCell: 'header_cel'
-				},
-				height: "100%"
-			},
-			"AreaChart" => {
-				isStacked: true,
-			},
-			"PieChart" => {
-				legend: {
-					alignment: "start",
-					position: "right"
-				}
-			}
-		}[klass_symbol] || {}
-	end
 
-	def line_chart(data_source, options = {})
-		rorschart_chart "LineChart", data_source, options
-	end
+  module Helper
+	
+		def line_chart(data_source, options = {})
+			rorschart_chart "LineChart", data_source, options
+		end
 
-	def pie_chart(data_source, options = {})
-		rorschart_chart "PieChart", data_source, options
-	end
+		def pie_chart(data_source, options = {})
+			rorschart_chart "PieChart", data_source, options
+		end
 
-	def column_chart(data_source, options = {})
-		rorschart_chart "ColumnChart", data_source, options
-	end
+		def column_chart(data_source, options = {})
+			rorschart_chart "ColumnChart", data_source, options
+		end
 
-	def bar_chart(data_source, options = {})
-		rorschart_chart "BarChart", data_source, options
-	end
+		def bar_chart(data_source, options = {})
+			rorschart_chart "BarChart", data_source, options
+		end
 
-	def area_chart(data_source, options = {})
-		rorschart_chart "AreaChart", data_source, options
-	end
+		def area_chart(data_source, options = {})
+			rorschart_chart "AreaChart", data_source, options
+		end
 
-	def table_chart(data_source, options = {})
-		rorschart_chart "Table", data_source, options
-	end
+		def table_chart(data_source, options = {})
+			rorschart_chart "Table", data_source, options
+		end
 
-	def geo_chart(data_source, options = {})
-		rorschart_chart "GeoChart", data_source, options
-	end
+		def geo_chart(data_source, options = {})
+			rorschart_chart "GeoChart", data_source, options
+		end
 
-	def to_chart(data_source)
-		to_datatable_format(data_source).to_json
-	end
+		def to_chart(data_source)
+			to_datatable_format(data_source).to_json
+		end
 
-	def rorschart_chart(klass_name, dataSource, options = {})
+		def rorschart_chart(klass_name, dataSource, options = {})
 
-		dataSource = format_if_needed(dataSource)
-		element_id = options.delete(:id) || generateChartId
-		options = default_options.merge(chart_options(klass_name)).deep_merge(options);
-		height = options.delete(:height) || "300px"
+			dataSource = format_if_needed(dataSource)
+			element_id = options.delete(:id) || generateChartId
+			options = default_options.merge(chart_options(klass_name)).deep_merge(options);
+			height = options.delete(:height) || "300px"
 
-		html = <<HTML
-			<div id="#{ERB::Util.html_escape(element_id)}" style="height: #{ERB::Util.html_escape(height)}; width:100%;">
+			html = <<HTML
+				<div id="#{ERB::Util.html_escape(element_id)}" style="height: #{ERB::Util.html_escape(height)}; width:100%;">
 				Rorchart is not initialized.			
 			</div>
 HTML
@@ -130,135 +58,18 @@ HTML
 			</script>
 JS
 
-		(html + js).html_safe 
-	end	
-
-private
-
-
-	def format_if_needed(data_source)
-		data_source.is_a?(String) ? data_source : to_datatable_format(data_source)
-	end
-
-	def to_datatable_format(data)
-
-		data = convert_objects_to_array_of_hash(data)
-		data = merge_series(data)
-
-		case data
-		when Array
-			
-			case data.first			
-			when Array
-				cols = columns_from_array_row(data.first)
-				rows = add_rows data
-			
-			when Hash
-				cols = columns_from_hash_row(data)
-				rows = add_rows data.map{|row| row.values}
-			end
-
-		when Hash
-			cols = columns_from_array_row(data.first)			
-			rows = add_rows data
-		end
-
-		return  {cols: cols, rows: rows}
-	end
-
-	def merge_series(data)
-
-		return data if data.first.nil? || data.first.is_a?(Array)
-		prototype = flatten_array_hash(data).inject({}) { |h, (k, v)| h[k] = nil; h }
-		return data if prototype.values.size > 3
-
-		series = {}
-		data.each { |e|
-			key = e.values.first
-			series[key] = series[key] ? convert_grouped_values_into_series(series[key], e) : prototype.merge(e)
-		}
-
-		if series.keys[0].is_a? Date
-			series.sort.collect{|e| e[1]}
-		else
-			series.values
+			(html + js).html_safe 
 		end
-	end
-
-	def convert_grouped_values_into_series(serieA, serieB)
-		# if (serieB.values.size == 3)
-		# 	serieA.merge({serieB.values[1] => serieB.values[2]})
-		# else
-		# 	serieA.merge(serieB)
-		# end
-		serieA.merge(serieB)
-	end
-
-	def flatten_array_hash(data)
-		data.inject({}){|row, hash| row.merge(hash)}
-	end
-
-	def add_rows(rows)
-		rows.map{|row|
-			{"c" => 
-				row.map{|col|
-					{"v" => col}
-				}
-			}
-		}
-	end
-
-	def generateChartId
-		@current_chart_id ||= 0
-		"chart#{@current_chart_id += 1}"
-	end
-
-	def convert_objects_to_array_of_hash(data)
-	
-		data = data.to_a if data.is_a? ActiveRecord::Relation
-		data = [] << data if data.is_a? ActiveRecord::Base
-
-		if data.is_a? Array and data.first.is_a? ActiveRecord::Base
-			data = data.map{|m| model_to_hash_without_empty_primary_key(m)}			
-		end
-
-		return data
-	end
-
-	def model_to_hash_without_empty_primary_key(object)
-		primary_keys = object.class.columns.map{|c| c.name if c.primary}.compact
-		object.attributes.except(primary_keys.first)
-	end
-
-	def chart_class_from_string(klass_symbol)
-		"google.visualization." + klass_symbol.to_s
-	end
-
-	def columns_from_hash_row(data)
-		hash_row = flatten_array_hash(data)
-		hash_row.map { |c|
-			{:type => type_to_string(c[1]), :label => c[0]}
-		}
-	end
 
-	def columns_from_array_row(array_row)
-		array_row.map { |c|
-			{:type => type_to_string(c), :label => default_label_for_type(c)}
-		}
-	end
+		private
 
-	def type_to_string(cel)
-		return 'number' if (cel.is_a? Integer) or (cel.is_a? Float) or cel.nil?
-		return 'datetime' if (cel.is_a? DateTime) or (cel.is_a? Time) 
-		return 'date' if cel.is_a? Date
-		return 'boolean' if (!!cel == cel)
-		return 'string'
-	end
+  	include Rorschart::GoogleChart::Mapper
+		include Rorschart::GoogleChart::Options
 
-	def default_label_for_type(cel)
-		return 'Date' if (cel.is_a? DateTime) or (cel.is_a? Date)
-		return 'Value'
-	end
+    def generateChartId
+      @current_chart_id ||= 0
+      "chart#{@current_chart_id += 1}"
+    end
 
   end
 end

data/lib/rorschart/multiple_series.rb

@@ -0,0 +1,71 @@
+module Rorschart
+  class MultipleSeries
+
+    attr_accessor :raw_series, :pivot_series
+
+    def initialize(raw_series)
+      @raw_series = raw_series
+      @pivot_series = raw_series.collect { |serie|
+        PivotData.new(serie)
+      }
+    end
+
+    def cols
+      cols_with_dup = @pivot_series.inject([]) { |cols, series| 
+        cols + series.cols
+      }
+   
+      cols_with_dup.uniq
+
+    end
+
+    def rows
+      # create union of all series first columns, to represent all abscisse values available
+      union_x = union_of_first_columns()
+
+      # 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)
+      }
+
+      # The Merge:
+      # For abscisse value, grab for each serie the corresponding row - or nil
+      union_series = []
+      union_x.each { |x|
+        row = [x]
+        series_indexed.each { |serie_hash|
+          row << serie_hash[x]
+        }
+        union_series << row.flatten
+      }
+
+      # Return union of all series
+      union_series
+    end
+
+    private
+
+    def uniq_label(label)
+    end
+
+    def union_of_first_columns
+      (
+        @pivot_series.inject([]) { |union, serie|
+          union + serie.rows
+        }
+      ).collect{|r| r[0]}.uniq.sort
+    end
+
+    def index_series_by_first_col(serie)
+
+      serie_hash = {}
+      serie.rows.each { |row|
+        serie_hash[row[0]] = row.drop(1)
+      }
+
+      serie_hash
+    end
+
+  end
+end

data/lib/rorschart/pivot_data.rb

@@ -0,0 +1,88 @@
+module Rorschart
+
+  class PivotData
+
+    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          
+          case data.first     
+          when Array
+            cols = columns_from_array_row(data.first)
+          when Hash
+            cols = columns_from_hash_row(data)
+            data = data.map{|row| row.values}
+          end
+        when Hash
+          cols = columns_from_array_row(data.first)     
+        end
+
+        @rows = data.to_a
+        @cols = cols
+    end
+
+    def sort_by_date!
+
+      if ['datetime', 'date'].include? @cols.first[:type]
+        @rows.sort!
+      end
+
+    end
+
+private
+
+    def convert_objects_to_array_of_hash(data)
+    
+      data = data.to_a if data.is_a? ActiveRecord::Relation
+      data = [] << data if data.is_a? ActiveRecord::Base
+
+      if data.is_a? Array and data.first.is_a? ActiveRecord::Base
+        data = data.map{|m| model_to_hash_without_empty_primary_key(m)}     
+      end
+
+      return data
+    end
+
+    def model_to_hash_without_empty_primary_key(object)
+      primary_keys = object.class.columns.map{|c| c.name if c.primary}.compact
+      object.attributes.except(primary_keys.first)
+    end
+
+    def columns_from_hash_row(data)
+      hash_row = flatten_array_hash(data)
+      hash_row.map { |c|
+        {:type => type_to_string(c[1]), :label => c[0]}
+      }
+    end
+
+    def columns_from_array_row(array_row)
+      array_row.map { |c|
+        {:type => type_to_string(c), :label => default_label_for_type(c)}
+      }
+    end
+
+    def type_to_string(cel)
+      return 'number' if (cel.is_a? Integer) or (cel.is_a? Float) or cel.nil?
+      return 'datetime' if (cel.is_a? DateTime) or (cel.is_a? Time) 
+      return 'date' if cel.is_a? Date
+      return 'boolean' if (!!cel == cel)
+      return 'string'
+    end
+
+    def default_label_for_type(cel)
+      return 'Date' if (cel.is_a? DateTime) or (cel.is_a? Date)
+      return 'Value'
+    end
+
+    def flatten_array_hash(data)
+      data.inject({}){|row, hash| row.merge(hash)}
+    end
+
+  end
+
+end

data/lib/rorschart/version.rb

@@ -1,3 +1,3 @@
 module Rorschart
-  VERSION = "0.8.0"
+  VERSION = "0.10.0"
 end

data/lib/rorschart.rb

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

data/test/{rorschart_test.rb → google_chart_mapper_test.rb}

@@ -1,8 +1,9 @@
 require "test_helper"
+require "rorschart/google_chart_mapper"
 
-
-class TestRorschart  < Minitest::Unit::TestCase
-  include Rorschart::Helper
+class TestGoogleChartMapper  < Minitest::Unit::TestCase
+  
+  include Rorschart::GoogleChart::Mapper
 
   def compare_dataTable(right, left)
     assert_equal right[:cols], left[:cols]
@@ -14,8 +15,8 @@ class TestRorschart  < Minitest::Unit::TestCase
 
     # Given
     data = {
-      DateTime.now => 17,
-      DateTime.now - 1 => 18      
+      DateTime.now - 1 => 18,
+      DateTime.now => 17
     }
     
     # When
@@ -28,8 +29,8 @@ class TestRorschart  < Minitest::Unit::TestCase
           {type: 'number', label: 'Value'}
           ],
        rows: [
-          {c:[{v: DateTime.now}, {v: 17}]},
-          {c:[{v: DateTime.now - 1}, {v: 18}]}
+          {c:[{v: DateTime.now - 1}, {v: 18}]},
+          {c:[{v: DateTime.now}, {v: 17}]}
            ]
     }
 
@@ -62,6 +63,32 @@ class TestRorschart  < Minitest::Unit::TestCase
 
   def test_from_an_array_of_hash_and_detect_type_and_reuse_column_name
 
+    # Given
+    data = [
+      {"collector_tstamp"=> Date.parse("2013-11-28"), "count"=> 49},
+      {"collector_tstamp"=> Date.parse("2013-12-02"), "count"=> 44}
+    ]
+
+    # When
+    dataTable = to_datatable_format(data)   
+
+    # Then
+    excepted = {
+       cols: [
+          {type: 'date', label: 'collector_tstamp'},
+          {type: 'number', label: 'count'}
+          ],
+       rows: [
+          {c:[{v: Date.parse("2013-11-28")}, {v: 49}]},
+          {c:[{v: Date.parse("2013-12-02")}, {v: 44}]}
+           ]
+    }
+
+    compare_dataTable excepted, dataTable
+  end
+
+  def test_order_date_series
+
     # Given
     data = [
       {"collector_tstamp"=> Date.parse("2013-12-02"), "count"=> 44},
@@ -79,7 +106,7 @@ class TestRorschart  < Minitest::Unit::TestCase
           ],
        rows: [
           {c:[{v: Date.parse("2013-11-28")}, {v: 49}]},
-          {c:[{v: Date.parse("2013-12-02")}, {v: 44}]}
+          {c:[{v: Date.parse("2013-12-02")}, {v: 44}]}          
            ]
     }
 
@@ -90,8 +117,8 @@ class TestRorschart  < Minitest::Unit::TestCase
 
     # Given
     data = [
-      [Date.parse("2013-12-02"), 44],
-      [Date.parse("2013-11-28"), 49]
+      [Date.parse("2013-11-28"), 49],
+      [Date.parse("2013-12-02"), 44]
     ]
 
     # When
@@ -104,8 +131,8 @@ class TestRorschart  < Minitest::Unit::TestCase
           {type: 'number', label: 'Value'}
           ],
        rows: [
-          {c:[{v: Date.parse("2013-12-02")}, {v: 44}]},
-          {c:[{v: Date.parse("2013-11-28")}, {v: 49}]}
+          {c:[{v: Date.parse("2013-11-28")}, {v: 49}]},
+          {c:[{v: Date.parse("2013-12-02")}, {v: 44}]}
            ]
     }
 
@@ -162,14 +189,20 @@ class TestRorschart  < Minitest::Unit::TestCase
   end
 
   def test_merge_two_series
+
     # Given
-    data = [
+    serie1 = [
       {"collector_tstamp"=> Date.parse("2013-12-01"), "count"=> 1},
-      {"collector_tstamp"=> Date.parse("2013-12-02"), "count"=> 2},
+      {"collector_tstamp"=> Date.parse("2013-12-02"), "count"=> 2}
+    ]
+
+    serie2 = [
       {"collector_tstamp"=> Date.parse("2013-12-02"), "visit"=> 11},
-      {"collector_tstamp"=> Date.parse("2013-12-03"), "visit"=> 3}
+      {"collector_tstamp"=> Date.parse("2013-12-03"), "visit"=> 3}      
     ]
 
+    data = Rorschart::MultipleSeries.new [serie1, serie2]
+
     # When
     series = to_datatable_format(data)
 
@@ -191,19 +224,68 @@ class TestRorschart  < Minitest::Unit::TestCase
 
   end
 
+  def test_merge_multiple_series
+
+    # Given
+    serie1 = [
+      {"collector_tstamp"=> Date.parse("2013-12-01"), "count"=> 1},
+      {"collector_tstamp"=> Date.parse("2013-12-02"), "count"=> 2}
+    ]
+
+    serie2 = [
+      {"collector_tstamp"=> Date.parse("2013-12-02"), "visit"=> 11},
+      {"collector_tstamp"=> Date.parse("2013-12-03"), "visit"=> 3}      
+    ]
+
+    serie3 = [
+      {"collector_tstamp"=> Date.parse("2013-12-02"), "visit"=> 6},
+      {"collector_tstamp"=> Date.parse("2013-12-03"), "visit"=> 8},
+      {"collector_tstamp"=> Date.parse("2013-12-04"), "visit"=> 9}
+    ]
+
+
+    data = Rorschart::MultipleSeries.new [serie1, serie2, serie3]
+
+    # When
+    series = to_datatable_format(data)
+
+    # Then
+    excepted = {
+       cols: [
+          {type: 'date', label: 'collector_tstamp'},
+          {type: 'number', label: 'count'},
+          {type: 'number', label: 'visit'}          
+          ],
+       rows: [
+          {c:[{v: Date.parse("2013-12-01")}, {v: 1}, {v: nil}, {v: nil}]},
+          {c:[{v: Date.parse("2013-12-02")}, {v: 2}, {v: 11}, {v: 6}]},          
+          {c:[{v: Date.parse("2013-12-03")}, {v: nil}, {v: 3}, {v: 8}]},
+          {c:[{v: Date.parse("2013-12-04")}, {v: nil}, {v: nil}, {v: 9}]},          
+           ]
+    }
+
+    compare_dataTable excepted, series  
+
+  end
+
   def test_merge_two_series_with_first_serie_start_later
+
     # Given
-    data = [
+    serie1 = [
       {"collector_tstamp"=> Date.parse("2013-12-03"), "count"=> 1},
       {"collector_tstamp"=> Date.parse("2013-12-04"), "count"=> 2},
-      {"collector_tstamp"=> Date.parse("2013-12-05"), "count"=> 3},
+      {"collector_tstamp"=> Date.parse("2013-12-05"), "count"=> 3}
+    ]
 
+    serie2 = [
       {"collector_tstamp"=> Date.parse("2013-12-01"), "visit"=> 5},
       {"collector_tstamp"=> Date.parse("2013-12-02"), "visit"=> 6},
       {"collector_tstamp"=> Date.parse("2013-12-03"), "visit"=> 7},
-      {"collector_tstamp"=> Date.parse("2013-12-04"), "visit"=> 8}
+      {"collector_tstamp"=> Date.parse("2013-12-04"), "visit"=> 8}      
     ]
 
+    data = Rorschart::MultipleSeries.new [serie1, serie2]
+
     # When
     series = to_datatable_format(data)
 
@@ -226,7 +308,7 @@ class TestRorschart  < Minitest::Unit::TestCase
     compare_dataTable excepted, series  
 
   end
-
+  
   # def test_convert_numeric_grouped_dy_date_and_another_field_into_multiseries
 
   #   # Given
@@ -287,22 +369,14 @@ class TestRorschart  < Minitest::Unit::TestCase
   #   compare_dataTable excepted, dataTable
   # end   
 
-  def test_flatten_data
-
+  def test_is_already_converted?
     # Given
-    data = [
-              {:a => 1, :b => 2},
-              {:a => 2, :b => 3},
-              {:b => 2, :c => 4}
-            ] 
-
-    # When
-    flat = flatten_array_hash(data)
-
-    # Then
-    excepted = {:a => 2, :b => 2, :c => 4}
+    data_converted = {
+            "cols" => [{type: 'number', label: 'count'}],
+            "rows" => []
+            }
 
-    assert_equal excepted, flat
+    assert_equal true, is_already_converted?(data_converted)
   end
 
 end

data/test/pivot_data_test.rb

@@ -0,0 +1,33 @@
+require "test_helper"
+require "rorschart/pivot_data"
+
+module Rorschart
+
+    class TestPivotData  < Minitest::Unit::TestCase
+
+    def test_flatten_data
+
+        # Given
+        data = [
+                  {:a => 1, :b => 2},
+                  {:a => 2, :b => 3},
+                  {:b => 2, :c => 4}
+                ] 
+
+        # When
+
+        pivot_data = PivotData.new(nil)
+        flat = pivot_data.send(:flatten_array_hash, data)
+
+        # flat = flatten_array_hash(data)
+
+        # Then
+        excepted = {:a => 2, :b => 2, :c => 4}
+
+        assert_equal excepted, flat
+    end
+      
+
+    end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorschart
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Eric Pantera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,11 +98,16 @@ files:
 - app/assets/stylesheets/rorschart.css
 - lib/rorschart.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/rorschart_test.rb
+- test/google_chart_mapper_test.rb
+- test/pivot_data_test.rb
 - test/test_helper.rb
 homepage: https://github.com/epantera/rorschart
 licenses:
@@ -129,5 +134,6 @@ signing_key:
 specification_version: 4
 summary: Beautiful Google Charts from Rails data structures
 test_files:
-- test/rorschart_test.rb
+- test/google_chart_mapper_test.rb
+- test/pivot_data_test.rb
 - test/test_helper.rb