googlecharts 1.3.1 → 1.3.4

data.tar.gz.sig

@@ -1,4 +1,4 @@
-
-��l-��,��/�!�m�V�Gj�ޙ�=�ea�z�����F����h�)�X�u:i��Z��Զy�~�F�O5m��|
�7��!��/'��k������f�%���*���R�sk���H�$�dϞnw��5���
-*U�Ìq��^��m��
-5��C8gB!�i����u��Kj�|�bD��C!��
+{�(�
+�����?������~^�
�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�

data/History.txt

@@ -1,3 +1,10 @@
+== 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)
+
+== 1.3.2 - 1.3.3
+* changes required by github
+
 == 1.3.1
 * added width and spacing options
 

data/Manifest.txt

@@ -8,20 +8,9 @@ config/requirements.rb
 lib/gchart.rb
 lib/gchart/aliases.rb
 lib/gchart/version.rb
-log/debug.log
-script/destroy
-script/generate
-script/txt2html
 setup.rb
 spec/gchart_spec.rb
 spec/spec.opts
 spec/spec_helper.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

data/README.txt

@@ -1,180 +1,9 @@
-The goal of this Gem is to make the creation of Google Charts a simple and easy task.
+CHECK README.markdown  (open as a text file)
 
-Gchart.line(  :size => '200x300', 
-              :title => "example title",
-              :bg => 'efefef',
-              :legend => ['first data set label', 'second data set label'],
-              :data => [10, 30, 120, 45, 72])
-              
+Or check:
 
+  http://googlecharts.rubyforge.org
 
-==Chart Type
+and/or 
 
-This gem supports the following types of charts:
-  
-  * line, 
-  * line_xy
-  * sparkline
-  * scatter
-  * bar
-  * venn
-  * pie
-  * pie_3d
-
-To create a chart, simply require Gchart and call any of the existing type:
-
-    require 'gchart'
-    Gchart.pie
-  
-  
-==Chart Title
-
-  To add a title to a chart pass the title to your chart:
-  
-    Gchart.line(:title => 'Sexy Charts!')
-    
-You can also specify the color and/or size
-    
-    Gchart.line(:title => 'Sexy Charts!', :title_color => 'FF0000', :title_size => '20')
-
-==Colors
-
-Specify a color with at least a 6-letter string of hexadecimal values in the format RRGGBB. For example:
-
-    * FF0000 = red
-    * 00FF00 = green
-    * 0000FF = blue
-    * 000000 = black
-    * FFFFFF = white
-
-You can optionally specify transparency by appending a value between 00 and FF where 00 is completely transparent and FF completely opaque. For example:
-
-    * 0000FFFF = solid blue
-    * 0000FF00 = transparent blue
-
-If you need to use multiple colors, check the doc. Usually you just need to pass :attribute => 'FF0000,00FF00'
-
-Some charts have more options than other, make sure to refer to the documentation.
-
-===Background options:
-
-If you don't set the background option, your graph will be transparent.
-
-* You have 3 types of background  http://code.google.com/apis/chart/#chart_or_background_fill
-
-- solid
-- gradient
-- stripes
-
-By default, if you set a background color, the fill will be solid:
-
-    Gchart.bar(:bg => 'efefef')
-
-However you can specify another fill type such as:
-            
-    Gchart.line(:bg => {:color => 'efefef', :type => 'gradient'})
-  
-In the above code, we decided to have a gradient background, however since we only passed one color, the chart will start by the specified color and transition to white. By the default, the gradient angle is 0. Change it as follows:
-
-    Gchart.line(:title =>'bg example', :bg => {:color => 'efefef', :type => 'gradient', :angle => 90})
-    
-For a more advance use of colors, refer to http://code.google.com/apis/chart/#linear_gradient
-
-    Gchart.line(:bg => {:color => '76A4FB,1,ffffff,0', :type => 'gradient'})
-    
-    
-The same way you set the background color, you can also set the graph background:
-
-    Gchart.line(:graph_bg => 'cccccc')
-    
-or both
-
-    Gchart.line(:bg => {:color => '76A4FB,1,ffffff,0', :type => 'gradient'}, :graph_bg => 'cccccc', :title => 'Sexy Chart')
-    
-    
-Another type of fill is stripes http://code.google.com/apis/chart/#linear_stripes
-
-    Gchart.line(:bg => {:color => 'efefef', :type => 'stripes'})
-    
-You can customize the amount of stripes, colors and width by changing the color value.
-    
-    
-== Legend & Labels
-
-You probably will want to use a legend or labels for your graph.
-
-    Gchart.line(:legend => 'legend label')
-or
-    Gchart.line(:legend => ['legend label 1', 'legend label 2'])
-    
-Will do the trick. You can also use the labels alias (makes more sense when using the pie charts)
-
-    chart = Gchart.pie(:labels => ['label 1', 'label 2'])
-
-== Multiple axis labels 
-
-Multiple axis labels are available for line charts, bar charts and scatter plots.
-
-* x = bottom x-axis
-* t = top x-axis
-* y = left y-axis
-* r = right y-axis
-
-    Gchart.line(:label_axis => 'x,y,r')
-  
-To add labels on these axis:
-
-    Gchart.line(:axis_labels => ['Jan|July|Jan|July|Jan', '0|100', 'A|B|C', '2005|2006|2007'])
-
-    
-== Data options
-
-Data are passed using an array or a nested array.    
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234])  
-  
-  Gchart.bar(:data => [[1,2,4,67,100,41,234],[45,23,67,12,67,300, 250]])
-  
-By default, the graph is drawn with your max value representing 100% of the height or width of the graph. You can change that my passing the max value.
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :max_value => 300)
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :max_value => 'auto')
-  
-or if you want to use the real values from your dataset:
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :max_value => false)
-  
-  
-You can also define a different encoding to add more granularity:
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :encoding => 'simple') 
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :encoding => 'extended') 
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :encoding => 'text') 
-  
-
-==Pies:
-  
-you have 2 type of pies:
-  - Gchart.pie() the standard 2D pie
-  _ Gchart.pie_3d() the fancy 3D pie
-  
-To set labels, you can use one of these two options:
-
-    @legend = ['Matt_fu', 'Rob_fu']
-    Gchart.pie_3d(:title => @title, :labels => @legend, :data => @data, :size => '400x200')
-    Gchart.pie_3d(:title => @title, :legend => @legend, :data => @data, :size => '400x200')
-  
-  
-  
-=== try yourself
-
-Gchart.bar( :data => [[1,2,4,67,100,41,234],[45,23,67,12,67,300, 250]], 
-            :title => 'SDRuby Fu level', 
-            :legend => ['matt','patrick'], 
-            :bg => {:color => '76A4FB', :type => 'gradient'}, 
-            :bar_colors => 'ff0000,00ff00')
-
- "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://github.com/mattetti/googlecharts

data/Rakefile

@@ -1,4 +1,32 @@
 require 'config/requirements'
 require 'config/hoe' # setup Hoe + all gem configuration
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+Dir['tasks/**/*.rake'].each { |rake| load rake }
+
+desc %{Update ".manifest" with the latest list of project filenames. Respect\
+.gitignore by excluding everything that git ignores. Update `files` and\
+`test_files` arrays in "*.gemspec" file if it's present.}
+task :manifest do
+  list = Dir['**/*'].sort
+  spec_file = Dir['*.gemspec'].first
+  list -= [spec_file] if spec_file
+  
+  File.read('.gitignore').each_line do |glob|
+    glob = glob.chomp.sub(/^\//, '')
+    list -= Dir[glob]
+    list -= Dir["#{glob}/**/*"] if File.directory?(glob) and !File.symlink?(glob)
+    puts "excluding #{glob}"
+  end
+ 
+  if spec_file
+    spec = File.read spec_file
+    spec.gsub! /^(\s* s.(test_)?files \s* = \s* )( \[ [^\]]* \] | %w\( [^)]* \) )/mx do
+      assignment = $1
+      bunch = $2 ? list.grep(/^test\//) : list
+      '%s%%w(%s)' % [assignment, bunch.join(' ')]
+    end
+      
+    File.open(spec_file, 'w') {|f| f << spec }
+  end
+  File.open('.manifest', 'w') {|f| f << list.join("\n") }
+end

data/lib/gchart.rb

@@ -15,27 +15,24 @@ class Gchart
   @@file_name = 'chart.png'
   
   attr_accessor :title, :type, :width, :height, :horizontal, :grouped, :legend, :data, :encoding, :max_value, :bar_colors,
-                :title_color, :title_size, :custom, :axis_with_labels, :axis_labels, :bar_width_and_spacing
+                :title_color, :title_size, :custom, :axis_with_labels, :axis_labels, :bar_width_and_spacing, :id, :alt, :class
     
-  class << self
-    # Support for Gchart.line(:title => 'my title', :size => '400x600')
-    def method_missing(m, options={})
-      # Extract the format and optional filename, then clean the hash
-      format = options[:format] || 'url'
-      @@file_name = options[:filename] unless options[:filename].nil?
-      options.delete(:format)
-      options.delete(:filename)
-      # create the chart and return it in the format asked for
-      if @@types.include?(m.to_s)  
-        chart = new(options.merge!({:type => m}))
-        chart.send(format)
-      elsif m.to_s == 'version' 
-        Gchart::VERSION::STRING
-      else
-        "#{m} is not a supported chart format, please use one of the following: #{supported_types}."
-      end  
-    end
-
+  # Support for Gchart.line(:title => 'my title', :size => '400x600')
+  def self.method_missing(m, options={})
+    # Extract the format and optional filename, then clean the hash
+    format = options[:format] || 'url'
+    @@file_name = options[:filename] unless options[:filename].nil?
+    options.delete(:format)
+    options.delete(:filename)
+    # create the chart and return it in the format asked for
+    if @@types.include?(m.to_s)  
+      chart = new(options.merge!({:type => m}))
+      chart.send(format)
+    elsif m.to_s == 'version' 
+      Gchart::VERSION::STRING
+    else
+      "#{m} is not a supported chart format, please use one of the following: #{supported_types}."
+    end  
   end
   
   def initialize(options={})
@@ -47,6 +44,12 @@ class Gchart
       @grouped = false
       @encoding = 'simple'
       @max_value = 'auto'
+      # Sets the alt tag when chart is exported as image tag
+      @alt = 'Google Chart'
+      # Sets the CSS id selector when chart is exported as image tag
+      @id = false
+      # Sets the CSS class selector when chart is exported as image tag
+      @class = false
 
       # set the options value if definable
       options.each do |attribute, value| 
@@ -123,10 +126,20 @@ class Gchart
   
   # Format
   
-  def img_tag
-    "<img src='#{query_builder}'/>"
+  def image_tag
+    image = "<img"
+    image += " id=\"#{@id}\"" if @id  
+    image += " class=\"#{@class}\"" if @class      
+    image += " src=\"#{query_builder}\""
+    image += " width=\"#{@width}\""
+    image += " height=\"#{@height}\""
+    image += " alt=\"#{@alt}\""
+    image += " title=\"#{@title}\"" if @title
+    image += " />"
   end
   
+  alias_method :img_tag, :image_tag
+  
   def url
     query_builder
   end

data/lib/gchart/version.rb

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

data/spec/gchart_spec.rb

@@ -377,10 +377,34 @@ describe 'exporting a chart' do
     Gchart.line(:data => [0, 26], :format => 'url').should == Gchart.line(:data => [0, 26])
   end
   
-  it "should be available as the img tag" do
-    Gchart.line(:data => [0, 26], :format => 'img_tag').should match(/<img src=(.*)\/>/)
+  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" \/>/)
   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" \/>/)
+  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" \/>/)
+  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" \/>/)
+  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" \/>/)
+  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" \/>/)
+  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" \/>/)
+  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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: googlecharts
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.4
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -30,7 +30,7 @@ cert_chain:
   ZR7qHIpykzr3ezcNiWtBWw==
   -----END CERTIFICATE-----
 
-date: 2008-05-08 00:00:00 -07:00
+date: 2008-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -45,7 +45,6 @@ extra_rdoc_files:
 - License.txt
 - Manifest.txt
 - README.txt
-- website/index.txt
 files: 
 - History.txt
 - License.txt
@@ -57,23 +56,12 @@ files:
 - lib/gchart.rb
 - lib/gchart/aliases.rb
 - lib/gchart/version.rb
-- log/debug.log
-- script/destroy
-- script/generate
-- script/txt2html
 - setup.rb
 - spec/gchart_spec.rb
 - spec/spec.opts
 - spec/spec_helper.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
 has_rdoc: true
 homepage: http://googlecharts.rubyforge.org
 post_install_message: 
@@ -97,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: googlecharts
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: description of gem