google_visualr 2.1.3 → 2.1.4

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.2-p180@google_visualr --create
+rvm use ruby-1.9.3-p194@google_visualr --create

data/Gemfile.lock

@@ -1,91 +1,102 @@
 PATH
   remote: .
   specs:
-    google_visualr (2.1.3)
+    google_visualr (2.1.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
-      mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
-    arel (2.0.10)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.3)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.2)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2)
-    rdoc (3.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    thor (0.14.6)
-    treetop (1.4.10)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.15)
+  bundler (>= 1.2.1)
   google_visualr!
-  rails (>= 3.0.9)
-  rspec (>= 2.6.0)
+  rails (>= 3.2.8)
+  rspec (>= 2.11.0)

data/README.rdoc

@@ -96,6 +96,10 @@ Please submit all feedback, bugs and feature-requests to {GitHub Issues Tracker}
 
 = Change Log
 
+<em>Version 2.1.4</em>
+* {Pull Request 39}[https://github.com/winston/google_visualr/pull/39] Added ability to use Listeners.
+* {Pull Request 40}[https://github.com/winston/google_visualr/pull/40] Allowed decoupling of class name and chart name.
+
 <em>Version 2.1.3</em>
 * Added support for Bubble Chart.
 * {Pull Request 37}[https://github.com/winston/google_visualr/pull/37] Added support for Stepped Area Chart.
@@ -118,4 +122,4 @@ Who is Winston Teo? {You should follow Winston on Twitter}[http://www.twitter.co
 
 = License
 
-Copyright © 2011 Winston Teo Yong Wei. Free software, released under the MIT license.
+Copyright © 2012 Winston Teo Yong Wei. Free software, released under the MIT license.

data/google_visualr.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "google_visualr"
 
-  s.add_development_dependency "bundler", ">= 1.0.15"
-  s.add_development_dependency "rspec"  , ">= 2.6.0"
-  s.add_development_dependency "rails"  , ">= 3.0.9"
+  s.add_development_dependency "bundler", ">= 1.2.1"
+  s.add_development_dependency "rspec"  , ">= 2.11.0"
+  s.add_development_dependency "rails"  , ">= 3.2.8"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/lib/google_visualr/base_chart.rb

@@ -4,11 +4,16 @@ module GoogleVisualr
     include GoogleVisualr::Packages
     include GoogleVisualr::ParamHelpers
 
-    attr_accessor :data_table
+    attr_accessor :data_table, :listeners
 
     def initialize(data_table, options={})
       @data_table = data_table
       send(:options=, options)
+      @listeners  = []
+    end
+
+    def chart_name
+      class_name
     end
 
     def options
@@ -19,6 +24,10 @@ module GoogleVisualr
       @options = stringify_keys!(options)
     end
 
+    def add_listener(event, callback)
+      @listeners << { :event => event.to_s, :callback => callback }
+    end
+
     # Generates JavaScript and renders the Google Chart in the final HTML output.
     #
     # Parameters:
@@ -27,14 +36,16 @@ module GoogleVisualr
       js  = "\n<script type='text/javascript'>"
       js << "\n  google.load('visualization','1', {packages: ['#{package_name}'], callback: function() {"
       js << "\n    #{@data_table.to_js}"
-      js << "\n    var chart = new google.visualization.#{class_name}(document.getElementById('#{element_id}'));"
+      js << "\n    var chart = new google.visualization.#{chart_name}(document.getElementById('#{element_id}'));"
       js << "\n    chart.draw(data_table, #{js_parameters(@options)});"
+      @listeners.each do |listener|
+        js << "\n    google.visualization.events.addListener(chart, '#{listener[:event]}', #{listener[:callback]});"
+      end
       js << "\n  }});"
       js << "\n</script>"
-
       js
     end
 
   end
 
-end
+end

data/lib/google_visualr/version.rb

@@ -1,3 +1,3 @@
 module GoogleVisualr
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

data/spec/google_visualr/base_chart_spec.rb

@@ -21,11 +21,25 @@ describe GoogleVisualr::BaseChart do
     end
   end
 
+  describe "#add_listener" do
+    it "adds to listeners array" do
+      @chart.add_listener("select", "function() {test_event(chart);}")
+      @chart.listeners.should == [{ :event => "select", :callback => "function() {test_event(chart);}" }]
+    end
+  end
+
   describe "#to_js" do
     it "generates JS" do
       js = @chart.to_js("body")
       js.should == base_chart_js("body")
     end
+
+    it "generates JS with listeners" do
+      @chart.add_listener("select", "function() {test_event(chart);}")
+
+      js = @chart.to_js("body")
+      js.should == base_chart_with_listener_js("body")
+    end
   end
 
 end

data/spec/google_visualr/image_charts_spec.rb

@@ -1,65 +1,127 @@
 require 'spec_helper'
 
+# Warning..
+# Image Charts are deprecated as iof 20 Apr 2012, but supported till 2015.
+# We might remove these soon
+
+shared_examples_for "image chart" do
+  it "generates correct URI" do
+    CGI.parse(chart.uri.query).should == CGI.parse(uri.query)
+  end
+end
+
 describe GoogleVisualr::Image::PieChart do
-  describe "#uri" do
-    let(:chart){ GoogleVisualr::Image::PieChart.new( data_table, {} )}
-    image_pie_options.each_with_index do |opts, i|
-      context "#{opts.inspect}" do
-        it "generates correct URI" do
-          chart.options = opts
-          uri = chart.uri
-          #puts uri.to_s
-          CGI.parse(uri.query).should == CGI.parse(image_pie_chart_uris[i].query)
-        end
-      end
-    end
+  let(:chart) { GoogleVisualr::Image::PieChart.new( data_table, options ) }
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Favorite Desserts", :is3D => false, :labels => "none" } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=2004%7C2005%7C2006%7C2007&chs=400x200&cht=p&chtt=Favorite+Desserts&chl=&chd=t%3A1000%2C1200%2C1500%2C800&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Favorite Desserts", :is3D => false, :labels => "name", :backgroundColor => "#EFEFEF", :legend => "left" } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CEFEFEF&chdl=2004%7C2005%7C2006%7C2007&chs=400x200&cht=p&chdlp=l&chtt=Favorite+Desserts&chl=2004%7C2005%7C2006%7C2007&chd=t%3A1000%2C1200%2C1500%2C800&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Favorite Desserts", :width => 650, :height => 300, :is3D => true, :labels => "value", :backgroundColor => "#FFFFFF", :legend => "bottom" } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=2004%7C2005%7C2006%7C2007&chs=650x300&cht=p3&chdlp=b&chtt=Favorite+Desserts&chl=1000%7C1200%7C1500%7C800&chd=t%3A1000%2C1200%2C1500%2C800&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Favorite Desserts", :width => 650, :height => 300, :is3D => false, :labels => "none", :backgroundColor => "#FFFFFF", :color => "#444D92", :legend => "top" } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=2004%7C2005%7C2006%7C2007&chs=650x300&cht=p&chdlp=t&chtt=Favorite+Desserts&chco=444D92&chl=&chd=t%3A1000%2C1200%2C1500%2C800&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Favorite Desserts", :width => 650, :height => 300, :is3D => true, :labels => "none", :backgroundColor => "#FFFFFF", :colors => %w(#444D92 #4c56a2 #5E67AB #7078B5 #8289BE #949AC7 #A6AAD0 #B7BBDA #C9CCE3 #DBDDEC #EDEEF6), :legend => "none" } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=2004%7C2005%7C2006%7C2007&chs=650x300&cht=p3&chtt=Favorite+Desserts&chco=444D92%7C4c56a2%7C5E67AB%7C7078B5%7C8289BE%7C949AC7%7CA6AAD0%7CB7BBDA%7CC9CCE3%7CDBDDEC%7CEDEEF6&chl=&chd=t%3A1000%2C1200%2C1500%2C800&chds=a") }
   end
 end
 
 describe GoogleVisualr::Image::LineChart do
-  describe "#uri" do
-    let(:chart){ GoogleVisualr::Image::LineChart.new( data_table, {} )}
-    image_line_options.each_with_index do |opts, i|
-      context "#{opts.inspect}" do
-        it "generates correct URI" do
-          chart.options = opts
-          uri = chart.uri
-          #puts uri.to_s
-          CGI.parse(uri.query).should == CGI.parse(image_line_chart_uris[i].query)
-        end
-      end
-    end
+  let(:chart) { GoogleVisualr::Image::LineChart.new( data_table, options ) }
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test1 Line Chart", :colors => ['#437E9D', '#E6A65A'], :legend => "left", :backgroundColor => "#EFEFEF", :showCategoryLabels => true, :showValueLabels => false } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CEFEFEF&chdl=Sales%7CExpenses&chs=400x200&chxl=0%3A%7C2004%7C2005%7C2006%7C2007%7C1%3A%7C%7C&cht=lc&chdlp=l&chtt=Test1+Line+Chart&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test2 Line Chart", :width => 500, :height => 200, :color => '#437E9D', :legend => "right", :backgroundColor => "#FFFFFF", :showCategoryLabels => false, :showValueLabels => true } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C%7C&cht=lc&chdlp=r&chtt=Test2+Line+Chart&chco=437E9D&chds=a&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test3 Line Chart", :width => 500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "top", :showCategoryLabels => false, :showValueLabels => false, :showAxisLines => false } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C%7C1%3A%7C%7C&cht=lc%3Anda&chdlp=t&chtt=Test3+Line+Chart&chco=437E9D%2CE6A65A&chds=a&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test4 Line Chart", :width => 500, :height => 200, :color => '#437E9D', :legend => "bottom", :showCategoryLabels => true, :showValueLabels => true, :showAxisLines => true } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C2004%7C2005%7C2006%7C2007%7C&cht=lc&chdlp=b&chtt=Test4+Line+Chart&chco=437E9D&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test5 Line Chart", :width => 500, :height => 200, :color => '#437E9D', :legend => "none", :showCategoryLabels => true, :showValueLabels => true, :min => 200, :max => 2000, :valueLabelsInterval => 200 } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chs=500x200&chxl=0%3A%7C2004%7C2005%7C2006%7C2007%7C&cht=lc&chtt=Test5+Line+Chart&chco=437E9D&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chxr=1%2C200%2C2000%2C200&chds=200%2C2000") }
   end
 end
 
 describe GoogleVisualr::Image::BarChart do
-  describe "#uri" do
-    let(:chart){ GoogleVisualr::Image::BarChart.new( data_table, {} )}
-    image_bar_options.each_with_index do |opts, i|
-      context "#{opts.inspect}" do
-        it "generates correct URI" do
-          chart.options = opts
-          uri = chart.uri
-          #puts uri.to_s
-          CGI.parse(uri.query).should == CGI.parse(image_bar_chart_uris[i].query)
-        end
-      end
-    end
+  let(:chart) { GoogleVisualr::Image::BarChart.new( data_table, options ) }
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test1 Bar Chart", :colors => ['#437E9D', '#E6A65A'], :legend => "left", :backgroundColor => "#EFEFEF", :showCategoryLabels => true, :showValueLabels => false } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CEFEFEF&chdl=Sales%7CExpenses&chs=400x200&chxl=1%3A%7C2004%7C2005%7C2006%7C2007%7C0%3A%7C%7C&cht=bhs&chdlp=l&chtt=Test1+Bar+Chart&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test2 Bar Chart", :width => 500, :height => 200, :color => '#437E9D', :legend => "right", :backgroundColor => "#FFFFFF", :showCategoryLabels => false, :showValueLabels => true } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=Sales%7CExpenses&chs=500x200&chxl=1%3A%7C%7C&cht=bhs&chdlp=r&chtt=Test2+Bar+Chart&chco=437E9D&chds=a&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test3 Bar Chart", :width => 500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "top", :showCategoryLabels => false, :showValueLabels => false } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=1%3A%7C%7C0%3A%7C%7C&cht=bhs&chdlp=t&chtt=Test3+Bar+Chart&chco=437E9D%2CE6A65A&chds=a&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test4 Bar Chart", :width => 500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "bottom", :showCategoryLabels => true, :showValueLabels => true, :isStacked => false, :isVertical => true } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C2004%7C2005%7C2006%7C2007%7C&cht=bvg&chdlp=b&chtt=Test4+Bar+Chart&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test5 Bar Chart", :width => 500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "none", :isStacked => true, :isVertical => true, :min => 200, :max => 2000, :valueLabelsInterval => 200 } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chs=500x200&chxl=0%3A%7C2004%7C2005%7C2006%7C2007%7C&cht=bvs&chtt=Test5+Bar+Chart&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chxr=1%2C200%2C2000%2C200&chds=200%2C2000") }
   end
 end
 
 describe GoogleVisualr::Image::SparkLine do
-  describe "#uri" do
-    let(:chart){ GoogleVisualr::Image::SparkLine.new( data_table, {} )}
-    sparkline_options.each_with_index do |opts, i|
-      context "#{opts.inspect}" do
-        it "generates correct URI" do
-          chart.options = opts
-          uri = chart.uri
-          #puts uri.to_s
-          CGI.parse(uri.query).should == CGI.parse(sparkline_uris[i].query)
-        end
-      end
-    end
-  end
-end
+  let(:chart) { GoogleVisualr::Image::SparkLine.new( data_table, options ) }
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test1 Sparkline", :colors => ['#437E9D', '#E6A65A'], :legend => "left", :backgroundColor => "#EFEFEF", :showAxisLines => false } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CEFEFEF&chdl=Sales%7CExpenses&chs=400x200&chxl=0%3A%7C%7C1%3A%7C%7C&cht=ls&chdlp=l&chtt=Test1+Sparkline&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test2 Sparkline", :width => 500, :height => 200, :color => '#437E9D', :legend => "right", :backgroundColor => "#FFFFFF", :showAxisLines => true } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C%7C&cht=ls&chdlp=r&chtt=Test2+Sparkline&chco=437E9D&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test3 Sparkline", :width => 500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "top", :showAxisLines => false } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C%7C1%3A%7C%7C&cht=ls&chdlp=t&chtt=Test3+Sparkline&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test4 Sparkline", :width => 500, :height => 200, :color => '#437E9D', :legend => "bottom", :showAxisLines => false } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C%7C1%3A%7C%7C&cht=ls&chdlp=b&chtt=Test4+Sparkline&chco=437E9D&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a") }
+  end
+
+  it_should_behave_like "image chart" do
+    let(:options) { { :title => "Test5 Sparkline", :width => 500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "none", :showAxisLines => false } }
+    let(:uri)     { URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chs=500x200&chxl=0%3A%7C%7C1%3A%7C%7C&cht=ls&chtt=Test5+Sparkline&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a") }
+  end
+end

data/spec/support/common.rb

@@ -1,146 +1,37 @@
 def data_table
-
   @cols = [
-            { :type => "string", :label => "Year"     },
-            { :type => "number", :label => "Sales"    },
-            { :type => "number", :label => "Expenses" }
-          ]
+    { :type => "string", :label => "Year" },
+    { :type => "number", :label => "Sales" },
+    { :type => "number", :label => "Expenses" }
+  ]
   @rows = [
-            { :c => [ {:v => "2004"}, {:v => 1000}, {:v => 400} ] },
-            { :c => [ {:v => "2005"}, {:v => 1200}, {:v => 450} ] },
-            { :c => [ {:v => "2006"}, {:v => 1500}, {:v => 600} ] },
-            { :c => [ {:v => "2007"}, {:v => 800 }, {:v => 500} ] }
-          ]
+    { :c => [{ :v => "2004" }, { :v => 1000 }, { :v => 400 }] },
+    { :c => [{ :v => "2005" }, { :v => 1200 }, { :v => 450 }] },
+    { :c => [{ :v => "2006" }, { :v => 1500 }, { :v => 600 }] },
+    { :c => [{ :v => "2007" }, { :v => 800  }, { :v => 500 }] }
+  ]
   GoogleVisualr::DataTable.new(:cols => @cols, :rows => @rows)
-
 end
 
 def base_chart(data_table=data_table)
-
-  GoogleVisualr::BaseChart.new( data_table, { :legend => "Test Chart", :width =>  800, :is3D => true } )
-
+  GoogleVisualr::BaseChart.new(data_table, { :legend => "Test Chart", :width => 800, :is3D => true })
 end
 
 def base_chart_js(div_class="div_class")
-
   js  = "\n<script type='text/javascript'>"
   js << "\n  google.load('visualization','1', {packages: ['basechart'], callback: function() {"
   js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn('string', 'Year');data_table.addColumn('number', 'Sales');data_table.addColumn('number', 'Expenses');data_table.addRow([{v: '2004'}, {v: 1000}, {v: 400}]);data_table.addRow([{v: '2005'}, {v: 1200}, {v: 450}]);data_table.addRow([{v: '2006'}, {v: 1500}, {v: 600}]);data_table.addRow([{v: '2007'}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
   js << "\n    chart.draw(data_table, {legend: 'Test Chart', width: 800, is3D: true});"
   js << "\n  }});"
   js << "\n</script>"
-
 end
 
-# Helpers for image chart specs
-
-def pie_data_table
-  @cols = [
-            { :type => "string", :label => "Favorite Dessert"     },
-            { :type => "number", :label => "Count"    }
-          ]
-  @rows = [
-            { :c => [ {:v => "Pie"}, {:v => 100} ] },
-            { :c => [ {:v => "Cake"}, {:v => 120} ] },
-            { :c => [ {:v => "Ice Cream"}, {:v => 150} ] },
-            { :c => [ {:v => "Cookies"}, {:v => 80 } ] }
-          ]
-  GoogleVisualr::DataTable.new(:cols => @cols, :rows => @rows)
-end
-
-def image_pie_options
-  [
-    { :title => "Favorite Desserts", :is3D => false, :labels => "name", :backgroundColor => "#EFEFEF", :legend => "left" },
-    { :title => "Favorite Desserts", :width =>  650, :height => 300, :is3D => true, :labels => "value", :backgroundColor => "#FFFFFF",
-      :legend => "bottom" },
-    { :title => "Favorite Desserts", :width =>  650, :height => 300, :is3D => false, :labels => "none", :backgroundColor => "#FFFFFF",
-      :color => "#444D92", :legend => "top" },
-    { :title => "Favorite Desserts", :width =>  650, :height => 300, :is3D => true, :labels => "none", :backgroundColor => "#FFFFFF",
-      :colors => ['#444D92', '#4c56a2', '#5E67AB', '#7078B5', '#8289BE', '#949AC7',
-        '#A6AAD0', '#B7BBDA', '#C9CCE3', '#DBDDEC', '#EDEEF6'], :legend => "none" }
-  ]
-end
-
-def image_pie_chart_uris
-  [
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CEFEFEF&chdl=2004%7C2005%7C2006%7C2007&chs=400x200&cht=p&chdlp=l&chtt=Favorite+Desserts&chl=2004%7C2005%7C2006%7C2007&chd=t%3A1000%2C1200%2C1500%2C800&chds=a"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=2004%7C2005%7C2006%7C2007&chs=650x300&cht=p3&chdlp=b&chtt=Favorite+Desserts&chl=1000%7C1200%7C1500%7C800&chd=t%3A1000%2C1200%2C1500%2C800&chds=a"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=2004%7C2005%7C2006%7C2007&chs=650x300&cht=p&chdlp=t&chtt=Favorite+Desserts&chco=444D92&chl=&chd=t%3A1000%2C1200%2C1500%2C800&chds=a"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=2004%7C2005%7C2006%7C2007&chs=650x300&cht=p3&chtt=Favorite+Desserts&chco=444D92%7C4c56a2%7C5E67AB%7C7078B5%7C8289BE%7C949AC7%7CA6AAD0%7CB7BBDA%7CC9CCE3%7CDBDDEC%7CEDEEF6&chl=&chd=t%3A1000%2C1200%2C1500%2C800&chds=a")
-  ]
-end
-
-def image_line_options
-  [
-    { :title => "Test1 Line Chart", :colors => ['#437E9D', '#E6A65A'], :legend => "left", 
-      :backgroundColor => "#EFEFEF", :showCategoryLabels => true, :showValueLabels => false },
-    { :title => "Test2 Line Chart", :width =>  500, :height => 200, :color => '#437E9D', :legend => "right", 
-      :backgroundColor => "#FFFFFF", :showCategoryLabels => false, :showValueLabels => true },
-    { :title => "Test3 Line Chart", :width =>  500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "top", 
-      :showCategoryLabels => false, :showValueLabels => false, :showAxisLines => false },
-    { :title => "Test4 Line Chart", :width =>  500, :height => 200, :color => '#437E9D', :legend => "bottom", 
-      :showCategoryLabels => true, :showValueLabels => true, :showAxisLines => true },
-    { :title => "Test5 Line Chart", :width =>  500, :height => 200, :color => '#437E9D', :legend => "none", 
-      :showCategoryLabels => true, :showValueLabels => true, :min => 200, :max => 2000, :valueLabelsInterval => 200 }
-  ]
-end
-
-def image_line_chart_uris
-  [
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CEFEFEF&chdl=Sales%7CExpenses&chs=400x200&chxl=0%3A%7C2004%7C2005%7C2006%7C2007%7C1%3A%7C%7C&cht=lc&chdlp=l&chtt=Test1+Line+Chart&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C%7C&cht=lc&chdlp=r&chtt=Test2+Line+Chart&chco=437E9D&chds=a&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C%7C1%3A%7C%7C&cht=lc%3Anda&chdlp=t&chtt=Test3+Line+Chart&chco=437E9D%2CE6A65A&chds=a&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C2004%7C2005%7C2006%7C2007%7C&cht=lc&chdlp=b&chtt=Test4+Line+Chart&chco=437E9D&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chs=500x200&chxl=0%3A%7C2004%7C2005%7C2006%7C2007%7C&cht=lc&chtt=Test5+Line+Chart&chco=437E9D&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chxr=1%2C200%2C2000%2C200&chds=200%2C2000")
-  ]
-end
-
-def image_bar_options
-  [
-    { :title => "Test1 Bar Chart", :colors => ['#437E9D', '#E6A65A'], :legend => "left", 
-      :backgroundColor => "#EFEFEF", :showCategoryLabels => true, :showValueLabels => false },
-    { :title => "Test2 Bar Chart", :width =>  500, :height => 200, :color => '#437E9D', :legend => "right", 
-      :backgroundColor => "#FFFFFF", :showCategoryLabels => false, :showValueLabels => true },
-    { :title => "Test3 Bar Chart", :width =>  500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "top", 
-      :showCategoryLabels => false, :showValueLabels => false },
-    { :title => "Test4 Bar Chart", :width =>  500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "bottom", 
-      :showCategoryLabels => true, :showValueLabels => true, :isStacked => false, :isVertical => true },
-    { :title => "Test5 Bar Chart", :width =>  500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "none", 
-      :isStacked => true, :isVertical => true, :min => 200, :max => 2000, :valueLabelsInterval => 200 }
-  ]
-end
-
-def image_bar_chart_uris
-  [
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CEFEFEF&chdl=Sales%7CExpenses&chs=400x200&chxl=1%3A%7C2004%7C2005%7C2006%7C2007%7C0%3A%7C%7C&cht=bhs&chdlp=l&chtt=Test1+Bar+Chart&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=Sales%7CExpenses&chs=500x200&chxl=1%3A%7C%7C&cht=bhs&chdlp=r&chtt=Test2+Bar+Chart&chco=437E9D&chds=a&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=1%3A%7C%7C0%3A%7C%7C&cht=bhs&chdlp=t&chtt=Test3+Bar+Chart&chco=437E9D%2CE6A65A&chds=a&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C2004%7C2005%7C2006%7C2007%7C&cht=bvg&chdlp=b&chtt=Test4+Bar+Chart&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chs=500x200&chxl=0%3A%7C2004%7C2005%7C2006%7C2007%7C&cht=bvs&chtt=Test5+Bar+Chart&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chxr=1%2C200%2C2000%2C200&chds=200%2C2000")
-  ]
-end
-
-def sparkline_options
-  [
-    { :title => "Test1 Sparkline", :colors => ['#437E9D', '#E6A65A'], :legend => "left", 
-      :backgroundColor => "#EFEFEF", :showAxisLines => false },
-    { :title => "Test2 Sparkline", :width =>  500, :height => 200, :color => '#437E9D', :legend => "right", 
-      :backgroundColor => "#FFFFFF", :showAxisLines => true },
-    { :title => "Test3 Sparkline", :width =>  500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "top", 
-      :showAxisLines => false },
-    { :title => "Test4 Sparkline", :width =>  500, :height => 200, :color => '#437E9D', :legend => "bottom", 
-      :showAxisLines => false },
-    { :title => "Test5 Sparkline", :width =>  500, :height => 200, :colors => ['#437E9D', '#E6A65A'], :legend => "none", 
-      :showAxisLines => false }
-  ]
+def base_chart_with_listener_js(div_class="div_class")
+  js  = "\n<script type='text/javascript'>"
+  js << "\n  google.load('visualization','1', {packages: ['basechart'], callback: function() {"
+  js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn('string', 'Year');data_table.addColumn('number', 'Sales');data_table.addColumn('number', 'Expenses');data_table.addRow([{v: '2004'}, {v: 1000}, {v: 400}]);data_table.addRow([{v: '2005'}, {v: 1200}, {v: 450}]);data_table.addRow([{v: '2006'}, {v: 1500}, {v: 600}]);data_table.addRow([{v: '2007'}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
+  js << "\n    chart.draw(data_table, {legend: 'Test Chart', width: 800, is3D: true});"
+  js << "\n    google.visualization.events.addListener(chart, 'select', function() {test_event(chart);});"
+  js << "\n  }});"
+  js << "\n</script>"
 end
-
-def sparkline_uris
-  [
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CEFEFEF&chdl=Sales%7CExpenses&chs=400x200&chxl=0%3A%7C%7C1%3A%7C%7C&cht=ls&chdlp=l&chtt=Test1+Sparkline&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chf=bg%2Cs%2CFFFFFF&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C%7C&cht=ls&chdlp=r&chtt=Test2+Sparkline&chco=437E9D&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C%7C1%3A%7C%7C&cht=ls&chdlp=t&chtt=Test3+Sparkline&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chdl=Sales%7CExpenses&chs=500x200&chxl=0%3A%7C%7C1%3A%7C%7C&cht=ls&chdlp=b&chtt=Test4+Sparkline&chco=437E9D&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a"),
-    URI.parse("https://chart.googleapis.com/chart?chxt=x%2Cy&chs=500x200&chxl=0%3A%7C%7C1%3A%7C%7C&cht=ls&chtt=Test5+Sparkline&chco=437E9D%2CE6A65A&chd=t%3A1000%2C1200%2C1500%2C800%7C400%2C450%2C600%2C500&chds=a")
-  ]
-end

metadata

@@ -1,60 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: google_visualr
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.1.4
   prerelease: 
-  version: 2.1.3
 platform: ruby
-authors: 
+authors:
 - Winston Teo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.15
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.6.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.0.9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.8
   type: :development
-  version_requirements: *id003
-description: This Ruby gem, GoogleVisualr, is a wrapper around the Google Chart Tools that allows anyone to create the same beautiful charts with just Ruby; you don't have to write any JavaScript at all.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.8
+description: This Ruby gem, GoogleVisualr, is a wrapper around the Google Chart Tools
+  that allows anyone to create the same beautiful charts with just Ruby; you don't
+  have to write any JavaScript at all.
+email:
 - winston.yongwei+google_visualr@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -155,30 +169,27 @@ files:
 - spec/support/common.rb
 homepage: https://github.com/winston/google_visualr
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: google_visualr
-rubygems_version: 1.8.13
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A Ruby wrapper around the Google Chart Tools that allows anyone to create the same beautiful charts with just plain Ruby.
+summary: A Ruby wrapper around the Google Chart Tools that allows anyone to create
+  the same beautiful charts with just plain Ruby.
 test_files: []
-