gruff 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,5 +1,15 @@
 CHANGELOG
 
+== 0.0.4
+
+* Added bar graphs
+* Added area graphs
+* Added pie graphs
+* Added render_image_background for using images as background on a theme
+* Fixed small size legend centering issue
+* Added initial line marker rounding to significant digits (Christian Winkler)
+* Line graphs line width is scaled with number of points being drawn (Christian Winkler)
+
 == 0.0.3
 
 * Added option to draw line graphs without the lines (points only), thanks to Eric Hodel
@@ -11,7 +21,6 @@ CHANGELOG
 * Added bar graphs (initial functionality...will be enhanced)
 * Removed rendered test output from gem
 
-
 == 0.0.1
 
 * Initial release.

data/lib/gruff/area.rb

@@ -1,15 +1,57 @@
 
 require 'gruff/base'
 
-module Gruff
-  class Area < Base
-
-    # TODO Not yet implemented.
-    def draw
-      super
-    
-      @d.draw(@base_image)
+class Gruff::Area < Gruff::Base
+
+  def draw
+    super
+
+    @x_increment = @graph_width / (@column_count - 1).to_f
+    @d = @d.stroke 'transparent'
+
+    @norm_data.each do |data_row|
+      poly_points = Array.new
+      prev_x = prev_y = 0.0
+      @d = @d.fill current_color
+
+      data_row[1].each_with_index do |data_point, index|
+        # Use incremented x and scaled y
+        new_x = @graph_left + (@x_increment * index)
+        new_y = @graph_top + (@graph_height - data_point * @graph_height)
+
+        if prev_x > 0 and prev_y > 0 then
+          poly_points << new_x
+          poly_points << new_y
+          
+          #@d = @d.polyline(prev_x, prev_y, new_x, new_y)
+        else
+          poly_points << @graph_left
+          poly_points << @graph_bottom - 1
+          poly_points << new_x
+          poly_points << new_y
+          
+          #@d = @d.polyline(@graph_left, @graph_bottom, new_x, new_y)
+        end
+
+        draw_label(new_x, index)
+
+        prev_x = new_x
+        prev_y = new_y
+      end
+
+      # Add closing points, draw polygon
+      poly_points << @graph_right
+      poly_points << @graph_bottom - 1
+      poly_points << @graph_left
+      poly_points << @graph_bottom - 1
+
+      @d = @d.polyline(*poly_points)
+
+      increment_color()
     end
 
+    @d.draw(@base_image)
   end
-end
+   
+ 
+end

data/lib/gruff/bar.rb

@@ -1,8 +1,7 @@
 
 require 'gruff/base'
 
-module Gruff
-  class Bar < Base
+class Gruff::Bar < Gruff::Base
 
     def draw
       super
@@ -10,6 +9,7 @@ module Gruff
       # Setup spacing.
       #
       # Columns sit side-by-side.
+      spacing_factor = 0.9
       @bar_width = @graph_width / (@column_count * @data.length).to_f
     
       @d = @d.stroke_opacity 0.0
@@ -20,41 +20,21 @@ module Gruff
         data_row[1].each_with_index do |data_point, point_index|
           # 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)
-          right_x = left_x + @bar_width
+          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
           
           @d = @d.rectangle(left_x, left_y, right_x, right_y)
-
-          # TODO Calculate center based on bar_width and current row
-          #draw_label(left_x, index)
+          
+          # 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
 
-private
-
-    # Draws column labels below graph, centered under entire block
-    def draw_label(x_offset, index)
-      # TODO
-      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,
-                                x_offset, @raw_rows - 80,
-                                @labels[index], @scale)
-        @labels_seen[index] = 1
-      end
-    end
-
-  end
-end
+end

data/lib/gruff/base.rb

@@ -13,9 +13,11 @@ rescue LoadError
   require 'RMagick' # capitalized on Windows
 end
 
+require 'yaml'
+
 module Gruff
   
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
   
   class Base
   
@@ -48,6 +50,7 @@ module Gruff
       @marker_pointsize = 21.0
       @raw_columns = 800.0
       @raw_rows = 600.0
+      @graph_width = 590.0
       @column_count = 0
       @maximum_value = 0
       @data = Array.new
@@ -55,6 +58,10 @@ module Gruff
       @labels_seen = Hash.new
       @scale = @columns / @raw_columns
 
+      @show_line_markers = true
+      @show_legend = true
+      @show_title = true
+
       reset_themes()
       theme_keynote()
     end
@@ -179,7 +186,7 @@ module Gruff
     def to_blob(fileformat='PNG')
       draw()
       return @base_image.to_blob do
-         self.format=fileformat
+         self.format = fileformat
       end
     end
 
@@ -201,6 +208,7 @@ protected
     # - title
     def setup_drawing
       normalize()
+      setup_graph_measurements()
       
       draw_line_markers()
       draw_legend()
@@ -209,35 +217,44 @@ protected
 
     # Make copy of data with values scaled between 0-100
     def normalize
-      @norm_data = Array.new
-      @data.each do |data_row|
-        norm_data_points = Array.new
-        data_row[1].each do |data_point|
-          norm_data_points << (data_point.to_f/@maximum_value.to_f)
+      if @norm_data.nil?
+        @norm_data = Array.new
+        @data.each do |data_row|
+          norm_data_points = Array.new
+          data_row[1].each do |data_point|
+            norm_data_points << (data_point.to_f/@maximum_value.to_f)
+          end
+          @norm_data << [data_row[0], norm_data_points]
         end
-        @norm_data << [data_row[0], norm_data_points]
       end
     end
 
-    # Draws horizontal background lines and labels
-    def draw_line_markers
+    def setup_graph_measurements
       @graph_left = 130.0
-      @graph_right = @raw_columns - 100.0 # TODO Make wider
+      @graph_right = @graph_left + @graph_width
       @graph_top = 150.0
       @graph_bottom = @raw_rows - 110.0
       @graph_height = @graph_bottom - @graph_top
-      @graph_width = @graph_right - @graph_left
+    end
+
+    # Draws horizontal background lines and labels
+    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
-      (0..4).each do |index|
-        #y = ( index.to_f * (@graph_height.to_f/4.0) ) + @graph_top.to_f
-        y = @graph_top + @graph_height - ( index.to_f * (@graph_height.to_f/4.0) )
+      number_of_lines = 4
+
+      # 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)
+      inc_graph = @graph_height.to_f / (@maximum_value.to_f / increment)
+
+      (0..number_of_lines).each do |index|
+        y = @graph_top + @graph_height - index.to_f * inc_graph
         @d = @d.line(@graph_left, y, @graph_right, y)
-        
-        marker_label = 0
-        marker_label = @maximum_value.to_f * (index.to_f/4.to_f) if index > 0
+
+        marker_label = index * increment
 
         @d.fill = @marker_color
         @d.font = @font
@@ -253,15 +270,24 @@ 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
+      
       @color_index = 0
-      @legend_labels = @data.collect {|item| item[0] }
+      @legend_labels = @norm_data.collect {|item| item[0] }
 
+      # Sort norm_data with avg largest values set first (for display)
+      sort_norm_data()
+      
       legend_square_width = 20 # small square with color of this item
 
+      # May fix legend drawing problem at small sizes
+      @d.font = @font
+      @d.pointsize = 20
+
       metrics = @d.get_type_metrics(@base_image, @legend_labels.join(''))
       legend_text_width = metrics.width
-      legend_width = legend_text_width + @legend_labels.length * (legend_square_width * 2.7)
-      legend_left = scale(@raw_columns - legend_width) / 2
+      legend_width = legend_text_width + (@legend_labels.length * legend_square_width * 2.7)
+      legend_left = (@raw_columns - legend_width) / 2
       legend_increment = legend_width / @legend_labels.length.to_f
 
       current_x_offset = legend_left
@@ -296,6 +322,8 @@ protected
     end
 
     def draw_title
+      return unless @show_title
+      
       @d.fill = @marker_color
       @d.font = @font
       @d.stroke = 'transparent'
@@ -308,11 +336,39 @@ protected
                         @title, @scale)
     end
 
+    ##
+    # Draws column labels below graph, centered over x_offset
+    def draw_label(x_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,
+                                x_offset, @raw_rows - 80,
+                                @labels[index], @scale)
+        @labels_seen[index] = 1
+      end
+    end
+
+    # Use with a theme definition method to draw a gradiated (or solid color) background.
     def render_gradiated_background(top_color, bottom_color)
       Image.new(@columns, @rows, 
           GradientFill.new(0, 0, 100, 0, top_color, bottom_color))
     end
 
+    # Use with a theme to use an image (800x600 original) background.
+    def render_image_background(image_path)
+      image = Image.read(image_path)
+      if @scale != 1.0
+        image[0].resize!(@scale)
+      end
+      image[0]
+    end
+
     def current_color
       @colors[@color_index]
     end
@@ -343,11 +399,47 @@ protected
       return new_fontsize
     end
 
+    def clip_value_if_greater_than(value, max_value)
+      (value > max_value) ? max_value : value
+    end
+
+    # round down to significant digits
+    def significant(inc)
+      factor = 1.0
+      while (inc < 10)
+        inc *= 10
+        factor /= 10
+      end
+
+      while (inc > 100)
+        inc /= 10
+        factor *= 10
+      end
+
+      res = inc.floor * factor
+      if (res.to_i.to_f == res)
+        res.to_i
+      else
+        res
+      end
+    end
+
+    # Sort with largest overall summed value at front of array 
+    # so it shows up correctly in the drawn graph.
+    def sort_norm_data
+      @norm_data.sort! { |a,b| sums(b[1]) <=> sums(a[1]) }
+    end
+
+    def sums(data_set)
+      total_sum = 0
+      data_set.collect {|num| total_sum += num }
+      total_sum
+    end
+
   end
   
   class ColorlistExhaustedException < StandardError; end
-    
-  
+      
 end
 
 

data/lib/gruff/line.rb

@@ -1,3 +1,4 @@
+
 require 'gruff/base'
 
 class Gruff::Line < Gruff::Base
@@ -24,11 +25,11 @@ class Gruff::Line < Gruff::Base
     super
 
     @x_increment = @graph_width / (@column_count - 1).to_f
-    circle_radius = 5.0
+    circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 2.5), 5.0)
 
     @d = @d.stroke_opacity 1.0
-    @d = @d.stroke_width 5.0
-
+    @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 4), 5.0)
+    
     @norm_data.each do |data_row|
       prev_x = prev_y = 0.0
       @d = @d.stroke current_color
@@ -56,24 +57,5 @@ class Gruff::Line < Gruff::Base
     @d.draw(@base_image)
   end
 
-private
-
-  ##
-  # Draws column labels below graph
-  def draw_label(x_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,
-                              x_offset, @raw_rows - 80,
-                              @labels[index], @scale)
-      @labels_seen[index] = 1
-    end
-  end
 
 end

data/lib/gruff/pie.rb

@@ -1,15 +1,92 @@
 
 require 'gruff/base'
 
-module Gruff
-  class Pie < Base
+class Gruff::Pie < Gruff::Base
 
-    # TODO Not yet implemented.
-    def draw
-      super
+  def draw
+    @show_line_markers = false
+    
+    super
 
-      @d.draw(@base_image)
+    diameter = @graph_height
+    radius = @graph_height / 2.0
+    top_x = @graph_left + (@graph_width - diameter) / 2.0
+    center_x = @graph_left + (@graph_width / 2.0)
+    center_y = @graph_top + (@graph_height / 2.0)
+    total_sum = sums_for_pie()
+    prev_degrees = 0.0
+
+    @norm_data.each do |data_row|
+      @d = @d.stroke current_color
+      @d = @d.fill 'transparent'
+      @d.stroke_width(200.0)
+
+      current_degrees = (data_row[1][0] / total_sum) * 360.0
+      #@d = @d.pie_slice(center_x, center_y, radius, 
+      #                  current_percent * 100.0)
+      
+      #@d = @d.arc(top_x, @graph_top, 
+      #            top_x + diameter, @graph_top + diameter,
+      #            prev_degrees, prev_degrees + current_degrees)
+      radius = 100.0
+      @d = @d.ellipse(center_x, center_y, 
+                  radius, radius,
+                  prev_degrees, prev_degrees + current_degrees)
+      
+      
+      prev_degrees += current_degrees
+      increment_color()
     end
 
+    @d.draw(@base_image)
+  end
+
+private
+
+  def sums_for_pie
+    total_sum = 0.0
+    @norm_data.collect {|data_row| total_sum += data_row[1][0] }
+    total_sum
+  end
+
+end
+
+class Magick::Draw
+  
+  def pie_slice(center_x=0.0, center_y=0.0, radius=100.0, percent=0.0, rot_x=0.0)
+    # Okay, this part is as confusing as hell, so pay attention:
+		# This line determines the horizontal portion of the point on the circle where the X-Axis
+		# should end.  It's caculated by taking the center of the on-image circle and adding that
+		# to the radius multiplied by the formula for determinig the point on a unit circle that a
+		# angle corresponds to.  3.6 * percent gives us that angle, but it's in degrees, so we need to
+		# convert, hence the muliplication by Pi over 180
+		arc_end_x = radius + (radius * Math.cos((3.6 * percent)*(Math::PI/180.0)))
+
+		# The same goes for here, except it's the vertical point instead of the horizontal one
+		arc_end_y = radius + (radius * Math.sin((3.6 * percent)*(Math::PI/180.0)))
+
+		# Because the SVG path format is seriously screwy, we need to set the large-arc-flag to 1
+		# if the angle of an arc is greater than 180 degrees.  I have no idea why this is, but it is.
+		percent > 50 ? large_arc_flag = 1 : large_arc_flag = 0
+
+		# This is also confusing
+		#  M tells us to move to an absolute point on the image.  
+		#   We're moving to the center of the pie
+		#  h tells us to move to a relative point.  
+		#   We're moving to the right edge of the circle.
+		#  A tells us to start an absolute elliptical arc.  
+		#   The first two values are the radii of the ellipse
+		#   The third value is the x-axis-rotation (how to rotate the ellipse)
+		#   The fourth value is our large-arc-flag
+		#   The fifth is the sweep-flag
+		#   The sixth and seventh values are the end point of the arc which we calculated previously
+		# More info on the SVG path string format at: http://www.w3.org/TR/SVG/paths.html
+		#
+		#path = "M#{radius + 2},#{radius + 2} h#{radius} A#{radius},#{radius} #{rot_x} #{large_arc_flag},1 #{arc_end_x},#{arc_end_y} z"
+		path = "M#{radius},#{radius} h#{radius} A#{radius},#{radius} #{rot_x} #{large_arc_flag},1 #{arc_end_x},#{arc_end_y} z"
+    puts "PATH: #{path}"
+
+		self.path(path)
   end
-end
+  
+end

data/rakefile

@@ -61,6 +61,7 @@ spec = Gem::Specification.new do |s|
 
   s.files = [ "rakefile", "README", "CHANGELOG", "MIT-LICENSE" ]
   s.files = s.files + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
+  s.files = s.files + Dir.glob( "assets/*" ).delete_if { |item| item.include?( "\.svn" ) }
   s.files = s.files + Dir.glob( "test/**/*" ).delete_if { |item| item.include?( "\.svn" ) || item.include?("\.png") }
 end
   
@@ -70,7 +71,6 @@ Rake::GemPackageTask.new(spec) do |p|
   p.need_zip = true
 end
 
-
 desc "Publish the API documentation"
 task :pgem => [:package] do 
   Rake::SshFilePublisher.new("boss@topfunky.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload

data/test/area_test.rb

@@ -0,0 +1,110 @@
+#!/usr/bin/ruby
+
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+#$:.unshift File.dirname(__FILE__) + "/fixtures/helpers"
+
+require 'test/unit'
+require 'gruff'
+
+class TestGruffArea < Test::Unit::TestCase
+
+  def setup
+    @datasets = [
+      [:Jimmy, [25, 36, 86, 39, 25, 31, 79, 88]],
+      [:Charles, [80, 54, 67, 54, 68, 70, 90, 95]],
+      [:Julie, [22, 29, 35, 38, 36, 40, 46, 57]],
+      [: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]],
+      ]
+  end
+  
+  def test_area_graph
+    g = Gruff::Area.new
+    g.title = "Visual Multi-Area Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      2 => '5/15', 
+      4 => '5/24', 
+      6 => '5/30', 
+    }
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    # Default theme
+    g.write("test/output/area_keynote.png")
+  end
+  
+  def test_resize
+    g = Gruff::Area.new(400)
+    g.title = "Small Size Multi-Area Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      2 => '5/15', 
+      4 => '5/24', 
+      6 => '5/30', 
+    }
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    # Default theme
+    g.write("test/output/area_keynote_small.png")
+  end
+  
+  def test_many_datapoints
+    g = Gruff::Area.new
+    g.title = "Many Multi-Area Graph Test"
+    g.labels = {
+      0 => 'June', 
+      10 => 'July', 
+      30 => 'August', 
+      50 => 'September', 
+    }
+    g.data('many points', (0..50).collect {|i| rand(100) })
+
+    # Default theme
+    g.write("test/output/area_many.png")
+  end
+
+  def test_many_areas_graph_small
+    g = Gruff::Area.new(400)
+    g.title = "Many Values Area Test 400px"
+    g.labels = {
+      0 => '5/6', 
+      10 => '5/15', 
+      20 => '5/24', 
+      30 => '5/30', 
+      40 => '6/4', 
+      50 => '6/16'
+    }
+    %w{jimmy jane philip arthur julie bert}.each do |student_name|
+      g.data(student_name, (0..50).collect { |i| rand 100 })
+    end
+
+    # Default theme
+    g.write("test/output/area_many_areas_small.png")
+  end
+
+  def test_area_graph_tiny
+    g = Gruff::Area.new(300)
+    g.title = "Area Test 300px"
+    g.labels = {
+      0 => '5/6', 
+      10 => '5/15', 
+      20 => '5/24', 
+      30 => '5/30', 
+      40 => '6/4', 
+      50 => '6/16'
+    }
+    %w{jimmy jane philip arthur julie bert}.each do |student_name|
+      g.data(student_name, (0..50).collect { |i| rand 100 })
+    end
+
+    # Default theme
+    g.write("test/output/area_tiny.png")
+  end
+  
+end
+

data/test/bar_test.rb

@@ -26,19 +26,16 @@ class TestGruffBar < Test::Unit::TestCase
     g.title = "Visual Multi-Line Bar Graph Test"
     g.labels = {
       0 => '5/6', 
-      2 => '5/15', 
-      4 => '5/24', 
-      6 => '5/30', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
     }
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
 
     g.write("test/output/bar_keynote.png")
-    
-    g.theme_37signals
-    g.write("test/output/bar_37signals.png")
-    
+        
     g.theme_rails_keynote
     g.write("test/output/bar_rails_keynote.png")
     
@@ -52,25 +49,69 @@ class TestGruffBar < Test::Unit::TestCase
     g.title = "Visual Multi-Line Bar Graph Test"
     g.labels = {
       0 => '5/6', 
-      2 => '5/15', 
-      4 => '5/24', 
-      6 => '5/30', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
     }
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
 
     g.write("test/output/bar_keynote_small.png")
-    
-    g.theme_37signals
-    g.write("test/output/bar_37signals_small.png")
-    
-    g.theme_rails_keynote
-    g.write("test/output/bar_rails_keynote_small.png")
-    
-    g.theme_odeo
-    g.write("test/output/bar_odeo_small.png")
   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.theme_image_based
+    g.write("test/output/bar_image.png")
+
+    g = Gruff::Bar.new(400)
+    g.title = "Bar Graph With Image Background Small"
+    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.theme_image_based
+    g.write("test/output/bar_image_small.png")
+
+  end
+
   
+end
+
+class Gruff::Base
+  # A color scheme from the colors used on the 2005 Rails keynote presentation at RubyConf.
+  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

data/test/line_test.rb

@@ -60,6 +60,14 @@ class TestGruffLine < Test::Unit::TestCase
     end
 
     g.write("test/output/line_small.png")
+
+    g = Gruff::Line.new(400)
+    g.title = "Small Values Line Graph Test 400px"
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    g.write("test/output/line_small_small.png")
   end
     
   def test_line_large_values    
@@ -205,6 +213,24 @@ class TestGruffLine < Test::Unit::TestCase
     g.write("test/output/line_dots_small.png")
   end
 
+  def test_many_lines_graph_small
+    g = Gruff::Line.new(400)
+    g.title = "Many Values Line Test 400px"
+    g.labels = {
+      0 => '5/6', 
+      10 => '5/15', 
+      20 => '5/24', 
+      30 => '5/30', 
+      40 => '6/4', 
+      50 => '6/16'
+    }
+    %w{jimmy jane philip arthur julie bert}.each do |student_name|
+      g.data(student_name, (0..50).collect { |i| rand 100 })
+    end
+
+    # Default theme
+    g.write("test/output/line_many_lines_small.png")
+  end
 
   def test_dots_graph_tiny
     g = Gruff::Line.new(300, false)

data/test/pie_test.rb

@@ -0,0 +1,83 @@
+#!/usr/bin/ruby
+
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+#$:.unshift File.dirname(__FILE__) + "/fixtures/helpers"
+
+require 'test/unit'
+require 'gruff'
+
+class TestGruffPie < Test::Unit::TestCase
+
+  def setup
+    @datasets = [
+      [:Jimmy, [25]],
+      [:Charles, [80]],
+      [:Julie, [22]],
+      [:Jane, [95]],
+      [:Philip, [90]],
+      ["Arthur", [5]],
+      ]
+  end
+  
+  def test_pie_graph
+    g = Gruff::Pie.new
+    g.title = "Visual Pie Graph Test"
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    # Default theme
+    g.write("test/output/pie_keynote.png")
+  end
+
+  def test_pie_graph_small
+    g = Gruff::Pie.new(400)
+    g.title = "Visual Pie Graph Test Small"
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    # Default theme
+    g.write("test/output/pie_keynote_small.png")
+  end
+
+
+=begin  
+  def test_resize
+    g = Gruff::Pie.new(400)
+    g.title = "Small Size Multi-Pie Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      2 => '5/15', 
+      4 => '5/24', 
+      6 => '5/30', 
+    }
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    # Default theme
+    g.write("test/output/pie_keynote_small.png")
+  end
+  
+  def test_pie_graph_tiny
+    g = Gruff::Pie.new(300)
+    g.title = "Pie Test 300px"
+    g.labels = {
+      0 => '5/6', 
+      10 => '5/15', 
+      20 => '5/24', 
+      30 => '5/30', 
+      40 => '6/4', 
+      50 => '6/16'
+    }
+    %w{jimmy jane philip arthur julie bert}.each do |student_name|
+      g.data(student_name, (0..50).collect { |i| rand 100 })
+    end
+
+    # Default theme
+    g.write("test/output/pie_tiny.png")
+  end
+=end
+  
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2005-10-26 00:00:00 -07:00
+  version: 0.0.4
+date: 2005-11-14 00:00:00 -08:00
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
   - lib
@@ -40,9 +40,12 @@ files:
   - lib/gruff/base.rb
   - lib/gruff/line.rb
   - lib/gruff/pie.rb
+  - assets/bubble.png
+  - test/area_test.rb
   - test/bar_test.rb
   - test/line_test.rb
   - test/output
+  - test/pie_test.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []