gchart 0.2.0 → 0.3.0

data/CHANGELOG.txt

@@ -1,3 +1,10 @@
+== 0.3.0 (2007-12-24)
+  
+  * Breaking change: labels --> legend
+  * Switched to RSpec, added skeletal specs for all types
+  * Extensive refactoring, pulled chart types into GChart::Base subclasses
+  * (bug) Errors in the static helpers should report a reasonable file and line
+
 == 0.2.0 (2007-12-12)
 
   * Support for basic :labels

data/Manifest.txt

@@ -3,5 +3,23 @@ Manifest.txt
 README.txt
 Rakefile
 lib/gchart.rb
+lib/gchart/bar.rb
+lib/gchart/base.rb
+lib/gchart/line.rb
+lib/gchart/pie.rb
+lib/gchart/pie_3d.rb
+lib/gchart/scatter.rb
+lib/gchart/venn.rb
+lib/gchart/xy_line.rb
 lib/version.rb
-test/test_gchart.rb
+spec/gchart/bar_spec.rb
+spec/gchart/base_spec.rb
+spec/gchart/line_spec.rb
+spec/gchart/pie_3d_spec.rb
+spec/gchart/pie_spec.rb
+spec/gchart/scatter_spec.rb
+spec/gchart/venn_spec.rb
+spec/gchart/xy_line_spec.rb
+spec/gchart_spec.rb
+spec/helper.rb
+spec/spec.opts

data/README.txt

@@ -8,7 +8,7 @@ a friendly Ruby interface. It can generate the URL for a given chart
 
 == PROBLEMS/TODO
 
-* Add support for legends, fills (area or background), grid lines, shape markers, range markers 
+* Add support fills (area or background), grid lines, shape markers, range markers 
 * Support shorthand colors and color names
 * Make venn data specification friendlier
 
@@ -38,8 +38,8 @@ query parameters using the :extras key, e.g.,
   # chart title
   g = GChart.line(:title => "Awesomeness over Time", :data => [0, 10, 100])
 
-  # data set labels
-  g = GChart.line(:data => [[1, 2], [3, 4]], :labels => ["Monkeys", "Ferrets"])
+  # data set legend
+  g = GChart.line(:data => [[1, 2], [3, 4]], :legend => ["Monkeys", "Ferrets"])
 
   # data set colors
   g = GChart.line(:data => [[0, 10, 100], [100, 10, 0]], :colors => ["ff0000", "0000ff"])

data/Rakefile

@@ -1,5 +1,7 @@
 require "rubygems"
 require "hoe"
+require "spec/rake/spectask"
+
 require "./lib/version.rb"
 
 hoe = Hoe.new("gchart", GChart::VERSION) do |p|
@@ -11,3 +13,12 @@ hoe = Hoe.new("gchart", GChart::VERSION) do |p|
   p.url = "http://gchart.rubyforge.org"
   p.changes = p.paragraphs_of("CHANGELOG.txt", 0..1).join("\n\n")
 end
+
+desc "Run all specs"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList["spec/**/*_spec.rb"]
+  t.spec_opts = ["--options", "spec/spec.opts"]
+end
+
+Rake::Task[:default].prerequisites.clear
+task :default => :spec

data/lib/gchart.rb

@@ -1,157 +1,45 @@
-require File.dirname(__FILE__) + "/version"
+require File.expand_path(File.dirname(__FILE__) + "/version")
 
-require "open-uri"
-require "uri"
+%w(base bar line pie pie_3d scatter venn xy_line).each do |type|
+  require File.expand_path(File.dirname(__FILE__) + "/gchart/#{type}")
+end
 
-class GChart
+module GChart
   URL   = "http://chart.apis.google.com/chart"
-  TYPES = %w(line linexy bar pie pie3d venn scatter).collect { |t| t.to_sym }
   CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.".split("")
   PAIRS = CHARS.collect { |first| CHARS.collect { |second| first + second } }.flatten
 
   class << self
-    def encode_extended(number) #:nodoc:
-      return "__" if number.nil?
-      PAIRS[number.to_i]
-    end
+    # Convenience constructor for GChart::Line.
+    def line(*args, &block); Line.new(*args, &block) end
     
-    TYPES.each do |type|
-      class_eval <<-END
-        def #{type}(options={}, &block)
-          new(options.merge(:type => #{type.inspect}, &block))
-        end
-      END
-    end
-  end
-
-  # Array of chart data
-  attr_accessor :data
-  
-  # Hash of additional query params
-  attr_accessor :extras
-  
-  # Width (in pixels)
-  attr_accessor :width
-  
-  # Height (in pixels)
-  attr_accessor :height
-  
-  # Orientation. Applies to bar charts
-  attr_accessor :horizontal
-  
-  # Grouping. Applies to bar charts
-  attr_accessor :grouped
-  
-  # Overall chart title
-  attr_accessor :title
-  
-  # Array of RRGGBB colors, one per data set
-  attr_accessor :colors
-  
-  # Array of data set labels
-  attr_accessor :labels
-  
-  attr_accessor :max
-  
-  # The chart type
-  attr_reader :type
-  
-  alias_method :horizontal?, :horizontal
-  alias_method :grouped?, :grouped
-  
-  def initialize(options={}, &block)
-    @type = :line
-    @data = []
-    @extras = {}
-    @width = 300
-    @height = 200
-    @horizontal = false
-    @grouped = false
+    # Convenience constructor for GChart::XYLine.
+    def xyline(*args, &block); XYLine.new(*args, &block) end
     
-    options.each { |k, v| send("#{k}=", v) }
-    yield(self) if block_given?
-  end
-
-  # Sets the chart type. Raises +ArgumentError+ if +type+ isn't in +TYPES+.
-  def type=(type)
-    unless TYPES.include?(type)
-      raise ArgumentError, %Q(Invalid type #{type.inspect}. Valid types: #{TYPES.inspect}.)
-    end
+    # Convenience constructor for GChart::Bar.
+    def bar(*args, &block); Bar.new(*args, &block) end    
     
-    @type = type
-  end
-  
-  # Returns the chart's size as "WIDTHxHEIGHT".
-  def size
-    "#{width}x#{height}"
-  end
-  
-  # Sets the chart's size as "WIDTHxHEIGHT".
-  def size=(size)
-    self.width, self.height = size.split("x").collect { |n| Integer(n) }
-  end
-  
-  # Returns the chart's URL.
-  def to_url
-    query = google_query_params.collect { |k, v| "#{k}=#{URI.escape(v)}" }.join("&")
-    "#{URL}?#{query}"
-  end
-  
-  # Returns the chart's generated PNG as a blob.
-  def fetch
-    open(to_url) { |data| data.read }
-  end
-  
-  # Writes the chart's generated PNG to a file. If +io_or_file+ quacks like an IO,
-  # +write+ will be called on it instead.
-  def write(io_or_file="chart.png")
-    return io_or_file.write(fetch) if io_or_file.respond_to?(:write)
-    open(io_or_file, "w+") { |f| f.write(fetch) }
-  end
-  
-  private
-  
-  def google_query_params
-    params = { "cht" => google_chart_type, "chd" => google_data, "chs" => size }
-    params["chtt"] = title.tr("\n", "|").gsub(/\s+/, "+") if title
-    params["chco"] = colors.join(",") if colors
+    # Convenience constructor for GChart::Pie.
+    def pie(*args, &block); Pie.new(*args, &block) end    
     
-    if labels
-      param = (type == :pie || type == :pie3d) ? "chl" : "chdl"
-      params[param] = labels.join("|")
-    end
+    # Convenience constructor for GChart::Pie3D.
+    def pie3d(*args, &block); Pie3D.new(*args, &block) end    
     
-    params.merge(extras)
-  end
-  
-  def google_chart_type
-    case type
-    when :line
-      "lc"
-    when :linexy
-      "lxy"
-    when :bar
-      "b" + (horizontal? ? "h" : "v") + (grouped? ? "g" : "s")
-    when :pie
-      "p"
-    when :pie3d
-      "p3"
-    when :venn
-      "v"
-    when :scatter
-      "s"
-    end
-  end
-  
-  def google_data
-    raw = data && data.first.is_a?(Array) ? data : [data]
-    max = self.max || raw.collect { |s| s.max }.max
+    # Convenience constructor for GChart::Venn.
+    def venn(*args, &block); Venn.new(*args, &block) end    
     
-    sets = raw.collect do |set|
-      # we'll just always use the extended encoding for now
-      set.collect { |n| GChart.encode_extended(n * (PAIRS.size - 1) / max) }.join
-    end
+    # Convenience constructor for GChart::Scatter.
+    def scatter(*args, &block); Scatter.new(*args, &block) end
     
-    "e:#{sets.join(",")}"
-  end  
+    # Encode +n+ as a string. +n+ is normalized based on +max+.
+    # +encoding+ can currently only be :extended.
+    def encode(encoding, n, max)
+      unless encoding == :extended
+        raise ArgumentError, "unsupported encoding: #{encoding.inspect}"
+      end
+
+      return "__" if n.nil?
+      PAIRS[(n * (PAIRS.size - 1) / max).to_i]
+    end
+  end
 end

data/lib/gchart/bar.rb

@@ -0,0 +1,37 @@
+module GChart
+  class Bar < GChart::Base
+    ORIENTATIONS = [:horizontal, :vertical]
+    
+    attr_accessor :grouped
+    alias_method :grouped?, :grouped
+    
+    attr_reader :orientation
+    
+    def initialize(*args, &block)
+      @grouped = false
+      @orientation = :horizontal
+      super
+    end
+    
+    def orientation=(orientation)
+      unless ORIENTATIONS.include?(orientation)
+        raise ArgumentError, "Invalid orientation: #{orientation.inspect}. " +
+          "Valid orientations: #{ORIENTATIONS.inspect}"
+      end
+      
+      @orientation = orientation
+    end
+    
+    def horizontal?
+      @orientation == :horizontal
+    end
+
+    def vertical?
+      @orientation == :vertical
+    end
+    
+    def render_chart_type #:nodoc:
+      "b#{@orientation.to_s[0..0]}#{grouped? ? "g" : "s"}"
+    end
+  end
+end

data/lib/gchart/base.rb

@@ -0,0 +1,120 @@
+require "open-uri"
+require "uri"
+
+module GChart
+  class Base
+    # Array of chart data. See subclasses for specific usage.
+    attr_accessor :data
+    
+    # Hash of additional HTTP query params.
+    attr_accessor :extras
+    
+    # Chart title.
+    attr_accessor :title
+    
+    # Array of rrggbb colors, one per data set.
+    attr_accessor :colors
+    
+    # Array of legend text, one per data set.
+    attr_accessor :legend
+    
+    # Max data value for quantization.
+    attr_accessor :max
+
+    # Chart width, in pixels.
+    attr_reader :width    
+    
+    # Chart height, in pixels.
+    attr_reader :height
+
+    def initialize(options={}, &block)
+      @data = []
+      @extras = {}
+      @width = 300
+      @height = 200
+  
+      options.each { |k, v| send("#{k}=", v) }
+      yield(self) if block_given?
+    end
+
+    # Sets the chart's width, in pixels. Raises +ArgumentError+ if +width+ is less than 1.
+    def width=(width)
+      raise ArgumentError, "Invalid width: #{width.inspect}" if width.nil? || width < 1
+      @width = width
+    end
+
+    # Sets the chart's height, in pixels. Raises +ArgumentError+ if +height+ is less than 1.
+    def height=(height)
+      raise ArgumentError, "Invalid height: #{height.inspect}" if height.nil? || height < 1
+      @height = height
+    end
+
+    # Returns the chart's size as "WIDTHxHEIGHT".
+    def size
+      "#{width}x#{height}"
+    end
+
+    # Sets the chart's size as "WIDTHxHEIGHT".
+    def size=(size)
+      self.width, self.height = size.split("x").collect { |n| Integer(n) }
+    end
+
+    # Returns the chart's URL.
+    def to_url
+      query = query_params.collect { |k, v| "#{k}=#{URI.escape(v)}" }.join("&")
+      "#{GChart::URL}?#{query}"
+    end
+
+    # Returns the chart's generated PNG as a blob.
+    def fetch
+      open(to_url) { |io| io.read }
+    end
+
+    # Writes the chart's generated PNG to a file. If +io_or_file+ quacks like an IO,
+    # calls +write+ on it instead.
+    def write(io_or_file="chart.png")
+      return io_or_file.write(fetch) if io_or_file.respond_to?(:write)
+      open(io_or_file, "w+") { |io| io.write(fetch) }
+    end
+
+    protected
+    
+    def query_params #:nodoc:
+      params = { "cht" => render_chart_type, "chs" => size }
+    
+      render_data(params)
+      render_title(params)
+      render_colors(params)
+      render_legend(params)
+
+      params.merge(extras)
+    end
+
+    def render_chart_type #:nodoc:
+      raise NotImplementedError, "override in subclasses"
+    end
+    
+    def render_data(params) #:nodoc:
+      raw = data && data.first.is_a?(Array) ? data : [data]
+      max = self.max || raw.collect { |s| s.max }.max
+  
+      sets = raw.collect do |set|
+        set.collect { |n| GChart.encode(:extended, n, max) }.join
+      end
+  
+      params["chd"] = "e:#{sets.join(",")}"
+    end
+    
+    def render_title(params) #:nodoc:
+      params["chtt"] = title.tr("\n", "|").gsub(/\s+/, "+") if title
+    end
+    
+    def render_colors(params) #:nodoc:
+      params["chco"] = colors.join(",") if colors  
+    end
+    
+    def render_legend(params) #:nodoc:
+      params["chdl"] = legend.join("|") if legend
+    end    
+  end
+end

data/lib/gchart/line.rb

@@ -0,0 +1,7 @@
+module GChart
+  class Line < GChart::Base
+    def render_chart_type #:nodoc:
+      "lc"
+    end
+  end
+end

data/lib/gchart/pie.rb

@@ -0,0 +1,11 @@
+module GChart
+  class Pie < GChart::Base
+    def render_chart_type #:nodoc:
+      "p"
+    end
+    
+    def render_legend(params)
+      params["chl"] = legend.join("|") if legend
+    end
+  end
+end

data/lib/gchart/pie_3d.rb

@@ -0,0 +1,7 @@
+module GChart
+  class Pie3D < GChart::Pie
+    def render_chart_type #:nodoc:
+      "p3"
+    end
+  end
+end

data/lib/gchart/scatter.rb

@@ -0,0 +1,7 @@
+module GChart
+  class Scatter < GChart::Base
+    def render_chart_type #:nodoc:
+      "s"
+    end
+  end
+end

data/lib/gchart/venn.rb

@@ -0,0 +1,7 @@
+module GChart
+  class Venn < GChart::Base
+    def render_chart_type #:nodoc:
+      "v"
+    end
+  end
+end

data/lib/gchart/xy_line.rb

@@ -0,0 +1,7 @@
+module GChart
+  class XYLine < GChart::Base
+    def render_chart_type #:nodoc:
+      "lxy"
+    end
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
-class GChart
-  VERSION = "0.2.0"  
+module GChart
+  VERSION = "0.3.0"  
 end

data/spec/gchart/bar_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../helper")
+
+describe GChart::Bar do
+  before(:each) do
+    @chart = GChart::Bar.new
+  end
+  
+  it "is ungrouped by default" do
+    @chart.grouped.should == false
+    @chart.should_not be_grouped
+  end
+  
+  it "is horizontal by default" do
+    @chart.orientation.should == :horizontal
+    @chart.should be_horizontal
+    @chart.should_not be_vertical
+  end
+  
+  it "renders the correct chart type" do
+    GChart::Bar.new.render_chart_type.should == "bhs"
+    GChart::Bar.new(:grouped => true).render_chart_type.should == "bhg"
+    GChart::Bar.new(:orientation => :vertical).render_chart_type.should == "bvs"
+  end
+end

data/spec/gchart/base_spec.rb

@@ -0,0 +1,150 @@
+require "tmpdir"
+require File.expand_path("#{File.dirname(__FILE__)}/../helper")
+
+describe GChart::Base do
+  it "can be initialized with a hash" do
+    GChart::Base.new(:title => "foo").title.should == "foo"
+  end
+
+  it "complains about being initialized with unknown attributes" do
+    lambda { GChart::Base.new(:monkey => :chimchim) }.should raise_error(NoMethodError)
+  end
+
+  it "can be initialized with a block" do
+    chart = GChart::Base.new do |c|
+      c.title = "foo"
+    end
+
+    chart.title.should == "foo"
+  end
+end
+
+describe GChart::Base, "#data" do
+  it "is an empty array by default" do
+    GChart::Base.new.data.should == []
+  end
+end
+
+describe GChart::Base, "#size" do
+  before(:each) { @chart = GChart::Base.new }
+  
+  it "can be accessed as width and height" do
+    @chart.width.should_not be_zero
+    @chart.height.should_not be_zero
+  end
+  
+  it "can be accessed as a combined size" do
+    @chart.size.should == "#{@chart.width}x#{@chart.height}"
+  end
+  
+  it "can be specified as a combined size" do
+    @chart.size = "11x13"
+    @chart.width.should == 11
+    @chart.height.should == 13
+  end
+  
+  it "has a reasonable default value" do
+    @chart.size.should == "300x200"
+  end
+  
+  it "complains about negative numbers" do
+    lambda { @chart.size = "-15x13" }.should raise_error(ArgumentError)
+    lambda { @chart.width = -1 }.should raise_error(ArgumentError)
+    lambda { @chart.height= -1 }.should raise_error(ArgumentError)
+  end
+end
+
+describe GChart::Base, "#render_chart_type" do
+  it "raises; subclasses must implement" do
+    lambda { GChart::Base.new.render_chart_type }.should raise_error(NotImplementedError)
+  end
+end
+
+describe GChart::Base, "#query_params" do
+  before(:each) do
+    @chart = GChart::Base.new
+    @chart.stub!(:render_chart_type).and_return("TEST")
+  end
+  
+  it "contains the chart's type" do
+    @chart.query_params["cht"].should == "TEST"
+  end
+  
+  it "contains the chart's data" do
+    @chart.data = [[1, 2, 3], [3, 2, 1]]
+    @chart.query_params["chd"].should == "e:VVqq..,..qqVV"
+  end
+  
+  it "contains the chart's size" do
+    @chart.query_params["chs"].should == "300x200"
+  end
+  
+  it "contains the chart's title" do
+    @chart.title = "foo"
+    @chart.query_params["chtt"].should == "foo"
+  end
+  
+  it "escapes the chart's title" do
+    @chart.title = "foo bar"
+    @chart.query_params["chtt"].should == "foo+bar"
+    
+    @chart.title = "foo\nbar"
+    @chart.query_params["chtt"].should == "foo|bar"
+  end
+  
+  it "contains the chart's colors" do
+    @chart.colors = ["cccccc", "eeeeee"]
+    @chart.query_params["chco"].should == "cccccc,eeeeee"
+  end
+end
+
+describe GChart::Base, "#to_url" do
+  before(:each) do
+    @chart = GChart::Base.new
+    @chart.stub!(:render_chart_type).and_return("TEST")
+  end
+
+  it "generates a URL that points at Google" do
+    @chart.to_url.should =~ %r(http://chart.apis.google.com/chart)
+  end
+end
+
+describe GChart::Base, "#fetch" do
+  # THIS EXPECTATION HITS THE CLOUD!  Comment it out for a faster cycle. :)
+  it "fetches a blob from Google" do
+    blob = GChart.line(:data => [1, 2]).fetch
+    blob.should_not be_nil
+    blob.should =~ /PNG/
+  end
+end
+
+describe GChart::Base, "#write" do
+  before(:each) do
+    @chart = GChart::Base.new
+    @chart.stub!(:fetch).and_return("PAYLOAD")
+  end
+  
+  it "writes to chart.png by default" do
+    Dir.chdir(Dir.tmpdir) do
+      @chart.write
+      File.file?("chart.png").should == true
+    end
+  end
+  
+  it "writes to a specified file" do
+    Dir.chdir(Dir.tmpdir) do
+      @chart.write("foo.png")
+      File.file?("foo.png").should == true
+    end
+  end
+  
+  it "writes to anything that quacks like IO" do
+    result = ""
+    
+    StringIO.open(result, "w+") do |io|
+      @chart.write(io)
+    end
+    
+    result.should == "PAYLOAD"
+  end
+end

data/spec/gchart/line_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../helper")
+
+describe GChart::Line do
+  it "renders the correct chart type" do
+    GChart::Line.new.render_chart_type.should == "lc"
+  end
+end

data/spec/gchart/pie_3d_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../helper")
+
+describe GChart::Pie3D do
+  it "renders the correct chart type" do
+    GChart::Pie3D.new.render_chart_type.should == "p3"
+  end
+end

data/spec/gchart/pie_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../helper")
+
+describe GChart::Pie do
+  it "renders the correct chart type" do
+    GChart::Pie.new.render_chart_type.should == "p"
+  end
+end

data/spec/gchart/scatter_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../helper")
+
+describe GChart::Scatter do
+  it "renders the correct chart type" do
+    GChart::Scatter.new.render_chart_type.should == "s"
+  end
+end

data/spec/gchart/venn_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../helper")
+
+describe GChart::Venn do
+  it "renders the correct chart type" do
+    GChart::Venn.new.render_chart_type.should == "v"
+  end
+end

data/spec/gchart/xy_line_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../helper")
+
+describe GChart::XYLine do
+  it "renders the correct chart type" do
+    GChart::XYLine.new.render_chart_type.should == "lxy"
+  end
+end

data/spec/gchart_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path("#{File.dirname(__FILE__)}/helper")
+
+describe GChart do
+  it "supplies a version" do
+    GChart::VERSION.should_not be_nil
+  end
+end
+
+describe GChart, ".encode" do
+  it "only supports the extended encoding" do
+    lambda { GChart.encode(:simple, 4, 10) }.should raise_error(ArgumentError)
+  end
+
+  it "implements the extended encoding" do
+    expected = {
+      0 => "AA", 25 => "AZ", 26 => "Aa", 51 => "Az", 52 => "A0", 61 => "A9", 62 => "A-", 63 => "A.",
+      64 => "BA", 89 => "BZ", 90 => "Ba", 115 => "Bz", 116 => "B0", 125 => "B9", 126 => "B-", 127 => "B.",
+      4032 => ".A", 4057 => ".Z", 4058 => ".a", 4083 => ".z", 4084 => ".0", 4093 => ".9", 4094 => ".-", 4095 => ".."
+    }
+    
+    expected.each do |original, encoded|
+      GChart.encode(:extended, original, 4095).should == encoded
+    end
+  end
+  
+  it "encodes nil correctly" do
+    GChart.encode(:extended, nil, 1).should == "__"
+  end
+end
+
+describe GChart, ".line" do
+  it "can render a basic line URL" do
+    expected = { "cht" => "lc", "chs" => "300x200", "chd" => "e:AAAo..", "chtt" => "test" }
+    chart = GChart.line(:title => "test", :data => [1, 100, 10000])
+
+    chart.query_params.should == expected
+    chart.to_url.should == "http://chart.apis.google.com/chart?chs=300x200&cht=lc&chtt=test&chd=e:AAAo.."
+  end
+end

data/spec/helper.rb

@@ -0,0 +1,11 @@
+$LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../lib"))
+
+require "spec"
+require "gchart"
+
+module GChart
+  class Base
+    public :query_params
+    public :render_chart_type, :render_data
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: gchart
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-platform: ""
+  version: 0.3.0
+platform: ruby
 authors: 
 - John Barnette
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2007-12-12 00:00:00 -08:00
+date: 2007-12-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.3.0
     version: 
-description: "== PROBLEMS/TODO  * Add support for legends, fills (area or background), grid lines, shape markers, range markers  * Support shorthand colors and color names * Make venn data specification friendlier  There are lots of missing features. Until they're implemented, you can directly specify query parameters using the :extras key, e.g.,  # provides a legend for each data set g = GChart.line(:data => [[1, 2], [3, 4]], :extras => { \"chdl\" => [\"First\", \"Second\"] })"
+description: "== PROBLEMS/TODO  * Add support fills (area or background), grid lines, shape markers, range markers  * Support shorthand colors and color names * Make venn data specification friendlier  There are lots of missing features. Until they're implemented, you can directly specify query parameters using the :extras key, e.g.,  # provides a legend for each data set g = GChart.line(:data => [[1, 2], [3, 4]], :extras => { \"chdl\" => [\"First\", \"Second\"] })"
 email: jbarnette@rubyforge.org
 executables: []
 
@@ -37,8 +37,26 @@ files:
 - README.txt
 - Rakefile
 - lib/gchart.rb
+- lib/gchart/bar.rb
+- lib/gchart/base.rb
+- lib/gchart/line.rb
+- lib/gchart/pie.rb
+- lib/gchart/pie_3d.rb
+- lib/gchart/scatter.rb
+- lib/gchart/venn.rb
+- lib/gchart/xy_line.rb
 - lib/version.rb
-- test/test_gchart.rb
+- spec/gchart/bar_spec.rb
+- spec/gchart/base_spec.rb
+- spec/gchart/line_spec.rb
+- spec/gchart/pie_3d_spec.rb
+- spec/gchart/pie_spec.rb
+- spec/gchart/scatter_spec.rb
+- spec/gchart/venn_spec.rb
+- spec/gchart/xy_line_spec.rb
+- spec/gchart_spec.rb
+- spec/helper.rb
+- spec/spec.opts
 has_rdoc: true
 homepage: http://gchart.rubyforge.org
 post_install_message: 
@@ -62,9 +80,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gchart
-rubygems_version: 0.9.5
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: GChart uses the Google Chart API to create pretty pictures.
-test_files: 
-- test/test_gchart.rb
+test_files: []
+

data/test/test_gchart.rb

@@ -1,114 +0,0 @@
-require "test/unit"
-require "gchart"
-
-class GChart
-  public :google_query_params, :google_chart_type, :google_data
-end
-
-class TestGChart < Test::Unit::TestCase
-  def test_supplies_a_version
-    assert_not_nil(GChart::VERSION)
-  end
-  
-  def test_allows_hash_initialization
-    assert_equal(:line, GChart.new(:type => :line).type)
-  end
-  
-  def test_complains_about_unknown_options
-    assert_raise(NoMethodError) { GChart.new(:monkey => :chimchim) }
-  end
-  
-  def test_allows_block_initialization
-    c = GChart.new do |chart|
-      chart.type = :line
-    end
-    
-    assert_equal(:line, c.type)
-  end
-  
-  def test_allows_all_valid_chart_types
-    GChart::TYPES.each do |type|
-      assert_nothing_raised(ArgumentError) { GChart.new(:type => type) }
-    end
-  end
-  
-  def test_complains_about_invalid_chart_types
-    assert_raise(ArgumentError) { GChart.new(:type => :monkey) }
-  end
-  
-  def test_allows_size_to_be_specified_combined
-    c = GChart.new(:size => "13x14")
-    assert_equal(13, c.width)
-    assert_equal(14, c.height)
-  end
-  
-  def test_defaults
-    c = GChart.new
-    assert_equal(:line, c.type)   
-    assert_equal([], c.data)
-    assert_equal(300, c.width)
-    assert_equal(200, c.height)
-    assert(!c.horizontal?)
-    assert(!c.grouped?)
-  end
-  
-  def test_google_chart_types
-    assert_equal("lc", GChart.new(:type => :line).google_chart_type)
-    assert_equal("lxy", GChart.new(:type => :linexy).google_chart_type)
-    
-    assert_equal("bhg", GChart.new(:type => :bar, :horizontal => true, :grouped => true).google_chart_type)
-    assert_equal("bhs", GChart.new(:type => :bar, :horizontal => true, :grouped => false).google_chart_type)
-    assert_equal("bvs", GChart.new(:type => :bar, :horizontal => false, :grouped => false).google_chart_type)
-    
-    assert_equal("p", GChart.new(:type => :pie).google_chart_type)
-    assert_equal("v", GChart.new(:type => :venn).google_chart_type)
-    assert_equal("s", GChart.new(:type => :scatter).google_chart_type)
-  end
-  
-  def test_google_extended_notation
-    expected = {
-      0 => "AA", 25 => "AZ", 26 => "Aa", 51 => "Az", 52 => "A0", 61 => "A9", 62 => "A-", 63 => "A.",
-      64 => "BA", 89 => "BZ", 90 => "Ba", 115 => "Bz", 116 => "B0", 125 => "B9", 126 => "B-", 127 => "B.",
-      4032 => ".A", 4057 => ".Z", 4058 => ".a", 4083 => ".z", 4084 => ".0", 4093 => ".9", 4094 => ".-", 4095 => ".."
-    }
-    
-    expected.each do |original, encoded|
-      assert_equal(encoded, GChart.encode_extended(original))
-    end
-    
-    assert_equal("__", GChart.encode_extended(nil))    
-  end
-  
-  def test_allows_extra_query_params
-    c = GChart.new(:extras => { :foo => :bar })
-    assert(c.google_query_params.include?(:foo))
-  end
-  
-  def test_supports_title
-    chart = GChart.new
-    
-    assert_nil(chart.google_query_params["chtt"])
-    
-    chart.title = "foo"
-    assert_equal("foo", chart.google_query_params["chtt"])
-    
-    chart.title = "a space"
-    assert_equal("a+space", chart.google_query_params["chtt"])
-    
-    chart.title = "a\nnewline"
-    assert_equal("a|newline", chart.google_query_params["chtt"])
-  end
-  
-  def test_supports_colors
-    chart = GChart.new(:colors => ["cccccc", "eeeeee"])
-    assert_equal(chart.google_query_params["chco"], "cccccc,eeeeee")
-  end
-  
-  def test_generates_correct_query_params_and_url_for_simple_example
-    expected = { "cht" => "lc", "chs" => "300x200", "chd" => "e:AAAo..", "chtt" => "test" }
-    
-    chart = GChart.new(:title => "test", :data => [1, 100, 10000])
-    assert_equal(expected, chart.google_query_params)
-    assert_equal("http://chart.apis.google.com/chart?chs=300x200&cht=lc&chtt=test&chd=e:AAAo..", chart.to_url)
-  end
-end