gchart 0.1.0 → 0.2.0

data/CHANGELOG.txt

@@ -1,3 +1,9 @@
-== 0.1.0
+== 0.2.0 (2007-12-12)
+
+  * Support for basic :labels
+  * Support for pie3d
+  * Minor doc cleanups
+
+== 0.1.0 (2007-12-10)
 
   * Birthday!

data/README.txt

@@ -26,7 +26,7 @@ query parameters using the :extras key, e.g.,
   # bar chart
   g = GChart.bar(:data => [100, 1000, 10000])
   
-  # pie chart
+  # pie chart (pie3d for a fancier look)
   g = GChart.pie(:data => [33, 33, 34])
   
   # venn diagram (asize, bsize, csize, ab%, bc%, ca%, abc%)
@@ -38,6 +38,9 @@ query parameters using the :extras key, e.g.,
   # chart title
   g = GChart.line(:title => "Awesomeness over Time", :data => [0, 10, 100])
 
+  # data set labels
+  g = GChart.line(:data => [[1, 2], [3, 4]], :labels => ["Monkeys", "Ferrets"])
+
   # data set colors
   g = GChart.line(:data => [[0, 10, 100], [100, 10, 0]], :colors => ["ff0000", "0000ff"])
   

data/lib/gchart.rb

@@ -5,7 +5,7 @@ require "uri"
 
 class GChart
   URL   = "http://chart.apis.google.com/chart"
-  TYPES = %w(line linexy bar pie venn scatter).collect { |t| t.to_sym }
+  TYPES = %w(line linexy bar pie pie3d venn scatter).collect { |t| t.to_sym }
   CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.".split("")
   PAIRS = CHARS.collect { |first| CHARS.collect { |second| first + second } }.flatten
 
@@ -48,6 +48,11 @@ class GChart
   # Array of RRGGBB colors, one per data set
   attr_accessor :colors
   
+  # Array of data set labels
+  attr_accessor :labels
+  
+  attr_accessor :max
+  
   # The chart type
   attr_reader :type
   
@@ -81,7 +86,7 @@ class GChart
     "#{width}x#{height}"
   end
   
-  # Allows the chart's size to be set as "WIDTHxHEIGHT".
+  # Sets the chart's size as "WIDTHxHEIGHT".
   def size=(size)
     self.width, self.height = size.split("x").collect { |n| Integer(n) }
   end
@@ -97,9 +102,8 @@ class GChart
     open(to_url) { |data| data.read }
   end
   
-  # Writes the chart's generated PNG. If +io_or_file+ quacks like an IO,
-  # +write+ will be called. Otherwise, write to disk. +io_or_file+ defaults
-  # to "chart.png".
+  # Writes the chart's generated PNG to a file. If +io_or_file+ quacks like an IO,
+  # +write+ will be called on it instead.
   def write(io_or_file="chart.png")
     return io_or_file.write(fetch) if io_or_file.respond_to?(:write)
     open(io_or_file, "w+") { |f| f.write(fetch) }
@@ -111,6 +115,12 @@ class GChart
     params = { "cht" => google_chart_type, "chd" => google_data, "chs" => size }
     params["chtt"] = title.tr("\n", "|").gsub(/\s+/, "+") if title
     params["chco"] = colors.join(",") if colors
+    
+    if labels
+      param = (type == :pie || type == :pie3d) ? "chl" : "chdl"
+      params[param] = labels.join("|")
+    end
+    
     params.merge(extras)
   end
   
@@ -124,6 +134,8 @@ class GChart
       "b" + (horizontal? ? "h" : "v") + (grouped? ? "g" : "s")
     when :pie
       "p"
+    when :pie3d
+      "p3"
     when :venn
       "v"
     when :scatter
@@ -132,9 +144,11 @@ class GChart
   end
   
   def google_data
-    # we'll just always use the extended encoding for now
-    sets = (Array === data.first ? data : [data]).collect do |set|
-      max = set.max
+    raw = data && data.first.is_a?(Array) ? data : [data]
+    max = self.max || raw.collect { |s| s.max }.max
+    
+    sets = raw.collect do |set|
+      # we'll just always use the extended encoding for now
       set.collect { |n| GChart.encode_extended(n * (PAIRS.size - 1) / max) }.join
     end
     

data/lib/version.rb

@@ -1,3 +1,3 @@
 class GChart
-  VERSION = "0.1.0"  
+  VERSION = "0.2.0"  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gchart
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ""
 authors: 
 - John Barnette
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-10 00:00:00 -08:00
+date: 2007-12-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency