googlecharts 1.3.6 → 1.4.0

data/lib/gchart/version.rb

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

data/lib/themes.yml

@@ -0,0 +1,45 @@
+#Default themes ganked from Gruff: http://github.com/topfunky/gruff/tree/master
+:keynote:
+  :colors:
+    - &blue 6886B4
+    - &yellow FDD84E
+    - &green 72AE6E
+    - &red D1695E
+    - &purple 8A6EAF
+    - &orange EFAA43
+    - &white FFFFFF
+    - &black !str 000000
+  :bar_colors: [ *blue, *yellow, *green, *red, *purple, *orange ]
+  :background: *black
+  :chart_background: *white
+:thirty7signals:
+  :colors:
+    - &green 339933
+    - &purple cc99cc
+    - &blue 336699
+    - &yellow FFF804
+    - &red ff0000
+    - &orange cf5910
+  :bar_colors: [ *yellow, *blue, *green, *red, *purple, *orange ]
+  :background: *white
+:pastel:
+  :colors:
+    - &blue a9dada
+    - &green aedaa9
+    - &peach daaea9
+    - &yellow dadaa9
+    - &dk_purple a9a9da
+    - &purple daaeda
+    - &grey dadada
+  :bar_colors: [ *blue, *green, *peach, *yellow, *dk_purple ]
+  :background_color: *white
+:greyscale:
+  :bar_colors: [
+            282828,  
+            383838,  
+            686868,  
+            989898,  
+            c8c8c8,  
+            e8e8e8
+            ]
+  :background_color: *white

data/script/destroy

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.join(File.dirname(__FILE__), '..')
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.join(File.dirname(__FILE__), '..')
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Generate.new.run(ARGV)

data/script/txt2html

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+begin
+  require 'newgem'
+rescue LoadError
+  puts "\n\nGenerating the website requires the newgem RubyGem"
+  puts "Install: gem install newgem\n\n"
+  exit(1)
+end
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+require File.dirname(__FILE__) + '/../lib/gchart'
+
+version  = Gchart.version
+download = 'http://rubyforge.org/projects/googlecharts'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1: return 'st'
+    when 2: return 'nd'
+    when 3: return 'rd'
+    else    return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.join(File.dirname(__FILE__), '/../website/template.rhtml')
+  
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text = fsrc.read
+  syntax_items = []
+  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
+    ident = syntax_items.length
+    element, syntax, source = $1, $2, $3
+    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
+    "syntax-temp-#{ident}"
+  }
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text).to_html
+  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)

data/spec/fixtures/another_test_theme.yml

@@ -0,0 +1,8 @@
+:test_two:
+  :colors:
+    - &blue 6886B4
+    - &yellow FDD84E
+    - &grey 333333
+  :bar_colors: [ *blue, *yellow ]
+  :background: *grey
+  :chart_background: *grey

data/spec/fixtures/test_theme.yml

@@ -0,0 +1,8 @@
+:test:
+  :colors:
+    - &blue 6886B4
+    - &yellow FDD84E
+    - &white FFFFFF
+  :bar_colors: [ *blue, *yellow ]
+  :background: *white
+  :chart_background: *white

data/spec/gchart_spec.rb

@@ -6,62 +6,88 @@ 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
-  
+
   before(:each) do
     @chart = Gchart.line
   end
-  
+
   it "should include the Google URL" do
     @chart.include?("http://chart.apis.google.com/chart?").should be_true
   end
-  
+
   it "should have a default size" do
     @chart.include?('chs=300x200').should be_true
   end
-  
+
   it "should be able to have a custom size" do
     Gchart.line(:size => '400x600').include?('chs=400x600').should be_true
     Gchart.line(:width => 400, :height => 600).include?('chs=400x600').should be_true
   end
-  
+
+  it "should have query parameters in predictable order" do
+    Gchart.line(:axis_with_labels => 'x,y,r', :size => '400x600').should match(/chxr=.+chxt=.+cht=.+chs=/)
+  end
+
   it "should have a type" 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
     Gchart.line(:data => [0, 26], :max_value => 26).should == Gchart.line(:data => [0, 26])
   end
-  
+
   it "should support simple encoding with and without max_value" do
     Gchart.line(:data => [0, 26], :max_value => 26).include?('chd=s:A9').should be_true
     Gchart.line(:data => [0, 26], :max_value => false).include?('chd=s:Aa').should be_true
   end
-  
+
   it "should support the extended encoding and encode properly" do
     Gchart.line(:data => [0, 10], :encoding => 'extended', :max_value => false).include?('chd=e:AA').should be_true
-    Gchart.line(:encoding => 'extended', 
+    Gchart.line(:encoding => 'extended',
                 :max_value => false,
                 :data => [[0,25,26,51,52,61,62,63], [64,89,90,115,4084]]
                 ).include?('chd=e:AAAZAaAzA0A9A-A.,BABZBaBz.0').should be_true
   end
-  
+
   it "should auto set the max value for extended encoding" do
     Gchart.line(:data => [0, 25], :encoding => 'extended', :max_value => false).include?('chd=e:AAAZ').should be_true
     # Extended encoding max value is '..'
     Gchart.line(:data => [0, 25], :encoding => 'extended').include?('chd=e:AA..').should be_true
   end
-  
+
   it "should be able to have data with text encoding" do
     Gchart.line(:data => [10, 5.2, 4, 45, 78], :encoding => 'text').include?('chd=t:10,5.2,4,45,78').should be_true
   end
-  
+
+  it "should handle max and min values with text encoding" do
+    Gchart.line(:data => [10, 5.2, 4, 45, 78], :encoding => 'text').include?('chds=0,78').should be_true
+  end
+
+  it "should automatically handle negative values with proper max/min limits when using text encoding" do
+    Gchart.line(:data => [-10, 5.2, 4, 45, 78], :encoding => 'text').include?('chds=-10,78').should be_true
+  end
+
+  it "should handle negative values with manual max/min limits when using text encoding" do
+   Gchart.line(:data => [-10, 5.2, 4, 45, 78], :encoding => 'text', :min_value => -20, :max_value => 100).include?('chds=-20,100').should be_true
+  end
+
+  it "should set the proper axis values when using text encoding and negative values" do
+    Gchart.bar( :data       => [[-10], [100]],
+                :encoding   => 'text',
+                :horizontal => true,
+                :min_value  => -20,
+                :max_value  => 100,
+                :axis_with_labels => 'x',
+                :bar_colors => ['FD9A3B', '4BC7DC']).should include("chxr=0,-20,100")
+  end
+
   it "should be able to have muliple set of data with text encoding" do
     Gchart.line(:data => [[10, 5.2, 4, 45, 78], [20, 40, 70, 15, 99]], :encoding => 'text').include?(Gchart.jstize('chd=t:10,5.2,4,45,78|20,40,70,15,99')).should be_true
   end
@@ -69,75 +95,128 @@ describe "generating a default Gchart" do
   it "should be able to receive a custom param" do
     Gchart.line(:custom => 'ceci_est_une_pipe').include?('ceci_est_une_pipe').should be_true
   end
-  
+
   it "should be able to set label axis" do
     Gchart.line(:axis_with_labels => 'x,y,r').include?('chxt=x,y,r').should be_true
     Gchart.line(:axis_with_labels => ['x','y','r']).include?('chxt=x,y,r').should be_true
   end
-  
+
   it "should be able to have axis labels" do
    Gchart.line(:axis_labels => ['Jan|July|Jan|July|Jan', '0|100', 'A|B|C', '2005|2006|2007']).include?(Gchart.jstize('chxl=0:|Jan|July|Jan|July|Jan|1:|0|100|2:|A|B|C|3:|2005|2006|2007')).should be_true
    Gchart.line(:axis_labels => ['Jan|July|Jan|July|Jan']).include?(Gchart.jstize('chxl=0:|Jan|July|Jan|July|Jan')).should be_true
    Gchart.line(:axis_labels => [['Jan','July','Jan','July','Jan']]).include?(Gchart.jstize('chxl=0:|Jan|July|Jan|July|Jan')).should be_true
    Gchart.line(:axis_labels => [['Jan','July','Jan','July','Jan'], ['0','100'], ['A','B','C'], ['2005','2006','2007']]).include?(Gchart.jstize('chxl=0:|Jan|July|Jan|July|Jan|1:|0|100|2:|A|B|C|3:|2005|2006|2007')).should be_true
   end
-  
+
+
 end
 
 describe "generating different type of charts" do
-  
+
   it "should be able to generate a line chart" do
     Gchart.line.should be_an_instance_of(String)
     Gchart.line.include?('cht=lc').should be_true
   end
-  
+
   it "should be able to generate a sparkline chart" do
     Gchart.sparkline.should be_an_instance_of(String)
     Gchart.sparkline.include?('cht=ls').should be_true
   end
-  
+
   it "should be able to generate a line xy chart" do
     Gchart.line_xy.should be_an_instance_of(String)
     Gchart.line_xy.include?('cht=lxy').should be_true
   end
-  
+
   it "should be able to generate a scatter chart" do
     Gchart.scatter.should be_an_instance_of(String)
     Gchart.scatter.include?('cht=s').should be_true
   end
-  
+
   it "should be able to generate a bar chart" do
     Gchart.bar.should be_an_instance_of(String)
     Gchart.bar.include?('cht=bvs').should be_true
   end
-  
+
   it "should be able to generate a Venn diagram" do
     Gchart.venn.should be_an_instance_of(String)
     Gchart.venn.include?('cht=v').should be_true
   end
-  
+
   it "should be able to generate a Pie Chart" do
     Gchart.pie.should be_an_instance_of(String)
     Gchart.pie.include?('cht=p').should be_true
   end
-  
+
   it "should be able to generate a Google-O-Meter" do
     Gchart.meter.should be_an_instance_of(String)
     Gchart.meter.include?('cht=gom').should be_true
   end
-  
+
+  it "should be able to generate a map chart" do
+    Gchart.map.should be_an_instance_of(String)
+    Gchart.map.include?('cht=t').should be_true
+  end
+
   it "should not support other types" do
     Gchart.sexy.should == "sexy is not a supported chart format, please use one of the following: #{Gchart.supported_types}."
   end
-  
+
 end
 
+
+describe "range markers" do
+
+  it "should be able to generate given a hash of range-marker options" do
+    Gchart.line(:range_markers => {:start_position => 0.59, :stop_position => 0.61, :color => 'ff0000'}).include?('chm=r,ff0000,0,0.59,0.61').should be_true
+  end
+
+  it "should be able to generate given an array of range-marker hash options" do
+    Gchart.line(:range_markers => [
+          {:start_position => 0.59, :stop_position => 0.61, :color => 'ff0000'},
+          {:start_position => 0, :stop_position => 0.6, :color => '666666'},
+          {:color => 'cccccc', :start_position => 0.6, :stop_position => 1}
+        ]).include?(Gchart.jstize('r,ff0000,0,0.59,0.61|r,666666,0,0,0.6|r,cccccc,0,0.6,1')).should be_true
+  end
+
+  it "should allow a :overlaid? to be set" do
+    Gchart.line(:range_markers => {:start_position => 0.59, :stop_position => 0.61, :color => 'ffffff', :overlaid? => true}).include?('chm=r,ffffff,0,0.59,0.61,1').should be_true
+    Gchart.line(:range_markers => {:start_position => 0.59, :stop_position => 0.61, :color => 'ffffff', :overlaid? => false}).include?('chm=r,ffffff,0,0.59,0.61').should be_true
+  end
+
+  describe "when setting the orientation option" do
+    before(:each) do
+      options = {:start_position => 0.59, :stop_position => 0.61, :color => 'ff0000'}
+    end
+
+    it "to vertical (R) if given a valid option" do
+      Gchart.line(:range_markers => options.merge(:orientation => 'v')).include?('chm=R').should be_true
+      Gchart.line(:range_markers => options.merge(:orientation => 'V')).include?('chm=R').should be_true
+      Gchart.line(:range_markers => options.merge(:orientation => 'R')).include?('chm=R').should be_true
+      Gchart.line(:range_markers => options.merge(:orientation => 'vertical')).include?('chm=R').should be_true
+      Gchart.line(:range_markers => options.merge(:orientation => 'Vertical')).include?('chm=R').should be_true
+    end
+
+    it "to horizontal (r) if given a valid option (actually anything other than the vertical options)" do
+      Gchart.line(:range_markers => options.merge(:orientation => 'horizontal')).include?('chm=r').should be_true
+      Gchart.line(:range_markers => options.merge(:orientation => 'h')).include?('chm=r').should be_true
+      Gchart.line(:range_markers => options.merge(:orientation => 'etc')).include?('chm=r').should be_true
+    end
+
+    it "if left blank defaults to horizontal (r)" do
+      Gchart.line(:range_markers => options).include?('chm=r').should be_true
+    end
+  end
+
+end
+
+
 describe "a bar graph" do
-  
+
   it "should have a default vertical orientation" do
     Gchart.bar.include?('cht=bvs').should be_true
   end
-  
+
   it "should be able to have a different orientation" do
     Gchart.bar(:orientation => 'vertical').include?('cht=bvs').should be_true
     Gchart.bar(:orientation => 'v').include?('cht=bvs').should be_true
@@ -145,104 +224,111 @@ describe "a bar graph" do
     Gchart.bar(:orientation => 'horizontal').include?('cht=bhs').should be_true
     Gchart.bar(:horizontal => false).include?('cht=bvs').should be_true
   end
-  
+
   it "should be set to be stacked by default" do
     Gchart.bar.include?('cht=bvs').should be_true
   end
-  
+
   it "should be able to stacked or grouped" do
     Gchart.bar(:stacked => true).include?('cht=bvs').should be_true
     Gchart.bar(:stacked => false).include?('cht=bvg').should be_true
     Gchart.bar(:grouped => true).include?('cht=bvg').should be_true
     Gchart.bar(:grouped => false).include?('cht=bvs').should be_true
   end
-  
+
   it "should be able to have different bar colors" do
     Gchart.bar(:bar_colors => 'efefef,00ffff').include?('chco=').should be_true
     Gchart.bar(:bar_colors => 'efefef,00ffff').include?('chco=efefef,00ffff').should be_true
     # alias
     Gchart.bar(:bar_color => 'efefef').include?('chco=efefef').should be_true
   end
-  
+
   it "should be able to have different bar colors when using an array of colors" do
     Gchart.bar(:bar_colors => ['efefef','00ffff']).include?('chco=efefef,00ffff').should be_true
   end
-  
+
   it 'should be able to accept a string of width and spacing options' do
     Gchart.bar(:bar_width_and_spacing => '25,6').include?('chbh=25,6').should be_true
   end
-  
+
   it 'should be able to accept a single fixnum width and spacing option to set the bar width' do
     Gchart.bar(:bar_width_and_spacing => 25).include?('chbh=25').should be_true
   end
-  
+
   it 'should be able to accept an array of width and spacing options' do
     Gchart.bar(:bar_width_and_spacing => [25,6,12]).include?('chbh=25,6,12').should be_true
     Gchart.bar(:bar_width_and_spacing => [25,6]).include?('chbh=25,6').should be_true
     Gchart.bar(:bar_width_and_spacing => [25]).include?('chbh=25').should be_true
   end
-  
+
   describe "with a hash of width and spacing options" do
-    
+
     before(:each) do
       @default_width         = 23
       @default_spacing       = 4
       @default_group_spacing = 8
     end
-    
+
     it 'should be able to have a custom bar width' do
       Gchart.bar(:bar_width_and_spacing => {:width => 19}).include?("chbh=19,#{@default_spacing},#{@default_group_spacing}").should be_true
     end
-    
+
     it 'should be able to have custom spacing' do
       Gchart.bar(:bar_width_and_spacing => {:spacing => 19}).include?("chbh=#{@default_width},19,#{@default_group_spacing}").should be_true
     end
-    
+
     it 'should be able to have custom group spacing' do
       Gchart.bar(:bar_width_and_spacing => {:group_spacing => 19}).include?("chbh=#{@default_width},#{@default_spacing},19").should be_true
     end
-    
+
   end
-  
+
 end
 
 describe "a line chart" do
-  
+
   before(:each) do
     @title = 'Chart Title'
     @legend = ['first data set label', 'n data set label']
     @chart = Gchart.line(:title => @title, :legend => @legend)
   end
-  
+
   it 'should be able have a chart title' do
     @chart.include?("chtt=Chart+Title").should be_true
   end
-  
+
   it "should be able to a custom color and size title" do
      Gchart.line(:title => @title, :title_color => 'FF0000').include?('chts=FF0000').should be_true
      Gchart.line(:title => @title, :title_size => '20').include?('chts=454545,20').should be_true
   end
-  
+
   it "should be able to have multiple legends" do
     @chart.include?(Gchart.jstize("chdl=first+data+set+label|n+data+set+label")).should be_true
   end
-  
+
+  it "should escape text values in url" do
+    title = 'Chart & Title'
+    legend = ['first data & set label', 'n data set label']
+    chart = Gchart.line(:title => title, :legend => legend)
+    chart.include?(Gchart.jstize("chdl=first+data+%26+set+label|n+data+set+label")).should be_true
+  end
+
   it "should be able to have one legend" do
     chart = Gchart.line(:legend => 'legend label')
     chart.include?("chdl=legend+label").should be_true
   end
-  
+
   it "should be able to set the background fill" do
     Gchart.line(:bg => 'efefef').include?("chf=bg,s,efefef").should be_true
     Gchart.line(:bg => {:color => 'efefef', :type => 'solid'}).include?("chf=bg,s,efefef").should be_true
-    
+
     Gchart.line(:bg => {:color => 'efefef', :type => 'gradient'}).include?("chf=bg,lg,0,efefef,0,ffffff,1").should be_true
     Gchart.line(:bg => {:color => 'efefef,0,ffffff,1', :type => 'gradient'}).include?("chf=bg,lg,0,efefef,0,ffffff,1").should be_true
     Gchart.line(:bg => {:color => 'efefef', :type => 'gradient', :angle => 90}).include?("chf=bg,lg,90,efefef,0,ffffff,1").should be_true
-    
+
     Gchart.line(:bg => {:color => 'efefef', :type => 'stripes'}).include?("chf=bg,ls,90,efefef,0.2,ffffff,0.2").should be_true
   end
-  
+
   it "should be able to set a graph fill" do
     Gchart.line(:graph_bg => 'efefef').include?("chf=c,s,efefef").should be_true
     Gchart.line(:graph_bg => {:color => 'efefef', :type => 'solid'}).include?("chf=c,s,efefef").should be_true
@@ -250,26 +336,26 @@ describe "a line chart" do
     Gchart.line(:graph_bg => {:color => 'efefef,0,ffffff,1', :type => 'gradient'}).include?("chf=c,lg,0,efefef,0,ffffff,1").should be_true
     Gchart.line(:graph_bg => {:color => 'efefef', :type => 'gradient', :angle => 90}).include?("chf=c,lg,90,efefef,0,ffffff,1").should be_true
   end
-  
+
   it "should be able to set both a graph and a background fill" do
     Gchart.line(:bg => 'efefef', :graph_bg => '76A4FB').include?("bg,s,efefef").should be_true
     Gchart.line(:bg => 'efefef', :graph_bg => '76A4FB').include?("c,s,76A4FB").should be_true
     Gchart.line(:bg => 'efefef', :graph_bg => '76A4FB').include?(Gchart.jstize("chf=c,s,76A4FB|bg,s,efefef")).should be_true
   end
-  
+
   it "should be able to have different line colors" do
     Gchart.line(:line_colors => 'efefef|00ffff').include?(Gchart.jstize('chco=efefef|00ffff')).should be_true
     Gchart.line(:line_color => 'efefef|00ffff').include?(Gchart.jstize('chco=efefef|00ffff')).should be_true
   end
-  
+
   it "should be able to render a graph where all the data values are 0" do
     Gchart.line(:data => [0, 0, 0]).include?("chd=s:AAA").should be_true
   end
-  
+
 end
 
 describe "a sparkline chart" do
-  
+
   before(:each) do
     @title = 'Chart Title'
     @legend = ['first data set label', 'n data set label']
@@ -277,40 +363,40 @@ describe "a sparkline chart" do
     @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]
     @chart = Gchart.sparkline(:title => @title, :data => @data, :legend => @legend)
   end
-  
+
   it "should create a sparkline" do
     @chart.include?('cht=ls').should be_true
   end
-  
+
   it 'should be able have a chart title' do
     @chart.include?("chtt=Chart+Title").should be_true
   end
-  
+
   it "should be able to a custom color and size title" do
      Gchart.sparkline(:title => @title, :title_color => 'FF0000').include?('chts=FF0000').should be_true
      Gchart.sparkline(:title => @title, :title_size => '20').include?('chts=454545,20').should be_true
   end
-  
+
   it "should be able to have multiple legends" do
     @chart.include?(Gchart.jstize("chdl=first+data+set+label|n+data+set+label")).should be_true
   end
-  
+
   it "should be able to have one legend" do
     chart = Gchart.sparkline(:legend => 'legend label')
     chart.include?("chdl=legend+label").should be_true
   end
-  
+
   it "should be able to set the background fill" do
     Gchart.sparkline(:bg => 'efefef').include?("chf=bg,s,efefef").should be_true
     Gchart.sparkline(:bg => {:color => 'efefef', :type => 'solid'}).include?("chf=bg,s,efefef").should be_true
-           
+
     Gchart.sparkline(:bg => {:color => 'efefef', :type => 'gradient'}).include?("chf=bg,lg,0,efefef,0,ffffff,1").should be_true
     Gchart.sparkline(:bg => {:color => 'efefef,0,ffffff,1', :type => 'gradient'}).include?("chf=bg,lg,0,efefef,0,ffffff,1").should be_true
     Gchart.sparkline(:bg => {:color => 'efefef', :type => 'gradient', :angle => 90}).include?("chf=bg,lg,90,efefef,0,ffffff,1").should be_true
-          
+
     Gchart.sparkline(:bg => {:color => 'efefef', :type => 'stripes'}).include?("chf=bg,ls,90,efefef,0.2,ffffff,0.2").should be_true
   end
-  
+
   it "should be able to set a graph fill" do
     Gchart.sparkline(:graph_bg => 'efefef').include?("chf=c,s,efefef").should be_true
     Gchart.sparkline(:graph_bg => {:color => 'efefef', :type => 'solid'}).include?("chf=c,s,efefef").should be_true
@@ -318,22 +404,22 @@ describe "a sparkline chart" do
     Gchart.sparkline(:graph_bg => {:color => 'efefef,0,ffffff,1', :type => 'gradient'}).include?("chf=c,lg,0,efefef,0,ffffff,1").should be_true
     Gchart.sparkline(:graph_bg => {:color => 'efefef', :type => 'gradient', :angle => 90}).include?("chf=c,lg,90,efefef,0,ffffff,1").should be_true
   end
-  
+
   it "should be able to set both a graph and a background fill" do
     Gchart.sparkline(:bg => 'efefef', :graph_bg => '76A4FB').include?("bg,s,efefef").should be_true
     Gchart.sparkline(:bg => 'efefef', :graph_bg => '76A4FB').include?("c,s,76A4FB").should be_true
     Gchart.sparkline(:bg => 'efefef', :graph_bg => '76A4FB').include?(Gchart.jstize("chf=c,s,76A4FB|bg,s,efefef")).should be_true
   end
-  
+
   it "should be able to have different line colors" do
     Gchart.sparkline(:line_colors => 'efefef|00ffff').include?(Gchart.jstize('chco=efefef|00ffff')).should be_true
     Gchart.sparkline(:line_color => 'efefef|00ffff').include?(Gchart.jstize('chco=efefef|00ffff')).should be_true
   end
-  
+
 end
 
 describe "a 3d pie chart" do
-  
+
   before(:each) do
     @title = 'Chart Title'
     @legend = ['first data set label', 'n data set label']
@@ -341,21 +427,21 @@ describe "a 3d pie chart" do
     @data = [12,8,40,15,5]
     @chart = Gchart.pie(:title => @title, :legend => @legend, :data => @data)
   end
-  
+
   it "should create a pie" do
     @chart.include?('cht=p').should be_true
   end
-  
+
   it "should be able to be in 3d" do
     Gchart.pie_3d(:title => @title, :legend => @legend, :data => @data).include?('cht=p3').should be_true
   end
-  
+
   it "should be able to set labels by using the legend or labesl accessor" do
     Gchart.pie_3d(:title => @title, :legend => @legend, :data => @data).include?("chl=#{@jstized_legend}").should be_true
     Gchart.pie_3d(:title => @title, :labels => @legend, :data => @data).include?("chl=#{@jstized_legend}").should be_true
     Gchart.pie_3d(:title => @title, :labels => @legend, :data => @data).should == Gchart.pie_3d(:title => @title, :legend => @legend, :data => @data)
   end
-  
+
 end
 
 describe "a google-o-meter" do
@@ -366,48 +452,82 @@ describe "a google-o-meter" do
     @jstized_legend = Gchart.jstize(@legend.join('|'))
     @chart = Gchart.meter(:data => @data)
   end
-  
+
   it "should create a meter" do
     @chart.include?('cht=gom').should be_true
   end
-  
+
   it "should be able to set a solid background fill" do
     Gchart.meter(:bg => 'efefef').include?("chf=bg,s,efefef").should be_true
     Gchart.meter(:bg => {:color => 'efefef', :type => 'solid'}).include?("chf=bg,s,efefef").should be_true
   end
-  
+
+end
+
+describe "a map chart" do
+
+  before(:each) do
+    @data = [0,100,50,32]
+    @geographical_area = 'usa'
+    @map_colors = ['FFFFFF', 'FF0000', 'FFFF00', '00FF00']
+    @country_codes = ['MT', 'WY', "ID", 'SD']
+    @chart = Gchart.map(:data => @data, :encoding => 'text', :size => '400x300',
+      :geographical_area => @geographical_area, :map_colors => @map_colors,
+      :country_codes => @country_codes)
+  end
+
+  it "should create a map" do
+    @chart.include?('cht=t').should be_true
+  end
+
+  it "should set the geographical area" do
+    @chart.include?('chtm=usa').should be_true
+  end
+
+  it "should set the map colors" do
+    @chart.include?('chco=FFFFFF,FF0000,FFFF00,00FF00').should be_true
+  end
+
+  it "should set the country/state codes" do
+    @chart.include?('chld=MTWYIDSD').should be_true
+  end
+
+  it "should set the chart data" do
+    @chart.include?('chd=t:0,100,50,32').should be_true
+  end
+
 end
 
 describe 'exporting a chart' do
-  
+
   it "should be available in the url format by default" do
     Gchart.line(:data => [0, 26], :format => 'url').should == Gchart.line(:data => [0, 26])
   end
-  
+
   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
@@ -416,25 +536,25 @@ describe 'exporting a chart' 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')
     File.exist?('chart.png').should be_true
     File.delete('chart.png') if File.exist?('chart.png')
   end
-  
+
   it "should be available as a file using a custom file name" do
     File.delete('custom_file_name.png') if File.exist?('custom_file_name.png')
     Gchart.line(:data => [0, 26], :format => 'file', :filename => 'custom_file_name.png')
     File.exist?('custom_file_name.png').should be_true
     File.delete('custom_file_name.png') if File.exist?('custom_file_name.png')
   end
-  
+
   it "should work even with multiple attrs" do
     File.delete('foo.png') if File.exist?('foo.png')
     Gchart.line(:size => '400x200',
@@ -447,5 +567,5 @@ describe 'exporting a chart' do
     File.exist?('foo.png').should be_true
     File.delete('foo.png') if File.exist?('foo.png')
   end
-  
-end
+
+end