mattetti-googlecharts 1.3.3 → 1.3.4

data/History.txt

@@ -1,3 +1,14 @@
+== 1.3.X
+* added code to properly escape image tag URLs (mokolabs)
+* added themes support + 4 default themes (keynote, thirty7signals, pastel, greyscale) chart.line(:theme=>:keynote) (jakehow)
+
+== 1.3.4
+* updated documentation and cleaned it up (mokolabs)
+* added support for custom class, id and alt tags when using the image_tag format (i.e Gchart.line(:data => [0, 26], :format => 'image_tag')) (mokolabs)
+
+== 1.3.2 - 1.3.3
+* changes required by github
+
 == 1.3.1
 * added width and spacing options
 

data/README.txt

@@ -1,180 +1,9 @@
-The goal of this Gem is to make the creation of Google Charts a simple and easy task.
+CHECK README.markdown  (open as a text file)
 
-Gchart.line(  :size => '200x300', 
-              :title => "example title",
-              :bg => 'efefef',
-              :legend => ['first data set label', 'second data set label'],
-              :data => [10, 30, 120, 45, 72])
-              
+Or check:
 
+  http://googlecharts.rubyforge.org
 
-==Chart Type
+and/or 
 
-This gem supports the following types of charts:
-  
-  * line, 
-  * line_xy
-  * sparkline
-  * scatter
-  * bar
-  * venn
-  * pie
-  * pie_3d
-
-To create a chart, simply require Gchart and call any of the existing type:
-
-    require 'gchart'
-    Gchart.pie
-  
-  
-==Chart Title
-
-  To add a title to a chart pass the title to your chart:
-  
-    Gchart.line(:title => 'Sexy Charts!')
-    
-You can also specify the color and/or size
-    
-    Gchart.line(:title => 'Sexy Charts!', :title_color => 'FF0000', :title_size => '20')
-
-==Colors
-
-Specify a color with at least a 6-letter string of hexadecimal values in the format RRGGBB. For example:
-
-    * FF0000 = red
-    * 00FF00 = green
-    * 0000FF = blue
-    * 000000 = black
-    * FFFFFF = white
-
-You can optionally specify transparency by appending a value between 00 and FF where 00 is completely transparent and FF completely opaque. For example:
-
-    * 0000FFFF = solid blue
-    * 0000FF00 = transparent blue
-
-If you need to use multiple colors, check the doc. Usually you just need to pass :attribute => 'FF0000,00FF00'
-
-Some charts have more options than other, make sure to refer to the documentation.
-
-===Background options:
-
-If you don't set the background option, your graph will be transparent.
-
-* You have 3 types of background  http://code.google.com/apis/chart/#chart_or_background_fill
-
-- solid
-- gradient
-- stripes
-
-By default, if you set a background color, the fill will be solid:
-
-    Gchart.bar(:bg => 'efefef')
-
-However you can specify another fill type such as:
-            
-    Gchart.line(:bg => {:color => 'efefef', :type => 'gradient'})
-  
-In the above code, we decided to have a gradient background, however since we only passed one color, the chart will start by the specified color and transition to white. By the default, the gradient angle is 0. Change it as follows:
-
-    Gchart.line(:title =>'bg example', :bg => {:color => 'efefef', :type => 'gradient', :angle => 90})
-    
-For a more advance use of colors, refer to http://code.google.com/apis/chart/#linear_gradient
-
-    Gchart.line(:bg => {:color => '76A4FB,1,ffffff,0', :type => 'gradient'})
-    
-    
-The same way you set the background color, you can also set the graph background:
-
-    Gchart.line(:graph_bg => 'cccccc')
-    
-or both
-
-    Gchart.line(:bg => {:color => '76A4FB,1,ffffff,0', :type => 'gradient'}, :graph_bg => 'cccccc', :title => 'Sexy Chart')
-    
-    
-Another type of fill is stripes http://code.google.com/apis/chart/#linear_stripes
-
-    Gchart.line(:bg => {:color => 'efefef', :type => 'stripes'})
-    
-You can customize the amount of stripes, colors and width by changing the color value.
-    
-    
-== Legend & Labels
-
-You probably will want to use a legend or labels for your graph.
-
-    Gchart.line(:legend => 'legend label')
-or
-    Gchart.line(:legend => ['legend label 1', 'legend label 2'])
-    
-Will do the trick. You can also use the labels alias (makes more sense when using the pie charts)
-
-    chart = Gchart.pie(:labels => ['label 1', 'label 2'])
-
-== Multiple axis labels 
-
-Multiple axis labels are available for line charts, bar charts and scatter plots.
-
-* x = bottom x-axis
-* t = top x-axis
-* y = left y-axis
-* r = right y-axis
-
-    Gchart.line(:label_axis => 'x,y,r')
-  
-To add labels on these axis:
-
-    Gchart.line(:axis_labels => ['Jan|July|Jan|July|Jan', '0|100', 'A|B|C', '2005|2006|2007'])
-
-    
-== Data options
-
-Data are passed using an array or a nested array.    
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234])  
-  
-  Gchart.bar(:data => [[1,2,4,67,100,41,234],[45,23,67,12,67,300, 250]])
-  
-By default, the graph is drawn with your max value representing 100% of the height or width of the graph. You can change that my passing the max value.
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :max_value => 300)
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :max_value => 'auto')
-  
-or if you want to use the real values from your dataset:
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :max_value => false)
-  
-  
-You can also define a different encoding to add more granularity:
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :encoding => 'simple') 
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :encoding => 'extended') 
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :encoding => 'text') 
-  
-
-==Pies:
-  
-you have 2 type of pies:
-  - Gchart.pie() the standard 2D pie
-  _ Gchart.pie_3d() the fancy 3D pie
-  
-To set labels, you can use one of these two options:
-
-    @legend = ['Matt_fu', 'Rob_fu']
-    Gchart.pie_3d(:title => @title, :labels => @legend, :data => @data, :size => '400x200')
-    Gchart.pie_3d(:title => @title, :legend => @legend, :data => @data, :size => '400x200')
-  
-  
-  
-=== try yourself
-
-Gchart.bar( :data => [[1,2,4,67,100,41,234],[45,23,67,12,67,300, 250]], 
-            :title => 'SDRuby Fu level', 
-            :legend => ['matt','patrick'], 
-            :bg => {:color => '76A4FB', :type => 'gradient'}, 
-            :bar_colors => 'ff0000,00ff00')
-
- "http://chart.apis.google.com/chart?chs=300x200&chdl=matt|patrick&chd=s:AAANUIv,JENCN9y&chtt=SDRuby+Fu+level&chf=bg,lg,0,76A4FB,0,ffffff,1&cht=bvs&chco=ff0000,00ff00"  
- 
-Gchart.pie(:data => [20,10,15,5,50], :title => 'SDRuby Fu level', :size => '400x200', :labels => ['matt', 'rob', 'patrick', 'ryan', 'jordan'])
-http://chart.apis.google.com/chart?cht=p&chs=400x200&chd=s:YMSG9&chtt=SDRuby+Fu+level&chl=matt|rob|patrick|ryan|jordan
+  http://github.com/mattetti/googlecharts

data/lib/gchart/version.rb

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

data/lib/gchart.rb

@@ -1,5 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 require 'gchart/version'
+require 'gchart/theme'
 require "open-uri"
 require "uri"
 
@@ -15,27 +16,27 @@ class Gchart
   @@file_name = 'chart.png'
   
   attr_accessor :title, :type, :width, :height, :horizontal, :grouped, :legend, :data, :encoding, :max_value, :bar_colors,
-                :title_color, :title_size, :custom, :axis_with_labels, :axis_labels, :bar_width_and_spacing
+                :title_color, :title_size, :custom, :axis_with_labels, :axis_labels, :bar_width_and_spacing, :id, :alt, :class
     
-  class << self
-    # Support for Gchart.line(:title => 'my title', :size => '400x600')
-    def method_missing(m, options={})
-      # Extract the format and optional filename, then clean the hash
-      format = options[:format] || 'url'
-      @@file_name = options[:filename] unless options[:filename].nil?
-      options.delete(:format)
-      options.delete(:filename)
-      # create the chart and return it in the format asked for
-      if @@types.include?(m.to_s)  
-        chart = new(options.merge!({:type => m}))
-        chart.send(format)
-      elsif m.to_s == 'version' 
-        Gchart::VERSION::STRING
-      else
-        "#{m} is not a supported chart format, please use one of the following: #{supported_types}."
-      end  
-    end
-
+  # Support for Gchart.line(:title => 'my title', :size => '400x600')
+  def self.method_missing(m, options={})
+    # Start with theme defaults if a theme is set
+    theme = options[:theme]
+    options = theme ? Chart::Theme.load(theme).to_options.merge(options) : options 
+    # Extract the format and optional filename, then clean the hash
+    format = options[:format] || 'url'
+    @@file_name = options[:filename] unless options[:filename].nil?
+    options.delete(:format)
+    options.delete(:filename)
+    # create the chart and return it in the format asked for
+    if @@types.include?(m.to_s)  
+      chart = new(options.merge!({:type => m}))
+      chart.send(format)
+    elsif m.to_s == 'version' 
+      Gchart::VERSION::STRING
+    else
+      "#{m} is not a supported chart format, please use one of the following: #{supported_types}."
+    end  
   end
   
   def initialize(options={})
@@ -47,6 +48,12 @@ class Gchart
       @grouped = false
       @encoding = 'simple'
       @max_value = 'auto'
+      # Sets the alt tag when chart is exported as image tag
+      @alt = 'Google Chart'
+      # Sets the CSS id selector when chart is exported as image tag
+      @id = false
+      # Sets the CSS class selector when chart is exported as image tag
+      @class = false
 
       # set the options value if definable
       options.each do |attribute, value| 
@@ -123,10 +130,20 @@ class Gchart
   
   # Format
   
-  def img_tag
-    "<img src='#{query_builder}'/>"
+  def image_tag
+    image = "<img"
+    image += " id=\"#{@id}\"" if @id  
+    image += " class=\"#{@class}\"" if @class      
+    image += " src=\"#{query_builder(:html)}\""
+    image += " width=\"#{@width}\""
+    image += " height=\"#{@height}\""
+    image += " alt=\"#{@alt}\""
+    image += " title=\"#{@title}\"" if @title
+    image += " />"
   end
   
+  alias_method :img_tag, :image_tag
+  
   def url
     query_builder
   end
@@ -355,7 +372,7 @@ class Gchart
   end
   
   
-  def query_builder
+  def query_builder(options="")
     query_params = instance_variables.map do |var|
       case var
       # Set the graph size  
@@ -386,7 +403,15 @@ class Gchart
       end
     end.compact
     
-    jstize(@@url + query_params.join('&'))
+    # Use ampersand as default delimiter
+    unless options == :html
+      delimiter = '&'
+    # Escape ampersand for html image tags
+    else
+      delimiter = '&amp;'
+    end
+    
+    jstize(@@url + query_params.join(delimiter))
   end
   
 end

data/spec/gchart_spec.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require File.dirname(__FILE__) + '/../lib/gchart'
 
+Chart::Theme.add_theme_file("#{File.dirname(__FILE__)}/fixtures/test_theme.yml")
+
 # Time to add your specs!
 # http://rspec.rubyforge.org/
 describe "generating a default Gchart" do
@@ -26,6 +28,11 @@ describe "generating a default Gchart" do
     @chart.include?('cht=lc').should be_true
   end
   
+  it 'should use theme defaults if theme is set' do
+    Gchart.line(:theme=>:test).include?('chco=6886B4,FDD84E').should be_true
+    Gchart.line(:theme=>:test).include?(Gchart.jstize('chf=c,s,FFFFFF|bg,s,FFFFFF')).should be_true
+  end
+  
   it "should use the simple encoding by default with auto max value" do
     # 9 is the max value in simple encoding, 26 being our max value the 2nd encoded value should be 9
     Gchart.line(:data => [0, 26]).include?('chd=s:A9').should be_true
@@ -377,10 +384,43 @@ describe 'exporting a chart' do
     Gchart.line(:data => [0, 26], :format => 'url').should == Gchart.line(:data => [0, 26])
   end
   
-  it "should be available as the img tag" do
-    Gchart.line(:data => [0, 26], :format => 'img_tag').should match(/<img src=(.*)\/>/)
+  it "should be available as an image tag" do
+    Gchart.line(:data => [0, 26], :format => 'image_tag').should match(/<img src=(.*) width="300" height="200" alt="Google Chart" \/>/)
+  end
+  
+  it "should be available as an image tag using img_tag alias" do
+    Gchart.line(:data => [0, 26], :format => 'img_tag').should match(/<img src=(.*) width="300" height="200" alt="Google Chart" \/>/)
   end
   
+  it "should be available as an image tag using custom dimensions" do
+    Gchart.line(:data => [0, 26], :format => 'image_tag', :size => '400x400').should match(/<img src=(.*) width="400" height="400" alt="Google Chart" \/>/)
+  end
+ 
+  it "should be available as an image tag using custom alt text" do
+    Gchart.line(:data => [0, 26], :format => 'image_tag', :alt => 'Sexy chart').should match(/<img src=(.*) width="300" height="200" alt="Sexy chart" \/>/)
+  end
+  
+  it "should be available as an image tag using custom title text" do
+    Gchart.line(:data => [0, 26], :format => 'image_tag', :title => 'Sexy chart').should match(/<img src=(.*) width="300" height="200" alt="Google Chart" title="Sexy chart" \/>/)
+  end
+  
+  it "should be available as an image tag using custom css id selector" do
+    Gchart.line(:data => [0, 26], :format => 'image_tag', :id => 'chart').should match(/<img id="chart" src=(.*) width="300" height="200" alt="Google Chart" \/>/)
+  end
+  
+  it "should be available as an image tag using custom css class selector" do
+    Gchart.line(:data => [0, 26], :format => 'image_tag', :class => 'chart').should match(/<img class="chart" src=(.*) width="300" height="200" alt="Google Chart" \/>/)
+  end
+
+  it "should use ampersands to separate key/value pairs in URLs by default" do
+    Gchart.line(:data => [0, 26]).should satisfy {|chart| chart.include? "&" }
+    Gchart.line(:data => [0, 26]).should_not satisfy {|chart| chart.include? "&amp;" }
+  end
+  
+  it "should escape ampersands in URLs when used as an image tag" do
+    Gchart.line(:data => [0, 26], :format => 'image_tag', :class => 'chart').should satisfy {|chart| chart.include? "&amp;" }
+  end
+   
   it "should be available as a file" do
     File.delete('chart.png') if File.exist?('chart.png')
     Gchart.line(:data => [0, 26], :format => 'file')

data/website/index.txt

@@ -5,7 +5,8 @@ h2. → 'Sexy Charts using Google API & Ruby'
 
 h2. What
   
-  A nice and simple wrapper for "Google Chart API":http://code.google.com/apis/chart/
+A nice and simple wrapper for "Google Chart API":http://code.google.com/apis/chart/
+(Fully tested using RSpec, check the specs for more usage examples)
 
 h2. Installing
 
@@ -52,17 +53,18 @@ or use rubyforge:
 require:
 <pre syntax="ruby">require 'gchart'</pre>
 
-<pre syntax="ruby">Gchart.line(  :size => '200x300', 
-              :title => "example title",
-              :bg => 'efefef',
-              :legend => ['first data set label', 'second data set label'],
-              :data => [10, 30, 120, 45, 72])</pre>
+<pre syntax="ruby">
+Gchart.line(:size => '200x300', 
+            :title => "example title",
+            :bg => 'efefef',
+            :legend => ['first data set label', 'second data set label'],
+            :data => [10, 30, 120, 45, 72])</pre>
 
 ---
 
 *simple line chart*
 <pre syntax="ruby">
-  Gchart.line(:data => [0, 40, 10, 70, 20])
+Gchart.line(:data => [0, 40, 10, 70, 20])
 </pre>
 
 Generate the following url: http://chart.apis.google.com/chart?chs=300x200&chd=s:AiI9R&cht=lc
@@ -73,7 +75,7 @@ Inserted in an image tag, it will look like that:
 
 *multiple line charts*
 <pre syntax="ruby">
-  Gchart.line(:data => [[0, 40, 10, 70, 20],[41, 10, 80, 50]])
+Gchart.line(:data => [[0, 40, 10, 70, 20],[41, 10, 80, 50]])
 </pre>
 
 !http://chart.apis.google.com/chart?cht=lc&chs=300x200&chd=s:AeH1P,fH9m(multiple lines chart)!
@@ -81,7 +83,7 @@ Inserted in an image tag, it will look like that:
 *set line colors*
 
 <pre syntax="ruby">
-  Gchart.line(:data => [[0, 40, 10, 70, 20],[41, 10, 80, 50]], :line_colors => "FF0000,00FF00")
+Gchart.line(:data => [[0, 40, 10, 70, 20],[41, 10, 80, 50]], :line_colors => "FF0000,00FF00")
 </pre>
 
 !http://chart.apis.google.com/chart?cht=lc&chs=300x200&chd=s:AeH1P,fH9m&chco=FF0000,00FF00(line colors)!
@@ -91,8 +93,8 @@ Inserted in an image tag, it will look like that:
 *sparkline chart*
 
 <pre syntax="ruby">
-  data = [27,25,25,25,25,27,100,31,25,36,25,25,39,25,31,25,25,25,26,26,25,25,28,25,25,100,28,27,31,25,27,27,29,25,27,26,26,25,26,26,35,33,34,25,26,25,36,25,26,37,33,33,37,37,39,25,25,25,25]
-  Gchart.sparkline(:data => data, :size => '120x40', :line_colors => '0077CC')
+data = [27,25,25,25,25,27,100,31,25,36,25,25,39,25,31,25,25,25,26,26,25,25,28,25,25,100,28,27,31,25,27,27,29,25,27,26,26,25,26,26,35,33,34,25,26,25,36,25,26,37,33,33,37,37,39,25,25,25,25]
+Gchart.sparkline(:data => data, :size => '120x40', :line_colors => '0077CC')
 </pre>
 
 !http://chart.apis.google.com/chart?chd=s:QPPPPQ9SPVPPXPSPPPPPPPRPP9RQSPQQRPQPPPPPVUUPPPVPPWUUWWXPPPP&chco=0077CC&chs=120x40&cht=ls(sparline)!
@@ -102,21 +104,21 @@ A sparkline chart has exactly the same parameters as a line chart. The only diff
 *bar chart*
 
 <pre syntax="ruby">
-  Gchart.bar(:data => [300, 100, 30, 200])
+Gchart.bar(:data => [300, 100, 30, 200])
 </pre>
 !http://chart.apis.google.com/chart?cht=bvs&chs=300x200&chd=s:9UGo(bars)!
 
 *set the bar chart orientation*
 
 <pre syntax="ruby">
-  Gchart.bar(:data => [300, 100, 30, 200], :orientation => 'horizontal')
+Gchart.bar(:data => [300, 100, 30, 200], :orientation => 'horizontal')
 </pre>
 !http://chart.apis.google.com/chart?cht=bhs&chs=300x200&chd=s:9UGo(bars)!
 
 *multiple bars chart*
 
 <pre syntax="ruby">
-  Gchart.bar(:data => [[300, 100, 30, 200], [100, 200, 300, 10]])
+Gchart.bar(:data => [[300, 100, 30, 200], [100, 200, 300, 10]])
 </pre>
 
 !http://chart.apis.google.com/chart?cht=bvs&chs=300x200&chd=s:9UGo,Uo9C(stacked multiple bars)!
@@ -124,13 +126,13 @@ A sparkline chart has exactly the same parameters as a line chart. The only diff
 The problem is that by default the bars are stacked, so we need to set the colors:
 
 <pre syntax="ruby">
-  Gchart.bar(:data => [[300, 100, 30, 200], [100, 200, 300, 10]], :bar_colors => 'FF0000,00FF00')
+Gchart.bar(:data => [[300, 100, 30, 200], [100, 200, 300, 10]], :bar_colors => 'FF0000,00FF00')
 </pre>
 
 If you prefer you can use this other syntax:
 
 <pre syntax="ruby">
-  Gchart.bar(:data => [[300, 100, 30, 200], [100, 200, 300, 10]], :bar_colors => ['FF0000', '00FF00'])
+Gchart.bar(:data => [[300, 100, 30, 200], [100, 200, 300, 10]], :bar_colors => ['FF0000', '00FF00'])
 </pre>
 
 !http://chart.apis.google.com/chart?cht=bvs&chs=300x200&chd=s:9UGo,Uo9C&chco=FF0000,00FF00(colors)!
@@ -138,9 +140,9 @@ If you prefer you can use this other syntax:
 The problem now, is that we can't see the first value of the second dataset since it's lower than the first value of the first dataset. Let's unstack the bars:
 
 <pre syntax="ruby">
-  Gchart.bar( :data => [[300, 100, 30, 200], [100, 200, 300, 10]], 
-              :bar_colors => 'FF0000,00FF00',
-              :stacked => false )
+Gchart.bar(:data => [[300, 100, 30, 200], [100, 200, 300, 10]], 
+           :bar_colors => 'FF0000,00FF00',
+           :stacked => false )
 </pre>
 
 !http://chart.apis.google.com/chart?cht=bvg&chs=300x200&chd=s:9UGo,Uo9C&chco=FF0000,00FF00(grouped bars)!
@@ -152,31 +154,31 @@ A bar chart can accept options to set the width of the bars, spacing between bar
 The Google API sets these options in the order of width, spacing, and group spacing, with both spacing values being optional. So, if you provide a string or array, provide them in that order:
 
 <pre syntax="ruby">
-  Gchart.bar(:data => @data, :bar_width_and_spacing => '25,6') # width of 25, spacing of 6
-  Gchart.bar(:data => @data, :bar_width_and_spacing => '25,6,12') # width of 25, spacing of 6, group spacing of 12
-  Gchart.bar(:data => @data, :bar_width_and_spacing => [25,6]) # width of 25, spacing of 6
-  Gchart.bar(:data => @data, :bar_width_and_spacing => 25) # width of 25
+Gchart.bar(:data => @data, :bar_width_and_spacing => '25,6') # width of 25, spacing of 6
+Gchart.bar(:data => @data, :bar_width_and_spacing => '25,6,12') # width of 25, spacing of 6, group spacing of 12
+Gchart.bar(:data => @data, :bar_width_and_spacing => [25,6]) # width of 25, spacing of 6
+Gchart.bar(:data => @data, :bar_width_and_spacing => 25) # width of 25
 </pre>
   
 The hash lets you set these values directly, with the Google default values set for any options you don't include:
 
 <pre syntax="ruby">
-  Gchart.bar(:data => @data, :bar_width_and_spacing => {:width => 19})
-  Gchart.bar(:data => @data, :bar_width_and_spacing => {:spacing => 10, :group_spacing => 12})
+Gchart.bar(:data => @data, :bar_width_and_spacing => {:width => 19})
+Gchart.bar(:data => @data, :bar_width_and_spacing => {:spacing => 10, :group_spacing => 12})
 </pre>
 
 
 *pie chart*
 
 <pre syntax="ruby">
-  Gchart.pie(:data => [20, 35, 45])
+Gchart.pie(:data => [20, 35, 45])
 </pre>
 !http://chart.apis.google.com/chart?cht=p&chs=300x200&chd=s:bv9(Pie Chart)!
 
 *3D pie chart*
 
 <pre syntax="ruby">
-  Gchart.pie_3d(:data => [20, 35, 45])
+Gchart.pie_3d(:data => [20, 35, 45])
 </pre>
 !http://chart.apis.google.com/chart?cht=p3&chs=300x200&chd=s:bv9(Pie Chart)!
 
@@ -192,7 +194,7 @@ Data set:
 * the seventh value specifies the area of A intersecting B intersecting C
 
 <pre syntax="ruby">
-  Gchart.venn(:data => [100, 80, 60, 30, 30, 30, 10])
+Gchart.venn(:data => [100, 80, 60, 30, 30, 30, 10])
 </pre>
 !http://chart.apis.google.com/chart?cht=v&chs=300x200&chd=s:9wkSSSG(Venn)!
 
@@ -203,7 +205,7 @@ Data set:
 Supply two data sets, the first data set specifies x coordinates, the second set specifies y coordinates, the third set the data point size.
 
 <pre syntax="ruby">
-  Gchart.scatter(:data => [[1, 2, 3, 4, 5], [1, 2, 3, 4 ,5], [5, 4, 3, 2, 1]])
+Gchart.scatter(:data => [[1, 2, 3, 4, 5], [1, 2, 3, 4 ,5], [5, 4, 3, 2, 1]])
 </pre>
 
 !http://chart.apis.google.com/chart?cht=s&chs=300x200&chd=s:MYkw9,MYkw9,9wkYM(scatter)!
@@ -215,15 +217,60 @@ Supply two data sets, the first data set specifies x coordinates, the second set
 Supply a single label that will be what the arrow points to. It only supports a solid fill for the background.
 
 <pre syntax="ruby">
- Gchart.meter(:data => [70], :label => ['Flavor'])
+  Gchart.meter(:data => [70], :label => ['Flavor'])
+</pre>
+
+
+*Chart themes*
+
+Googlecharts comes with 4 themes: keynote, thirty7signals, pastel and greyscale. (ganked from "Gruff": http://github.com/topfunky/gruff/tree/master )
+
+<pre syntax="ruby">
+  Gchart.line(
+              :theme => :keynote, 
+              :data => [[0,40,10,70,20],[41,10,80,50,40],[20,60,30,60,80],[5,23,35,10,56],[80,90,5,30,60]], 
+              :title => 'keynote'
+              )
+</pre>
+
+* keynote
+
+!http://chart.apis.google.com/chart?chtt=keynote&chco=6886B4,FDD84E,72AE6E,D1695E,8A6EAF,EFAA43&chs=300x200&cht=lc&chd=s:AbGvN,bG2hb,NoUo2,DPXGl,29DUo&chf=c,s,FFFFFF|bg,s,000000!
+
+* thirty7signals
+
+!http://chart.apis.google.com/chart?chtt=thirty7signals&chco=FFF804,336699,339933,ff0000,cc99cc,cf5910&chs=300x200&cht=lc&chd=s:AbGvN,bG2hb,NoUo2,DPXGl,29DUo&chf=bg,s,FFFFFF!
+
+* pastel
+
+!http://chart.apis.google.com/chart?chtt=pastel&chco=a9dada,aedaa9,daaea9,dadaa9,a9a9da&chs=300x200&cht=lc&chd=s:AbGvN,bG2hb,NoUo2,DPXGl,29DUo!
+
+* greyscale
+
+!http://chart.apis.google.com/chart?chtt=greyscale&chco=282828,383838,686868,989898,c8c8c8,e8e8e8&chs=300x200&cht=lc&chd=s:AbGvN,bG2hb,NoUo2,DPXGl,29DUo!
+
+
+You can also use your own theme. Create a yml file using the same format as the themes located in lib/themes.yml
+
+Load your theme(s):
+
+<pre syntax="ruby">
+  Chart::Theme.add_theme_file("#{File.dirname(__FILE__)}/fixtures/another_test_theme.yml")
 </pre>
 
+And use the standard method signature to use your own theme:
+
+<pre syntax="ruby">
+  Gchart.line(:theme => :custom_theme, :data => [[0, 40, 10, 70, 20],[41, 10, 80, 50]], :title => 'greyscale')
+</pre>
+
+
 ---
 
 *set a chart title*
 
 <pre syntax="ruby">
-  Gchart.bar(:title => "Recent Chart Sexyness", :data => [15, 30, 10, 20, 100, 20, 40, 100])
+Gchart.bar(:title => "Recent Chart Sexyness", :data => [15, 30, 10, 20, 100, 20, 40, 100])
 </pre>
 
 !http://chart.apis.google.com/chart?cht=bvs&chs=300x200&chd=s:JSGM9MY9&chtt=Recent+Chart+Sexyness(chart title)!
@@ -231,7 +278,7 @@ Supply a single label that will be what the arrow points to. It only supports a
 *set the title size*
 
 <pre syntax="ruby">
-  Gchart.bar(:title => "Recent Chart Sexyness", :title_size => 20, :data => [15, 30, 10, 20, 100, 20, 40, 100])
+Gchart.bar(:title => "Recent Chart Sexyness", :title_size => 20, :data => [15, 30, 10, 20, 100, 20, 40, 100])
 </pre>
 
 !http://chart.apis.google.com/chart?cht=bvs&chs=300x200&chd=s:JSGM9MY9&chtt=Recent+Chart+Sexyness&chts=454545,20(title size)!
@@ -239,7 +286,7 @@ Supply a single label that will be what the arrow points to. It only supports a
 *set the title color*
 
 <pre syntax="ruby">
-  Gchart.bar(:title => "Recent Chart Sexyness", :title_color => 'FF0000', :data => [15, 30, 10, 20, 100, 20, 40, 100])
+Gchart.bar(:title => "Recent Chart Sexyness", :title_color => 'FF0000', :data => [15, 30, 10, 20, 100, 20, 40, 100])
 </pre>
 
 !http://chart.apis.google.com/chart?cht=bvs&chs=300x200&chd=s:JSGM9MY9&chtt=Recent+Chart+Sexyness&chts=FF0000(Title color)!
@@ -247,9 +294,9 @@ Supply a single label that will be what the arrow points to. It only supports a
 *set the chart's size*
 
 <pre syntax="ruby">
-  Gchart.bar( :title => "Recent Chart Sexyness", 
-              :data => [15, 30, 10, 20, 100, 20, 40, 100],
-              :size => '600x400')
+Gchart.bar(:title => "Recent Chart Sexyness", 
+           :data => [15, 30, 10, 20, 100, 20, 40, 100],
+           :size => '600x400')
 </pre>
 
 !http://chart.apis.google.com/chart?cht=bvs&chs=600x400&chd=s:JSGM9MY9&chtt=Recent+Chart+Sexyness(size)!
@@ -257,9 +304,9 @@ Supply a single label that will be what the arrow points to. It only supports a
 *set the image background color*
 
 <pre syntax="ruby">
-  Gchart.bar( :title => "Matt's Mojo", 
-              :data => [15, 30, 10, 20, 100, 20, 40, 100, 90, 100, 80],
-              :background => 'FF9994')
+Gchart.bar(:title => "Matt's Mojo", 
+           :data => [15, 30, 10, 20, 100, 20, 40, 100, 90, 100, 80],
+           :background => 'FF9994')
 </pre>
 
 !http://chart.apis.google.com/chart?chf=bg,s,FF9994&cht=bvs&chs=300x200&chd=s:JSGM9MY929w&chtt=Matt's+Mojo(Background)!
@@ -267,9 +314,9 @@ Supply a single label that will be what the arrow points to. It only supports a
 *set the chart background color*
 
 <pre syntax="ruby">
-  Gchart.bar( :title => "Matt's Mojo", 
-              :data => [15, 30, 10, 20, 100, 20, 40, 100, 90, 100, 80],
-              :background => 'FF9994', :chart_background => '000000')
+Gchart.bar(:title => "Matt's Mojo", 
+           :data => [15, 30, 10, 20, 100, 20, 40, 100, 90, 100, 80],
+           :background => 'FF9994', :chart_background => '000000')
 </pre>
 
 !http://chart.apis.google.com/chart?chf=c,s,000000|bg,s,FF9994&cht=bvs&chs=300x200&chd=s:JSGM9MY929w&chtt=Matt's+Mojo(chart background)!
@@ -277,18 +324,18 @@ Supply a single label that will be what the arrow points to. It only supports a
 *Set bar/line colors*
 
 <pre syntax="ruby">
-  Gchart.bar( :title => "Matt's Mojo", 
-              :data => [15, 30, 10, 20, 100, 20, 40, 100, 90, 100, 80],
-              :bar_colors => '76A4FB',
-              :background => 'EEEEEE', :chart_background => 'CCCCCC')
+Gchart.bar(:title => "Matt's Mojo", 
+           :data => [15, 30, 10, 20, 100, 20, 40, 100, 90, 100, 80],
+           :bar_colors => '76A4FB',
+           :background => 'EEEEEE', :chart_background => 'CCCCCC')
 </pre>
 
 !http://chart.apis.google.com/chart?chf=c,s,CCCCCC|bg,s,EEEEEE&cht=bvs&chs=300x200&chd=s:JSGM9MY929w&chco=76A4FB&chtt=Matt's+Mojo(bar colors)!
 
 <pre syntax="ruby">
-  Gchart.line( :title => "Matt's Mojo", 
-              :data => [15, 30, 10, 20, 100, 20, 40, 100, 90, 100, 80],
-              :line_colors => '76A4FB')
+Gchart.line(:title => "Matt's Mojo", 
+            :data => [15, 30, 10, 20, 100, 20, 40, 100, 90, 100, 80],
+            :line_colors => '76A4FB')
 </pre>
 
 !http://chart.apis.google.com/chart?cht=lc&chs=300x200&chd=s:JSGM9MY929w&chco=76A4FB&chtt=Matt's+Mojo(line colors)!
@@ -296,27 +343,27 @@ Supply a single label that will be what the arrow points to. It only supports a
 *legend / labels*
 
 <pre syntax="ruby">
-  Gchart.bar( :title => "Matt vs Rob",
-              :data => [[300, 100, 30, 200], [100, 200, 300, 10]], 
-              :bar_colors => 'FF0000,00FF00',
-              :stacked => false, :size => '400x200',
-              :legend => ["Matt's Mojo", "Rob's Mojo"] )
+Gchart.bar(:title => "Matt vs Rob",
+           :data => [[300, 100, 30, 200], [100, 200, 300, 10]], 
+           :bar_colors => 'FF0000,00FF00',
+           :stacked => false, :size => '400x200',
+           :legend => ["Matt's Mojo", "Rob's Mojo"] )
 </pre>
 !http://chart.apis.google.com/chart?cht=bvg&chdl=Matt's+Mojo|Rob's+Mojo&chs=400x200&chd=s:9UGo,Uo9C&chco=FF0000,00FF00&chtt=Matt+vs+Rob(legend)!
 
 <pre syntax="ruby">
-  Gchart.line( :title => "Matt vs Rob",
-              :data => [[300, 100, 30, 200], [100, 200, 300, 10]], 
-              :bar_colors => ['FF0000','00FF00'],
-              :stacked => false, :size => '400x200',
-              :legend => ["Matt's Mojo", "Rob's Mojo"] )
+Gchart.line(:title => "Matt vs Rob",
+            :data => [[300, 100, 30, 200], [100, 200, 300, 10]], 
+            :bar_colors => ['FF0000','00FF00'],
+            :stacked => false, :size => '400x200',
+            :legend => ["Matt's Mojo", "Rob's Mojo"] )
 </pre>
 !http://chart.apis.google.com/chart?cht=lc&chdl=Matt's+Mojo|Rob's+Mojo&chs=400x200&chd=s:9UGo,Uo9C&chco=FF0000,00FF00&chtt=Matt+vs+Rob(line legend)!
 
 
 <pre syntax="ruby">
-  Gchart.pie_3d(  :title => 'ruby_fu', :size => '400x200',
-                  :data => [10, 45, 45], :labels => ["DHH", "Rob", "Matt"] )
+Gchart.pie_3d(:title => 'ruby_fu', :size => '400x200',
+              :data => [10, 45, 45], :labels => ["DHH", "Rob", "Matt"] )
 </pre>
 
 !http://chart.apis.google.com/chart?cht=p3&chl=DHH|Rob|Matt&chs=400x200&chd=s:N99&chtt=ruby_fu(labels)!
@@ -324,27 +371,27 @@ Supply a single label that will be what the arrow points to. It only supports a
 *Display axis labels*
 
 <pre syntax="ruby">
-  Gchart.line( :data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => 'x,y,r')
+Gchart.line(:data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => 'x,y,r')
 </pre>
 
 or you can use the other syntax:
 
 <pre syntax="ruby">
-  Gchart.line( :data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => ['x','y','r'])
+Gchart.line(:data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => ['x','y','r'])
 </pre>
 
 !http://chart.apis.google.com/chart?cht=lc&chs=300x200&chxt=x,y,r&chd=s:9UGoUo9C(axis with labels)!
 
 <pre syntax="ruby">
-  Gchart.line(  :data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => 'x',
-                :axis_labels => ['Jan|July|Jan|July|Jan'])
+Gchart.line(:data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => 'x',
+            :axis_labels => ['Jan|July|Jan|July|Jan'])
 </pre>
 
 or you can use the other syntax:
 
 <pre syntax="ruby">
-  Gchart.line(  :data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => 'x',
-                :axis_labels => ['Jan','July','Jan','July','Jan'])
+Gchart.line(:data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => 'x',
+            :axis_labels => ['Jan','July','Jan','July','Jan'])
 </pre>
 
 !http://chart.apis.google.com/chart?cht=lc&chxl=0:|Jan|July|Jan|July|Jan&chs=300x200&chxt=x&chd=s:9UGoUo9C(x labels)!
@@ -352,15 +399,15 @@ or you can use the other syntax:
 *multiple axis labels*
 
 <pre syntax="ruby">
-  Gchart.line(  :data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => 'x,r',
-                :axis_labels => ['Jan|July|Jan|July|Jan', '2005|2006|2007'])
+Gchart.line(:data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => 'x,r',
+            :axis_labels => ['Jan|July|Jan|July|Jan', '2005|2006|2007'])
 </pre>
 
 or 
 
 <pre syntax="ruby">
-  Gchart.line(  :data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => 'x,r',
-                :axis_labels => [['Jan','July','Jan','July','Jan'], ['2005','2006','2007']])
+Gchart.line(:data => [300, 100, 30, 200, 100, 200, 300, 10], :axis_with_labels => 'x,r',
+            :axis_labels => [['Jan','July','Jan','July','Jan'], ['2005','2006','2007']])
 </pre>
 
 !http://chart.apis.google.com/chart?cht=lc&chxl=0:|Jan|July|Jan|July|Jan|1:|2005|2006|2007&chs=300x200&chxt=x,r&chd=s:9UGoUo9C(multiple axis labels)!
@@ -372,7 +419,7 @@ or
 I certainly didn't cover the entire API, if you want to add your own params:
 
 <pre syntax="ruby">
-  Gchart.line( :custom => 'chd=s:93zyvneTTOMJMLIJFHEAECFJGHDBFCFIERcgnpy45879,IJKNUWUWYdnswz047977315533zy1246872tnkgcaZQONHCECAAAAEII&chls=3,6,3|1,1,0')
+Gchart.line(:custom => 'chd=s:93zyvneTTOMJMLIJFHEAECFJGHDBFCFIERcgnpy45879,IJKNUWUWYdnswz047977315533zy1246872tnkgcaZQONHCECAAAAEII&chls=3,6,3|1,1,0')
 </pre>
 
 !http://chart.apis.google.com/chart?cht=lc&chs=300x200&chd=s:93zyvneTTOMJMLIJFHEAECFJGHDBFCFIERcgnpy45879,IJKNUWUWYdnswz047977315533zy1246872tnkgcaZQONHCECAAAAEII&chls=3,6,3|1,1,0(Custom)!
@@ -384,24 +431,38 @@ I certainly didn't cover the entire API, if you want to add your own params:
 You might prefer to save the chart instead of using the url, not a problem:
 
 <pre syntax="ruby">
-  Gchart.line(:data => [0, 26], :format => 'file')
+Gchart.line(:data => [0, 26], :format => 'file')
 </pre>
 
 You might want to specify the path and/or the filename used to save your chart: 
 
 <pre syntax="ruby">
-  Gchart.line(:data => [0, 26], :format => 'file', :filename => 'custom_filename.png')
+Gchart.line(:data => [0, 26], :format => 'file', :filename => 'custom_filename.png')
 </pre>
 
 *Insert as an image tag*
 
-Because, I'm lazy, I also added a custom format:
+Because, I'm lazy, you can generate a full image tag, with support for standard html options.
+
+<pre syntax="ruby">
+Gchart.line(:data => [0, 26], :format => 'image_tag')
+</pre>
+
+<pre syntax="ruby">
+<img src="http://chart.apis.google.com/chart?chs=300x200&amp;chd=s:A9&amp;cht=lc" width="300" height="200" alt="Google Chart" />
+</pre>
+
+Here are a few more examples:
 
 <pre syntax="ruby">
-  Gchart.line(:data => [0, 26], :format => 'img_tag')
+Gchart.line(:data => [0, 26], :format => 'image_tag')
+Gchart.line(:data => [0, 26], :format => 'image_tag', :id => "sexy")
+Gchart.line(:data => [0, 26], :format => 'image_tag', :class => "chart")
+Gchart.line(:data => [0, 26], :format => 'image_tag', :alt => "Sexy Chart")
+Gchart.line(:data => [0, 26], :format => 'image_tag', :title => "Sexy Chart")
 </pre>
 
-&lt;img src='http://chart.apis.google.com/chart?chs=300x200&chd=s:A9&cht=lc'/&gt;
+Image dimensions will be automatically set based on your chart's size.
 
 ---
 
@@ -417,17 +478,17 @@ By default this library uses the simple encoding, if you need a different type o
 
 default / simple: chd=s:9UGoUo9C
 <pre syntax="ruby">
-  Gchart.line( :data => [300, 100, 30, 200, 100, 200, 300, 10] )
+  Gchart.line(:data => [300, 100, 30, 200, 100, 200, 300, 10] )
 </pre>
 
 extended: chd=e:..VVGZqqVVqq..CI
 <pre syntax="ruby">
-  Gchart.line( :data => [300, 100, 30, 200, 100, 200, 300, 10], :encoding => 'extended' )
+Gchart.line(:data => [300, 100, 30, 200, 100, 200, 300, 10], :encoding => 'extended' )
 </pre>
 
 text: chd=t:300,100,30,200,100,200,300,10
 <pre syntax="ruby">
-  Gchart.line( :data => [300, 100, 30, 200, 100, 200, 300, 10], :encoding => 'text' )
+Gchart.line(:data => [300, 100, 30, 200, 100, 200, 300, 10], :encoding => 'text' )
 </pre> 
 
 (note that the text encoding doesn't use a max value and therefore should be under 100)
@@ -439,29 +500,61 @@ Simple and extended encoding support the max value option.
 The max value option is a simple way of scaling your graph. The data is converted in chart value with the highest chart value being the highest point on the graph. By default, the calculation is done for you. However you can specify your own maximum or not use a maximum at all.
 
 <pre syntax="ruby">
-  Gchart.line( :data => [300, 100, 30, 200, 100, 200, 300, 10] )
+Gchart.line(:data => [300, 100, 30, 200, 100, 200, 300, 10] )
 </pre>
 
 !http://chart.apis.google.com/chart?cht=lc&chs=300x200&chd=s:9UGoUo9C(Title)!
 
 <pre syntax="ruby">
-  Gchart.line( :data => [300, 100, 30, 200, 100, 200, 300, 10], :max_value => 500 )
+Gchart.line(:data => [300, 100, 30, 200, 100, 200, 300, 10], :max_value => 500 )
 </pre>
 
 !http://chart.apis.google.com/chart?cht=lc&chs=300x200&chd=s:kMDYMYkB(max 500)!
 
 <pre syntax="ruby">
-  Gchart.line( :data => [100, 20, 30, 20, 10, 14, 30, 10], :max_value => false )
+Gchart.line(:data => [100, 20, 30, 20, 10, 14, 30, 10], :max_value => false )
 </pre>
 
 !http://chart.apis.google.com/chart?cht=lc&chs=300x200&chd=s:_UeUKOeK(real size)!
 
 
-
 h2. Repository
 
 The trunk repository is <code>http://github.com/mattetti/googlecharts/</code> for anonymous access.
 
+h2. People reported using this gem
+
+
+  <div>
+    <img  src="http://img.skitch.com/20080627-r14subqdx2ye3w13qefbx974gc.png" alt="github"/><br/>
+    <li><a href="http://github.com">http://github.com</a></li><br/>
+  </div>
+  
+  <div>
+    <img  src="http://stafftool.com/images/masthead_screen.gif" alt="stafftool"/><br/>
+    <li><a href="http://stafftool.com/">Takeo(contributor)</a></li><br/>
+  </div>
+  
+  <div>
+    <img  src="http://img.skitch.com/20080627-g2pp89h7gdbh15m1rr8hx48jep.jpg" alt="graffletopia"/><br/>
+    <li><a href="http://graffletopia.com"> http://graffletopia.com  Mokolabs(contributor)</a></li><br/>
+  </div>
+  
+  <div>
+    <img  src="http://img.skitch.com/20080627-kc1weqsbkmxeqhwiyriq3n6g8k.jpg" alt="gumgum"/><br/>
+    <li><a href="http://gumgum.com"> http://gumgum.com  Mattetti(contributor)</a></li><br/>
+  </div>
+  
+  <div>
+    <img  src="http://img.skitch.com/20080627-n48j8pb2r7irsewfeh4yp3da12.jpg" alt="feedflix"/><br/>
+    <li><a href="http://feedflix.com/"> http://feedflix.com/</a></li><br/>
+  </div>
+  
+  <div>
+    <li><a href="http://www.csuchico.edu/"> California State University, Chico</a></li><br/>
+  </div>
+
+
 h2. License
 
 This code is free to use under the terms of the MIT license. 
@@ -473,4 +566,5 @@ Comments are welcome. Send an email to "Matt Aimonetti":mailto:mattaimonetti@gma
 h3. Contributors
 
 "David Grandinetti":http://github.com/dbgrandi
-"Toby Sterrett":http://github.com/takeo
+"Toby Sterrett":http://github.com/takeo
+"Patrick Crowley":http://github.com/mokolabs

metadata

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