googlecharts 1.6.1 → 1.6.2

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

data/googlecharts.gemspec

@@ -0,0 +1,77 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{googlecharts}
+  s.version = "1.6.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Matt Aimonetti"]
+  s.date = %q{2011-04-13}
+  s.description = %q{Generate charts using Google API & Ruby}
+  s.email = %q{mattaimonetti@gmail.com}
+  s.extra_rdoc_files = [
+    "README",
+    "README.markdown",
+    "README.txt"
+  ]
+  s.files = [
+    "History.txt",
+    "License.txt",
+    "Manifest.txt",
+    "README",
+    "README.markdown",
+    "README.txt",
+    "Rakefile",
+    "VERSION",
+    "config/hoe.rb",
+    "config/requirements.rb",
+    "googlecharts.gemspec",
+    "lib/gchart.rb",
+    "lib/gchart/aliases.rb",
+    "lib/gchart/theme.rb",
+    "lib/gchart/version.rb",
+    "lib/googlecharts.rb",
+    "lib/themes.yml",
+    "script/destroy",
+    "script/generate",
+    "script/txt2html",
+    "setup.rb",
+    "spec/fixtures/another_test_theme.yml",
+    "spec/fixtures/test_theme.yml",
+    "spec/gchart_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/theme_spec.rb",
+    "tasks/deployment.rake",
+    "tasks/environment.rake",
+    "tasks/rspec.rake",
+    "tasks/website.rake",
+    "website/index.html",
+    "website/index.txt",
+    "website/javascripts/rounded_corners_lite.inc.js",
+    "website/stylesheets/screen.css",
+    "website/template.rhtml"
+  ]
+  s.homepage = %q{http://googlecharts.rubyforge.org/}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Generate charts using Google API & Ruby}
+  s.test_files = [
+    "spec/gchart_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/theme_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/lib/gchart.rb

@@ -33,7 +33,7 @@ class Gchart
     'chart.png'
   end
 
-  attr_accessor :title, :type, :width, :height, :curved, :horizontal, :grouped, :legend, :data, :encoding, :bar_colors,
+  attr_accessor :title, :type, :width, :height, :curved, :horizontal, :grouped, :legend, :labels, :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, :usemap
 
@@ -397,8 +397,10 @@ class Gchart
   # or
   # Gchart.line(:legend => ['first label', 'last label'])
   def set_legend
-    return set_labels if type.to_s =~ /pie|pie_3d|meter/
-
+    if type.to_s =~ /pie|pie_3d|meter/
+      @labels = legend
+      return set_labels
+    end
     if legend.is_a?(Array)
       "chdl=#{@legend.map{|label| "#{CGI::escape(label.to_s)}"}.join('|')}"
     else
@@ -420,10 +422,10 @@ class Gchart
   end
   
   def set_labels
-    if legend.is_a?(Array)
-      "chl=#{@legend.map{|label| "#{CGI::escape(label.to_s)}"}.join('|')}"
+    if labels.is_a?(Array)
+      "chl=#{@labels.map{|label| "#{CGI::escape(label.to_s)}"}.join('|')}"
     else
-      "chl=#{@legend}"
+      "chl=#{@labels}"
     end
   end
 
@@ -638,6 +640,8 @@ class Gchart
         set_title unless title.nil?
       when '@legend'
         set_legend unless legend.nil?
+      when '@labels'
+        set_labels unless labels.nil?
       when '@thickness'
         set_line_thickness
       when '@new_markers'

data/lib/gchart/aliases.rb

@@ -8,7 +8,6 @@ class Gchart
   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
   alias_method :curved?, :curved

data/lib/gchart/version.rb

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

data/spec/gchart_spec.rb

@@ -178,7 +178,12 @@ describe "generating a default Gchart" do
     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
-
+  
+  it 'should generate different labels and legend' do
+    Gchart.line(:legend => %w(1 2 3), :labels=>%w(one two three)).should(include('chdl=1|2|3'))
+    Gchart.line(:legend => %w(1 2 3), :labels=>%w(one two three)).should(include('chl=one|two|three'))
+  end
+  
 end
 
 describe "generating different type of charts" do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: googlecharts
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 -08:00
+date: 2011-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -40,6 +39,7 @@ files:
 - VERSION
 - config/hoe.rb
 - config/requirements.rb
+- googlecharts.gemspec
 - lib/gchart.rb
 - lib/gchart/aliases.rb
 - lib/gchart/theme.rb
@@ -78,7 +78,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -87,7 +86,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"