googlecharts 1.6.3 → 1.6.6

data/.gitignore

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

data/History.txt

@@ -1,3 +1,10 @@
+== 1.6.6
+* added ssl support
+* refactored code
+* аdded ability to set the legend position
+* fixed legend position value
+* separated labels and legends for pies
+
 == 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)

data/README.markdown

@@ -296,30 +296,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
-
-
-People reported using this gem:
----------------------
-
-![github](http://img.skitch.com/20080627-r14subqdx2ye3w13qefbx974gc.png)
-
-* [http://github.com](http://github.com) 
-
-![stafftool.com](http://stafftool.com/images/masthead_screen.gif)
-
-* [http://stafftool.com/](http://stafftool.com/) Takeo (contributor)
-
-![graffletopia.com](http://img.skitch.com/20080627-g2pp89h7gdbh15m1rr8hx48jep.jpg) 
-
-* [graffleropia.com](http://graffletopia.com) Mokolabs (contributor)
-
-![gumgum](http://img.skitch.com/20080627-kc1weqsbkmxeqhwiyriq3n6g8k.jpg)
-
-* [http://gumgum.com](http://gumgum.com) Mattetti (Author)
-
-![http://img.skitch.com/20080627-n48j8pb2r7irsewfeh4yp3da12.jpg]
-
-* [http://feedflix.com/](http://feedflix.com/) [lifehacker article](http://lifehacker.com/395610/feedflix-creates-detailed-charts-from-your-netflix-use)
-
-* [California State University, Chico](http://www.csuchico.edu/)
+http://chart.apis.google.com/chart?cht=p&chs=400x200&chd=s:YMSG9&chtt=SDRuby+Fu+level&chl=matt|rob|patrick|ryan|jordan

data/README.txt

@@ -1,9 +1,3 @@
 CHECK README.markdown  (open as a text file)
 
-Or check:
-
-  http://googlecharts.rubyforge.org
-
-and/or 
-
-  http://github.com/mattetti/googlecharts
+http://github.com/mattetti/googlecharts

data/Rakefile

@@ -1,20 +1 @@
-require 'rubygems'  
-require 'rake'
-
-begin  
-  require 'jeweler'  
-  Jeweler::Tasks.new do |gemspec|  
-    gemspec.name = "googlecharts"  
-    gemspec.summary = "Generate charts using Google API & Ruby"  
-    gemspec.description = "Generate charts using Google API & Ruby"  
-    gemspec.email = "mattaimonetti@gmail.com"  
-    gemspec.homepage = "http://googlecharts.rubyforge.org/"  
-    gemspec.authors = ["Matt Aimonetti"]  
-  end 
-  Jeweler::GemcutterTasks.new 
-rescue LoadError  
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"  
-end  
-  
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
-
+require 'rubygems'  

data/googlecharts.gemspec

@@ -1,71 +1,20 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "gchart/version"
 
 Gem::Specification.new do |s|
   s.name = %q{googlecharts}
-  s.version = "1.6.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Matt Aimonetti"]
-  s.date = %q{2011-05-05}
+  s.version = GchartInfo::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors = ["Matt Aimonetti", "Andrey Deryabin"]
+  s.date = %q{2011-05-21}
+  s.summary = %q{Generate charts using Google API & Ruby}
   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.email = %q{mattaimonetti@gmail.com deriabin@gmail.com}
   s.homepage = %q{http://googlecharts.rubyforge.org/}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Generate charts using Google API & Ruby}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
-

data/lib/gchart.rb

@@ -2,6 +2,7 @@ $:.unshift File.dirname(__FILE__)
 require 'gchart/version'
 require 'gchart/theme'
 require "net/http"
+require "net/https"
 require "uri"
 require "cgi"
 require 'enumerator'
@@ -9,8 +10,12 @@ require 'enumerator'
 class Gchart
   include GchartInfo
 
-  def self.url
-    "http://chart.apis.google.com/chart?" 
+  def self.url(use_ssl = false)
+    if use_ssl
+      'https://www.google.com/chart?'
+    else
+      'http://chart.apis.google.com/chart?'
+    end
   end
 
   def self.types
@@ -33,11 +38,11 @@ class Gchart
     'chart.png'
   end
 
-  attr_accessor :title, :type, :width, :height, :curved, :horizontal, :grouped, :legend, :labels, :data, :encoding, :bar_colors,
+  attr_accessor :title, :type, :width, :height, :curved, :horizontal, :grouped, :legend, :legend_position, :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
 
-  attr_accessor :bg_type, :bg_color, :bg_angle, :chart_type, :chart_color, :chart_angle, :axis_range, :thickness, :new_markers, :grid_lines 
+  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
   
@@ -75,6 +80,7 @@ class Gchart
     @curved = false
     @horizontal = false
     @grouped = false
+    @use_ssl = false
     @encoding = 'simple'
     # @max_value = 'auto'
     # @min_value defaults to nil meaning zero
@@ -255,11 +261,13 @@ class Gchart
 
   # Returns the chart's generated PNG as a blob. (borrowed from John's gchart.rubyforge.org)
   def fetch
-    url = URI.parse(self.class.url)
+    url = URI.parse(self.class.url(use_ssl))
     req = Net::HTTP::Post.new(url.path)
     req.body = query_builder
     req.content_type = 'application/x-www-form-urlencoded'
-    Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }.body
+    http = Net::HTTP.new(url.host, url.port)
+    http.use_ssl = use_ssl
+    http.start {|resp| resp.request(req) }.body
   end
 
   # Writes the chart's generated PNG to a file. (borrowed from John's gchart.rubyforge.org)
@@ -409,18 +417,35 @@ class Gchart
 
   end
 
+  def set_legend_position
+    case @legend_position.to_s
+    when /(bottom|b)$/
+      "chdlp=b"
+    when /(bottom_vertical|bv)$/
+      "chdlp=bv"
+    when /(top|t)$/
+      "chdlp=t"
+    when /(top_vertical|tv)$/
+      "chdlp=tv"
+    when /(right|r)$/
+      "chdlp=r"
+    when /(left|l)$/
+      "chdlp=l"
+    end
+  end
+
   def set_line_thickness
-      "chls=#{thickness}"
+    "chls=#{thickness}"
   end
-  
+
   def set_line_markers
-      "chm=#{new_markers}"
+    "chm=#{new_markers}"
   end
-  
+
   def set_grid_lines
-      "chg=#{grid_lines}"
+    "chg=#{grid_lines}"
   end
-  
+
   def set_labels
     if labels.is_a?(Array)
       "chl=#{@labels.map{|label| "#{CGI::escape(label.to_s)}"}.join('|')}"
@@ -623,7 +648,7 @@ class Gchart
   end
 
   def url_builder(options="")
-    self.class.url + query_builder(options)
+    self.class.url(use_ssl) + query_builder(options)
   end
 
   def query_builder(options="")
@@ -642,6 +667,8 @@ class Gchart
         set_legend unless legend.nil?
       when '@labels'
         set_labels unless labels.nil?
+      when '@legend_position'
+        set_legend_position unless legend_position.nil?
       when '@thickness'
         set_line_thickness
       when '@new_markers'

data/lib/gchart/version.rb

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

data/spec/gchart_spec.rb

@@ -392,6 +392,18 @@ describe "a line chart" do
     chart = Gchart.line(:legend => 'legend label')
     chart.include?("chdl=legend+label").should be_true
   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)
+    puts chart.inspect
+    chart.include?("chdlp=bv").should be_true
+    
+    chart = Gchart.line(:title => title, :legend => legend, :legend_position => 'r')
+    chart.include?("chdlp=r").should be_true
+  end
 
   it "should be able to set the background fill" do
     Gchart.line(:bg => 'efefef').should include("chf=bg,s,efefef")
@@ -651,3 +663,16 @@ describe 'exporting a chart' do
   end
 
 end
+
+describe 'SSL support' do
+  it 'should change url if is presented' do
+    Gchart.line(:use_ssl => true).should include('https://www.google.com/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', :use_ssl => true)
+    File.exist?('chart.png').should be_true
+    File.delete('chart.png') if File.exist?('chart.png')
+  end
+end

metadata

@@ -2,39 +2,35 @@
 name: googlecharts
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.6.3
+  version: 1.6.6
 platform: ruby
 authors: 
 - Matt Aimonetti
+- Andrey Deryabin
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -07:00
+date: 2011-05-21 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
 description: Generate charts using Google API & Ruby
-email: mattaimonetti@gmail.com
+email: mattaimonetti@gmail.com deriabin@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
-- README.markdown
-- README.txt
+extra_rdoc_files: []
+
 files: 
+- .gitignore
 - 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
@@ -42,24 +38,11 @@ files:
 - 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
 has_rdoc: true
 homepage: http://googlecharts.rubyforge.org/
 licenses: []
@@ -88,5 +71,9 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Generate charts using Google API & Ruby
-test_files: []
-
+test_files: 
+- spec/fixtures/another_test_theme.yml
+- spec/fixtures/test_theme.yml
+- spec/gchart_spec.rb
+- spec/spec_helper.rb
+- spec/theme_spec.rb

data/Manifest.txt

@@ -1,18 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-README.txt
-Rakefile
-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
-tasks/rspec.rake

data/VERSION

@@ -1 +0,0 @@
-1.6.3

data/config/hoe.rb

@@ -1,71 +0,0 @@
-require 'gchart/version'
-
-AUTHOR = 'Matt Aimonetti'  # can also be an array of Authors
-EMAIL = "mattaimonetti@gmail.com"
-DESCRIPTION = "description of gem"
-GEM_NAME = 'googlecharts' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'googlecharts' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "matt_a"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil 
-# UNCOMMENT IF REQUIRED: 
-# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
-VERS = GchartInfo::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'gchart documentation',
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps 
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
-    @extra_deps
-  end 
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-  
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  
-end
-
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-hoe.rsync_args = '-av --delete --ignore-errors'