@@ -4,8 +4,9 @@ module GoogleChart module Axis AXIS_TYPE_MAPPING = { :top => "t", :bottom => "x", :left => "y", :right => "r" } ALIGNMENT_MAPPING = { :center => 0, :left => -1, :right => -1} + DRAWING_CONTROL_MAPPING = { :lines => 'l', :ticks => 't', :both => 'lt'} - Axis = Struct.new("Axis", :type, :labels, :positions, :range, :color, :font_size, :alignment, :interval) + Axis = Struct.new("Axis", :type, :labels, :positions, :range, :color, :font_size, :alignment, :interval, :drawing_control) def axis(type, options={}) @axes ||= [] @@ -30,7 +31,7 @@ module GoogleChart "#{@axes.index(axis)},#{axis.range.min},#{axis.range.max}#{interval_str}" if axis.range end.compact styles = @axes.collect do |axis| - style = [axis.color,axis.font_size, ALIGNMENT_MAPPING[axis.alignment]].compact + style = [axis.color,axis.font_size, ALIGNMENT_MAPPING[axis.alignment],DRAWING_CONTROL_MAPPING[axis.drawing_control]].compact unless style.empty? "#{@axes.index(axis)},#{style.join(',')}" end @@ -52,6 +53,7 @@ module GoogleChart raise ArgumentError.new("font_size cannot be specified without a color") if (axis.font_size && axis.color == nil) raise ArgumentError.new("alignment cannot be specified without a color") if (axis.alignment && (axis.color == nil or axis.font_size == nil)) raise ArgumentError.new("alignment must be one of :left, :center, :right") unless (axis.alignment ==nil or ALIGNMENT_MAPPING.keys.include?(axis.alignment)) + raise ArgumentError.new("drawing_control must be one of :lines, :ticks: or :both") unless (axis.drawing_control == nil or DRAWING_CONTROL_MAPPING.keys.include?(axis.drawing_control)) unless (axis.labels.to_a.size == axis.positions.to_a.size) raise ArgumentError.new("sizes of labels and positions must be the same") unless axis.labels == nil or axis.positions == nil lib/google_chart/modules/axis.rb @@ -33,9 +33,10 @@ describe GoogleChart::Axis do axis.range = 0..500 axis.labels = ["a","b","c"] axis.positions = [100,200,400] + axis.drawing_control = :lines end @chart.query_params[:chxt].should eql("t") - @chart.query_params[:chxs].should eql("0,ff00ff,15,0") + @chart.query_params[:chxs].should eql("0,ff00ff,15,0,l") @chart.query_params[:chxl].should eql("0:|a|b|c") @chart.query_params[:chxp].should eql("0,100,200,400") @chart.query_params[:chxr].should eql("0,0,500") @@ -122,4 +123,14 @@ describe GoogleChart::Axis do lambda { @chart.axis(:top, params) }.should raise_error(ArgumentError) end + it "should raise an error if an invalid drawing control is given" do + params = @valid_axis_params.except(:drawing_control) + lambda { @chart.axis(:top, params) }.should_not raise_error(ArgumentError) + params[:drawing_control] = :ticks + lambda { @chart.axis(:top, params) }.should_not raise_error(ArgumentError) + + params[:drawing_control] = :blah + lambda { @chart.axis(:top, params) }.should raise_error(ArgumentError) + end + end spec/gchartrb/axis_spec.rb c93f7bd9ec1f48ba148f6dc8c6c55ca2dec14e66 Martin Sadler martin@martin.local http://github.com/martinbtt/gchartrb/commit/ff618a37c9e0f286736f954a57491819bc6c2786 ff618a37c9e0f286736f954a57491819bc6c2786 2009-10-07T05:58:56-07:00 2009-10-07T05:58:56-07:00 add drawing_control support to axis e.g. add tick lines b07cd66115dc5f1ce72611483a05e53b242fef51 Martin Sadler martin@martin.local