googlecharts 1.6.8 → 1.6.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fa6cc0f0e71b51d4dcc1583a1b0a14b4015a41e3
+  data.tar.gz: 083b34ae2a25223b6c56d8a0b9ceefb665e95597
+SHA512:
+  metadata.gz: f68d4956480164bcee5e66c5d3de359023e355e21a9079b5318f740b321706969040ecfd1236c778e365330da55dc65292fa1bf6774262dab66fff111d29f2c5
+  data.tar.gz: e972de17e3f51432b417394d83ab2dd4a715c958bf7bd9c50d2eb3cd43f18bcfd8d6cbd634a23c91377b5c4253923211b5edf5b39e1395e338fbcb12d519968b

data/.gitignore

@@ -1,4 +1,7 @@
 .DS_Store
 log/*
 .manifest
-pkg
+pkg
+.rspec
+.rvmrc
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - jruby

data/Gemfile

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+gemspec
+
+group :test do
+  gem 'rspec'
+  gem 'rake', '>= 0.8.7'
+end
+
+
+

data/History.txt

@@ -1,3 +1,13 @@
+== 1.6.12
+* added license to gemspec
+* added pie_c type for concentric pie charts
+
+== 1.6.10
+* added support for custom position on axis with label (parameter chxp)
+* refactored bar chart
+* fixed issue #44
+* allows GChart to take a theme 
+
 == 1.6.8
 * added title alignment support
 

data/README.markdown

@@ -1,3 +1,7 @@
+## Googlecharts
+
+[![Build Status](https://travis-ci.org/mattetti/googlecharts.png?branch=master)](https://travis-ci.org/mattetti/googlecharts)
+
 The goal of this Gem is to make the creation of Google Charts a simple and easy task.
     
     require 'googlecharts'
@@ -291,6 +295,7 @@ Multi Lines Chart Sample :
 
 	chart = Gchart.new(	:type => 'line',
 						:title => "example title",
+						:theme => :keynote,
 						:data => [[17, 17, 11, 8, 2],[10, 20, 15, 5, 7],[2, 3, 7, 9, 12]], 
 						:line_colors => 'e0440e,e62ae5,287eec',
 						:legend => ['courbe 1','courbe 2','courbe 3'],
@@ -313,4 +318,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
+http://chart.apis.google.com/chart?cht=p&chs=400x200&chd=s:YMSG9&chtt=SDRuby+Fu+level&chl=matt|rob|patrick|ryan|jordan

data/Rakefile

@@ -1 +1,12 @@
-require 'rubygems'  
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |task|
+    task.pattern = "**/spec/*_spec.rb"
+    task.rspec_opts = []
+    task.rspec_opts << '--color'
+    task.rspec_opts << '-f documentation'
+end

data/googlecharts.gemspec

@@ -6,12 +6,13 @@ Gem::Specification.new do |s|
   s.name = %q{googlecharts}
   s.version = GchartInfo::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors = ["Matt Aimonetti", "Andrey Deryabin"]
-  s.date = %q{2011-05-21}
+  s.authors = ["Matt Aimonetti", "Andrey Deryabin", "Pedro Pimentel"]
+  s.date = %q{2015-08-12}
   s.summary = %q{Generate charts using Google API & Ruby}
   s.description = %q{Generate charts using Google API & Ruby}
-  s.email = %q{mattaimonetti@gmail.com deriabin@gmail.com}
+  s.email = %q{mattaimonetti@gmail.com deriabin@gmail.com zukunft@gmail.com}
   s.homepage = %q{http://googlecharts.rubyforge.org/}
+  s.license = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/gchart/aliases.rb

@@ -9,7 +9,6 @@ class Gchart
   alias_method :line_color=, :bar_colors=
   alias_method :slice_colors=, :bar_colors=
   alias_method :horizontal?, :horizontal
-  alias_method :grouped?, :grouped
   alias_method :curved?, :curved
 
 end

data/lib/gchart/version.rb

@@ -1,3 +1,3 @@
 module GchartInfo #:nodoc:
-  VERSION = "1.6.8"
+  VERSION = "1.6.12"
 end

data/lib/gchart.rb

@@ -19,7 +19,7 @@ class Gchart
   end
 
   def self.types
-    @types ||= ['line', 'line_xy', 'scatter', 'bar', 'venn', 'pie', 'pie_3d', 'jstize', 'sparkline', 'meter', 'map', 'radar']
+    @types ||= ['line', 'line_xy', 'scatter', 'bar', 'venn', 'pie', 'pie_3d', 'pie_c', 'jstize', 'sparkline', 'meter', 'map', 'radar']
   end
 
   def self.simple_chars
@@ -38,14 +38,14 @@ class Gchart
     'chart.png'
   end
 
-  attr_accessor :title, :type, :width, :height, :curved, :horizontal, :grouped, :legend, :legend_position, :labels, :data, :encoding, :bar_colors,
-  :title_color, :title_size, :title_alignment, :custom, :axis_with_labels, :axis_labels, :bar_width_and_spacing, :id, :alt, :klass,
+  attr_accessor :title, :type, :width, :height, :curved, :horizontal, :grouped, :overlapped, :legend, :legend_position, :labels, :data, :encoding, :bar_colors,
+  :title_color, :title_size, :title_alignment, :custom, :axis_with_labels, :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, :use_ssl
 
   attr_accessor :min_value, :max_value
-  
+
   types.each do |type|
     instance_eval <<-DYNCLASSMETH
     def #{type}(options = {})
@@ -73,13 +73,21 @@ class Gchart
   end
 
   def initialize(options={})
+    # Allow Gchart to take a theme too
+    @theme = options[:theme] 
+    options = @theme ? Chart::Theme.load(@theme).to_options.merge(options) : options
+    options.delete(:theme)
+
     @type = options[:type] || 'line'
     @data = []
     @width = 300
     @height = 200
     @curved = false
     @horizontal = false
+
     @grouped = false
+    @overlapped = false
+
     @use_ssl = false
     @encoding = 'simple'
     # @max_value = 'auto'
@@ -106,11 +114,11 @@ class Gchart
   def size=(size='300x200')
     @width, @height = size.split("x").map { |dimension| dimension.to_i }
   end
-  
+
   def size
     "#{width}x#{height}"
   end
-  
+
   def dimensions
     # TODO: maybe others?
     [:line_xy, :scatter].include?(type) ? 2 : 1
@@ -125,9 +133,14 @@ class Gchart
     end
   end
 
-  # Sets the bar graph presentation (stacked or grouped)
-  def stacked=(option=true)
-    @grouped = option ? false : true
+  def bar_presentation
+    if @overlapped
+      'o'
+    elsif @grouped
+      'g'
+    else
+      's'
+    end
   end
 
   def bg=(options)
@@ -149,7 +162,7 @@ class Gchart
       @chart_angle = options[:angle]
     end
   end
-  
+
   def max_value=(max_v)
     if max_v =~ /false/
       @max_value = false
@@ -174,7 +187,7 @@ class Gchart
     ds.each_with_index do |mds, mds_index|
       mds[:min_value] ||= min_value
       mds[:max_value] ||= max_value
-      
+
       if mds_index == 0 && type.to_s == 'bar'
         # TODO: unless you specify a zero line (using chp or chds),
         #       the min_value of a bar chart is always 0.
@@ -235,7 +248,7 @@ class Gchart
       @dataset
     end
   end
-  
+
   # Sets of data to handle multiple sets
   def datasets
     datasets = []
@@ -248,7 +261,7 @@ class Gchart
     end
     datasets
   end
-  
+
   def self.jstize(string)
     # See http://github.com/mattetti/googlecharts/issues#issue/27
     #URI.escape( string ).gsub("%7C", "|")
@@ -313,7 +326,7 @@ class Gchart
   # The title size cannot be set without specifying a color.
   # A dark key will be used for the title color if no color is specified 
   def set_title
-    title_params = "chtt=#{title}"
+    title_params = "chtt=#{title}".gsub(/\|/,"\n")
     unless (title_color.nil? && title_size.nil? && title_alignment.nil?)
       title_params << "&chts=" + (color, size, alignment = (title_color || '454545'), title_size, (title_alignment.to_s[0,1] || 'c')).compact.join(',')
     end
@@ -460,6 +473,11 @@ class Gchart
     "chxt=#{axis_with_labels}"
   end
 
+  def set_custom_axis_with_labels
+    @custom_axis_with_labels = custom_axis_with_labels.join(',') if @custom_axis_with_labels.is_a?(Array)
+    "chxp=#{custom_axis_with_labels}"
+  end
+
   def set_axis_labels
     if axis_labels.is_a?(Array)
       if RUBY_VERSION.to_f < 1.9
@@ -510,6 +528,7 @@ class Gchart
     when 'line'      then "lc"
     when 'line_xy'   then "lxy"
     when 'pie_3d'    then "p3"
+    when 'pie_c'     then "pc"
     when 'pie'       then "p"
     when 'venn'      then "v"
     when 'scatter'   then "s"
@@ -519,7 +538,7 @@ class Gchart
     when 'radar'
       "r" + (curved? ? 's' : '')
     when 'bar'
-      "b" + (horizontal? ? "h" : "v") + (grouped? ? "g" : "s")
+      "b" + (horizontal? ? "h" : "v") + bar_presentation
     end
   end
 
@@ -530,7 +549,7 @@ class Gchart
     when 'stripes'  then 'ls'
     end
   end
-  
+
   def number_visible
     n = 0
     dataset.each do |mds|
@@ -543,7 +562,7 @@ class Gchart
     end
     ""
   end
-  
+
   # Turns input into an array of axis hashes, dependent on the chart type
   def convert_dataset(ds)
     if dimensions == 2
@@ -563,7 +582,7 @@ class Gchart
     end
     ds
   end
-  
+
   # just an alias
   def axis_set
     dataset
@@ -577,7 +596,7 @@ class Gchart
       value.nil? ? "_" : value
     end
   end
-  
+
   def convert_to_extended_value(number)
     if number.nil?
       '__'
@@ -586,7 +605,7 @@ class Gchart
       value.nil? ? "__" : value
     end
   end
-  
+
   def encode_scaled_dataset(chars, nil_char)
     dsets = []
     dataset.each do |ds|
@@ -655,6 +674,7 @@ class Gchart
   def query_builder(options="")
     query_params = instance_variables.sort.map do |var|
       case var.to_s
+
       when '@data'
         set_data unless data == []  
         # Set the graph size  
@@ -673,7 +693,7 @@ class Gchart
       when '@thickness'
         set_line_thickness
       when '@new_markers'
-          set_line_markers
+        set_line_markers
       when '@bg_color'
         set_colors
       when '@chart_color'
@@ -690,6 +710,8 @@ class Gchart
         set_range_markers
       when '@grid_lines'
         set_grid_lines
+      when '@custom_axis_with_labels'
+        set_custom_axis_with_labels
       when '@geographical_area'
         set_geographical_area
       when '@country_codes'