mattetti-googlecharts 1.3.5 → 1.3.6

data/History.txt

@@ -1,4 +1,8 @@
-== 1.3.X
+== 1.3.6
+* support nil values. The Google Charts API specifies that a single underscore (_) can be used to omit a value from a line chart with 'simple' data encoding, and a double underscore (__) can do the same for a chart with 'extended' data encoding. (Matt Moyer)
+* allow a label to appear on a google-o-meter via the :legend option. (hallettj)
+
+== 1.3.5
 * added code to properly escape image tag URLs (mokolabs)
 * added themes support + 4 default themes (keynote, thirty7signals, pastel, greyscale) chart.line(:theme=>:keynote) (jakehow)
 

data/lib/gchart/version.rb

@@ -2,7 +2,7 @@ module GchartInfo #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 3
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/gchart.rb

@@ -235,7 +235,7 @@ class Gchart
   # or
   # Gchart.line(:legend => ['first label', 'last label'])
   def set_legend
-    return set_labels if @type == :pie || @type == :pie_3d
+    return set_labels if @type == :pie || @type == :pie_3d || @type == :meter
     
     if @legend.is_a?(Array)
       "chdl=#{@legend.map{|label| "#{label}"}.join('|')}"
@@ -325,12 +325,12 @@ class Gchart
   # to about 300 pixels. Simple encoding is suitable for all other types of chart regardless of size.
   def simple_encoding(dataset=[])
     dataset = prepare_dataset(dataset)
-    @max_value = dataset.map{|ds| ds.max}.max if @max_value == 'auto'
+    @max_value = dataset.compact.map{|ds| ds.compact.max}.max if @max_value == 'auto'
     
     if @max_value == false || @max_value == 'false' || @max_value == :false || @max_value == 0
-      "s:" + dataset.map { |ds| ds.map { |number| convert_to_simple_value(number) }.join }.join(',')
+      "s:" + dataset.map { |ds| ds.map { |number| number.nil? ? '_' : convert_to_simple_value(number) }.join }.join(',')
     else
-      "s:" + dataset.map { |ds| ds.map { |number| convert_to_simple_value( (@@simple_chars.size - 1) * number / @max_value) }.join }.join(',')
+      "s:" + dataset.map { |ds| ds.map { |number| number.nil? ? '_' : convert_to_simple_value( (@@simple_chars.size - 1) * number / @max_value) }.join }.join(',')
     end
     
   end
@@ -361,12 +361,12 @@ class Gchart
   def extended_encoding(dataset=[])
     
     dataset = prepare_dataset(dataset)
-    @max_value = dataset.map{|ds| ds.max}.max if @max_value == 'auto'
+    @max_value = dataset.compact.map{|ds| ds.compact.max}.max if @max_value == 'auto'
     
     if @max_value == false || @max_value == 'false' || @max_value == :false
-      "e:" +  dataset.map { |ds| ds.map { |number| convert_to_extended_value(number)}.join }.join(',')
+      "e:" +  dataset.map { |ds| ds.map { |number| number.nil? ? '__' : convert_to_extended_value(number)}.join }.join(',')
     else
-      "e:" + dataset.map { |ds| ds.map { |number| convert_to_extended_value( (@@ext_pairs.size - 1) * number / @max_value) }.join }.join(',')
+      "e:" + dataset.map { |ds| ds.map { |number| number.nil? ? '__' : convert_to_extended_value( (@@ext_pairs.size - 1) * number / @max_value) }.join }.join(',')
     end
     
   end
@@ -414,4 +414,4 @@ class Gchart
     jstize(@@url + query_params.join(delimiter))
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattetti-googlecharts
 version: !ruby/object:Gem::Version 
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors: 
 - Matt Aimonetti