gruff 0.0.7 → 0.0.8

data/CHANGELOG

@@ -1,5 +1,12 @@
 CHANGELOG
 
+== 0.0.8
+
+* NEW Sidestacked Bar Graphs. [Alun Eyre]
+* baseline_value larger than data will now show correctly. [Mike Perham]
+* hide_dots and hide_lines are now options for line graphs.
+* 
+
 == 0.0.6
 
 * Fixed hang when no data is passed.

data/lib/gruff.rb

@@ -8,3 +8,6 @@ require File.dirname(__FILE__) + '/gruff/bar'
 require File.dirname(__FILE__) + '/gruff/line'
 require File.dirname(__FILE__) + '/gruff/pie'
 require File.dirname(__FILE__) + '/gruff/stacked_bar'
+require File.dirname(__FILE__) + '/gruff/side_stacked_bar'
+require File.dirname(__FILE__) + '/gruff/photo_bar'
+

data/lib/gruff/bar.rb

@@ -20,6 +20,9 @@ class Gruff::Bar < Gruff::Base
         @d = @d.fill current_color
       
         data_row[1].each_with_index do |data_point, point_index|
+          # TODO Try this out
+          ##data_point = 0 if data_point.nil?
+          
           # Use incremented x and scaled y
           left_x = @graph_left + (@bar_width * (row_index + point_index + ((@data.length - 1) * point_index)))
           left_y = @graph_top + (@graph_height - data_point * @graph_height) + 1

data/lib/gruff/base.rb

@@ -3,9 +3,13 @@
 #
 # Author:: Geoffrey Grosenbach boss@topfunky.com
 #
-# Date:: October 23, 2005
+# Date Created:: October 23, 2005
 #
 #
+# Other contributors:
+#
+# Jarkko Laine, Mike Perham, Andreas Schwarz, Alun Eyre, Guillaume Theoret, and others.
+#
 
 require 'RMagick'
 
@@ -13,7 +17,7 @@ require 'yaml'
 
 module Gruff
   
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
   
   class Base
   
@@ -33,20 +37,28 @@ module Gruff
     # RMagick must be built with the Freetype libraries for this to work properly.
     attr_accessor :font
 
+    attr_accessor :hide_line_markers, :hide_legend, :hide_title
+
     # Graph is drawn at 4/3 ratio (800x600, 400x300, etc.).
     #
     # Looks for Bitstream Vera as the default font. Expects an environment var of MAGICK_FONT_PATH to be set.
     # (Uses RMagick's default font otherwise.)
     def initialize(target_width=800)
-      @columns = target_width.to_f
-      @rows = target_width.to_f * 0.75
+
+      if not Numeric === target_width
+        geometric_width, geometric_height = target_width.split('x')
+        @columns = geometric_width.to_f
+        @rows = geometric_height.to_f
+      else
+        @columns = target_width.to_f
+        @rows = target_width.to_f * 0.75        
+      end
 
       # Internal for calculations
       @font = File.expand_path('Vera.ttf', ENV['MAGICK_FONT_PATH'])
       @marker_pointsize = 21.0
       @raw_columns = 800.0
-      @raw_rows = 600.0
-      @graph_width = 590.0
+      @raw_rows = 800.0 * (@rows/@columns)
       @column_count = 0
       @maximum_value = 0
       @has_data = false
@@ -55,9 +67,7 @@ module Gruff
       @labels_seen = Hash.new
       @scale = @columns / @raw_columns
 
-      @show_line_markers = true
-      @show_legend = true
-      @show_title = true
+      @hide_line_markers = @hide_legend = @hide_title = false
 
       reset_themes()
       theme_keynote()
@@ -245,16 +255,28 @@ protected
     end
 
     def setup_graph_measurements
-      @graph_left = 130.0
-      @graph_right = @graph_left + @graph_width
+      # TODO Separate horizontal lines from line number labels so they can be shown or hidden independently
+      # TODO Get width of longest left-hand vertical text label and space left margin accordingly
+      unless @hide_line_markers
+        @graph_left = 130.0 # TODO Calculate based on string width of labels
+        @graph_right_margin = 80.0 # TODO see previous line
+        @graph_bottom_margin = 80.0
+      else
+        @graph_left = @graph_right_margin = @graph_bottom_margin =  40
+      end
+
+      @graph_right = @raw_columns - @graph_right_margin
+
+      @graph_width = @raw_columns - @graph_left - @graph_right_margin
+
       @graph_top = 150.0
-      @graph_bottom = @raw_rows - 110.0
+      @graph_bottom = @raw_rows - @graph_bottom_margin
       @graph_height = @graph_bottom - @graph_top
     end
 
     # Draws horizontal background lines and labels
     def draw_line_markers
-      return unless @show_line_markers
+      return if @hide_line_markers
             
       # Draw horizontal line markers and annotate with numbers
       @d = @d.stroke(@marker_color)
@@ -285,7 +307,7 @@ protected
 
     # Draws a legend with the names of the datasets matched to the colors used to draw them.
     def draw_legend
-      return unless @show_legend
+      return if @hide_legend
 
       # Sort norm_data with avg largest values set first (for display)
       sort_norm_data()
@@ -337,7 +359,7 @@ protected
     end
 
     def draw_title
-      return unless @show_title
+      return if (@hide_title || @title.nil?)
       
       @d.fill = @marker_color
       @d.font = @font
@@ -354,6 +376,8 @@ protected
     ##
     # Draws column labels below graph, centered over x_offset
     def draw_label(x_offset, index)
+      return unless @show_line_markers
+
       if !@labels[index].nil? && @labels_seen[index].nil?
         @d.fill = @marker_color
         @d.font = @font
@@ -363,7 +387,7 @@ protected
         @d.gravity = CenterGravity
         @d = @d.annotate_scaled(@base_image,
                                 1, 1,
-                                x_offset, @raw_rows - 80,
+                                x_offset, @raw_rows - (@graph_bottom_margin - 30),
                                 @labels[index], @scale)
         @labels_seen[index] = 1
       end
@@ -392,7 +416,7 @@ protected
     def render_image_background(image_path)
       image = Image.read(image_path)
       if @scale != 1.0
-        image[0].resize!(@scale)
+        image[0].resize!(@scale) # TODO Resize with new scale (crop if necessary for wide graph)
       end
       image[0]
     end
@@ -441,7 +465,7 @@ protected
     end
 
 
-    # round down to significant digits
+    # Round down to significant digits
     def significant(inc)
       factor = 1.0
       while (inc < 10)

data/lib/gruff/line.rb

@@ -8,6 +8,8 @@ class Gruff::Line < Gruff::Base
 	
   # Color of the baseline
   attr_accessor :baseline_color
+  
+  attr_accessor :hide_dots, :hide_lines
 	
   #
   # Call with target pixel width of graph (800, 400, 300), and/or 'false' to omit lines (points only).
@@ -17,14 +19,18 @@ class Gruff::Line < Gruff::Base
   #  g = Gruff::Line.new(400, false) # 400px wide, no lines
   #
   #  g = Gruff::Line.new(false) # Defaults to 800px wide, no lines
+  # 
+  # TODO Remove and go back to normal. Call hide_dots or hide_lines instead
   def initialize(*args)
     raise ArgumentError, "Wrong number of arguments" if args.length > 2
-    if args.empty? or not Numeric === args.first then
+    if args.empty? or ((not Numeric === args.first) && (not String === args.first)) then
       super()
     else
       super args.shift
     end
-    @lines = args.empty? || args.shift # draw lines by default
+    
+    @hide_dots = false
+    @hide_lines = args.empty? ? false : !args.shift # For backwards compatibility. Use g.hide_lines = true from now on.
     @baseline_color = 'red'
   end
 
@@ -63,10 +69,10 @@ class Gruff::Line < Gruff::Base
 
         new_y = @graph_top + (@graph_height - data_point * @graph_height)
 
-        if @lines and prev_x > 0 and prev_y > 0 then
+        if !@hide_lines and prev_x > 0 and prev_y > 0 then
           @d = @d.line(prev_x, prev_y, new_x, new_y)
         end
-        @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y)
+        @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y) unless @hide_dots
 
         prev_x = new_x
         prev_y = new_y
@@ -79,7 +85,13 @@ class Gruff::Line < Gruff::Base
   end
 
   def normalize
+    @maximum_value = max(@maximum_value.to_f, @baseline_value.to_f)
     super
     @norm_baseline = (@baseline_value.to_f / @maximum_value.to_f) if @baseline_value
   end
+  
+  def max(a, b)
+    (a < b ? b : a)
+  end
+
 end

data/lib/gruff/photo_bar.rb

@@ -0,0 +1,92 @@
+require File.dirname(__FILE__) + '/base'
+
+class Gruff::PhotoBar < Gruff::Base
+
+# TODO
+#
+# define base and cap in yml
+# allow for image directory to be located elsewhere
+# more exact measurements for bar heights (go all the way to the bottom of the graph)
+# option to tile images instead of use a single image
+# drop base label a few px lower so photo bar graphs can have a base dropping over the lower marker line
+#
+
+  # The name of a pre-packaged photo-based theme.
+  attr_accessor :theme
+
+  def draw
+    super
+
+    return unless @has_data
+
+    # TODO init_photo_bar_graphics() inside an overriden draw_legend()
+    init_photo_bar_graphics()
+
+    #Draw#define_clip_path()
+    #Draw#clip_path(pathname)
+    #Draw#composite....with bar graph image OverCompositeOp
+    #
+    # See also
+    #
+    # Draw.pattern # define an image to tile as the filling of a draw object
+    # 
+
+    # Setup spacing.
+    #
+    # Columns sit side-by-side.
+    spacing_factor = 0.9
+    @bar_width = current_color.columns
+
+    @norm_data.each_with_index do |data_row, row_index|
+  
+      data_row[1].each_with_index do |data_point, point_index|
+        data_point = 0 if data_point.nil?
+        # Use incremented x and scaled y
+        left_x = @graph_left + (@bar_width * (row_index + point_index + ((@data.length - 1) * point_index)))
+        left_y = @graph_top + (@graph_height - data_point * @graph_height) + 1
+        right_x = left_x + @bar_width * spacing_factor
+        right_y = @graph_top + @graph_height - 1
+      
+        bar_image_width = current_color.columns
+        bar_image_height = right_y.to_f - left_y.to_f
+      
+        # Crop to scale for data
+        bar_image = current_color.crop(0, 0, bar_image_width, bar_image_height)
+        
+        @d.gravity = NorthWestGravity
+        @d = @d.composite(left_x, left_y, bar_image_width, bar_image_height, bar_image)
+      
+        # Calculate center based on bar_width and current row
+        label_center = @graph_left + (@data.length * @bar_width * point_index) + (@data.length * @bar_width / 2.0)
+        draw_label(label_center, point_index)
+      end
+
+      increment_color()
+    end
+
+    @d.draw(@base_image)    
+  end
+
+
+  # Return the chosen theme or the default
+  def theme
+    @theme || 'plastik'
+  end
+
+protected
+
+  # Sets up colors with a list of images that will be used.
+  # Images should be 340px tall
+  def init_photo_bar_graphics    
+    color_list = Array.new
+    theme_dir = File.dirname(__FILE__) + '/../../assets/' + theme
+
+    Dir.open(theme_dir).each do |file|
+      next unless /\.png$/.match(file)
+      color_list << Image.read("#{theme_dir}/#{file}").first
+    end
+    @colors = color_list
+  end
+
+end
+

data/lib/gruff/side_stacked_bar.rb

@@ -0,0 +1,119 @@
+# new gruff graph type added to enable sideways stacking bar charts (basically looks like a x/y
+# flip of a standard stacking bar chart)
+#
+# alun.eyre@googlemail.com 
+#
+require File.dirname(__FILE__) + '/base'
+
+class Gruff::SideStackedBar < Gruff::Base
+
+    # instead of base class version, draws vertical background lines and label
+    def draw_line_markers
+
+      return unless @show_line_markers
+
+      # Draw horizontal line markers and annotate with numbers
+      @d = @d.stroke(@marker_color)
+      @d = @d.stroke_width 1
+      number_of_lines = 5
+
+      # TODO Round maximum marker value to a round number like 100, 0.1, 0.5, etc.
+      increment = significant(@maximum_value.to_f / number_of_lines)
+      (0..number_of_lines).each do |index|
+
+        line_diff = (@graph_right - @graph_left) / number_of_lines
+        x = @graph_right - (line_diff * index) - 1
+        @d = @d.line(x, @graph_bottom, x, @graph_top)
+
+        diff = index - number_of_lines
+        marker_label = diff.abs * increment
+
+        @d.fill = @marker_color
+        @d.font = @font
+        @d.stroke = 'transparent'
+        @d.pointsize = scale_fontsize(@marker_pointsize)
+#        @d.gravity = NorthGravity
+        @d = @d.annotate_scaled( @base_image, 
+                          100, 20,
+                          x - (@marker_pointsize/1.5), @graph_bottom + 40, 
+                          marker_label.to_s, @scale)
+
+      end
+    end
+
+    # instead of base class version, modified to enable us to draw on the Y axis instead of X
+    def draw_label(y_offset, index)
+      if !@labels[index].nil? && @labels_seen[index].nil?
+        @d.fill = @marker_color
+        @d.font = @font
+        @d.stroke = 'transparent'
+        @d.font_weight = NormalWeight
+        @d.pointsize = scale_fontsize(@marker_pointsize)
+        @d.gravity = CenterGravity
+        @d = @d.annotate_scaled(@base_image,
+                                1, 1,
+                                @graph_left / 2, y_offset,
+                                @labels[index], @scale)
+        @labels_seen[index] = 1
+      end
+    end
+
+    def draw
+      super
+
+      return unless @has_data
+
+      # Setup spacing.
+      #
+      # Columns sit stacked.
+      spacing_factor = 0.9
+
+      @bar_width = @graph_height / @column_count.to_f
+      @d = @d.stroke_opacity 0.0
+      height = Array.new(@column_count, 0)
+      length = Array.new(@column_count, @graph_left)
+
+      @norm_data.each_with_index do |data_row, row_index|
+        @d = @d.fill current_color
+
+        data_row[1].each_with_index do |data_point, point_index|
+
+	  ## using the original calcs from the stacked bar chart to get the difference between
+	  ## part of the bart chart we wish to stack.
+	  temp1 = @graph_left + (@graph_width -
+                                data_point * @graph_width - 
+                                height[point_index]) + 1
+	  temp2 = @graph_left + @graph_width - height[point_index] - 1
+	  difference = temp2 - temp1
+
+	  left_x = length[point_index] #+ 1
+          left_y = @graph_top + (@bar_width * point_index)
+	  right_x = left_x + difference
+          right_y = left_y + @bar_width * spacing_factor
+	  length[point_index] += difference
+          height[point_index] += (data_point * @graph_width - 2)
+
+          @d = @d.rectangle(left_x, left_y, right_x, right_y)
+
+          # Calculate center based on bar_width and current row
+          label_center = @graph_top + (@bar_width * point_index) + (@bar_width * spacing_factor / 2.0)
+          draw_label(label_center, point_index)
+        end
+
+        increment_color()
+      end
+
+      @d.draw(@base_image)    
+    end
+
+    protected
+
+    def larger_than_max?(data_point, index=0)
+      max(data_point, index) > @maximum_value
+    end
+
+    def max(data_point, index)
+      @data.inject(0) {|sum, item| sum + item[1][index]}
+    end
+
+end

data/lib/gruff/stacked_bar.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/base'
 
 class Gruff::StackedBar < Gruff::Base
 
+    # Draws a bar graph, but multiple sets are stacked on top of each other.
     def draw
       super
 
@@ -46,7 +47,7 @@ class Gruff::StackedBar < Gruff::Base
       @d.draw(@base_image)    
     end
     
-    protected
+protected
     
     def larger_than_max?(data_point, index=0)
       max(data_point, index) > @maximum_value

data/rakefile

@@ -21,6 +21,11 @@ RUBY_FORGE_USER    = "topfunky"
 desc "Default Task"
 task :default => [ :test ]
 
+desc "Clean images generated by tests"
+task :clean do
+  rm FileList['test/output/*.png']
+end
+
 # Run the unit tests
 Rake::TestTask.new { |t|
   t.libs << "test"

data/test/area_test.rb

@@ -17,6 +17,17 @@ class TestGruffArea < Test::Unit::TestCase
       [:Philip, [90, 34, 23, 12, 78, 89, 98, 88]],
       ["Arthur", [5, 10, 13, 11, 6, 16, 22, 32]],
       ]
+    @sample_labels = {
+        0 => '5/6', 
+        1 => '5/15', 
+        2 => '5/24', 
+        3 => '5/30', 
+        4 => '6/4', 
+        5 => '6/12', 
+        6 => '6/21', 
+        7 => '6/28', 
+      }      
+
   end
   
   def test_area_graph
@@ -105,6 +116,23 @@ class TestGruffArea < Test::Unit::TestCase
     # Default theme
     g.write("test/output/area_tiny.png")
   end
+
+  def test_wide
+    g = setup_basic_graph('800x400')
+    g.title = "Area Wide"
+    g.write("test/output/area_wide.png")
+  end
+
+protected
+  
+  def setup_basic_graph(size=800)
+    g = Gruff::Area.new(size)
+    g.title = "My Graph Title"
+    g.labels = @sample_labels
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+    return g
+  end
   
 end
-

data/test/bar_test.rb

@@ -61,23 +61,45 @@ class TestGruffBar < Test::Unit::TestCase
   end
 
   def test_bar_image_bg
-    g = Gruff::Bar.new
-    g.title = "Bar Graph With Image Background"
-    g.labels = {
-      0 => '5/6', 
-      1 => '5/15', 
-      2 => '5/24', 
-      3 => '5/30', 
-    }
-    @datasets.each do |data|
-      g.data(data[0], data[1])
-    end
-
+    g = setup_basic_graph()
+    g.title = "With Image Background"
     g.theme_image_based
     g.write("test/output/bar_image.png")
 
-    g = Gruff::Bar.new(400)
-    g.title = "Bar Graph With Image Background Small"
+    g = setup_basic_graph(400)
+    g.title = "With Image Background Small"
+    g.theme_image_based
+    g.write("test/output/bar_image_small.png")
+
+    g = setup_basic_graph('800x400')
+    g.title = "With Image Background Small"
+    g.theme_image_based
+    g.write("test/output/bar_image_wide.png")
+  end
+
+  def test_no_line_markers
+    g = setup_basic_graph(400)
+    g.title = "No Line Markers"
+    g.hide_line_markers = true
+    g.write("test/output/bar_no_line_markers.png")    
+  end
+
+  def test_wide_graph
+    g = setup_basic_graph('800x400')
+    g.title = "Wide Graph"
+    g.write("test/output/bar_wide_graph.png")    
+
+    g = setup_basic_graph('400x200')
+    g.title = "Wide Graph Small"
+    g.write("test/output/bar_wide_graph_small.png")
+  end
+
+
+protected
+
+  def setup_basic_graph(size=800)
+    g = Gruff::Bar.new(size)
+    g.title = "My Bar Graph"
     g.labels = {
       0 => '5/6', 
       1 => '5/15', 
@@ -87,10 +109,7 @@ class TestGruffBar < Test::Unit::TestCase
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
-
-    g.theme_image_based
-    g.write("test/output/bar_image_small.png")
-
+    g
   end
 
   
@@ -112,6 +131,6 @@ class Gruff::Base
 
     @marker_color = 'white'
   
-    @base_image = render_image_background('assets/bubble.png')
+    @base_image = render_image_background('assets/pc306715.jpg')
   end
 end

data/test/line_test.rb

@@ -19,6 +19,17 @@ class TestGruffLine < Test::Unit::TestCase
       [:Philip, [90, 34, 23, 12, 78, 89, 98, 88]],
       ["Arthur", [5, 10, 13, 11, 6, 16, 22, 32]],
       ]
+
+    @sample_labels = {
+        0 => '5/6', 
+        1 => '5/15', 
+        2 => '5/24', 
+        3 => '5/30', 
+        4 => '6/4', 
+        5 => '6/12', 
+        6 => '6/21', 
+        7 => '6/28', 
+      }      
   end
   
   def test_line_graph_with_themes
@@ -103,10 +114,10 @@ class TestGruffLine < Test::Unit::TestCase
   def test_similar_high_end_values
     g = Gruff::Line.new
     g.title = "Similar High End Values Test"
-    g.data('similar points', [100, 98, 99, 97, 96, 95, 96, 97, 98, 99, 100, 96] )
+    g.data('similar points', %w(29.43 29.459 29.498 29.53 29.548 29.589 29.619 29.66 29.689 29.74 29.769 29.79 29.808 29.828 29.849 29.878).collect {|i| i.to_f} )
 
     # Default theme
-    g.write("test/output/similar_high_end_values.png")    
+    g.write("test/output/line_similar_high_end_values.png")    
   end
 
 
@@ -244,6 +255,72 @@ class TestGruffLine < Test::Unit::TestCase
     g.write("test/output/line_some_nil_points.png")    
   end
 
+  def test_no_title
+    g = Gruff::Line.new(400)
+    g.labels = @sample_labels
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    g.write("test/output/line_no_title.png")
+  end
+
+  def test_no_line_markers
+    g = setup_basic_graph(400)
+    g.title = "No Line Markers"
+    g.hide_line_markers = true
+    g.write("test/output/line_no_line_markers.png")    
+  end
+
+  def test_no_legend
+    g = setup_basic_graph(400)
+    g.title = "No Legend"
+    g.hide_legend = true
+    g.write("test/output/line_no_legend.png")
+  end
+
+  def test_nothing_but_the_graph
+    g = setup_basic_graph(400)
+    g.title = "THIS TITLE SHOULD NOT DISPLAY!!!"
+    g.hide_line_markers = true
+    g.hide_legend = true
+    g.hide_title = true
+    g.write("test/output/line_nothing_but_the_graph.png")    
+  end
+
+  def test_baseline_larger_than_data
+    g = setup_basic_graph(400)
+    g.title = "Baseline Larger Than Data"
+    g.baseline_value = 150
+    g.write("test/output/line_large_baseline.png")    
+  end
+
+
+  def test_hide_dots
+    g = setup_basic_graph(400)
+    g.title = "Hide Dots"
+    g.hide_dots = true
+    g.write("test/output/line_hide_dots.png")    
+  end
+
+  def test_hide_lines
+    g = setup_basic_graph(400)
+    g.title = "Hide Lines"
+    g.hide_lines = true
+    g.write("test/output/line_hide_lines.png")    
+  end
+
+  def test_wide_graph
+    g = setup_basic_graph('800x400')
+    g.title = "Wide Graph"
+    g.write("test/output/line_wide_graph.png")    
+
+    g = setup_basic_graph('400x200')
+    g.title = "Wide Graph Small"
+    g.write("test/output/line_wide_graph_small.png")
+  end
+
+
 protected
 
   def line_graph_with_themes(size=nil)
@@ -254,12 +331,7 @@ protected
     end
 
     g.title = "Multi-Line Graph Test #{size}"
-    g.labels = {
-      0 => '5/6', 
-      2 => '5/15', 
-      4 => '5/24', 
-      6 => '5/30', 
-    }
+    g.labels = @sample_labels
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
@@ -278,6 +350,16 @@ protected
     g.theme_odeo
     g.write("test/output/line_theme_odeo_#{size}.png")
   end
+
+  def setup_basic_graph(size=800)
+    g = Gruff::Line.new(size)
+    g.title = "My Graph Title"
+    g.labels = @sample_labels
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+    return g
+  end
   
 end
 

data/test/photo_test.rb

@@ -0,0 +1,44 @@
+#!/usr/bin/ruby
+
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+
+require 'test/unit'
+require 'gruff'
+
+class TestGruffPhotoBar < Test::Unit::TestCase
+
+  def setup
+    @datasets = [
+      [:Jimmy, [25, 36, 86, 39]],
+      [:Charles, [80, 54, 67, 54]],
+#      [:Charity, [0, nil, 100, 90]],
+      ]
+  end
+
+  def test_bar_graph
+    bar_graph_sized
+    bar_graph_sized(400)
+  end
+
+
+protected
+
+  def bar_graph_sized(size=800)
+    g = Gruff::PhotoBar.new(size)
+    g.title = "Photo Bar Graph Test #{size}px"
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
+    @datasets.each do |data|
+      g.data(*data)
+    end
+
+    g.theme = 'plastik'
+
+    g.write("test/output/photo_plastik_#{size}.png")    
+  end
+
+end

data/test/pie_test.rb

@@ -17,6 +17,7 @@ class TestGruffPie < Test::Unit::TestCase
       [:Philip, [90]],
       ["Arthur", [5]],
       ]
+
   end
   
   def test_pie_graph
@@ -79,5 +80,22 @@ class TestGruffPie < Test::Unit::TestCase
     g.write("test/output/pie_tiny.png")
   end
 =end
+
+  def test_wide
+    g = setup_basic_graph('800x400')
+    g.title = "Wide Pie"
+    g.write("test/output/pie_wide.png")
+  end
+
+protected
+
+  def setup_basic_graph(size=800)
+    g = Gruff::Pie.new(size)
+    g.title = "My Graph Title"
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+    return g
+  end
   
 end

data/test/sidestacked_bar_test.rb

@@ -0,0 +1,88 @@
+#!/usr/bin/ruby
+
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+#$:.unshift File.dirname(__FILE__) + "/fixtures/helpers"
+
+require 'test/unit'
+require 'gruff'
+
+class TestGruffSideSideStackedBar < Test::Unit::TestCase
+
+  # TODO Delete old output files once when starting tests
+
+  def setup
+    @datasets = [
+      [:Jimmy, [25, 36, 86, 39]],
+      [:Charles, [80, 54, 67, 54]],
+      [:Julie, [22, 29, 35, 38]],
+      #[:Jane, [95, 95, 95, 90, 85, 80, 88, 100]],
+      #[:Philip, [90, 34, 23, 12, 78, 89, 98, 88]],
+      #["Arthur", [5, 10, 13, 11, 6, 16, 22, 32]],
+      ]
+    @sample_labels = {
+        0 => '5/6', 
+        1 => '5/15', 
+        2 => '5/24'
+      }      
+
+  end
+
+  def test_bar_graph
+    g = Gruff::SideStackedBar.new
+    g.title = "Visual Stacked Bar Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    g.write("test/output/side_stacked_bar_keynote.png")
+        
+    g.theme_rails_keynote
+    g.write("test/output/side_stacked_bar_rails_keynote.png")
+    
+    g.theme_odeo
+    g.write("test/output/side_stacked_bar_odeo.png")
+  end
+
+
+  def test_bar_graph_small
+    g = Gruff::SideStackedBar.new(400)
+    g.title = "Visual Stacked Bar Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    g.write("test/output/side_stacked_bar_keynote_small.png")
+  end
+
+  def test_wide
+    g = setup_basic_graph('800x400')
+    g.title = "Wide SSBar"
+    g.write("test/output/side_stacked_bar_wide.png")
+  end
+
+protected
+
+  def setup_basic_graph(size=800)
+    g = Gruff::SideStackedBar.new(size)
+    g.title = "My Graph Title"
+    g.labels = @sample_labels
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+    return g
+  end
+
+end
+

data/test/stacked_bar_test.rb

@@ -19,6 +19,12 @@ class TestGruffStackedBar < Test::Unit::TestCase
       #[:Philip, [90, 34, 23, 12, 78, 89, 98, 88]],
       #["Arthur", [5, 10, 13, 11, 6, 16, 22, 32]],
       ]
+    @sample_labels = {
+        0 => '5/6', 
+        1 => '5/15', 
+        2 => '5/24'
+      }      
+
   end
 
   def test_bar_graph
@@ -95,22 +101,3 @@ class TestGruffStackedBar < Test::Unit::TestCase
 
   
 end
-
-class Gruff::Base
-  def theme_image_based
-    reset_themes()
-    # Colors
-    @green = '#00ff00'
-    @grey = '#333333'
-    @orange = '#ff5d00'
-    @red = '#f61100'
-    @white = 'white'
-    @light_grey = '#999999'
-    @black = 'black'
-    @colors = [@green, @grey, @orange, @red, @white, @light_grey, @black]
-
-    @marker_color = 'white'
-  
-    @base_image = render_image_background('assets/bubble.png')
-  end
-end

metadata

@@ -3,11 +3,11 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
-date: 2005-12-04 00:00:00 -08:00
+  version: 0.0.8
+date: 2005-12-31 00:00:00 -08:00
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
-  - lib
+- lib
 email: boss@topfunky.com
 homepage: http://www.topfunky.com
 rubyforge_project: gruff
@@ -18,43 +18,52 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-  - Geoffrey Grosenbach
+- Geoffrey Grosenbach
 files: 
-  - rakefile
-  - README
-  - CHANGELOG
-  - MIT-LICENSE
-  - lib/gruff
-  - lib/gruff.rb
-  - lib/gruff/area.rb
-  - lib/gruff/bar.rb
-  - lib/gruff/base.rb
-  - lib/gruff/line.rb
-  - lib/gruff/pie.rb
-  - lib/gruff/stacked_bar.rb
-  - assets/bubble.png
-  - assets/plastik
-  - assets/plastik-yellow.png
-  - test/area_test.rb
-  - test/bar_test.rb
-  - test/line_test.rb
-  - test/output
-  - test/pie_test.rb
-  - test/stacked_bar_test.rb
+- rakefile
+- README
+- CHANGELOG
+- MIT-LICENSE
+- lib/gruff
+- lib/gruff.rb
+- lib/gruff/area.rb
+- lib/gruff/bar.rb
+- lib/gruff/base.rb
+- lib/gruff/line.rb
+- lib/gruff/photo_bar.rb
+- lib/gruff/pie.rb
+- lib/gruff/side_stacked_bar.rb
+- lib/gruff/stacked_bar.rb
+- assets/bubble.png
+- assets/pc306715.jpg
+- assets/plastik
+- test/area_test.rb
+- test/bar_test.rb
+- test/line_test.rb
+- test/output
+- test/photo_test.rb
+- test/pie_test.rb
+- test/sidestacked_bar_test.rb
+- test/stacked_bar_test.rb
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: 
-  - none
-dependencies: []
+- none
+dependencies: []
+