jparker-ruby-googlechart 0.5.0 → 0.6.0

data/lib/google_chart/{base.rb → abstract_chart.rb}

@@ -1,16 +1,28 @@
 module GoogleChart
-  class Base
-    @@base_url = 'http://chart.apis.google.com/chart'
+  class AbstractChart
+    @@base_url     = 'http://chart.apis.google.com/chart'
+    @@default_size = '600x500'
     
     def initialize(options = {})
       options.each {|key, value| send("#{key}=", value) }
       yield self if block_given?
     end
     
+    def to_url
+      "#{@@base_url}?#{query_string}"
+    end
+    
+    attr_writer :size
+    
+    def size
+      @size ||= @@default_size
+      "chs=#{@size}"
+    end
+    
     def self.inherited(klass)
       klass.class_eval do
         class_variable_set(:@@parameters, [])
-        register!(:chart_type)
+        register!(:chart_type, :size)
       end
     end
     
@@ -28,12 +40,6 @@ module GoogleChart
       class_variable_get :@@parameters
     end
     
-    # Collect all of the registered chart parameters and join them together
-    # to form the URL for the chart to be generated.
-    def to_url
-      "#{@@base_url}?#{query_string}"
-    end
-    
     private
     def query_string
       self.class.registry.map {|m| send(m) }.compact.join('&')

data/lib/google_chart/{axes.rb → axis.rb}

@@ -1,22 +1,12 @@
 # <URL:http://code.google.com/apis/chart/#multiple_axes_labels>
 module GoogleChart
-  module Axes
+  module Axis
     def self.included(klass)
       klass.register!(:axes)
     end
     
     # TODO: Add support for axis label positions/styles, support for multiple label sets per axis
     
-    def axes
-      unless @axes.nil? || @axes.empty?
-        [
-          'chxt=' + @axes.join(','),
-          @axis_labels.empty? ? nil : 'chxl=' + @axis_labels.join('|'),
-          @axis_ranges.empty? ? nil : 'chxr=' + @axis_ranges.join('|')
-        ].compact.join('&')
-      end
-    end
-    
     def axes=(axes)
       idx = 0
       @axes, @axis_labels, @axis_ranges = [], [], []
@@ -36,5 +26,15 @@ module GoogleChart
         end
       end
     end
+    
+    def axes
+      unless @axes.nil? || @axes.empty?
+        [
+          'chxt=' + @axes.join(','),
+          @axis_labels.empty? ? nil : 'chxl=' + @axis_labels.join('|'),
+          @axis_ranges.empty? ? nil : 'chxr=' + @axis_ranges.join('|')
+        ].compact.join('&')
+      end
+    end
   end
 end

data/lib/google_chart/bar_chart.rb

@@ -0,0 +1,31 @@
+module GoogleChart
+  class BarChart < AbstractChart
+    include Axis
+    include BarStyle
+    include Color
+    include Data
+    include GridLine
+    include Legend
+    include RangeMarker
+    include Title
+    
+    @@orientations = {:horizontal => 'h', :vertical => 'v'}
+    @@groupings    = {:grouped    => 'g', :stacked  => 's'}
+    
+    attr_writer :orientation, :grouping
+    
+    def horizontal=(arg)
+      self.orientation = arg ? :horizontal : :vertical
+    end
+    
+    def grouped=(arg)
+      self.grouping = arg ? :grouped : :stacked
+    end
+    
+    def chart_type
+      @grouping    ||= :stacked
+      @orientation ||= :vertical
+      "cht=b#{@@orientations[@orientation]}#{@@groupings[@grouping]}"
+    end
+  end
+end

data/lib/google_chart/bar_style.rb

@@ -0,0 +1,19 @@
+# <URL:http://code.google.com/apis/chart/#bar_width>
+module GoogleChart
+  module BarStyle
+    def self.included(klass)
+      klass.register!(:style)
+    end
+    
+    attr_writer :width
+    
+    # TODO: raise error if bar spacing > group spacing?
+    def spacing=(spacing)
+      @spacing = [spacing].flatten
+    end
+    
+    def style
+      "chbh=#{[@width, *@spacing].compact.join(',')}" if @width
+    end
+  end
+end

data/lib/google_chart/{colors.rb → color.rb}

@@ -1,14 +1,16 @@
 # <URL:http://code.google.com/apis/chart/#line_bar_pie_colors>
 module GoogleChart
-  module Colors
+  module Color
     def self.included(klass)
       klass.register!(:color)
     end
     
-    attr_writer :color
+    def color=(color)
+      @color = [color].flatten
+    end
     
     def color
-      'chco=' + [@color].flatten.join(',') if @color
+      "chco=#{@color.join(',')}" if @color
     end
   end
 end

data/lib/google_chart/data.rb

@@ -7,82 +7,77 @@ module GoogleChart
     
     attr_writer :encoding, :scale
     
-    @@simple_encoding   = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a
-    @@extended_alphabet = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a + %w[- .]
-    @@extended_encoding = @@extended_alphabet.collect {|a|
-      @@extended_alphabet.collect {|b| a + b }
-    }.flatten
+    @@simple   = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a
+    alphabet   = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a + %w[- .]
+    @@extended = alphabet.map {|a| alphabet.map {|b| a + b }}.flatten
     
-    def data
-      'chd=' + send(:"#{encoding}_encode", @data) if @data
+    def data=(data)
+      @data = data.any? {|e| Array === e } ? data : [data]
     end
     
-    def data=(data)
-      @data = data.any? {|e| e.is_a?(Array) } ? data : [data]
+    def data
+      'chd=' + send(:"#{encoding}_encode", @data) if @data
     end
     
     private
     def encoding
-      @encoding || :simple
+      @encoding ||= :simple
     end
     
-    def scale?
+    def scale
+      if @scale.nil?
+        min = [0, @data.map {|set| set.min }.min].min
+        max = @data.map {|set| set.max }.max
+        @scale = min..max
+      end
       @scale
     end
     
-    def scale_set(set, range)
-      if scale?
-        min, max = set.min, set.max
-        if min < 0
-          set.collect! {|n| n - min }
-          max -= min
-        end
-        set.collect {|n| (n * range).to_f / max if n }
-      else
-        set
-      end
+    def normalize(set, encoding_max)
+      min, max = scale.min, scale.max
+      set.map {|e| (e.to_f - min) / (max - min) * encoding_max if e }
     end
     
     def simple_encode(data)
-      's:' + data.collect {|set|
-        scale_set(set, @@simple_encoding.size - 1).collect {|n|
+      's:' + data.map {|set|
+        normalize(set, @@simple.size - 1).map {|e|
           case
-          when n.nil? then '_'
-          when n <= 0 then @@simple_encoding[0]
-          when n >= @@simple_encoding.size then @@simple_encoding[-1]
-          else @@simple_encoding[n.round]
+          when e.nil? then '_'
+          when e <= 0 then @@simple[0]
+          when e >= @@simple.size then @@simple[-1]
+          else @@simple[e.round]
           end
         }.join
       }.join(',')
     end
     
     def extended_encode(data)
-      'e:' + data.collect {|set|
-        scale_set(set, @@extended_encoding.size - 1).collect {|n|
+      'e:' + data.map {|set|
+        normalize(set, @@extended.size - 1).collect {|e|
           case
-          when n.nil? then '__'
-          when n <= 0 then @@extended_encoding[0]
-          when n >= @@extended_encoding.size then @@extended_encoding[-1]
-          else @@extended_encoding[n.round]
+          when e.nil? then '__'
+          when e <= 0 then @@extended[0]
+          when e >= @@extended.size then @@extended[-1]
+          else @@extended[e.round]
           end
         }.join
       }.join(',')
     end
     
     def text_encode(data)
-      't:' + data.collect {|set|
-        scale_set(set, 100).collect {|n|
+      't:' + data.map {|set|
+        normalize(set, 100).map {|e|
           case
-          when n.nil? then -1
-          when n < 0 then 0
-          when n > 100 then 100
+          when e.nil? then -1
+          when e < 0 then 0
+          when e > 100 then 100
           else
             # More than one decimal place yields negligible resolution at the
             # potentially great cost of one extra character in the URL. Avoid
             # this by rounding to the nearest tenth. Further round down to an
             # integer when possible to save the extra two characters (".0").
-            m = (n * 10).round
-            m / (m % 10 == 0 ? 10 : 10.0)
+            n = (e * 10).round
+            n / (n % 10 == 0 ? 10 : 10.0)
           end
         }.join(',')
       }.join('|')

data/lib/google_chart/{grid_lines.rb → grid_line.rb}

@@ -1,6 +1,6 @@
 # <URL:http://code.google.com/apis/chart/#grid>
 module GoogleChart
-  module GridLines
+  module GridLine
     def self.included(klass)
       klass.register!(:grid)
     end
@@ -8,14 +8,14 @@ module GoogleChart
     @@grid_line_styles  = { :solid => [1,0], :dash => [3,2], :dot => [1,2] }
     @@default_grid_step = 0
     
-    def grid
-      'chg=' + @grid if @grid
-    end
-    
     def grid=(grid)
       grid[:x] ||= @@default_grid_step
       grid[:y] ||= @@default_grid_step
       @grid = [grid[:x], grid[:y], *@@grid_line_styles[grid[:style]]].compact.join(',')
     end
+    
+    def grid
+      "chg=#{@grid}" if @grid
+    end
   end
 end

data/lib/google_chart/{legends.rb → legend.rb}

@@ -1,14 +1,16 @@
 # <URL:http://code.google.com/apis/chart/#chdl>
 module GoogleChart
-  module Legends
+  module Legend
     def self.included(klass)
       klass.register!(:legend)
     end
     
-    attr_writer :legend
+    def legend=(legend)
+      @legend = [legend].flatten.map {|l| CGI::escape(l) }
+    end
     
     def legend
-      'chdl=' + [@legend].flatten.collect {|l| CGI::escape(l) }.join('|') if @legend
+      "chdl=#{@legend.join('|')}" if @legend
     end
   end
 end

data/lib/google_chart/{line.rb → line_chart.rb}

@@ -1,24 +1,24 @@
 module GoogleChart
-  class Line < Base
+  class LineChart < AbstractChart
     @@chart_types = { :line => 'lc', :xy => 'lxy', :sparkline => 'ls' }
     
-    include Axes
-    include Colors
+    include Axis
+    include Color
     include Data
-    include GridLines
-    include Legends
-    include LineStyles
-    include RangeMarkers
-    include Sizes
-    include Titles
+    include GridLine
+    include Legend
+    include LineStyle
+    include RangeMarker
+    include Title
     
     def chart_type
       @chart_type ||= @@chart_types[:line]
       'cht=' + @chart_type if @chart_type
     end
     
-    def type=(chart_type)
+    def chart_type=(chart_type)
       @chart_type = @@chart_types[chart_type]
     end
+    alias_method :type=, :chart_type=
   end
 end

data/lib/google_chart/{line_styles.rb → line_style.rb}

@@ -1,35 +1,36 @@
 # <URL:http://code.google.com/apis/chart/#line_styles>
 module GoogleChart
-  module LineStyles
+  module LineStyle
     def self.included(klass)
       klass.register!(:style)
     end
     
-    @@line_styles = { :solid => [1,1,0], :dash => [1,3,2], :dot => [1,1,2] }
-    @@default_line_style = :solid
-    @@default_line_width = 1
+    @@styles = { :solid => [1,1,0], :dash => [1,3,2], :dot => [1,1,2] }
+    
+    @@default_style = :solid
+    @@default_width = 1
+    
+    def style=(style)
+      @style = [style].flatten
+    end
+    
+    def width=(width)
+      @width = [width].flatten
+    end
     
     def style
       @style ||= []
       @width ||= []
       
       # Pad @style and @width with defaults until they are equal in length
-      (@style.size - @width.size).times { @width << @@default_line_width }
-      (@width.size - @style.size).times { @style << @@default_line_style }
+      (@style.size - @width.size).times { @width << @@default_width }
+      (@width.size - @style.size).times { @style << @@default_style }
       
       unless @style.empty?
-        'chls=' + (0...@style.size).collect {|i|
-          @@line_styles[@style[i]].collect {|n| n * @width[i] }.join(',')
+        'chls=' + (0...@style.size).map {|i|
+          @@styles[@style[i]].map {|n| n * @width[i] }.join(',')
         }.join('|')
       end
     end
-    
-    def style=(style)
-      @style = [style].flatten
-    end
-    
-    def width=(width)
-      @width = [width].flatten
-    end
   end
 end

data/lib/google_chart/{range_markers.rb → range_marker.rb}

@@ -1,12 +1,16 @@
 # <URL:http://code.google.com/apis/chart/#hor_line_marker>
 module GoogleChart
-  module RangeMarkers
+  module RangeMarker
     def self.included(klass)
       klass.register!(:ranges)
     end
     
     @@range_marker_orientations = { :h => 'r', :v => 'R' }
     
+    def ranges=(ranges)
+      @ranges = ranges.any? {|e| e.is_a?(Array) } ? ranges : [ranges]
+    end
+    
     def ranges
       unless @ranges.nil? || @ranges.empty?
         'chm=' + @ranges.collect {|r|
@@ -18,9 +22,5 @@ module GoogleChart
         }.join('|')
       end
     end
-    
-    def ranges=(ranges)
-      @ranges = ranges.any? {|e| e.is_a?(Array) } ? ranges : [ranges]
-    end
   end
 end

data/lib/google_chart/{titles.rb → title.rb}

@@ -1,16 +1,16 @@
-require 'cgi'
-
 # <URL:http://code.google.com/apis/chart/#chtt>
 module GoogleChart
-  module Titles
+  module Title
     def self.included(klass)
       klass.register!(:title)
     end
     
-    attr_writer :title
+    def title=(title)
+      @title = CGI::escape(title)
+    end
     
     def title
-      'chtt=' + CGI::escape(@title) if @title
+      "chtt=#{@title}" if @title
     end
   end
 end

data/lib/google_chart.rb

@@ -1,29 +1,30 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'google_chart/axes'
-require 'google_chart/bar_styles'
-require 'google_chart/colors'
+require 'cgi'
+
+require 'google_chart/axis'
+require 'google_chart/bar_style'
+require 'google_chart/color'
 require 'google_chart/data'
-require 'google_chart/grid_lines'
-require 'google_chart/legends'
-require 'google_chart/line_styles'
-require 'google_chart/range_markers'
-require 'google_chart/sizes'
-require 'google_chart/titles'
+require 'google_chart/grid_line'
+require 'google_chart/legend'
+require 'google_chart/line_style'
+require 'google_chart/range_marker'
+require 'google_chart/title'
 
-require 'google_chart/base'
-require 'google_chart/bar'
-require 'google_chart/line'
+require 'google_chart/abstract_chart'
+require 'google_chart/bar_chart'
+require 'google_chart/line_chart'
 
 module GoogleChart
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
   
   def self.Line(options = {}, &block)
-    GoogleChart::Line.new(options, &block).to_url
+    GoogleChart::LineChart.new(options, &block).to_url
   end
   
   def self.Bar(options = {}, &block)
-    GoogleChart::Bar.new(options, &block).to_url
+    GoogleChart::BarChart.new(options, &block).to_url
   end
 end

data/test/google_chart/{test_base.rb → test_abstract_chart.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TestBase < Test::Unit::TestCase
+class TestAbstractChart < Test::Unit::TestCase
   should 'require descendent classes to define #chart_type method' do
-    klass = Class.new(GoogleChart::Base)
+    klass = Class.new(GoogleChart::AbstractChart)
     assert_raise(NoMethodError, /chart_type/) { klass.new.to_url }
     
     klass.class_eval { def chart_type() end }
@@ -10,12 +10,20 @@ class TestBase < Test::Unit::TestCase
   end
   
   should 'allow descendent classes to maintain distinct parameter registries' do
-    klass = Class.new(GoogleChart::Base)
-    another_klass = Class.new(GoogleChart::Base)
+    klass = Class.new(GoogleChart::AbstractChart)
+    another_klass = Class.new(GoogleChart::AbstractChart)
     assert_not_same(another_klass.registry, klass.registry)
   end
   
   should 'begin URLs with Google Charts base URL' do
     assert_match(%r{\Ahttp://chart\.apis\.google\.com/chart\?}, Class.new(MockChart).new.to_url)
   end
+  
+  should 'have a default chart size' do
+    assert_match(/\bchs=600x500\b/, Class.new(MockChart).new.to_url)
+  end
+  
+  should 'accept custom chart sizes' do
+    assert_match(/\bchs=800x375\b/, Class.new(MockChart).new(:size => '800x375').to_url)
+  end
 end

data/test/google_chart/{test_axes.rb → test_axis.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TestAxes < Test::Unit::TestCase
+class TestAxis < Test::Unit::TestCase
   def setup
-    @klass = Class.new(MockChart).class_eval { include GoogleChart::Axes }
+    @klass = Class.new(MockChart).class_eval { include GoogleChart::Axis }
   end
   
   should 'not display axis parameter by default' do

data/test/google_chart/test_bar_chart.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TestBarChart < Test::Unit::TestCase
+  should 'have a default chart type' do
+    assert_match(/\bcht=bvs\b/, GoogleChart::BarChart.new.to_url)
+  end
+  
+  should 'support horizontal orientation' do
+    assert_match(/\bcht=bhs\b/, GoogleChart::BarChart.new(:horizontal => true).to_url)
+  end
+  
+  should 'support grouped grouping' do
+    assert_match(/\bcht=bvg\b/, GoogleChart::BarChart.new(:grouped => true).to_url)
+  end
+  
+  should 'support horizontal orientation and grouped grouping' do
+    assert_match(/\bcht=bhg\b/, GoogleChart::BarChart.new(:horizontal => true, :grouped => true).to_url)
+  end
+  
+  should 'include Axis module' do
+    assert GoogleChart::Axis === GoogleChart::BarChart.new
+  end
+  
+  should 'include BarStyle module' do
+    assert GoogleChart::BarStyle === GoogleChart::BarChart.new
+  end
+  
+  should 'include Color module' do
+    assert GoogleChart::Color === GoogleChart::BarChart.new
+  end
+  
+  should 'include Data module' do
+    assert GoogleChart::Data === GoogleChart::BarChart.new
+  end
+  
+  should 'include GridLine module' do
+    assert GoogleChart::GridLine === GoogleChart::BarChart.new
+  end
+  
+  should 'include Legend module' do
+    assert GoogleChart::Legend === GoogleChart::BarChart.new
+  end
+  
+  should 'include RangeMarker module' do
+    assert GoogleChart::RangeMarker === GoogleChart::BarChart.new
+  end
+  
+  should 'include Title module' do
+    assert GoogleChart::Title === GoogleChart::BarChart.new
+  end
+end

data/test/google_chart/{test_bar_styles.rb → test_bar_style.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TestBarStyles < Test::Unit::TestCase
+class TestBarStyle < Test::Unit::TestCase
   def setup
-    @klass = Class.new(MockChart).class_eval { include GoogleChart::BarStyles }
+    @klass = Class.new(MockChart).class_eval { include GoogleChart::BarStyle }
   end
   
   should 'not display bar style parameter by default' do

data/test/google_chart/{test_colors.rb → test_color.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TestColors < Test::Unit::TestCase
+class TestColor < Test::Unit::TestCase
   def setup
-    @klass = Class.new(MockChart).class_eval { include GoogleChart::Colors }
+    @klass = Class.new(MockChart).class_eval { include GoogleChart::Color }
   end
   
   should 'not display color parameter by default' do

data/test/google_chart/test_data.rb

@@ -6,76 +6,123 @@ class TestData < Test::Unit::TestCase
   end
   
   should 'use simple encoding by default' do
-    assert_match(/\bchd=s:AB89\b/, @klass.new(:data => [0,1,60,61]).to_url)
+    assert_match(/\bchd=s:AB89\b/, @klass.new(:data => [0, 1, 60, 61]).to_url)
   end
   
   context 'simple encoding' do
-    should 'encode single dataset' do
-      assert_match(/\bchd=s:Af9\b/, @klass.new(:data => [0, 31, 61], :encoding => :simple).to_url)
+    setup { @chart = @klass.new(:encoding => :simple) }
+    
+    should 'encode dataset with auto-scaling' do
+      @chart.data = [0, 15, 10]
+      assert_match(/\bchd=s:A9p\b/, @chart.to_url)
+    end
+    
+    should 'encode dataset with manual scaling' do
+      @chart.data = [0, 15, 10]
+      @chart.scale = 0..20
+      assert_match(/\bchd=s:Auf\b/, @chart.to_url)
     end
     
     should 'encode multiple datasets' do
-      assert_match(/\bchd=s:JP,YH\b/, @klass.new(:data => [[9, 15], [24, 7]], :encoding => :simple).to_url)
+      @chart.data = [[9, 15], [24, 7]]
+      @chart.scale = 0..61
+      assert_match(/\bchd=s:JP,YH\b/, @chart.to_url)
     end
     
     should 'encode missing data' do
-      assert_match(/\bchd=s:y_h\b/, @klass.new(:data => [50, nil, 33], :encoding => :simple).to_url)
+      @chart.data = [50, nil, 33]
+      @chart.scale = 0..61
+      assert_match(/\bchd=s:y_h\b/, @chart.to_url)
     end
     
-    should 'encode floating point data' do
-      assert_match(/\bchd=s:yh\b/, @klass.new(:data => [49.5, 33.4], :encoding => :simple).to_url)
+    should 'encode out-of-bounds data' do
+      @chart.data = [62, 61, 60, 1, 0, -1]
+      @chart.scale = 0..61
+      assert_match(/\bchd=s:998BAA/, @chart.to_url)
     end
     
-    should 'scale data based on maximum value by default'
-    
-    should 'scale data using custom scale'
+    should 'encode floating point data' do
+      @chart.data = [49.5, 33.4]
+      @chart.scale = 0..61
+      assert_match(/\bchd=s:yh\b/, @chart.to_url)
+    end
   end
   
   context 'extended encoding' do
-    should 'encode single dataset' do
-      assert_match(/\bchd=e:AA\.\.gA\b/, @klass.new(:data => [0, 4095, 2048], :encoding => :extended).to_url)
+    setup { @chart = @klass.new(:encoding => :extended) }
+    
+    should 'encode dataset with auto-scaling' do
+      @chart.data = [0, 15, 10]
+      assert_match(/\bchd=e:AA\.\.qq\b/, @chart.to_url)
+    end
+    
+    should 'encode dataset with manual scaling' do
+      @chart.data = [0, 15, 10]
+      @chart.scale = 0..20
+      assert_match(/\bchd=e:AAv\.gA\b/, @chart.to_url)
     end
     
     should 'encode multiple datasets' do
-      assert_match(/\bchd=e:jpyh,JPYH\b/, @klass.new(:data => [[2281, 3233], [591, 1543]], :encoding => :extended).to_url)
+      @chart.data = [[2281, 3233], [591, 1543]]
+      @chart.scale = 0..4095
+      assert_match(/\bchd=e:jpyh,JPYH\b/, @chart.to_url)
     end
     
     should 'encode missing data' do
-      assert_match(/\bchd=e:jp__yh\b/, @klass.new(:data => [2281, nil, 3233], :encoding => :extended).to_url)
+      @chart.data = [2281, nil, 3233]
+      @chart.scale = 0..4095
+      assert_match(/\bchd=e:jp__yh\b/, @chart.to_url)
     end
     
-    should 'encode floating point data' do
-      assert_match(/\bchd=e:jpyh\b/, @klass.new(:data => [2281.4, 3232.5], :encoding => :extended).to_url)
+    should 'encode out-of-bounds data' do
+      @chart.data = [4096, 4095, 4094, 1, 0, -1]
+      @chart.scale = 0..4095
+      assert_match(/\bchd=e:\.\.\.\.\.-ABAAAA\b/, @chart.to_url)
     end
     
-    should 'scale data based on maximum value by default'
-    
-    should 'scale data using custom scale'
+    should 'encode floating point data' do
+      @chart.data = [2281.49, 3232.50]
+      @chart.scale = 0..4095
+      assert_match(/\bchd=e:jpyh\b/, @chart.to_url)
+    end
   end
   
   context 'text encoding' do
-    should 'encode single dataset' do
-      assert_match(/\bchd=t:6,14,5.2\b/, @klass.new(:data => [6, 14, 5.23], :encoding => :text).to_url)
+    setup { @chart = @klass.new(:encoding => :text) }
+    
+    should 'encode dataset with auto-scaling' do
+      @chart.data = [0, 15, 10]
+      assert_match(/\bchd=t:0,100,66.7\b/, @chart.to_url)
+    end
+    
+    should 'encode dataset with manual scaling' do
+      @chart.data = [0, 15, 10]
+      @chart.scale = 0..20
+      assert_match(/\bchd=t:0,75,50\b/, @chart.to_url)
     end
     
     should 'encode multiple datasets' do
-      assert_match(/\bchd=t:6,14\|5,23\b/, @klass.new(:data => [[6, 14], [5, 23]], :encoding => :text).to_url)
+      @chart.data = [[6, 14], [5, 23]]
+      @chart.scale = 0..100
+      assert_match(/\bchd=t:6,14\|5,23\b/, @chart.to_url)
     end
     
     should 'encode missing data' do
-      assert_match(/\bchd=t:6,-1,14\b/, @klass.new(:data => [6, nil, 14], :encoding => :text).to_url)
+      @chart.data = [6, nil, 14]
+      @chart.scale = 0..100
+      assert_match(/\bchd=t:6,-1,14\b/, @chart.to_url)
     end
     
-    should 'round floating point data to nearest 10th' do
-      assert_match(/\bchd=t:6.1,8.2\b/, @klass.new(:data => [6.14, 8.16], :encoding => :text).to_url)
+    should 'encode out-of-bounds data' do
+      @chart.data = [101, 100, 99, 1, 0, -1]
+      @chart.scale = 0..100
+      assert_match(/\bchd=t:100,100,99,1,0,0\b/, @chart.to_url)
     end
     
-    should 'round floating point data to nearest integer when possible' do
-      assert_match(/\bchd=t:6,14\b/, @klass.new(:data => [5.95, 14.04], :encoding => :text).to_url)
+    should 'rounds floating point data to the nearest tenth' do
+      @chart.data = [5.95, 14.01, 5.23]
+      @chart.scale = 0..100
+      assert_match(/\bchd=t:6,14,5.2\b/, @chart.to_url)
     end
-    
-    should 'scale data based on maximum value by default'
-    
-    should 'scale data using custom scale'
   end
 end

data/test/google_chart/{test_grid_lines.rb → test_grid_line.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TestGridLines < Test::Unit::TestCase
+class TestGridLine < Test::Unit::TestCase
   def setup
-    @klass = Class.new(MockChart).class_eval { include GoogleChart::GridLines }
+    @klass = Class.new(MockChart).class_eval { include GoogleChart::GridLine }
   end
   
   should 'not display grid lines by default' do

data/test/google_chart/{test_legends.rb → test_legend.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TestLegends < Test::Unit::TestCase
+class TestLegend < Test::Unit::TestCase
   def setup
-    @klass = Class.new(MockChart).class_eval { include GoogleChart::Legends }
+    @klass = Class.new(MockChart).class_eval { include GoogleChart::Legend }
   end
   
   should 'not display legend by default' do

data/test/google_chart/test_line_chart.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TestLineChart < Test::Unit::TestCase
+  should 'have a default chart type' do
+    assert_match(/\bcht=lc\b/, GoogleChart::LineChart.new.to_url)
+  end
+  
+  should 'support xy chart type' do
+    assert_match(/\bcht=lxy\b/, GoogleChart::LineChart.new(:type => :xy).to_url)
+  end
+  
+  should 'support sparkline chart type' do
+    assert_match(/\bcht=ls\b/, GoogleChart::LineChart.new(:type => :sparkline).to_url)
+  end
+  
+  should 'support line as chart type' do
+    assert_match(/\bcht=lc\b/, GoogleChart::LineChart.new(:type => :line).to_url)
+  end
+  
+  should 'include Axis module' do
+    assert GoogleChart::Axis === GoogleChart::LineChart.new
+  end
+  
+  should 'include Color module' do
+    assert GoogleChart::Color === GoogleChart::LineChart.new
+  end
+  
+  should 'include Data module' do
+    assert GoogleChart::Data === GoogleChart::LineChart.new
+  end
+  
+  should 'include GridLine module' do
+    assert GoogleChart::GridLine === GoogleChart::LineChart.new
+  end
+  
+  should 'include Legend module' do
+    assert GoogleChart::Legend === GoogleChart::LineChart.new
+  end
+  
+  should 'include LineStyle module' do
+    assert GoogleChart::LineStyle === GoogleChart::LineChart.new
+  end
+  
+  should 'include RangeMarker module' do
+    assert GoogleChart::RangeMarker === GoogleChart::LineChart.new
+  end
+  
+  should 'include Title module' do
+    assert GoogleChart::Title === GoogleChart::LineChart.new
+  end
+end

data/test/google_chart/{test_line_styles.rb → test_line_style.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TestLineStyles < Test::Unit::TestCase
+class TestLineStyle < Test::Unit::TestCase
   def setup
-    @klass = Class.new(MockChart).class_eval { include GoogleChart::LineStyles }
+    @klass = Class.new(MockChart).class_eval { include GoogleChart::LineStyle }
   end
   
   should 'not include line styles by default' do

data/test/google_chart/{test_range_markers.rb → test_range_marker.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TestRangeMarkers < Test::Unit::TestCase
+class TestRangeMarker < Test::Unit::TestCase
   def setup
-    @klass = Class.new(MockChart).class_eval { include GoogleChart::RangeMarkers }
+    @klass = Class.new(MockChart).class_eval { include GoogleChart::RangeMarker }
   end
   
   should 'not have range markers by default' do

data/test/google_chart/{test_titles.rb → test_title.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TestTitles < Test::Unit::TestCase
+class TestTitle < Test::Unit::TestCase
   def setup
-    @klass = Class.new(MockChart).class_eval { include GoogleChart::Titles }
+    @klass = Class.new(MockChart).class_eval { include GoogleChart::Title }
   end
   
   should 'not have a title by default' do

data/test/test_google_chart.rb

@@ -4,7 +4,7 @@ class TestGoogleChart < Test::Unit::TestCase
   context '#Line' do
     context 'with hash parameters' do
       setup do
-        @url = GoogleChart.Line(:size => '1000x300', :data => [[35, 41], [50, 33]])
+        @url = GoogleChart.Line(:size => '1000x300', :data => [[35, 41], [50, 33]], :scale => 0..61)
       end
       
       should 'return Google Chart URL' do
@@ -29,6 +29,7 @@ class TestGoogleChart < Test::Unit::TestCase
         @url = GoogleChart.Line do |c|
           c.size = '800x375'
           c.data = [[35, 41], [50, 33]]
+          c.scale = 0..61
         end
       end
       
@@ -53,7 +54,7 @@ class TestGoogleChart < Test::Unit::TestCase
   context '#Bar' do
     context 'with hash parameters' do
       setup do
-        @url = GoogleChart.Bar(:size => '1000x300', :data => [[35, 41], [50, 33]])
+        @url = GoogleChart.Bar(:size => '1000x300', :data => [[35, 41], [50, 33]], :scale => 0..61)
       end
       
       should 'return Google Chart URL' do
@@ -67,6 +68,10 @@ class TestGoogleChart < Test::Unit::TestCase
       should 'include chart size parameter' do
         assert_match(/\bchs=1000x300\b/, @url)
       end
+      
+      should 'include chart data parameter' do
+        assert_match(/\bchd=s:jp,yh\b/, @url)
+      end
     end
     
     context 'with block parameters' do
@@ -74,6 +79,7 @@ class TestGoogleChart < Test::Unit::TestCase
         @url = GoogleChart.Bar do |c|
           c.size = '800x375'
           c.data = [[35, 41], [50, 33]]
+          c.scale = 0..61
         end
       end
       

data/test/test_helper.rb

@@ -4,7 +4,7 @@ require 'shoulda'
 require 'redgreen' unless ENV['TM_MODE']
 require File.dirname(__FILE__) + '/../lib/google_chart'
 
-class MockChart < GoogleChart::Base
+class MockChart < GoogleChart::AbstractChart
   def chart_type
     'cht=mock'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jparker-ruby-googlechart
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - John Parker
@@ -55,19 +55,18 @@ files:
 - Rakefile
 - README.txt
 - lib/google_chart.rb
-- lib/google_chart/axes.rb
-- lib/google_chart/bar.rb
-- lib/google_chart/bar_styles.rb
-- lib/google_chart/base.rb
-- lib/google_chart/colors.rb
+- lib/google_chart/abstract_chart.rb
+- lib/google_chart/axis.rb
+- lib/google_chart/bar_chart.rb
+- lib/google_chart/bar_style.rb
+- lib/google_chart/color.rb
 - lib/google_chart/data.rb
-- lib/google_chart/grid_lines.rb
-- lib/google_chart/legends.rb
-- lib/google_chart/line.rb
-- lib/google_chart/line_styles.rb
-- lib/google_chart/range_markers.rb
-- lib/google_chart/sizes.rb
-- lib/google_chart/titles.rb
+- lib/google_chart/grid_line.rb
+- lib/google_chart/legend.rb
+- lib/google_chart/line_chart.rb
+- lib/google_chart/line_style.rb
+- lib/google_chart/range_marker.rb
+- lib/google_chart/title.rb
 has_rdoc: false
 homepage: http://github.com/jparker/ruby-googlechart
 post_install_message: 
@@ -98,16 +97,15 @@ summary: Ruby wrapper for the Google Charts API
 test_files: 
 - test/test_helper.rb
 - test/test_google_chart.rb
-- test/google_chart/test_axes.rb
-- test/google_chart/test_bar.rb
-- test/google_chart/test_bar_styles.rb
-- test/google_chart/test_base.rb
-- test/google_chart/test_colors.rb
+- test/google_chart/test_abstract_chart.rb
+- test/google_chart/test_axis.rb
+- test/google_chart/test_bar_chart.rb
+- test/google_chart/test_bar_style.rb
+- test/google_chart/test_color.rb
 - test/google_chart/test_data.rb
-- test/google_chart/test_grid_lines.rb
-- test/google_chart/test_legends.rb
-- test/google_chart/test_line.rb
-- test/google_chart/test_line_styles.rb
-- test/google_chart/test_range_markers.rb
-- test/google_chart/test_sizes.rb
-- test/google_chart/test_titles.rb
+- test/google_chart/test_grid_line.rb
+- test/google_chart/test_legend.rb
+- test/google_chart/test_line_chart.rb
+- test/google_chart/test_line_style.rb
+- test/google_chart/test_range_marker.rb
+- test/google_chart/test_title.rb

data/lib/google_chart/bar.rb

@@ -1,27 +0,0 @@
-module GoogleChart
-  class Bar < Base
-    include Axes
-    include BarStyles
-    include Colors
-    include Data
-    include GridLines
-    include Legends
-    include RangeMarkers
-    include Sizes
-    include Titles
-    
-    attr_writer :horizontal, :grouped
-    
-    def chart_type
-      'cht=b' + (horizontal? ? 'h' : 'v') + (grouped? ? 'g' : 's')
-    end
-    
-    def horizontal?
-      @horizontal
-    end
-    
-    def grouped?
-      @grouped
-    end
-  end
-end

data/lib/google_chart/bar_styles.rb

@@ -1,25 +0,0 @@
-# <URL:http://code.google.com/apis/chart/#bar_width>
-module GoogleChart
-  module BarStyles
-    def self.included(klass)
-      klass.register!(:style)
-    end
-    
-    attr_writer :width
-    
-    def style
-      "chbh=#{[@width, *@spacing].compact.join(',')}" if @width
-    end
-    
-    # Spacing can be given as a single number for space between bars within a
-    # group or as an array of numbers with the first element as the space
-    # between bars within a group and the second element as the space between
-    # groups. If not provided, the default spacing between groups is 8 pixels.
-    # 
-    # TODO: Should we raise an error if bar spacing is greater than group
-    # spacing? This would visually group bars from different groups.
-    def spacing=(spacing)
-      @spacing = [spacing].flatten
-    end
-  end
-end

data/lib/google_chart/sizes.rb

@@ -1,16 +0,0 @@
-# <URL:http://code.google.com/apis/chart/#chart_size>
-module GoogleChart
-  module Sizes
-    def self.included(klass)
-      klass.register!(:size)
-    end
-    
-    attr_writer :size
-    
-    @@default_size = '600x500'
-    
-    def size
-      'chs=' + (@size ? @size : @@default_size)
-    end
-  end
-end

data/test/google_chart/test_bar.rb

@@ -1,55 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TestBar < Test::Unit::TestCase
-  should 'have a default chart type' do
-    assert_match(/\bcht=bvs\b/, GoogleChart::Bar.new.to_url)
-  end
-  
-  should 'support horizontal orientation' do
-    assert_match(/\bcht=bhs\b/, GoogleChart::Bar.new(:horizontal => true).to_url)
-  end
-  
-  should 'support grouped grouping' do
-    assert_match(/\bcht=bvg\b/, GoogleChart::Bar.new(:grouped => true).to_url)
-  end
-  
-  should 'support horizontal orientation and grouped grouping' do
-    assert_match(/\bcht=bhg\b/, GoogleChart::Bar.new(:horizontal => true, :grouped => true).to_url)
-  end
-  
-  should 'include Axes module' do
-    assert GoogleChart::Axes === GoogleChart::Bar.new
-  end
-  
-  should 'include BarStyles module' do
-    assert GoogleChart::BarStyles === GoogleChart::Bar.new
-  end
-  
-  should 'include Colors module' do
-    assert GoogleChart::Colors === GoogleChart::Bar.new
-  end
-  
-  should 'include Data module' do
-    assert GoogleChart::Data === GoogleChart::Bar.new
-  end
-  
-  should 'include GridLines module' do
-    assert GoogleChart::GridLines === GoogleChart::Bar.new
-  end
-  
-  should 'include Legends module' do
-    assert GoogleChart::Legends === GoogleChart::Bar.new
-  end
-  
-  should 'include RangeMarkers module' do
-    assert GoogleChart::RangeMarkers === GoogleChart::Bar.new
-  end
-  
-  should 'include Sizes module' do
-    assert GoogleChart::Sizes === GoogleChart::Bar.new
-  end
-  
-  should 'include Titles module' do
-    assert GoogleChart::Titles === GoogleChart::Bar.new
-  end
-end

data/test/google_chart/test_line.rb

@@ -1,55 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TestLine < Test::Unit::TestCase
-  should 'have a default chart type' do
-    assert_match(/\bcht=lc\b/, GoogleChart::Line.new.to_url)
-  end
-  
-  should 'support xy chart type' do
-    assert_match(/\bcht=lxy\b/, GoogleChart::Line.new(:type => :xy).to_url)
-  end
-  
-  should 'support sparkline chart type' do
-    assert_match(/\bcht=ls\b/, GoogleChart::Line.new(:type => :sparkline).to_url)
-  end
-  
-  should 'support line as chart type' do
-    assert_match(/\bcht=lc\b/, GoogleChart::Line.new(:type => :line).to_url)
-  end
-  
-  should 'include Axes module' do
-    assert GoogleChart::Axes === GoogleChart::Line.new
-  end
-  
-  should 'include Colors module' do
-    assert GoogleChart::Colors === GoogleChart::Line.new
-  end
-  
-  should 'include Data module' do
-    assert GoogleChart::Data === GoogleChart::Line.new
-  end
-  
-  should 'include GridLines module' do
-    assert GoogleChart::GridLines === GoogleChart::Line.new
-  end
-  
-  should 'include Legends module' do
-    assert GoogleChart::Legends === GoogleChart::Line.new
-  end
-  
-  should 'include LineStyles module' do
-    assert GoogleChart::LineStyles === GoogleChart::Line.new
-  end
-  
-  should 'include RangeMarkers module' do
-    assert GoogleChart::RangeMarkers === GoogleChart::Line.new
-  end
-  
-  should 'include Sizes module' do
-    assert GoogleChart::Sizes === GoogleChart::Line.new
-  end
-  
-  should 'include Titles module' do
-    assert GoogleChart::Titles === GoogleChart::Line.new
-  end
-end

data/test/google_chart/test_sizes.rb

@@ -1,15 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TestSizes < Test::Unit::TestCase
-  def setup
-    @klass = Class.new(MockChart).class_eval { include GoogleChart::Sizes }
-  end
-  
-  should 'have a default size' do
-    assert_match(/\bchs=600x500\b/, @klass.new.to_url)
-  end
-  
-  should 'accept custom size' do
-    assert_match(/\bchs=800x375\b/, @klass.new(:size => '800x375').to_url)
-  end
-end