googlecharts 1.5.4 → 1.6.0

data/README.markdown

@@ -238,6 +238,11 @@ The hash lets you set these values directly, with the Google default values set
     Gchart.bar(:data => @data, :bar_width_and_spacing => {:width => 19})
     Gchart.bar(:data => @data, :bar_width_and_spacing => {:spacing => 10, :group_spacing => 12})
 
+Radar:
+-------------
+    In a Radar graph, the x-axis is circular. The points can be connected by straight lines or curved lines.
+    Gchart.radar(:data => @data, :curved => true)
+
 Sparklines:
 -------------
 
@@ -287,4 +292,4 @@ People reported using this gem:
 
 * [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/)
+* [California State University, Chico](http://www.csuchico.edu/)

data/VERSION

@@ -1 +1 @@
-1.5.4
+1.6.0

data/lib/gchart.rb

@@ -1,7 +1,7 @@
 $:.unshift File.dirname(__FILE__)
 require 'gchart/version'
 require 'gchart/theme'
-require "open-uri"
+require "net/http"
 require "uri"
 require "cgi"
 require 'enumerator'
@@ -14,7 +14,7 @@ class Gchart
   end
 
   def self.types
-    @types ||= ['line', 'line_xy', 'scatter', 'bar', 'venn', 'pie', 'pie_3d', 'jstize', 'sparkline', 'meter', 'map']
+    @types ||= ['line', 'line_xy', 'scatter', 'bar', 'venn', 'pie', 'pie_3d', 'jstize', 'sparkline', 'meter', 'map', 'radar']
   end
 
   def self.simple_chars
@@ -33,7 +33,7 @@ class Gchart
     'chart.png'
   end
 
-  attr_accessor :title, :type, :width, :height, :horizontal, :grouped, :legend, :data, :encoding, :bar_colors,
+  attr_accessor :title, :type, :width, :height, :curved, :horizontal, :grouped, :legend, :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
 
@@ -49,7 +49,7 @@ class Gchart
       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'
-      options[:filename] ||= Gchart.default_filename
+      options[:filename] ||= default_filename
       options.delete(:format)
       #update map_colors to become bar_colors
       options.update(:bar_colors => options[:map_colors]) if options.has_key?(:map_colors)
@@ -60,7 +60,7 @@ class Gchart
   end
 
   def self.version
-    Gchart::VERSION::STRING
+    VERSION::STRING
   end
 
   def self.method_missing(m, options={})
@@ -72,6 +72,7 @@ class Gchart
     @data = []
     @width = 300
     @height = 200
+    @curved = false
     @horizontal = false
     @grouped = false
     @encoding = 'simple'
@@ -92,7 +93,7 @@ class Gchart
 
   
   def self.supported_types
-    Gchart.types.join(' ')
+    self.class.types.join(' ')
   end
 
   # Defines the Graph size using the following format:
@@ -257,12 +258,16 @@ class Gchart
 
   # Returns the chart's generated PNG as a blob. (borrowed from John's gchart.rubyforge.org)
   def fetch
-    open(query_builder) { |io| io.read }
+    url = URI.parse(self.class.url)
+    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
   end
 
   # Writes the chart's generated PNG to a file. (borrowed from John's gchart.rubyforge.org)
   def write
-    io_or_file = filename || Gchart.default_filename
+    io_or_file = filename || self.class.default_filename
     return io_or_file.write(fetch) if io_or_file.respond_to?(:write)
     open(io_or_file, "wb+") { |io| io.write(fetch) }
   end
@@ -273,7 +278,7 @@ class Gchart
     image = "<img"
     image += " id=\"#{id}\"" if id  
     image += " class=\"#{klass}\"" if klass      
-    image += " src=\"#{query_builder(:html)}\""
+    image += " src=\"#{url_builder(:html)}\""
     image += " width=\"#{width}\""
     image += " height=\"#{height}\""
     image += " alt=\"#{alt}\""
@@ -284,7 +289,7 @@ class Gchart
   alias_method :img_tag, :image_tag
 
   def url
-    query_builder
+    url_builder
   end
 
   def file
@@ -293,8 +298,8 @@ class Gchart
 
   #
   def jstize(string)
-    Gchart.jstize(string)
-  end 
+    self.class.jstize(string)
+  end
 
   private
 
@@ -457,20 +462,21 @@ class Gchart
     # a passed axis_range should look like:
     # [[10,100]] or [[10,100,4]] or [[10,100], [20,300]]
     # in the second example, 4 is the interval 
-    if @calculated_axis_range
-      set = datasets
-    else
-      set = axis_range || datasets
-    end
+    set = @calculated_axis_range ? datasets : axis_range || datasets
+
+    return unless set && set.respond_to?(:each) && set.find {|o| o}.respond_to?(:each)
+
     # in the case of a line graph, the first axis range should 1
     index_increase = type.to_s == 'line' ? 1 : 0
-    if set && set.respond_to?(:each) && set.first.respond_to?(:each)
-      'chxr=' + set.enum_for(:each_with_index).map do |range, index|
-        [(index + index_increase), (min_value || range.first), (max_value || range.last)].compact.join(',')
-       end.join("|")
-    else
-      nil
-    end
+    'chxr=' + set.enum_for(:each_with_index).map do |axis_range, index|
+      next nil if axis_range.nil? # ignore this axis
+      min, max, step = axis_range
+      if axis_range.size > 3 or step && max && step > max # this is a full series
+        max = axis_range.last
+        step = nil
+      end
+      [(index + index_increase), (min_value || min || 0), (max_value || max), step].compact.join(',')
+    end.compact.join("|")
   end
 
   def set_geographical_area
@@ -478,38 +484,28 @@ class Gchart
   end
 
   def set_type
-    case type.to_s
-    when 'line'
-      "cht=lc"
-    when 'line_xy'
-      "cht=lxy"
+    'cht=' + case type.to_s
+    when 'line'      then "lc"
+    when 'line_xy'   then "lxy"
+    when 'pie_3d'    then "p3"
+    when 'pie'       then "p"
+    when 'venn'      then "v"
+    when 'scatter'   then "s"
+    when 'sparkline' then "ls"
+    when 'meter'     then "gom"
+    when 'map'       then "t"
+    when 'radar'
+      "r" + (curved? ? 's' : '')
     when 'bar'
-      "cht=b" + (horizontal? ? "h" : "v") + (grouped? ? "g" : "s")
-    when 'pie_3d'
-      "cht=p3"
-    when 'pie'
-      "cht=p"
-    when 'venn'
-      "cht=v"
-    when 'scatter'
-      "cht=s"
-    when 'sparkline'
-      "cht=ls"
-    when 'meter'
-      "cht=gom"
-    when 'map'
-      "cht=t"
+      "b" + (horizontal? ? "h" : "v") + (grouped? ? "g" : "s")
     end
   end
 
   def fill_type(type)
     case type
-    when 'solid'
-      's'
-    when 'gradient'
-      'lg'
-    when 'stripes'
-      'ls'
+    when 'solid'    then 's'
+    when 'gradient' then 'lg'
+    when 'stripes'  then 'ls'
     end
   end
   
@@ -555,7 +551,7 @@ class Gchart
     if number.nil?
       "_"
     else
-      value = Gchart.simple_chars[number.to_i]
+      value = self.class.simple_chars[number.to_i]
       value.nil? ? "_" : value
     end
   end
@@ -564,7 +560,7 @@ class Gchart
     if number.nil?
       '__'
     else
-      value = Gchart.ext_pairs[number.to_i]
+      value = self.class.ext_pairs[number.to_i]
       value.nil? ? "__" : value
     end
   end
@@ -603,7 +599,7 @@ class Gchart
   # Allowing five pixels per data point, this is sufficient for line and bar charts up
   # to about 300 pixels. Simple encoding is suitable for all other types of chart regardless of size.
   def simple_encoding
-    "s" + number_visible + ":" + encode_scaled_dataset(Gchart.simple_chars, '_')
+    "s" + number_visible + ":" + encode_scaled_dataset(self.class.simple_chars, '_')
   end
 
   # http://code.google.com/apis/chart/#text
@@ -627,7 +623,11 @@ class Gchart
   # Extended encoding has a resolution of 4,096 different values 
   # and is best used for large charts where a large data range is required.
   def extended_encoding
-    "e" + number_visible + ":" + encode_scaled_dataset(Gchart.ext_pairs, '__')
+    "e" + number_visible + ":" + encode_scaled_dataset(self.class.ext_pairs, '__')
+  end
+
+  def url_builder(options="")
+    self.class.url + query_builder(options)
   end
 
   def query_builder(options="")
@@ -683,7 +683,7 @@ class Gchart
       delimiter = '&amp;'
     end
 
-    jstize(Gchart.url + query_params.join(delimiter))
+    jstize(query_params.join(delimiter))
   end
 
 end

data/lib/gchart/aliases.rb

@@ -10,5 +10,6 @@ class Gchart
   alias_method :labels=, :legend=
   alias_method :horizontal?, :horizontal
   alias_method :grouped?, :grouped
+  alias_method :curved?, :curved
 
-end
+end

data/spec/gchart_spec.rb

@@ -112,22 +112,47 @@ describe "generating a default Gchart" do
    Gchart.line(:axis_labels => [['Jan','July','Jan','July','Jan'], ['0','100'], ['A','B','C'], ['2005','2006','2007']]).include?(Gchart.jstize('chxl=0:|Jan|July|Jan|July|Jan|1:|0|100|2:|A|B|C|3:|2005|2006|2007')).should be_true
   end
   
+  def labeled_line(options = {})
+    Gchart.line({:data => @data, :axis_with_labels => 'x,y'}.merge options)
+  end
+
   it "should display ranges properly" do
-    data = [85,107,123,131,155,172,173,189,203,222,217,233,250,239,256,267,247,261,275,295,288,305,322,307,325,347,331,346,363,382,343,359,383,352,374,393,358,379,396,416,377,398,419,380,409,426,453,432,452,465,436,460,480,440,457,474,501,457,489,507,347,373,413,402,424,448,475,488,513,475,507,530,440,476,500,518,481,512,531,367,396,423,387,415,446,478,442,469,492,463,489,508,463,491,518,549,503,526,547,493,530,549,493,520,541,564,510,535,564,492,512,537,502,530,548,491,514,538,568,524,548,568,512,533,552,577,520,545,570,516,536,555,514,536,566,521,553,579,604,541,569,595,551,581,602,549,576,606,631,589,615,650,597,624,646,672,605,626,654,584,608,631,574,597,622,559,591,614,644,580,603,629,584,615,631,558,591,618,641,314,356,395,397,429,450,421,454,477,507,458,490,560,593]
-    url = Gchart.line(:data => data, :axis_with_labels => 'x,y', :axis_labels => [(1.upto(24).to_a << 1)])
-    url.should include('chxr=1,85,593')
+    @data = [85,107,123,131,155,172,173,189,203,222,217,233,250,239,256,267,247,261,275,295,288,305,322,307,325,347,331,346,363,382,343,359,383,352,374,393,358,379,396,416,377,398,419,380,409,426,453,432,452,465,436,460,480,440,457,474,501,457,489,507,347,373,413,402,424,448,475,488,513,475,507,530,440,476,500,518,481,512,531,367,396,423,387,415,446,478,442,469,492,463,489,508,463,491,518,549,503,526,547,493,530,549,493,520,541,564,510,535,564,492,512,537,502,530,548,491,514,538,568,524,548,568,512,533,552,577,520,545,570,516,536,555,514,536,566,521,553,579,604,541,569,595,551,581,602,549,576,606,631,589,615,650,597,624,646,672,605,626,654,584,608,631,574,597,622,559,591,614,644,580,603,629,584,615,631,558,591,618,641,314,356,395,397,429,450,421,454,477,507,458,490,560,593]
+    labeled_line(:axis_labels => [(1.upto(24).to_a << 1)]).
+      should include('chxr=1,85,593')
   end
   
-  it "should force the y range properly" do
-    url = Gchart.bar(:data => [1,1,1,1,1,1,1,1,6,2,1,1],
+  def labeled_bar(options = {})
+    Gchart.bar({:data => @data,
             :axis_with_labels => 'x,y',
-            :min_value => 0,
-            :max_value => 16,
             :axis_labels => [1.upto(12).to_a],
-            :axis_range => [[0,0],[0,16]],
             :encoding => "text"
-            )
-    url.should include('chxr=0,0,16|1,0,16')
+    }.merge(options))
+  end
+
+  it "should force the y range properly" do
+    @data = [1,1,1,1,1,1,1,1,6,2,1,1]
+    labeled_bar(
+      :axis_range => [[0,0],[0,16]]
+    ).should include('chxr=0,0,0|1,0,16')
+    labeled_bar(
+      :max_value => 16,
+      :axis_range => [[0,0],[0,16]]
+    ).should include('chxr=0,0,16|1,0,16')
+
+    # nil means ignore axis
+    labeled_bar(
+      :axis_range => [nil,[0,16]]
+    ).should include('chxr=1,0,16')
+
+    # empty array means take defaults
+    labeled_bar(
+      :max_value => 16,
+      :axis_range => [[],[0,16]]
+    ).should include('chxr=0,0,16|1,0,16')
+    labeled_bar(
+      :axis_range => [[],[0,16]]
+    ).should include('chxr=0,0|1,0,16')
   end
   
   it "should take in consideration the max value when creating a range" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: googlecharts
 version: !ruby/object:Gem::Version 
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -07:00
+date: 2010-05-06 00:00:00 -07:00
 default_executable: 
 dependencies: []