googlecharts 1.6.0 → 1.6.1

data/README.markdown

@@ -1,5 +1,6 @@
 The goal of this Gem is to make the creation of Google Charts a simple and easy task.
-
+    
+    require 'googlecharts'
     Gchart.line(  :size => '200x300', 
                   :title => "example title",
                   :bg => 'efefef',
@@ -175,13 +176,42 @@ Multiple axis labels are available for line charts, bar charts and scatter plots
 * y = left y-axis
 * r = right y-axis
 
-    Gchart.line(:label_axis => 'x,y,r')
+    Gchart.line(:axis_with_label => 'x,y,r,t')
   
 To add labels on these axis:
 
-    Gchart.line(:axis_labels => ['Jan|July|Jan|July|Jan', '0|100', 'A|B|C', '2005|2006|2007'])
+    Gchart.line(:axis_with_label => 'x,y,r,t',
+                :axis_labels => ['Jan|July|Jan|July|Jan', '0|100', 'A|B|C', '2005|2006|2007'])
+
+Note that each array entry could also be an array but represent the
+labels for the corresponding axis.
+
+A question which comes back often is how do I only display the y axis
+label? Solution:
+
+    Gchart.line(
+            :data => [0,20, 40, 60, 140, 230, 60],
+            :axis_with_labels => 'y')
+
+Custom axis ranges
+---------------
+
+If you want to display a custom range for an axis, you need to set the
+range as described in the Google charts documentation: min, max, step:
+
+     Gchart.line( :data => [17, 17, 11, 8, 2], 
+                  :axis_with_labels => ['x', 'y'], 
+                  :axis_labels => [['J', 'F', 'M', 'A', 'M']], 
+                  :axis_range => [nil, [2,17,5]])
 
+
+In this case, the custom axis range is only defined for y (second
+entry) with a minimum value of 2, max 17 and a step of 5.
+
+This is also valid if you want to set a x axis and automatically define
+the y labels.
     
+
 Data options
 -------------
 

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/lib/gchart.rb

@@ -35,7 +35,7 @@ class Gchart
 
   attr_accessor :title, :type, :width, :height, :curved, :horizontal, :grouped, :legend, :data, :encoding, :bar_colors,
   :title_color, :title_size, :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
+  :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 
 
@@ -64,7 +64,7 @@ class Gchart
   end
 
   def self.method_missing(m, options={})
-    raise NoMethodError, "#{m} is not a supported chart format, please use one of the following: #{supported_types}."
+    raise NoMethodError, "#{m} is not a supported chart format. Please use one of the following: #{supported_types}."
   end
 
   def initialize(options={})
@@ -91,9 +91,8 @@ class Gchart
     end
   end
 
-  
   def self.supported_types
-    self.class.types.join(' ')
+    self.types.join(' ')
   end
 
   # Defines the Graph size using the following format:
@@ -102,10 +101,6 @@ class Gchart
     @width, @height = size.split("x").map { |dimension| dimension.to_i }
   end
   
-  def size=(size='300x200')
-    @width, @height = size.split("x").map { |dimension| dimension.to_i }
-  end
-
   def size
     "#{width}x#{height}"
   end
@@ -249,9 +244,11 @@ class Gchart
   end
   
   def self.jstize(string)
+    # See http://github.com/mattetti/googlecharts/issues#issue/27
+    #URI.escape( string ).gsub("%7C", "|")
     # See discussion: http://github.com/mattetti/googlecharts/commit/9b5cfb93aa51aae06611057668e631cd515ec4f3#comment_51347
     string.gsub(' ', '+').gsub(/\[|\{|\}|\\|\^|\[|\]|\`|\]/) {|c| "%#{c[0].to_s.upcase}"}
-    # string.gsub(' ', '+').gsub(/\[|\{|\}|\||\\|\^|\[|\]|\`|\]/) {|c| "%#{c[0].to_s.upcase}"}
+    #string.gsub(' ', '+').gsub(/\[|\{|\}|\||\\|\^|\[|\]|\`|\]/) {|c| "%#{c[0].to_s.upcase}"}
   end    
   # load all the custom aliases
   require 'gchart/aliases'
@@ -283,6 +280,7 @@ class Gchart
     image += " height=\"#{height}\""
     image += " alt=\"#{alt}\""
     image += " title=\"#{title}\"" if title
+    image += " usemap=\"#{usemap}\"" if usemap
     image += " />"
   end
 
@@ -451,8 +449,6 @@ class Gchart
         "#{index}:|#{labels}"
       end
     end
-    count = labels_arr.length
-    
     "chxl=#{labels_arr.join('|')}"
   end
 
@@ -466,16 +462,14 @@ class Gchart
 
     return unless set && set.respond_to?(:each) && set.find {|o| o}.respond_to?(:each)
 
-    # in the case of a line graph, the first axis range should 1
-    index_increase = type.to_s == 'line' ? 1 : 0
     'chxr=' + set.enum_for(:each_with_index).map do |axis_range, index|
       next nil if axis_range.nil? # ignore this axis
       min, max, step = axis_range
-      if axis_range.size > 3 or step && max && step > max # this is a full series
-        max = axis_range.last
+      if axis_range.size > 3 || step && max && step > max # this is a full series
+        max = axis_range.compact.max
         step = nil
       end
-      [(index + index_increase), (min_value || min || 0), (max_value || max), step].compact.join(',')
+      [index, (min_value || min || 0), (max_value || max), step].compact.join(',')
     end.compact.join("|")
   end
 
@@ -616,7 +610,7 @@ class Gchart
   #
   def text_encoding
     chds = dataset.map{|ds| "#{ds[:min_value]},#{ds[:max_value]}" }.join(",")
-    "t" + number_visible + ":" + datasets.map{ |ds| ds.join(',') }.join('|') + "&chds=" + chds
+    "t" + number_visible + ":" + datasets.map{ |ds| ds.map{|e|e||'_'}.join(',') }.join('|') + "&chds=" + chds
   end
 
   # http://code.google.com/apis/chart/#extended

data/lib/gchart/aliases.rb

@@ -7,6 +7,7 @@ class Gchart
   alias_method :bar_color=, :bar_colors=
   alias_method :line_colors=, :bar_colors=
   alias_method :line_color=, :bar_colors=
+  alias_method :slice_colors=, :bar_colors=
   alias_method :labels=, :legend=
   alias_method :horizontal?, :horizontal
   alias_method :grouped?, :grouped

data/spec/gchart_spec.rb

@@ -5,6 +5,16 @@ Chart::Theme.add_theme_file("#{File.dirname(__FILE__)}/fixtures/test_theme.yml")
 
 # Time to add your specs!
 # http://rspec.rubyforge.org/
+describe "The Gchart class" do
+  it "should show supported_types on error" do
+    Gchart.supported_types.should match(/line/)
+  end
+
+  it "should return supported types" do
+    Gchart.types.include?('line').should be_true
+  end
+end
+
 describe "generating a default Gchart" do
 
   before(:each) do
@@ -44,7 +54,7 @@ describe "generating a default Gchart" do
   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).should include('chxr=1,0,26')
+    Gchart.line(:data => [0, 26], :max_value => 26, :axis_with_labels => 'y').should include('chxr=0,0,26')
   end
 
   it "should support simple encoding with and without max_value" do
@@ -70,6 +80,10 @@ describe "generating a default Gchart" do
     Gchart.line(:data => [10, 5.2, 4, 45, 78], :encoding => 'text').should 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')
+  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')
   end
@@ -92,7 +106,7 @@ describe "generating a default Gchart" do
                 :bar_colors => ['FD9A3B', '4BC7DC']).should include("chxr=0,-20,100")
   end
 
-  it "should be able to have muliple set of data with text encoding" do
+  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
   end
 
@@ -113,19 +127,19 @@ describe "generating a default Gchart" do
   end
   
   def labeled_line(options = {})
-    Gchart.line({:data => @data, :axis_with_labels => 'x,y'}.merge 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.upto(24).to_a << 1)]).
-      should include('chxr=1,85,593')
+    labeled_line(:axis_labels => [((1..24).to_a << 1)]).
+      should include('chxr=0,85,672')
   end
   
   def labeled_bar(options = {})
     Gchart.bar({:data => @data,
             :axis_with_labels => 'x,y',
-            :axis_labels => [1.upto(12).to_a],
+            :axis_labels => [(1..12).to_a],
             :encoding => "text"
     }.merge(options))
   end
@@ -153,12 +167,16 @@ describe "generating a default Gchart" do
     labeled_bar(
       :axis_range => [[],[0,16]]
     ).should include('chxr=0,0|1,0,16')
+
+    Gchart.line(
+            :data => [0,20, 40, 60, 140, 230, 60],
+            :axis_with_labels => 'y').should 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.upto(24).to_a << 1)], :max_value => 700)
-    url.should include('chxr=1,85,700')
+    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')
   end
 
 end
@@ -211,8 +229,8 @@ describe "generating different type of charts" do
   end
 
   it "should not support other types" do
-    lambda{Gchart.sexy}.should raise_error
-    # msg => "sexy is not a supported chart format, please use one of the following: #{Gchart.supported_types}."
+    msg = "sexy is not a supported chart format. Please use one of the following: #{Gchart.supported_types}."
+    lambda{Gchart.sexy}.should raise_error(NoMethodError)
   end
 
 end
@@ -239,25 +257,25 @@ describe "range markers" do
 
   describe "when setting the orientation option" do
     before(:each) do
-      options = {:start_position => 0.59, :stop_position => 0.61, :color => 'ff0000'}
+      @options = {:start_position => 0.59, :stop_position => 0.61, :color => 'ff0000'}
     end
 
     it "to vertical (R) if given a valid option" do
-      Gchart.line(:range_markers => options.merge(:orientation => 'v')).include?('chm=R').should be_true
-      Gchart.line(:range_markers => options.merge(:orientation => 'V')).include?('chm=R').should be_true
-      Gchart.line(:range_markers => options.merge(:orientation => 'R')).include?('chm=R').should be_true
-      Gchart.line(:range_markers => options.merge(:orientation => 'vertical')).include?('chm=R').should be_true
-      Gchart.line(:range_markers => options.merge(:orientation => 'Vertical')).include?('chm=R').should be_true
+      Gchart.line(:range_markers => @options.merge(:orientation => 'v')).include?('chm=R').should be_true
+      Gchart.line(:range_markers => @options.merge(:orientation => 'V')).include?('chm=R').should be_true
+      Gchart.line(:range_markers => @options.merge(:orientation => 'R')).include?('chm=R').should be_true
+      Gchart.line(:range_markers => @options.merge(:orientation => 'vertical')).include?('chm=R').should be_true
+      Gchart.line(:range_markers => @options.merge(:orientation => 'Vertical')).include?('chm=R').should be_true
     end
 
     it "to horizontal (r) if given a valid option (actually anything other than the vertical options)" do
-      Gchart.line(:range_markers => options.merge(:orientation => 'horizontal')).include?('chm=r').should be_true
-      Gchart.line(:range_markers => options.merge(:orientation => 'h')).include?('chm=r').should be_true
-      Gchart.line(:range_markers => options.merge(:orientation => 'etc')).include?('chm=r').should be_true
+      Gchart.line(:range_markers => @options.merge(:orientation => 'horizontal')).include?('chm=r').should be_true
+      Gchart.line(:range_markers => @options.merge(:orientation => 'h')).include?('chm=r').should be_true
+      Gchart.line(:range_markers => @options.merge(:orientation => 'etc')).include?('chm=r').should be_true
     end
 
     it "if left blank defaults to horizontal (r)" do
-      Gchart.line(:range_markers => options).include?('chm=r').should be_true
+      Gchart.line(:range_markers => @options).include?('chm=r').should be_true
     end
   end
 

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems'
   gem 'rspec'
-  require 'spec'
-end
+  require 'rspec'
+end

data/tasks/rspec.rake

@@ -1,11 +1,17 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems'
-  require 'spec'
+  require 'rspec'
 end
+
 begin
-  require 'spec/rake/spectask'
+  require 'rspec/core/rake_task'
+
+  desc "Run the specs under spec/models"
+  RSpec::Core::RakeTask.new do |t|
+    # t.rspec_opts = ['--options', "spec/spec.opts"]
+  end
 rescue LoadError
   puts <<-EOS
 To use rspec for testing you must install rspec gem:
@@ -14,8 +20,3 @@ EOS
   exit(0)
 end
 
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/*_spec.rb']
-end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: googlecharts
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  hash: 13
+  prerelease: false
+  segments: 
+  - 1
+  - 6
+  - 1
+  version: 1.6.1
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -07:00
+date: 2011-02-06 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -24,7 +30,6 @@ extra_rdoc_files:
 - README.markdown
 - README.txt
 files: 
-- .gitignore
 - History.txt
 - License.txt
 - Manifest.txt
@@ -64,26 +69,32 @@ homepage: http://googlecharts.rubyforge.org/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Generate charts using Google API & Ruby

data/.gitignore

@@ -1,4 +0,0 @@
-.DS_Store
-log/*
-.manifest
-pkg