googlecharts 1.6.8 → 1.6.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 94b69525f188994f1689d2ba5014ca625662eee0
+  data.tar.gz: 856ca0857d23d0daf84a4bdbf9705a66963ff1ef
+SHA512:
+  metadata.gz: 81edf88de45d3c7ef7dcd3fb2b23ab969e37617c51b6437f12d8a200ef6f7b510fc3e05fa436639b74aae004208d6b5406d3268abcdf7c2755f3e45e77f4b940
+  data.tar.gz: cda6cd7a28b7fdbe91f609fecd606c24acef7f4f355aa88feb6c4971a7fd0d5f888a08ae23b7f362931a41cfd8742c05e8fa4efe17b7e8139aacffffe1eb41e4

data/.gitignore

@@ -1,4 +1,7 @@
 .DS_Store
 log/*
 .manifest
-pkg
+pkg
+.rspec
+.rvmrc
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - jruby

data/Gemfile

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+gemspec
+
+group :test do
+  gem 'rspec'
+  gem 'rake', '>= 0.8.7'
+end
+
+
+

data/History.txt

@@ -1,3 +1,9 @@
+== 1.6.10
+* added support for custom position on axis with label (parameter chxp)
+* refactored bar chart
+* fixed issue #44
+* allows GChart to take a theme 
+
 == 1.6.8
 * added title alignment support
 

data/README.markdown

@@ -1,3 +1,7 @@
+## Googlecharts
+
+[![Build Status](https://travis-ci.org/mattetti/googlecharts.png?branch=master)](https://travis-ci.org/mattetti/googlecharts)
+
 The goal of this Gem is to make the creation of Google Charts a simple and easy task.
     
     require 'googlecharts'
@@ -291,6 +295,7 @@ Multi Lines Chart Sample :
 
 	chart = Gchart.new(	:type => 'line',
 						:title => "example title",
+						:theme => :keynote,
 						:data => [[17, 17, 11, 8, 2],[10, 20, 15, 5, 7],[2, 3, 7, 9, 12]], 
 						:line_colors => 'e0440e,e62ae5,287eec',
 						:legend => ['courbe 1','courbe 2','courbe 3'],
@@ -313,4 +318,4 @@ try yourself
  "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://chart.apis.google.com/chart?cht=p&chs=400x200&chd=s:YMSG9&chtt=SDRuby+Fu+level&chl=matt|rob|patrick|ryan|jordan

data/Rakefile

@@ -1 +1,12 @@
-require 'rubygems'  
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |task|
+    task.pattern = "**/spec/*_spec.rb"
+    task.rspec_opts = []
+    task.rspec_opts << '--color'
+    task.rspec_opts << '-f documentation'
+end

data/googlecharts.gemspec

@@ -6,11 +6,11 @@ Gem::Specification.new do |s|
   s.name = %q{googlecharts}
   s.version = GchartInfo::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors = ["Matt Aimonetti", "Andrey Deryabin"]
-  s.date = %q{2011-05-21}
+  s.authors = ["Matt Aimonetti", "Andrey Deryabin", "Pedro Pimentel"]
+  s.date = %q{2014-12-15}
   s.summary = %q{Generate charts using Google API & Ruby}
   s.description = %q{Generate charts using Google API & Ruby}
-  s.email = %q{mattaimonetti@gmail.com deriabin@gmail.com}
+  s.email = %q{mattaimonetti@gmail.com deriabin@gmail.com zukunft@gmail.com}
   s.homepage = %q{http://googlecharts.rubyforge.org/}
 
   s.files         = `git ls-files`.split("\n")

data/lib/gchart.rb

@@ -38,14 +38,14 @@ class Gchart
     'chart.png'
   end
 
-  attr_accessor :title, :type, :width, :height, :curved, :horizontal, :grouped, :legend, :legend_position, :labels, :data, :encoding, :bar_colors,
-  :title_color, :title_size, :title_alignment, :custom, :axis_with_labels, :axis_labels, :bar_width_and_spacing, :id, :alt, :klass,
+  attr_accessor :title, :type, :width, :height, :curved, :horizontal, :grouped, :overlapped, :legend, :legend_position, :labels, :data, :encoding, :bar_colors,
+  :title_color, :title_size, :title_alignment, :custom, :axis_with_labels, :custom_axis_with_labels, :axis_labels, :bar_width_and_spacing, :id, :alt, :klass,
   :range_markers, :geographical_area, :map_colors, :country_codes, :axis_range, :filename, :min, :max, :colors, :usemap
 
   attr_accessor :bg_type, :bg_color, :bg_angle, :chart_type, :chart_color, :chart_angle, :axis_range, :thickness, :new_markers, :grid_lines, :use_ssl
 
   attr_accessor :min_value, :max_value
-  
+
   types.each do |type|
     instance_eval <<-DYNCLASSMETH
     def #{type}(options = {})
@@ -73,13 +73,21 @@ class Gchart
   end
 
   def initialize(options={})
+    # Allow Gchart to take a theme too
+    @theme = options[:theme] 
+    options = @theme ? Chart::Theme.load(@theme).to_options.merge(options) : options
+    options.delete(:theme)
+
     @type = options[:type] || 'line'
     @data = []
     @width = 300
     @height = 200
     @curved = false
     @horizontal = false
+
     @grouped = false
+    @overlapped = false
+
     @use_ssl = false
     @encoding = 'simple'
     # @max_value = 'auto'
@@ -106,11 +114,11 @@ class Gchart
   def size=(size='300x200')
     @width, @height = size.split("x").map { |dimension| dimension.to_i }
   end
-  
+
   def size
     "#{width}x#{height}"
   end
-  
+
   def dimensions
     # TODO: maybe others?
     [:line_xy, :scatter].include?(type) ? 2 : 1
@@ -125,9 +133,14 @@ class Gchart
     end
   end
 
-  # Sets the bar graph presentation (stacked or grouped)
-  def stacked=(option=true)
-    @grouped = option ? false : true
+  def bar_presentation
+    if @overlapped
+      'o'
+    elsif @grouped
+      'g'
+    else
+      's'
+    end
   end
 
   def bg=(options)
@@ -149,7 +162,7 @@ class Gchart
       @chart_angle = options[:angle]
     end
   end
-  
+
   def max_value=(max_v)
     if max_v =~ /false/
       @max_value = false
@@ -174,7 +187,7 @@ class Gchart
     ds.each_with_index do |mds, mds_index|
       mds[:min_value] ||= min_value
       mds[:max_value] ||= max_value
-      
+
       if mds_index == 0 && type.to_s == 'bar'
         # TODO: unless you specify a zero line (using chp or chds),
         #       the min_value of a bar chart is always 0.
@@ -235,7 +248,7 @@ class Gchart
       @dataset
     end
   end
-  
+
   # Sets of data to handle multiple sets
   def datasets
     datasets = []
@@ -248,7 +261,7 @@ class Gchart
     end
     datasets
   end
-  
+
   def self.jstize(string)
     # See http://github.com/mattetti/googlecharts/issues#issue/27
     #URI.escape( string ).gsub("%7C", "|")
@@ -313,7 +326,7 @@ class Gchart
   # The title size cannot be set without specifying a color.
   # A dark key will be used for the title color if no color is specified 
   def set_title
-    title_params = "chtt=#{title}"
+    title_params = "chtt=#{title}".gsub(/\|/,"\n")
     unless (title_color.nil? && title_size.nil? && title_alignment.nil?)
       title_params << "&chts=" + (color, size, alignment = (title_color || '454545'), title_size, (title_alignment.to_s[0,1] || 'c')).compact.join(',')
     end
@@ -460,6 +473,11 @@ class Gchart
     "chxt=#{axis_with_labels}"
   end
 
+  def set_custom_axis_with_labels
+    @custom_axis_with_labels = custom_axis_with_labels.join(',') if @custom_axis_with_labels.is_a?(Array)
+    "chxp=#{custom_axis_with_labels}"
+  end
+
   def set_axis_labels
     if axis_labels.is_a?(Array)
       if RUBY_VERSION.to_f < 1.9
@@ -519,7 +537,7 @@ class Gchart
     when 'radar'
       "r" + (curved? ? 's' : '')
     when 'bar'
-      "b" + (horizontal? ? "h" : "v") + (grouped? ? "g" : "s")
+      "b" + (horizontal? ? "h" : "v") + bar_presentation
     end
   end
 
@@ -530,7 +548,7 @@ class Gchart
     when 'stripes'  then 'ls'
     end
   end
-  
+
   def number_visible
     n = 0
     dataset.each do |mds|
@@ -543,7 +561,7 @@ class Gchart
     end
     ""
   end
-  
+
   # Turns input into an array of axis hashes, dependent on the chart type
   def convert_dataset(ds)
     if dimensions == 2
@@ -563,7 +581,7 @@ class Gchart
     end
     ds
   end
-  
+
   # just an alias
   def axis_set
     dataset
@@ -577,7 +595,7 @@ class Gchart
       value.nil? ? "_" : value
     end
   end
-  
+
   def convert_to_extended_value(number)
     if number.nil?
       '__'
@@ -586,7 +604,7 @@ class Gchart
       value.nil? ? "__" : value
     end
   end
-  
+
   def encode_scaled_dataset(chars, nil_char)
     dsets = []
     dataset.each do |ds|
@@ -655,6 +673,7 @@ class Gchart
   def query_builder(options="")
     query_params = instance_variables.sort.map do |var|
       case var.to_s
+
       when '@data'
         set_data unless data == []  
         # Set the graph size  
@@ -673,7 +692,7 @@ class Gchart
       when '@thickness'
         set_line_thickness
       when '@new_markers'
-          set_line_markers
+        set_line_markers
       when '@bg_color'
         set_colors
       when '@chart_color'
@@ -690,6 +709,8 @@ class Gchart
         set_range_markers
       when '@grid_lines'
         set_grid_lines
+      when '@custom_axis_with_labels'
+        set_custom_axis_with_labels
       when '@geographical_area'
         set_geographical_area
       when '@country_codes'

data/lib/gchart/aliases.rb

@@ -9,7 +9,6 @@ class Gchart
   alias_method :line_color=, :bar_colors=
   alias_method :slice_colors=, :bar_colors=
   alias_method :horizontal?, :horizontal
-  alias_method :grouped?, :grouped
   alias_method :curved?, :curved
 
 end

data/lib/gchart/version.rb

@@ -1,3 +1,3 @@
 module GchartInfo #:nodoc:
-  VERSION = "1.6.8"
+  VERSION = "1.6.10"
 end

data/spec/gchart_spec.rb

@@ -7,11 +7,16 @@ Chart::Theme.add_theme_file("#{File.dirname(__FILE__)}/fixtures/test_theme.yml")
 # http://rspec.rubyforge.org/
 describe "The Gchart class" do
   it "should show supported_types on error" do
-    Gchart.supported_types.should match(/line/)
+    expect(Gchart.supported_types).to match(/line/)
   end
 
   it "should return supported types" do
-    Gchart.types.include?('line').should be_true
+    expect(Gchart.types).to include('line')
+  end
+
+  it "should support theme option" do
+    chart = Gchart.new(:type => 'line',:theme => :test)
+    expect(chart.send('url')).to include('chco=6886B4,FDD84E')
   end
 end
 
@@ -21,121 +26,122 @@ describe "generating a default Gchart" do
     @chart = Gchart.line
   end
 
+  it "should create a line break when a pipe character is encountered" do
+    @chart = Gchart.line(:title => "title|subtitle")	
+    expect(@chart).to include("chtt=title\nsubtitle")
+  end
+
   it "should include the Google URL" do
-    @chart.include?("http://chart.apis.google.com/chart?").should be_true
+    expect(@chart).to include("http://chart.apis.google.com/chart?")
   end
 
   it "should have a default size" do
-    @chart.should include('chs=300x200')
+    expect(@chart).to include('chs=300x200')
   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
+    expect(Gchart.line(:size => '400x600')).to include('chs=400x600')
+    expect(Gchart.line(:width => 400, :height => 600)).to include('chs=400x600')
   end
 
   it "should have query parameters in predictable order" do
-    Gchart.line(:axis_with_labels => 'x,y,r', :size => '400x600').should match(/chxt=.+cht=.+chs=/)
+    expect(Gchart.line(:axis_with_labels => 'x,y,r', :size => '400x600')).to match(/chxt=.+cht=.+chs=/)
   end
 
   it "should have a type" do
-    @chart.include?('cht=lc').should be_true
+    expect(@chart).to include('cht=lc')
   end
 
   it 'should use theme defaults if theme is set' do
-    Gchart.line(:theme=>:test).should include('chco=6886B4,FDD84E')
-    if RUBY_VERSION.to_f < 1.9
-      Gchart.line(:theme=>:test).should include(Gchart.jstize('chf=c,s,FFFFFF|bg,s,FFFFFF')) 
-    else
-       Gchart.line(:theme=>:test).should include(Gchart.jstize('chf=bg,s,FFFFFF|c,s,FFFFFF'))
-    end
+    expect(Gchart.line(:theme=>:test)).to include('chco=6886B4,FDD84E')
+    expect(Gchart.line(:theme=>:test)).to match(/chf=(c,s,FFFFFF\|bg,s,FFFFFF|bg,s,FFFFFF\|c,s,FFFFFF)/)
   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]).should include('chd=s:A9')
-    Gchart.line(:data => [0, 26], :max_value => 26, :axis_with_labels => 'y').should include('chxr=0,0,26')
+    expect(Gchart.line(:data => [0, 26])).to include('chd=s:A9')
+    expect(Gchart.line(:data => [0, 26], :max_value => 26, :axis_with_labels => 'y')).to include('chxr=0,0,26')
   end
 
   it "should support simple encoding with and without max_value" do
-    Gchart.line(:data => [0, 26], :max_value => 26).should include('chd=s:A9')
-    Gchart.line(:data => [0, 26], :max_value => false).should include('chd=s:Aa')
+    expect(Gchart.line(:data => [0, 26], :max_value => 26)).to include('chd=s:A9')
+    expect(Gchart.line(:data => [0, 26], :max_value => false)).to include('chd=s:Aa')
   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',
+    expect(Gchart.line(:data => [0, 10], :encoding => 'extended', :max_value => false)).to include('chd=e:AA')
+    expect(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
+                )).to include('chd=e:AAAZAaAzA0A9A-A.,BABZBaBz.0')
   end
 
   it "should auto set the max value for extended encoding" do
-    Gchart.line(:data => [0, 25], :encoding => 'extended', :max_value => false).should include('chd=e:AAAZ')
+    expect(Gchart.line(:data => [0, 25], :encoding => 'extended', :max_value => false)).to include('chd=e:AAAZ')
     # Extended encoding max value is '..'
-    Gchart.line(:data => [0, 25], :encoding => 'extended').include?('chd=e:AA..').should be_true
+    expect(Gchart.line(:data => [0, 25], :encoding => 'extended')).to include('chd=e:AA..')
   end
 
   it "should be able to have data with text encoding" do
-    Gchart.line(:data => [10, 5.2, 4, 45, 78], :encoding => 'text').should include('chd=t:10,5.2,4,45,78')
+    expect(Gchart.line(:data => [10, 5.2, 4, 45, 78], :encoding => 'text')).to include('chd=t:10,5.2,4,45,78')
   end
 
   it "should be able to have missing data points with text encoding" do
-    Gchart.line(:data => [10, 5.2, nil, 45, 78], :encoding => 'text').should include('chd=t:10,5.2,_,45,78')
+    expect(Gchart.line(:data => [10, 5.2, nil, 45, 78], :encoding => 'text')).to include('chd=t:10,5.2,_,45,78')
   end
 
   it "should handle max and min values with text encoding" do
-    Gchart.line(:data => [10, 5.2, 4, 45, 78], :encoding => 'text').should include('chds=0,78')
+    expect(Gchart.line(:data => [10, 5.2, 4, 45, 78], :encoding => 'text')).to include('chds=0,78')
   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').should include('chds=-10,78')
+    expect(Gchart.line(:data => [-10, 5.2, 4, 45, 78], :encoding => 'text')).to include('chds=-10,78')
   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
+   expect(Gchart.line(:data => [-10, 5.2, 4, 45, 78], :encoding => 'text', :min_value => -20, :max_value => 100)).to include('chds=-20,100')
   end
 
   it "should set the proper axis values when using text encoding and negative values" do
-    Gchart.bar( :data       => [[-10], [100]],
+    expect(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")
+                :bar_colors => ['FD9A3B', '4BC7DC'])).to include("chxr=0,-20,100")
   end
 
   it "should be able to have multiple 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
+    expect(Gchart.line(:data => [[10, 5.2, 4, 45, 78], [20, 40, 70, 15, 99]], :encoding => 'text')).to include(Gchart.jstize('chd=t:10,5.2,4,45,78|20,40,70,15,99'))
   end
 
   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
+    expect(Gchart.line(:custom => 'ceci_est_une_pipe')).to include('ceci_est_une_pipe')
   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
+    expect(Gchart.line(:axis_with_labels => 'x,y,r')).to include('chxt=x,y,r')
+    expect(Gchart.line(:axis_with_labels => ['x','y','r'])).to include('chxt=x,y,r')
   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
+   expect(Gchart.line(:axis_labels => ['Jan|July|Jan|July|Jan', '0|100', 'A|B|C', '2005|2006|2007'])).to include(Gchart.jstize('chxl=0:|Jan|July|Jan|July|Jan|1:|0|100|2:|A|B|C|3:|2005|2006|2007'))
+   expect(Gchart.line(:axis_labels => ['Jan|July|Jan|July|Jan'])).to include(Gchart.jstize('chxl=0:|Jan|July|Jan|July|Jan'))
+   expect(Gchart.line(:axis_labels => [['Jan','July','Jan','July','Jan']])).to include(Gchart.jstize('chxl=0:|Jan|July|Jan|July|Jan'))
+   expect(Gchart.line(:axis_labels => [['Jan','July','Jan','July','Jan'], ['0','100'], ['A','B','C'], ['2005','2006','2007']])).to include(Gchart.jstize('chxl=0:|Jan|July|Jan|July|Jan|1:|0|100|2:|A|B|C|3:|2005|2006|2007'))
   end
-  
+
   def labeled_line(options = {})
     Gchart.line({:data => @data, :axis_with_labels => 'x,y'}.merge(options))
   end
 
   it "should display ranges properly" do
     @data = [85,107,123,131,155,172,173,189,203,222,217,233,250,239,256,267,247,261,275,295,288,305,322,307,325,347,331,346,363,382,343,359,383,352,374,393,358,379,396,416,377,398,419,380,409,426,453,432,452,465,436,460,480,440,457,474,501,457,489,507,347,373,413,402,424,448,475,488,513,475,507,530,440,476,500,518,481,512,531,367,396,423,387,415,446,478,442,469,492,463,489,508,463,491,518,549,503,526,547,493,530,549,493,520,541,564,510,535,564,492,512,537,502,530,548,491,514,538,568,524,548,568,512,533,552,577,520,545,570,516,536,555,514,536,566,521,553,579,604,541,569,595,551,581,602,549,576,606,631,589,615,650,597,624,646,672,605,626,654,584,608,631,574,597,622,559,591,614,644,580,603,629,584,615,631,558,591,618,641,314,356,395,397,429,450,421,454,477,507,458,490,560,593]
-    labeled_line(:axis_labels => [((1..24).to_a << 1)]).
-      should include('chxr=0,85,672')
+    expect(labeled_line(:axis_labels => [((1..24).to_a << 1)])).
+      to include('chxr=0,85,672')
   end
-  
+
   def labeled_bar(options = {})
     Gchart.bar({:data => @data,
             :axis_with_labels => 'x,y',
@@ -146,117 +152,115 @@ describe "generating a default Gchart" do
 
   it "should force the y range properly" do
     @data = [1,1,1,1,1,1,1,1,6,2,1,1]
-    labeled_bar(
+    expect(labeled_bar(
       :axis_range => [[0,0],[0,16]]
-    ).should include('chxr=0,0,0|1,0,16')
-    labeled_bar(
+    )).to include('chxr=0,0,0|1,0,16')
+    expect(labeled_bar(
       :max_value => 16,
       :axis_range => [[0,0],[0,16]]
-    ).should include('chxr=0,0,16|1,0,16')
+    )).to include('chxr=0,0,16|1,0,16')
 
     # nil means ignore axis
-    labeled_bar(
+    expect(labeled_bar(
       :axis_range => [nil,[0,16]]
-    ).should include('chxr=1,0,16')
+    )).to include('chxr=1,0,16')
 
     # empty array means take defaults
-    labeled_bar(
+    expect(labeled_bar(
       :max_value => 16,
       :axis_range => [[],[0,16]]
-    ).should include('chxr=0,0,16|1,0,16')
-    labeled_bar(
+    )).to include('chxr=0,0,16|1,0,16')
+    expect(labeled_bar(
       :axis_range => [[],[0,16]]
-    ).should include('chxr=0,0|1,0,16')
+    )).to include('chxr=0,0|1,0,16')
 
-    Gchart.line(
+    expect(Gchart.line(
             :data => [0,20, 40, 60, 140, 230, 60],
-            :axis_with_labels => 'y').should include("chxr=0,0,230")
+            :axis_with_labels => 'y')).to include("chxr=0,0,230")
   end
-  
+
   it "should take in consideration the max value when creating a range" do
     data = [85,107,123,131,155,172,173,189,203,222,217,233,250,239,256,267,247,261,275,295,288,305,322,307,325,347,331,346,363,382,343,359,383,352,374,393,358,379,396,416,377,398,419,380,409,426,453,432,452,465,436,460,480,440,457,474,501,457,489,507,347,373,413,402,424,448,475,488,513,475,507,530,440,476,500,518,481,512,531,367,396,423,387,415,446,478,442,469,492,463,489,508,463,491,518,549,503,526,547,493,530,549,493,520,541,564,510,535,564,492,512,537,502,530,548,491,514,538,568,524,548,568,512,533,552,577,520,545,570,516,536,555,514,536,566,521,553,579,604,541,569,595,551,581,602,549,576,606,631,589,615,650,597,624,646,672,605,626,654,584,608,631,574,597,622,559,591,614,644,580,603,629,584,615,631,558,591,618,641,314,356,395,397,429,450,421,454,477,507,458,490,560,593]
     url = Gchart.line(:data => data, :axis_with_labels => 'x,y', :axis_labels => [((1..24).to_a << 1)], :max_value => 700)
-    url.should include('chxr=0,85,700')
+    expect(url).to include('chxr=0,85,700')
   end
-  
+
   it 'should generate different labels and legend' do
-    Gchart.pie(:legend => %w(1 2 3), :labels=>%w(one two three)).should(include('chdl=1|2|3') && include('chl=one|two|three'))
+    expect(Gchart.pie(:legend => %w(1 2 3), :labels=>%w(one two three))).to(include('chdl=1|2|3') && include('chl=one|two|three'))
   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
+    expect(Gchart.line).to be_an_instance_of(String)
+    expect(Gchart.line).to include('cht=lc')
   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
+    expect(Gchart.sparkline).to be_an_instance_of(String)
+    expect(Gchart.sparkline).to include('cht=ls')
   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
+    expect(Gchart.line_xy).to be_an_instance_of(String)
+    expect(Gchart.line_xy).to include('cht=lxy')
   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
+    expect(Gchart.scatter).to be_an_instance_of(String)
+    expect(Gchart.scatter).to include('cht=s')
   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
+    expect(Gchart.bar).to be_an_instance_of(String)
+    expect(Gchart.bar).to include('cht=bvs')
   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
+    expect(Gchart.venn).to be_an_instance_of(String)
+    expect(Gchart.venn).to include('cht=v')
   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
+    expect(Gchart.pie).to be_an_instance_of(String)
+    expect(Gchart.pie).to include('cht=p')
   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
+    expect(Gchart.meter).to be_an_instance_of(String)
+    expect(Gchart.meter).to include('cht=gom')
   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
+    expect(Gchart.map).to be_an_instance_of(String)
+    expect(Gchart.map).to include('cht=t')
   end
 
   it "should not support other types" do
     msg = "sexy is not a supported chart format. Please use one of the following: #{Gchart.supported_types}."
-    lambda{Gchart.sexy}.should raise_error(NoMethodError)
+    expect{Gchart.sexy}.to raise_error(NoMethodError)
   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
+    expect(Gchart.line(:range_markers => {:start_position => 0.59, :stop_position => 0.61, :color => 'ff0000'})).to include('chm=r,ff0000,0,0.59,0.61')
   end
 
   it "should be able to generate given an array of range-marker hash options" do
-    Gchart.line(:range_markers => [
+    expect(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
+        ])).to include(Gchart.jstize('r,ff0000,0,0.59,0.61|r,666666,0,0,0.6|r,cccccc,0,0.6,1'))
   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
+    expect(Gchart.line(:range_markers => {:start_position => 0.59, :stop_position => 0.61, :color => 'ffffff', :overlaid? => true})).to include('chm=r,ffffff,0,0.59,0.61,1')
+    expect(Gchart.line(:range_markers => {:start_position => 0.59, :stop_position => 0.61, :color => 'ffffff', :overlaid? => false})).to include('chm=r,ffffff,0,0.59,0.61')
   end
 
   describe "when setting the orientation option" do
@@ -265,75 +269,76 @@ describe "range markers" do
     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
+      expect(Gchart.line(:range_markers => @options.merge(:orientation => 'v'))).to include('chm=R')
+      expect(Gchart.line(:range_markers => @options.merge(:orientation => 'V'))).to include('chm=R')
+      expect(Gchart.line(:range_markers => @options.merge(:orientation => 'R'))).to include('chm=R')
+      expect(Gchart.line(:range_markers => @options.merge(:orientation => 'vertical'))).to include('chm=R')
+      expect(Gchart.line(:range_markers => @options.merge(:orientation => 'Vertical'))).to include('chm=R')
     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
+      expect(Gchart.line(:range_markers => @options.merge(:orientation => 'horizontal'))).to include('chm=r')
+      expect(Gchart.line(:range_markers => @options.merge(:orientation => 'h'))).to include('chm=r')
+      expect(Gchart.line(:range_markers => @options.merge(:orientation => 'etc'))).to include('chm=r')
     end
 
     it "if left blank defaults to horizontal (r)" do
-      Gchart.line(:range_markers => @options).include?('chm=r').should be_true
+      expect(Gchart.line(:range_markers => @options)).to include('chm=r')
     end
   end
-
 end
 
 
 describe "a bar graph" do
 
   it "should have a default vertical orientation" do
-    Gchart.bar.include?('cht=bvs').should be_true
+    expect(Gchart.bar).to include('cht=bvs')
   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
-    Gchart.bar(:orientation => 'h').include?('cht=bhs').should be_true
-    Gchart.bar(:orientation => 'horizontal').include?('cht=bhs').should be_true
-    Gchart.bar(:horizontal => false).include?('cht=bvs').should be_true
+    expect(Gchart.bar(:orientation => 'vertical')).to include('cht=bvs')
+    expect(Gchart.bar(:orientation => 'v')).to include('cht=bvs')
+    expect(Gchart.bar(:orientation => 'h')).to include('cht=bhs')
+    expect(Gchart.bar(:orientation => 'horizontal')).to include('cht=bhs')
+    expect(Gchart.bar(:horizontal => false)).to include('cht=bvs')
   end
 
   it "should be set to be stacked by default" do
-    Gchart.bar.include?('cht=bvs').should be_true
+    expect(Gchart.bar).to include('cht=bvs')
   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
+  it "should be able to stacked, grouped or overlapped" do
+    expect(Gchart.bar(:stacked => true)).to include('cht=bvs')
+    expect(Gchart.bar(:stacked => false)).to include('cht=bvs')
+    expect(Gchart.bar(:grouped => true)).to include('cht=bvg')
+    expect(Gchart.bar(:grouped => false)).to include('cht=bvs')
+    expect(Gchart.bar(:overlapped => true)).to include('cht=bvo')
+    expect(Gchart.bar(:overlapped => false)).to include('cht=bvs')
   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
+    expect(Gchart.bar(:bar_colors => 'efefef,00ffff')).to include('chco=')
+    expect(Gchart.bar(:bar_colors => 'efefef,00ffff')).to include('chco=efefef,00ffff')
     # alias
-    Gchart.bar(:bar_color => 'efefef').include?('chco=efefef').should be_true
+    expect(Gchart.bar(:bar_color => 'efefef')).to include('chco=efefef')
   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
+    expect(Gchart.bar(:bar_colors => ['efefef','00ffff'])).to include('chco=efefef,00ffff')
   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
+    expect(Gchart.bar(:bar_width_and_spacing => '25,6')).to include('chbh=25,6')
   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
+    expect(Gchart.bar(:bar_width_and_spacing => 25)).to include('chbh=25')
   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
+    expect(Gchart.bar(:bar_width_and_spacing => [25,6,12])).to include('chbh=25,6,12')
+    expect(Gchart.bar(:bar_width_and_spacing => [25,6])).to include('chbh=25,6')
+    expect(Gchart.bar(:bar_width_and_spacing => [25])).to include('chbh=25')
   end
 
   describe "with a hash of width and spacing options" do
@@ -345,19 +350,36 @@ describe "a bar graph" do
     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
+      expect(Gchart.bar(:bar_width_and_spacing => {:width => 19})).to include("chbh=19,#{@default_spacing},#{@default_group_spacing}")
     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
+      expect(Gchart.bar(:bar_width_and_spacing => {:spacing => 19})).to include("chbh=#{@default_width},19,#{@default_group_spacing}")
     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
+      expect(Gchart.bar(:bar_width_and_spacing => {:group_spacing => 19})).to include("chbh=#{@default_width},#{@default_spacing},19")
     end
+  end
+end
+
+describe "a radar chart" do
+
+  before(:each) do
+    @chart = Gchart.radar(:title => 'Chart Title')
+  end
 
+  it "should be able have a chart title" do
+    expect(@chart).to include("chtt=Chart+Title")
   end
 
+  it "should allow axis labels positions to be used" do
+    expect(Gchart.radar(:custom_axis_with_labels => '0,0,50,100')).to include('chxp=0,0,50,100')
+  end
+  
+  it "should allow array of axis labels positions to be used " do
+    expect(Gchart.radar(:custom_axis_with_labels => ['0', '0', '50', '100'])).to include('chxp=0,0,50,100')
+  end
 end
 
 describe "a line chart" do
@@ -369,80 +391,73 @@ describe "a line chart" do
   end
 
   it 'should be able have a chart title' do
-    @chart.include?("chtt=Chart+Title").should be_true
+    expect(@chart).to include("chtt=Chart+Title")
   end
 
   it "should be able to a custom color, size and alignment for 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
-     Gchart.line(:title => @title, :title_size => '20', :title_alignment => :left).include?('chts=454545,20,l').should be_true
+     expect(Gchart.line(:title => @title, :title_color => 'FF0000')).to include('chts=FF0000')
+     expect(Gchart.line(:title => @title, :title_size => '20')).to include('chts=454545,20')
+     expect(Gchart.line(:title => @title, :title_size => '20', :title_alignment => :left)).to include('chts=454545,20,l')
   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
+    expect(@chart).to include(Gchart.jstize("chdl=first+data+set+label|n+data+set+label"))
   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
+    expect(chart).to include(Gchart.jstize("chdl=first+data+%26+set+label|n+data+set+label"))
   end
 
   it "should be able to have one legend" do
     chart = Gchart.line(:legend => 'legend label')
-    chart.include?("chdl=legend+label").should be_true
+    expect(chart).to include("chdl=legend+label")
   end
-  
+
   it "should be able to set the position of the legend" do
     title = 'Chart & Title'
     legend = ['first data & set label', 'n data set label']
-    
+
     chart = Gchart.line(:title => title, :legend => legend, :legend_position => :bottom_vertical)
-    chart.include?("chdlp=bv").should be_true
-    
+    expect(chart).to include("chdlp=bv")
+
     chart = Gchart.line(:title => title, :legend => legend, :legend_position => 'r')
-    chart.include?("chdlp=r").should be_true
+    expect(chart).to include("chdlp=r")
   end
 
   it "should be able to set the background fill" do
-    Gchart.line(:bg => 'efefef').should include("chf=bg,s,efefef")
-    Gchart.line(:bg => {:color => 'efefef', :type => 'solid'}).should include("chf=bg,s,efefef")
+    expect(Gchart.line(:bg => 'efefef')).to include("chf=bg,s,efefef")
+    expect(Gchart.line(:bg => {:color => 'efefef', :type => 'solid'})).to include("chf=bg,s,efefef")
 
-    Gchart.line(:bg => {:color => 'efefef', :type => 'gradient'}).should include("chf=bg,lg,0,efefef,0,ffffff,1")
-    Gchart.line(:bg => {:color => 'efefef,0,ffffff,1', :type => 'gradient'}).should include("chf=bg,lg,0,efefef,0,ffffff,1")
-    Gchart.line(:bg => {:color => 'efefef', :type => 'gradient', :angle => 90}).should include("chf=bg,lg,90,efefef,0,ffffff,1")
+    expect(Gchart.line(:bg => {:color => 'efefef', :type => 'gradient'})).to include("chf=bg,lg,0,efefef,0,ffffff,1")
+    expect(Gchart.line(:bg => {:color => 'efefef,0,ffffff,1', :type => 'gradient'})).to include("chf=bg,lg,0,efefef,0,ffffff,1")
+    expect(Gchart.line(:bg => {:color => 'efefef', :type => 'gradient', :angle => 90})).to include("chf=bg,lg,90,efefef,0,ffffff,1")
 
-    Gchart.line(:bg => {:color => 'efefef', :type => 'stripes'}).should include("chf=bg,ls,90,efefef,0.2,ffffff,0.2")
+    expect(Gchart.line(:bg => {:color => 'efefef', :type => 'stripes'})).to include("chf=bg,ls,90,efefef,0.2,ffffff,0.2")
   end
 
   it "should be able to set a graph fill" do
-    Gchart.line(:graph_bg => 'efefef').should include("chf=c,s,efefef")
-    Gchart.line(:graph_bg => {:color => 'efefef', :type => 'solid'}).include?("chf=c,s,efefef").should be_true
-    Gchart.line(:graph_bg => {:color => 'efefef', :type => 'gradient'}).include?("chf=c,lg,0,efefef,0,ffffff,1").should be_true
-    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
+    expect(Gchart.line(:graph_bg => 'efefef')).to include("chf=c,s,efefef")
+    expect(Gchart.line(:graph_bg => {:color => 'efefef', :type => 'solid'})).to include("chf=c,s,efefef")
+    expect(Gchart.line(:graph_bg => {:color => 'efefef', :type => 'gradient'})).to include("chf=c,lg,0,efefef,0,ffffff,1")
+    expect(Gchart.line(:graph_bg => {:color => 'efefef,0,ffffff,1', :type => 'gradient'})).to include("chf=c,lg,0,efefef,0,ffffff,1")
+    expect(Gchart.line(:graph_bg => {:color => 'efefef', :type => 'gradient', :angle => 90})).to include("chf=c,lg,90,efefef,0,ffffff,1")
   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
-    if RUBY_VERSION.to_f < 1.9
-      Gchart.line(:bg => 'efefef', :graph_bg => '76A4FB').include?(Gchart.jstize("chf=c,s,76A4FB|bg,s,efefef")).should be_true      
-    else
-      Gchart.line(:bg => 'efefef', :graph_bg => '76A4FB').include?(Gchart.jstize("chf=bg,s,efefef|c,s,76A4FB")).should be_true
-    end
+    expect(Gchart.line(:bg => 'efefef', :graph_bg => '76A4FB')).to match /chf=(bg,s,efefef\|c,s,76A4FB|c,s,76A4FB\|bg,s,efefef)/
   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
+    expect(Gchart.line(:line_colors => 'efefef|00ffff')).to include(Gchart.jstize('chco=efefef|00ffff'))
+    expect(Gchart.line(:line_color => 'efefef|00ffff')).to include(Gchart.jstize('chco=efefef|00ffff'))
   end
 
   it "should be able to render a graph where all the data values are 0" do
-    Gchart.line(:data => [0, 0, 0]).should include("chd=s:AAA")
+    expect(Gchart.line(:data => [0, 0, 0])).to include("chd=s:AAA")
   end
-
 end
 
 describe "a sparkline chart" do
@@ -456,61 +471,54 @@ describe "a sparkline chart" do
   end
 
   it "should create a sparkline" do
-    @chart.include?('cht=ls').should be_true
+    expect(@chart).to include('cht=ls')
   end
 
   it 'should be able have a chart title' do
-    @chart.include?("chtt=Chart+Title").should be_true
+    expect(@chart).to include("chtt=Chart+Title")
   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
+     expect(Gchart.sparkline(:title => @title, :title_color => 'FF0000')).to include('chts=FF0000')
+     expect(Gchart.sparkline(:title => @title, :title_size => '20')).to include('chts=454545,20')
   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
+    expect(@chart).to include(Gchart.jstize("chdl=first+data+set+label|n+data+set+label"))
   end
 
   it "should be able to have one legend" do
     chart = Gchart.sparkline(:legend => 'legend label')
-    chart.include?("chdl=legend+label").should be_true
+    expect(chart).to include("chdl=legend+label")
   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
+    expect(Gchart.sparkline(:bg => 'efefef')).to include("chf=bg,s,efefef")
+    expect(Gchart.sparkline(:bg => {:color => 'efefef', :type => 'solid'})).to include("chf=bg,s,efefef")
 
-    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
+    expect(Gchart.sparkline(:bg => {:color => 'efefef', :type => 'gradient'})).to include("chf=bg,lg,0,efefef,0,ffffff,1")
+    expect(Gchart.sparkline(:bg => {:color => 'efefef,0,ffffff,1', :type => 'gradient'})).to include("chf=bg,lg,0,efefef,0,ffffff,1")
+    expect(Gchart.sparkline(:bg => {:color => 'efefef', :type => 'gradient', :angle => 90})).to include("chf=bg,lg,90,efefef,0,ffffff,1")
 
-    Gchart.sparkline(:bg => {:color => 'efefef', :type => 'stripes'}).include?("chf=bg,ls,90,efefef,0.2,ffffff,0.2").should be_true
+    expect(Gchart.sparkline(:bg => {:color => 'efefef', :type => 'stripes'})).to include("chf=bg,ls,90,efefef,0.2,ffffff,0.2")
   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
-    Gchart.sparkline(:graph_bg => {:color => 'efefef', :type => 'gradient'}).include?("chf=c,lg,0,efefef,0,ffffff,1").should be_true
-    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
+    expect(Gchart.sparkline(:graph_bg => 'efefef')).to include("chf=c,s,efefef")
+    expect(Gchart.sparkline(:graph_bg => {:color => 'efefef', :type => 'solid'})).to include("chf=c,s,efefef")
+    expect(Gchart.sparkline(:graph_bg => {:color => 'efefef', :type => 'gradient'})).to include("chf=c,lg,0,efefef,0,ffffff,1")
+    expect(Gchart.sparkline(:graph_bg => {:color => 'efefef,0,ffffff,1', :type => 'gradient'})).to include("chf=c,lg,0,efefef,0,ffffff,1")
+    expect(Gchart.sparkline(:graph_bg => {:color => 'efefef', :type => 'gradient', :angle => 90})).to include("chf=c,lg,90,efefef,0,ffffff,1")
   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
-    if RUBY_VERSION.to_f < 1.9
-      Gchart.sparkline(:bg => 'efefef', :graph_bg => '76A4FB').include?(Gchart.jstize("chf=c,s,76A4FB|bg,s,efefef")).should be_true
-    else
-      Gchart.sparkline(:bg => 'efefef', :graph_bg => '76A4FB').include?(Gchart.jstize("chf=bg,s,efefef|c,s,76A4FB")).should be_true
-    end
+    expect(Gchart.sparkline(:bg => 'efefef', :graph_bg => '76A4FB')).to match(/chf=(bg,s,efefef\|c,s,76A4FB|c,s,76A4FB\|bg,s,efefef)/)
   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
+    expect(Gchart.sparkline(:line_colors => 'efefef|00ffff')).to include(Gchart.jstize('chco=efefef|00ffff'))
+    expect(Gchart.sparkline(:line_color => 'efefef|00ffff')).to include(Gchart.jstize('chco=efefef|00ffff'))
   end
-
 end
 
 describe "a 3d pie chart" do
@@ -524,13 +532,12 @@ describe "a 3d pie chart" do
   end
 
   it "should create a pie" do
-    @chart.include?('cht=p').should be_true
+    expect(@chart).to include('cht=p')
   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
+    expect(Gchart.pie_3d(:title => @title, :legend => @legend, :data => @data)).to include('cht=p3')
   end
-
 end
 
 describe "a google-o-meter" do
@@ -543,19 +550,18 @@ describe "a google-o-meter" do
   end
 
   it "should create a meter" do
-    @chart.include?('cht=gom').should be_true
+    expect(@chart).to include('cht=gom')
   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
+    expect(Gchart.meter(:bg => 'efefef')).to include("chf=bg,s,efefef")
+    expect(Gchart.meter(:bg => {:color => 'efefef', :type => 'solid'})).to include("chf=bg,s,efefef")
   end
 
   it "should be able to set labels by using the legend or labesl accessor" do
-    Gchart.meter(:title => @title, :labels => @legend, :data => @data).should include("chl=#{@jstized_legend}")
-    Gchart.meter(:title => @title, :labels => @legend, :data => @data).should == Gchart.meter(:title => @title, :legend => @legend, :data => @data)
+    expect(Gchart.meter(:title => @title, :labels => @legend, :data => @data)).to include("chl=#{@jstized_legend}")
+    expect(Gchart.meter(:title => @title, :labels => @legend, :data => @data)).to eq(Gchart.meter(:title => @title, :legend => @legend, :data => @data))
   end
-
 end
 
 describe "a map chart" do
@@ -571,81 +577,80 @@ describe "a map chart" do
   end
 
   it "should create a map" do
-    @chart.include?('cht=t').should be_true
+    expect(@chart).to include('cht=t')
   end
 
   it "should set the geographical area" do
-    @chart.include?('chtm=usa').should be_true
+    expect(@chart).to include('chtm=usa')
   end
 
   it "should set the map colors" do
-    @chart.include?('chco=FFFFFF,FF0000,FFFF00,00FF00').should be_true
+    expect(@chart).to include('chco=FFFFFF,FF0000,FFFF00,00FF00')
   end
 
   it "should set the country/state codes" do
-    @chart.include?('chld=MTWYIDSD').should be_true
+    expect(@chart).to include('chld=MTWYIDSD')
   end
 
   it "should set the chart data" do
-    @chart.include?('chd=t:0,100,50,32').should be_true
+    expect(@chart).to include('chd=t:0,100,50,32')
   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])
+    expect(Gchart.line(:data => [0, 26], :format => 'url')).to eq(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" \/>/)
+    expect(Gchart.line(:data => [0, 26], :format => 'image_tag')).to 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" \/>/)
+    expect(Gchart.line(:data => [0, 26], :format => 'img_tag')).to 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" \/>/)
+    expect(Gchart.line(:data => [0, 26], :format => 'image_tag', :size => '400x400')).to 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" \/>/)
+    expect(Gchart.line(:data => [0, 26], :format => 'image_tag', :alt => 'Sexy chart')).to 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" \/>/)
+    expect(Gchart.line(:data => [0, 26], :format => 'image_tag', :title => 'Sexy chart')).to 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" \/>/)
+    expect(Gchart.line(:data => [0, 26], :format => 'image_tag', :id => 'chart')).to 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" \/>/)
+    expect(Gchart.line(:data => [0, 26], :format => 'image_tag', :class => 'chart')).to 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;" }
+    expect(Gchart.line(:data => [0, 26])).to include "&"
+    expect(Gchart.line(:data => [0, 26])).not_to 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;" }
+    expect(Gchart.line(:data => [0, 26], :format => 'image_tag', :class => 'chart')).to satisfy {|chart| expect(chart).to 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
+    expect(File.exist?('chart.png')).to be
     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
+    expect(File.exist?('custom_file_name.png')).to be
     File.delete('custom_file_name.png') if File.exist?('custom_file_name.png')
   end
 
@@ -658,21 +663,22 @@ describe 'exporting a chart' do
                 :format => "file",
                 :filename => "foo.png"
                 )
-    File.exist?('foo.png').should be_true
+    expect(File.exist?('foo.png')).to be
     File.delete('foo.png') if File.exist?('foo.png')
   end
-
 end
 
 describe 'SSL support' do
   it 'should change url if is presented' do
-    Gchart.line(:use_ssl => true).should include('https://chart.googleapis.com/chart?')
+    expect(Gchart.line(:use_ssl => true)).to include('https://chart.googleapis.com/chart?')
   end
-  
+
   it "should be available as a file" do
+    pending "unexpected error under Travis CI (should be fixed using http://martinottenwaelter.fr/2010/12/ruby19-and-the-ssl-error/)"
     File.delete('chart.png') if File.exist?('chart.png')
     Gchart.line(:data => [0, 26], :format => 'file', :use_ssl => true)
-    File.exist?('chart.png').should be_true
+    expect(File.exist?('chart.png')).to be_true
     File.delete('chart.png') if File.exist?('chart.png')
   end
 end
+