googlecharts 1.3.4 → 1.3.6

data.tar.gz.sig

@@ -1,4 +1,2 @@
-{�(�
-�����?������~^�
�k�
-�H��с7���j����J�	�1)F��XC��ږ����c̘<9a�9�p�t5K�p�5��`�сbII�3��F鐫ﶫ_
��bl&`=�;����I#�3Zd�@�sx�ޭa��^#'�z�2O������1��̀�>�s��|�
-�bw���\"Lڇ�j<���K��ynv�9d`~��G��Y�
+Е{.���Z��M4G�����ZZ$6<���V!B�t�Ye�=)�!xV�_-0��������N3�D�^L0�S�~����@�^ ���@/������G;�_8��_PN��H�%q��asR���:���7��/гn�^����'�"����B>y��(G�������S��n.>��{9�����V`%^��Fh/�m~Z,�`
+
�O�D��>stt̥t+

data/History.txt

@@ -1,3 +1,11 @@
+== 1.3.6
+* support nil values. The Google Charts API specifies that a single underscore (_) can be used to omit a value from a line chart with 'simple' data encoding, and a double underscore (__) can do the same for a chart with 'extended' data encoding. (Matt Moyer)
+* allow a label to appear on a google-o-meter via the :legend option. (hallettj)
+
+== 1.3.5
+* added code to properly escape image tag URLs (mokolabs)
+* added themes support + 4 default themes (keynote, thirty7signals, pastel, greyscale) chart.line(:theme=>:keynote) (jakehow)
+
 == 1.3.4
 * updated documentation and cleaned it up (mokolabs)
 * added support for custom class, id and alt tags when using the image_tag format (i.e Gchart.line(:data => [0, 26], :format => 'image_tag')) (mokolabs)

data/Manifest.txt

@@ -7,9 +7,11 @@ config/hoe.rb
 config/requirements.rb
 lib/gchart.rb
 lib/gchart/aliases.rb
+lib/gchart/theme.rb
 lib/gchart/version.rb
 setup.rb
 spec/gchart_spec.rb
+spec/theme_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
 tasks/environment.rake

data/lib/gchart.rb

@@ -1,5 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 require 'gchart/version'
+require 'gchart/theme'
 require "open-uri"
 require "uri"
 
@@ -19,6 +20,9 @@ class Gchart
     
   # Support for Gchart.line(:title => 'my title', :size => '400x600')
   def self.method_missing(m, options={})
+    # Start with theme defaults if a theme is set
+    theme = options[:theme]
+    options = theme ? Chart::Theme.load(theme).to_options.merge(options) : options 
     # Extract the format and optional filename, then clean the hash
     format = options[:format] || 'url'
     @@file_name = options[:filename] unless options[:filename].nil?
@@ -130,7 +134,7 @@ class Gchart
     image = "<img"
     image += " id=\"#{@id}\"" if @id  
     image += " class=\"#{@class}\"" if @class      
-    image += " src=\"#{query_builder}\""
+    image += " src=\"#{query_builder(:html)}\""
     image += " width=\"#{@width}\""
     image += " height=\"#{@height}\""
     image += " alt=\"#{@alt}\""
@@ -231,7 +235,7 @@ class Gchart
   # or
   # Gchart.line(:legend => ['first label', 'last label'])
   def set_legend
-    return set_labels if @type == :pie || @type == :pie_3d
+    return set_labels if @type == :pie || @type == :pie_3d || @type == :meter
     
     if @legend.is_a?(Array)
       "chdl=#{@legend.map{|label| "#{label}"}.join('|')}"
@@ -321,12 +325,12 @@ class Gchart
   # to about 300 pixels. Simple encoding is suitable for all other types of chart regardless of size.
   def simple_encoding(dataset=[])
     dataset = prepare_dataset(dataset)
-    @max_value = dataset.map{|ds| ds.max}.max if @max_value == 'auto'
+    @max_value = dataset.compact.map{|ds| ds.compact.max}.max if @max_value == 'auto'
     
     if @max_value == false || @max_value == 'false' || @max_value == :false || @max_value == 0
-      "s:" + dataset.map { |ds| ds.map { |number| convert_to_simple_value(number) }.join }.join(',')
+      "s:" + dataset.map { |ds| ds.map { |number| number.nil? ? '_' : convert_to_simple_value(number) }.join }.join(',')
     else
-      "s:" + dataset.map { |ds| ds.map { |number| convert_to_simple_value( (@@simple_chars.size - 1) * number / @max_value) }.join }.join(',')
+      "s:" + dataset.map { |ds| ds.map { |number| number.nil? ? '_' : convert_to_simple_value( (@@simple_chars.size - 1) * number / @max_value) }.join }.join(',')
     end
     
   end
@@ -357,18 +361,18 @@ class Gchart
   def extended_encoding(dataset=[])
     
     dataset = prepare_dataset(dataset)
-    @max_value = dataset.map{|ds| ds.max}.max if @max_value == 'auto'
+    @max_value = dataset.compact.map{|ds| ds.compact.max}.max if @max_value == 'auto'
     
     if @max_value == false || @max_value == 'false' || @max_value == :false
-      "e:" +  dataset.map { |ds| ds.map { |number| convert_to_extended_value(number)}.join }.join(',')
+      "e:" +  dataset.map { |ds| ds.map { |number| number.nil? ? '__' : convert_to_extended_value(number)}.join }.join(',')
     else
-      "e:" + dataset.map { |ds| ds.map { |number| convert_to_extended_value( (@@ext_pairs.size - 1) * number / @max_value) }.join }.join(',')
+      "e:" + dataset.map { |ds| ds.map { |number| number.nil? ? '__' : convert_to_extended_value( (@@ext_pairs.size - 1) * number / @max_value) }.join }.join(',')
     end
     
   end
   
   
-  def query_builder
+  def query_builder(options="")
     query_params = instance_variables.map do |var|
       case var
       # Set the graph size  
@@ -399,7 +403,15 @@ class Gchart
       end
     end.compact
     
-    jstize(@@url + query_params.join('&'))
+    # Use ampersand as default delimiter
+    unless options == :html
+      delimiter = '&'
+    # Escape ampersand for html image tags
+    else
+      delimiter = '&amp;'
+    end
+    
+    jstize(@@url + query_params.join(delimiter))
   end
   
-end
+end

data/lib/gchart/theme.rb

@@ -0,0 +1,46 @@
+require 'yaml'
+
+module Chart
+  class Theme
+    class ThemeNotFound < RuntimeError; end
+    
+    @@theme_files = ["#{File.dirname(__FILE__)}/../themes.yml"]
+
+    attr_accessor :colors
+    attr_accessor :bar_colors
+    attr_accessor :background
+    attr_accessor :chart_background
+    
+    def self.load(theme_name)
+      theme = new(theme_name)
+    end
+    
+    def self.theme_files
+      @@theme_files
+    end
+    
+    # Allows you to specify paths for custom theme files in YAML format
+    def self.add_theme_file(file)
+      @@theme_files << file
+    end
+    
+    def initialize(theme_name)
+      themes = {}
+      @@theme_files.each {|f| themes.update YAML::load(File.open(f))}
+      theme = themes[theme_name]
+      if theme
+        self.colors = theme[:colors]
+        self.bar_colors = theme[:bar_colors]
+        self.background = theme[:background]
+        self.chart_background = theme[:chart_background]
+        self
+      else
+        raise(ThemeNotFound, "Could not locate the #{theme_name} theme ...")
+      end
+    end
+    
+    def to_options
+      {:background => background, :chart_background => chart_background, :bar_colors => bar_colors.join(',')}
+    end
+  end
+end

data/lib/gchart/version.rb

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

data/spec/gchart_spec.rb

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

data/spec/theme_spec.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require File.dirname(__FILE__) + '/../lib/gchart'
+
+describe "generating a default Gchart" do
+  it 'should be able to add additional theme files' do
+    Chart::Theme.theme_files.should_not include("#{File.dirname(__FILE__)}/fixtures/another_test_theme.yml")
+    Chart::Theme.add_theme_file("#{File.dirname(__FILE__)}/fixtures/another_test_theme.yml")
+    Chart::Theme.theme_files.should include("#{File.dirname(__FILE__)}/fixtures/another_test_theme.yml")
+  end
+  
+  it 'should be able to load themes from the additional theme files' do
+    lambda { Chart::Theme.load(:test_two) }.should_not raise_error
+  end
+  
+  it 'should raise ThemeNotFound if theme does not exist' do
+    lambda { Chart::Theme.load(:nonexistent) }.should raise_error(Chart::Theme::ThemeNotFound, "Could not locate the nonexistent theme ...")
+  end
+  
+  it 'should set colors array' do
+    Chart::Theme.load(:keynote).colors.should eql(["6886B4", "FDD84E", "72AE6E", "D1695E", "8A6EAF", "EFAA43", "FFFFFF", "000000"])
+  end
+  
+  it 'should set bar colors array' do
+    Chart::Theme.load(:keynote).bar_colors.should eql(["6886B4", "FDD84E", "72AE6E", "D1695E", "8A6EAF", "EFAA43"])
+  end
+  
+  it 'should set background' do
+    Chart::Theme.load(:keynote).background.should eql("000000")
+  end
+  
+  it 'should set chart background' do
+    Chart::Theme.load(:keynote).chart_background.should eql("FFFFFF")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: googlecharts
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
+  version: 1.3.6
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -30,10 +30,19 @@ cert_chain:
   ZR7qHIpykzr3ezcNiWtBWw==
   -----END CERTIFICATE-----
 
-date: 2008-06-26 00:00:00 -07:00
+date: 2008-10-04 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: description of gem
 email: mattaimonetti@gmail.com
 executables: []
@@ -55,9 +64,11 @@ files:
 - config/requirements.rb
 - lib/gchart.rb
 - lib/gchart/aliases.rb
+- lib/gchart/theme.rb
 - lib/gchart/version.rb
 - setup.rb
 - spec/gchart_spec.rb
+- spec/theme_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/environment.rake