googlecharts 1.3.0 → 1.3.1

data/History.txt

@@ -1,3 +1,6 @@
+== 1.3.1
+* added width and spacing options
+
 == 1.3.0
 * added support for google-o-meter
 * fixed a bug when the max value of a data set was 0

data/lib/gchart.rb

@@ -15,7 +15,7 @@ class Gchart
   @@file_name = 'chart.png'
   
   attr_accessor :title, :type, :width, :height, :horizontal, :grouped, :legend, :data, :encoding, :max_value, :bar_colors,
-                :title_color, :title_size, :custom, :axis_with_labels, :axis_labels
+                :title_color, :title_size, :custom, :axis_with_labels, :axis_labels, :bar_width_and_spacing
     
   class << self
     # Support for Gchart.line(:title => 'my title', :size => '400x600')
@@ -174,6 +174,28 @@ class Gchart
     "chco=#{@bar_colors}"
   end
   
+  # set bar spacing
+  # chbh=
+  # <bar width in pixels>,
+  # <optional space between bars in a group>,
+  # <optional space between groups>
+  def set_bar_width_and_spacing
+    width_and_spacing_values = case @bar_width_and_spacing
+    when String
+      @bar_width_and_spacing
+    when Array
+      @bar_width_and_spacing.join(',')
+    when Hash
+      width = @bar_width_and_spacing[:width] || 23
+      spacing = @bar_width_and_spacing[:spacing] || 4
+      group_spacing = @bar_width_and_spacing[:group_spacing] || 8
+      [width,spacing,group_spacing].join(',')
+    else
+      @bar_width_and_spacing.to_s
+    end
+    "chbh=#{width_and_spacing_values}"
+  end
+  
   def fill_for(type=nil, color='', angle=nil)
     unless type.nil? 
       case type
@@ -353,6 +375,8 @@ class Gchart
         set_data unless @data == []
       when '@bar_colors'
         set_bar_colors
+      when '@bar_width_and_spacing'
+        set_bar_width_and_spacing
       when '@axis_with_labels'
         set_axis_with_labels
       when '@axis_labels'

data/lib/gchart/version.rb

@@ -2,7 +2,7 @@ module GchartInfo #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/gchart_spec.rb

@@ -161,6 +161,42 @@ describe "a bar graph" do
     Gchart.bar(:bar_colors => ['efefef','00ffff']).include?('chco=efefef,00ffff').should be_true
   end
   
+  it 'should be able to accept a string of width and spacing options' do
+    Gchart.bar(:bar_width_and_spacing => '25,6').include?('chbh=25,6').should be_true
+  end
+  
+  it 'should be able to accept a single fixnum width and spacing option to set the bar width' do
+    Gchart.bar(:bar_width_and_spacing => 25).include?('chbh=25').should be_true
+  end
+  
+  it 'should be able to accept an array of width and spacing options' do
+    Gchart.bar(:bar_width_and_spacing => [25,6,12]).include?('chbh=25,6,12').should be_true
+    Gchart.bar(:bar_width_and_spacing => [25,6]).include?('chbh=25,6').should be_true
+    Gchart.bar(:bar_width_and_spacing => [25]).include?('chbh=25').should be_true
+  end
+  
+  describe "with a hash of width and spacing options" do
+    
+    before(:each) do
+      @default_width         = 23
+      @default_spacing       = 4
+      @default_group_spacing = 8
+    end
+    
+    it 'should be able to have a custom bar width' do
+      Gchart.bar(:bar_width_and_spacing => {:width => 19}).include?("chbh=19,#{@default_spacing},#{@default_group_spacing}").should be_true
+    end
+    
+    it 'should be able to have custom spacing' do
+      Gchart.bar(:bar_width_and_spacing => {:spacing => 19}).include?("chbh=#{@default_width},19,#{@default_group_spacing}").should be_true
+    end
+    
+    it 'should be able to have custom group spacing' do
+      Gchart.bar(:bar_width_and_spacing => {:group_spacing => 19}).include?("chbh=#{@default_width},#{@default_spacing},19").should be_true
+    end
+    
+  end
+  
 end
 
 describe "a line chart" do
@@ -220,7 +256,7 @@ describe "a line chart" do
   end
   
   it "should be able to render a graph where all the data values are 0" do
-    Gchart.line(:data => [0, 0, 0]).include?("chd=s:AAA").should be true
+    Gchart.line(:data => [0, 0, 0]).include?("chd=s:AAA").should be_true
   end
   
 end
@@ -324,7 +360,7 @@ describe "a google-o-meter" do
     @chart = Gchart.meter(:data => @data)
   end
   
-  it "should greate a meter" do
+  it "should create a meter" do
     @chart.include?('cht=gom').should be_true
   end
   

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Googlecharts</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/googlecharts"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/googlecharts" class="numbers">1.3.0</a>
+      <a href="http://rubyforge.org/projects/googlecharts" class="numbers">1.3.1</a>
     </div>
     <h2>&#x2192; &#8216;Sexy Charts using Google <span class="caps">API</span> &#38; Ruby&#8217;</h2>
 
@@ -232,6 +232,32 @@ If you never added <a href="http://github.com">GitHub</a> as a gem source, you w
 	<p><img src="http://chart.apis.google.com/chart?cht=bvg&#38;chs=300x200&#38;chd=s:9UGo,Uo9C&#38;chco=FF0000,00FF00" title="grouped bars" alt="grouped bars" /></p>
 
 
+	<p><strong>bar chart width and spacing</strong></p>
+
+
+	<p>A bar chart can accept options to set the width of the bars, spacing between bars and spacing between bar groups. To set these, you can either provide a string, array or hash.</p>
+
+
+	<p>The Google <span class="caps">API</span> sets these options in the order of width, spacing, and group spacing, with both spacing values being optional. So, if you provide a string or array, provide them in that order:</p>
+
+
+	<p><pre class='syntax'>
+  <span class="constant">Gchart</span><span class="punct">.</span><span class="ident">bar</span><span class="punct">(</span><span class="symbol">:data</span> <span class="punct">=&gt;</span> <span class="attribute">@data</span><span class="punct">,</span> <span class="symbol">:bar_width_and_spacing</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">25,6</span><span class="punct">')</span> <span class="comment"># width of 25, spacing of 6</span>
+  <span class="constant">Gchart</span><span class="punct">.</span><span class="ident">bar</span><span class="punct">(</span><span class="symbol">:data</span> <span class="punct">=&gt;</span> <span class="attribute">@data</span><span class="punct">,</span> <span class="symbol">:bar_width_and_spacing</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">25,6,12</span><span class="punct">')</span> <span class="comment"># width of 25, spacing of 6, group spacing of 12</span>
+  <span class="constant">Gchart</span><span class="punct">.</span><span class="ident">bar</span><span class="punct">(</span><span class="symbol">:data</span> <span class="punct">=&gt;</span> <span class="attribute">@data</span><span class="punct">,</span> <span class="symbol">:bar_width_and_spacing</span> <span class="punct">=&gt;</span> <span class="punct">[</span><span class="number">25</span><span class="punct">,</span><span class="number">6</span><span class="punct">])</span> <span class="comment"># width of 25, spacing of 6</span>
+  <span class="constant">Gchart</span><span class="punct">.</span><span class="ident">bar</span><span class="punct">(</span><span class="symbol">:data</span> <span class="punct">=&gt;</span> <span class="attribute">@data</span><span class="punct">,</span> <span class="symbol">:bar_width_and_spacing</span> <span class="punct">=&gt;</span> <span class="number">25</span><span class="punct">)</span> <span class="comment"># width of 25</span>
+</pre></p>
+
+
+	<p>The hash lets you set these values directly, with the Google default values set for any options you don&#8217;t include:</p>
+
+
+	<p><pre class='syntax'>
+  <span class="constant">Gchart</span><span class="punct">.</span><span class="ident">bar</span><span class="punct">(</span><span class="symbol">:data</span> <span class="punct">=&gt;</span> <span class="attribute">@data</span><span class="punct">,</span> <span class="symbol">:bar_width_and_spacing</span> <span class="punct">=&gt;</span> <span class="punct">{</span><span class="symbol">:width</span> <span class="punct">=&gt;</span> <span class="number">19</span><span class="punct">})</span>
+  <span class="constant">Gchart</span><span class="punct">.</span><span class="ident">bar</span><span class="punct">(</span><span class="symbol">:data</span> <span class="punct">=&gt;</span> <span class="attribute">@data</span><span class="punct">,</span> <span class="symbol">:bar_width_and_spacing</span> <span class="punct">=&gt;</span> <span class="punct">{</span><span class="symbol">:spacing</span> <span class="punct">=&gt;</span> <span class="number">10</span><span class="punct">,</span> <span class="symbol">:group_spacing</span> <span class="punct">=&gt;</span> <span class="number">12</span><span class="punct">})</span>
+</pre></p>
+
+
 	<p><strong>pie chart</strong></p>
 
 
@@ -639,9 +665,10 @@ Data set:
 	<h3>Contributors</h3>
 
 
-	<p><a href="http://github.com/dbgrandi">David Grandinetti</a></p>
+	<p><a href="http://github.com/dbgrandi">David Grandinetti</a>
+<a href="http://github.com/takeo">Toby Sterrett</a></p>
     <p class="coda">
-      <a href="mattaimonetti@gmail.com">Matt Aimonetti</a>, 7th May 2008<br>
+      <a href="mattaimonetti@gmail.com">Matt Aimonetti</a>, 8th May 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -145,6 +145,26 @@ The problem now, is that we can't see the first value of the second dataset sinc
 
 !http://chart.apis.google.com/chart?cht=bvg&chs=300x200&chd=s:9UGo,Uo9C&chco=FF0000,00FF00(grouped bars)!
 
+*bar chart width and spacing*
+
+A bar chart can accept options to set the width of the bars, spacing between bars and spacing between bar groups. To set these, you can either provide a string, array or hash.
+
+The Google API sets these options in the order of width, spacing, and group spacing, with both spacing values being optional. So, if you provide a string or array, provide them in that order:
+
+<pre syntax="ruby">
+  Gchart.bar(:data => @data, :bar_width_and_spacing => '25,6') # width of 25, spacing of 6
+  Gchart.bar(:data => @data, :bar_width_and_spacing => '25,6,12') # width of 25, spacing of 6, group spacing of 12
+  Gchart.bar(:data => @data, :bar_width_and_spacing => [25,6]) # width of 25, spacing of 6
+  Gchart.bar(:data => @data, :bar_width_and_spacing => 25) # width of 25
+</pre>
+  
+The hash lets you set these values directly, with the Google default values set for any options you don't include:
+
+<pre syntax="ruby">
+  Gchart.bar(:data => @data, :bar_width_and_spacing => {:width => 19})
+  Gchart.bar(:data => @data, :bar_width_and_spacing => {:spacing => 10, :group_spacing => 12})
+</pre>
+
 
 *pie chart*
 
@@ -453,3 +473,4 @@ Comments are welcome. Send an email to "Matt Aimonetti":mailto:mattaimonetti@gma
 h3. Contributors
 
 "David Grandinetti":http://github.com/dbgrandi
+"Toby Sterrett":http://github.com/takeo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: googlecharts
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -30,7 +30,7 @@ cert_chain:
   ZR7qHIpykzr3ezcNiWtBWw==
   -----END CERTIFICATE-----
 
-date: 2008-05-07 00:00:00 -07:00
+date: 2008-05-08 00:00:00 -07:00
 default_executable: 
 dependencies: []