gruff 0.1.0 → 0.1.1

data/{rakefile → Rakefile}

@@ -66,7 +66,7 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.autorequire = 'gruff'
 
-  s.files = [ "rakefile", "README", "CHANGELOG", "MIT-LICENSE" ]
+  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") }

data/lib/gruff.rb

@@ -1,4 +1,3 @@
-
 # Extra full path added to fix some require errors on some installations.
 
 require File.dirname(__FILE__) + '/gruff/base'
@@ -10,4 +9,3 @@ 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_conversion.rb

@@ -10,14 +10,6 @@
 #
 #  $Log: bar_conversion.rb $
 #  $Log: Added comments $
-#  ------------------------------------------------------------------------
-#  This program was written by David Stokar is
-#  licensed under the GNU GPL license. Please see below for details. This
-#  header contains information regarding licensing terms under the GPL, and
-#  information regarding obtaining source code from the Author. Consequently,
-#  pursuant to section 3(c) of the GPL, you must accompany the information
-#  found in this header with any distribution you make of this Program.
-#  ------------------------------------------------------------------------
 ##############################################################################
 
 #

data/lib/gruff/base.rb

@@ -3,21 +3,21 @@
 #
 # Author:: Geoffrey Grosenbach boss@topfunky.com
 #
-# Date Created:: October 23, 2005
+# Originally Created:: October 23, 2005
 #
-#
-# Other contributors:
-#
-# Jarkko Laine, Mike Perham, Andreas Schwarz, Alun Eyre, Guillaume Theoret, David Stokar, and others.
+# Extra thanks to Tim Hunter for writing RMagick, 
+# and also contributions by
+# Jarkko Laine, Mike Perham, Andreas Schwarz, 
+# Alun Eyre, Guillaume Theoret, David Stokar, 
+# Paul Rogers, Dave Woodward, Frank Oxener, 
+# and a cast of thousands.
 #
 
 require 'RMagick'
 
-#require 'yaml'
-
 module Gruff
   
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   
   class Base
   
@@ -42,6 +42,9 @@ module Gruff
 
     # Font used for titles, labels, etc. Works best if you provide the full path to the TTF font file.
     # RMagick must be built with the Freetype libraries for this to work properly.
+    #
+    # Tries to find Bitstream Vera (Vera.ttf) in the location specified by
+    # ENV['MAGICK_FONT_PATH']. Uses default RMagick font otherwise.
     attr_accessor :font
 
     # Hide various elements
@@ -50,15 +53,20 @@ module Gruff
     # Message shown when there is no data. Fits up to 20 characters. Defaults to "No Data."
     attr_accessor :no_data_message
 
-    # Optionally set the size of the legend font. Based on an 800x600px graph. Default is 20.
+    # Optionally set the size of the font. Based on an 800x600px graph. Default is 20.
     #
     # Will be scaled down if graph is smaller than 800px wide.
     attr_accessor :legend_font_size
 
-    # Graph is drawn at 4/3 ratio (800x600, 400x300, etc.).
+    attr_accessor :marker_font_size
+    
+    attr_accessor :title_font_size
+
+    # If one numerical argument is given, the graph is drawn at 4/3 ratio according to the given width (800 results in 800x600, 400 gives 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.)
+    # Or, send a geometry string for other ratios ('800x400', '400x225'). 
+    #
+    # 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)
 
       if not Numeric === target_width
@@ -71,19 +79,22 @@ module Gruff
       end
 
       # Internal for calculations
-      @font = File.expand_path('Vera.ttf', ENV['MAGICK_FONT_PATH'])
-      @marker_pointsize = 21.0
       @raw_columns = 800.0
       @raw_rows = 800.0 * (@rows/@columns)
       @column_count = 0
-      @maximum_value = 0
-      @minimum_value = 0
+      @maximum_value = @minimum_value = nil
       @has_data = false
       @data = Array.new
       @labels = Hash.new
       @labels_seen = Hash.new
       @scale = @columns / @raw_columns
-      @legend_font_size = 20
+
+      vera_font_path = File.expand_path('Vera.ttf', ENV['MAGICK_FONT_PATH'])
+      @font = File.exists?(vera_font_path) ? vera_font_path : nil
+
+      @marker_font_size = 21.0
+      @legend_font_size = 20.0
+      @title_font_size = 36.0
 
       @no_data_message = "No Data"
 
@@ -204,16 +215,18 @@ module Gruff
       data_points.each_with_index do |data_point, index|
         next if data_point.nil?
         
-        # Setup max/min so spread starts at the low end of the data points (instead of 0)
-        if @maximum_value == 0 && @minimum_value == 0 && data_point != 0
+        # Setup max/min so spread starts at the low end of the data points
+        if @maximum_value.nil? && @minimum_value.nil?
           @maximum_value = @minimum_value = data_point
         end
-        
-        @maximum_value = larger_than_max?(data_point, index) ? max(data_point, index) : @maximum_value
+
+        # TODO Doesn't work with stacked bar graphs
+        #Original: @maximum_value = larger_than_max?(data_point, index) ? max(data_point, index) : @maximum_value
+        @maximum_value = larger_than_max?(data_point) ? data_point : @maximum_value
         if @maximum_value > 0
           @has_data = true
         end
-        @minimum_value = (data_point < @minimum_value) ? data_point : @minimum_value
+        @minimum_value = less_than_min?(data_point) ? data_point : @minimum_value
         if @minimum_value < 0
       	  @has_data = true
         end
@@ -334,13 +347,13 @@ protected
         marker_label = index * increment + @minimum_value.to_f
 
         @d.fill = @marker_color
-        @d.font = @font
+        @d.font = @font if @font
         @d.stroke = 'transparent'
-        @d.pointsize = scale_fontsize(@marker_pointsize)
+        @d.pointsize = scale_fontsize(@marker_font_size)
         @d.gravity = EastGravity
         @d = @d.annotate_scaled( @base_image, 
                           100, 20,
-                          -10, y - (@marker_pointsize/2.0), 
+                          -10, y - (@marker_font_size/2.0), 
                           marker_label.to_s, @scale)
         #                  "help", @scale)
       end
@@ -355,8 +368,8 @@ protected
       legend_square_width = 20 # small square with color of this item
 
       # May fix legend drawing problem at small sizes
-      @d.font = @font
-      @d.pointsize = legend_font_size
+      @d.font = @font if @font
+      @d.pointsize = @legend_font_size
 
       metrics = @d.get_type_metrics(@base_image, @legend_labels.join(''))
       legend_text_width = metrics.width
@@ -368,8 +381,8 @@ protected
       @legend_labels.each_with_index do |legend_label, index|        
         # Draw label
         @d.fill = @marker_color
-        @d.font = @font
-        @d.pointsize = scale_fontsize(legend_font_size)
+        @d.font = @font if @font
+        @d.pointsize = scale_fontsize(@legend_font_size)
         @d.stroke = 'transparent'
         @d.font_weight = NormalWeight
         @d.gravity = WestGravity
@@ -385,7 +398,7 @@ protected
         @d = @d.rectangle(current_x_offset, 70 + legend_box_y_offset, 
                           current_x_offset + legend_square_width, 70 + legend_square_width + legend_box_y_offset)
 
-        @d.pointsize = legend_font_size
+        @d.pointsize = @legend_font_size
         metrics = @d.get_type_metrics(@base_image, legend_label.to_s)
         current_string_offset = metrics.width + (legend_square_width * 2.7)
         current_x_offset += current_string_offset
@@ -397,9 +410,9 @@ protected
       return if (@hide_title || @title.nil?)
       
       @d.fill = @marker_color
-      @d.font = @font
+      @d.font = @font if @font
       @d.stroke = 'transparent'
-      @d.pointsize = scale_fontsize(36)
+      @d.pointsize = scale_fontsize(@title_font_size)
       @d.font_weight = BoldWeight
       @d.gravity = CenterGravity
       @d = @d.annotate_scaled( @base_image, 
@@ -415,10 +428,10 @@ protected
 
       if !@labels[index].nil? && @labels_seen[index].nil?
         @d.fill = @marker_color
-        @d.font = @font
+        @d.font = @font if @font
         @d.stroke = 'transparent'
         @d.font_weight = NormalWeight
-        @d.pointsize = scale_fontsize(@marker_pointsize)
+        @d.pointsize = scale_fontsize(@marker_font_size)
         @d.gravity = CenterGravity
         @d = @d.annotate_scaled(@base_image,
                                 1, 1,
@@ -430,7 +443,7 @@ protected
 
     def draw_no_data
         @d.fill = @marker_color
-        @d.font = @font
+        @d.font = @font if @font
         @d.stroke = 'transparent'
         @d.font_weight = NormalWeight
         @d.pointsize = scale_fontsize(80)
@@ -529,6 +542,24 @@ protected
       total_sum
     end
 
+    def get_maximum_by_stack
+      # Get sum of each stack
+      max_hash = {}
+      @data.each do |data_set|
+        data_set[DATA_VALUES_INDEX].each_with_index do |data_point, i|
+          max_hash[i] = 0.0 unless max_hash[i]
+          max_hash[i] += data_point.to_f
+        end
+      end
+
+      @maximum_value = 0
+      max_hash.keys.each do |key|
+        @maximum_value = max_hash[key] if max_hash[key] > @maximum_value
+      end
+      @minimum_value = 0
+    end
+
+
 private
     
     def increment_color

data/lib/gruff/pie.rb

@@ -57,7 +57,7 @@ private
     
     # Draw label
     @d.fill = @marker_color
-    @d.font = @font
+    @d.font = @font if @font
     @d.pointsize = scale_fontsize(20)
     @d.stroke = 'transparent'
     @d.font_weight = BoldWeight

data/lib/gruff/side_stacked_bar.rb

@@ -1,4 +1,4 @@
-# new gruff graph type added to enable sideways stacking bar charts (basically looks like a x/y
+# 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 
@@ -29,13 +29,13 @@ class Gruff::SideStackedBar < Gruff::Base
         marker_label = diff.abs * increment
 
         @d.fill = @marker_color
-        @d.font = @font
+        @d.font = @font if @font
         @d.stroke = 'transparent'
-        @d.pointsize = scale_fontsize(@marker_pointsize)
+        @d.pointsize = scale_fontsize(@marker_font_size)
 #        @d.gravity = NorthGravity
         @d = @d.annotate_scaled( @base_image, 
                           100, 20,
-                          x - (@marker_pointsize/1.5), @graph_bottom + 40, 
+                          x - (@marker_font_size/1.5), @graph_bottom + 40, 
                           marker_label.to_s, @scale)
 
       end
@@ -45,10 +45,10 @@ class Gruff::SideStackedBar < Gruff::Base
     def draw_label(y_offset, index)
       if !@labels[index].nil? && @labels_seen[index].nil?
         @d.fill = @marker_color
-        @d.font = @font
+        @d.font = @font if @font
         @d.stroke = 'transparent'
         @d.font_weight = NormalWeight
-        @d.pointsize = scale_fontsize(@marker_pointsize)
+        @d.pointsize = scale_fontsize(@marker_font_size)
         @d.gravity = CenterGravity
         @d = @d.annotate_scaled(@base_image,
                                 1, 1,
@@ -59,6 +59,7 @@ class Gruff::SideStackedBar < Gruff::Base
     end
 
     def draw
+      get_maximum_by_stack
       super
 
       return unless @has_data
@@ -78,19 +79,19 @@ class Gruff::SideStackedBar < Gruff::Base
 
         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
+      	  ## 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)

data/lib/gruff/stacked_bar.rb

@@ -5,8 +5,8 @@ class Gruff::StackedBar < Gruff::Base
 
     # Draws a bar graph, but multiple sets are stacked on top of each other.
     def draw
+      get_maximum_by_stack
       super
-
       return unless @has_data
 
       # Setup spacing.
@@ -45,15 +45,5 @@ class Gruff::StackedBar < Gruff::Base
     
       @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/test/bar_test.rb

@@ -113,6 +113,14 @@ class TestGruffBar < Test::Unit::TestCase
     g.write("test/output/bar_image_wide.png")
   end
 
+  def test_nil_font
+    g = setup_basic_graph 400
+    g.title = "Nil Font"
+    g.font = nil
+    g.write "test/output/bar_nil_font.png"
+  end
+
+
   def test_no_line_markers
     g = setup_basic_graph(400)
     g.title = "No Line Markers"

data/test/line_test.rb

@@ -39,7 +39,7 @@ class TestGruffLine < Test::Unit::TestCase
   
   def test_line_small_values    
     @datasets = [
-      [:small, [0.25, 0.14356, 0.0, 0.5674839, 0.456]],
+      [:small, [0.1, 0.14356, 0.0, 0.5674839, 0.456]],
       [:small2, [0.2, 0.3, 0.1, 0.05, 0.9]]
       ]
 
@@ -57,6 +57,28 @@ class TestGruffLine < Test::Unit::TestCase
     end
     g.write("test/output/line_small_small.png")
   end
+
+  def test_line_starts_with_zero
+    @datasets = [
+      [:first0, [0, 5, 10, 8, 18]],
+      [:normal, [1, 2, 3, 4, 5]]
+      ]
+
+    g = Gruff::Line.new
+    g.title = "Small Values Line Graph Test"
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+    g.write("test/output/line_small_zero.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_zero.png")
+  end
+
     
   def test_line_large_values    
     @datasets = [
@@ -118,26 +140,6 @@ class TestGruffLine < Test::Unit::TestCase
     g.write("test/output/line_similar_high_end_values.png")    
   end
 
-
-  # Requires the Creative Block font from http://www.blambot.com
-  def test_font
-    g = Gruff::Line.new
-    g.title = "Font Test"
-    g.labels = {
-      0 => '5/6', 
-      2 => '5/15', 
-      4 => '5/24', 
-      6 => '5/30',
-      8 => '6/2',
-      10 => '6/4', 
-    }
-    g.data('many points', (0..10).collect {|i| rand(100) })
-    g.font = File.expand_path('CREABBRG.TTF', ENV['MAGICK_FONT_PATH'])
-
-    # Default theme
-    g.write("test/output/line_font.png")
-  end
-
   def test_dots_graph
     g = Gruff::Line.new(false)
     g.title = "Dots Test 800px"
@@ -420,31 +422,47 @@ class TestGruffLine < Test::Unit::TestCase
 
 protected
 
+  # TODO Reset data after each theme
   def line_graph_with_themes(size=nil)
-    if !size.nil?
-      g = Gruff::Line.new(size)
-    else
-      g = Gruff::Line.new
-    end
-
+    g = Gruff::Line.new(size)
     g.title = "Multi-Line Graph Test #{size}"
     g.labels = @sample_labels
+    g.baseline_value = 90
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
-
-    g.baseline_value = 90
-
     # Default theme
     g.write("test/output/line_theme_keynote_#{size}.png")
   
+    g = Gruff::Line.new(size)
+    g.title = "Multi-Line Graph Test #{size}"
+    g.labels = @sample_labels
+    g.baseline_value = 90
     g.theme_37signals
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
     g.write("test/output/line_theme_37signals_#{size}.png")
   
+
+    g = Gruff::Line.new(size)
+    g.title = "Multi-Line Graph Test #{size}"
+    g.labels = @sample_labels
+    g.baseline_value = 90
     g.theme_rails_keynote
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
     g.write("test/output/line_theme_rails_keynote_#{size}.png")
   
+    g = Gruff::Line.new(size)
+    g.title = "Multi-Line Graph Test #{size}"
+    g.labels = @sample_labels
+    g.baseline_value = 90
     g.theme_odeo
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
     g.write("test/output/line_theme_odeo_#{size}.png")
   end
 
@@ -483,9 +501,7 @@ protected
     }
     g.data(:apples, [-1, -5, -20, -4])
     g.data(:peaches, [-10, -8, -6, -3])
-    return g
+    g
   end
-
   
 end
-

data/test/sidestacked_bar_test.rb

@@ -39,14 +39,7 @@ class TestGruffSideSideStackedBar < Test::Unit::TestCase
     @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")
+    g.write "test/output/side_stacked_bar_keynote.png"
   end
 
 
@@ -62,14 +55,13 @@ class TestGruffSideSideStackedBar < Test::Unit::TestCase
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
-
-    g.write("test/output/side_stacked_bar_keynote_small.png")
+    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")
+    g.write "test/output/side_stacked_bar_wide.png"
   end
 
 protected

data/test/stacked_bar_test.rb

@@ -13,9 +13,6 @@ class TestGruffStackedBar < Test::Unit::TestCase
       [: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', 
@@ -37,14 +34,7 @@ class TestGruffStackedBar < Test::Unit::TestCase
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
-
-    g.write("test/output/stacked_bar_keynote.png")
-        
-    g.theme_rails_keynote
-    g.write("test/output/stacked_bar_rails_keynote.png")
-    
-    g.theme_odeo
-    g.write("test/output/stacked_bar_odeo.png")
+    g.write "test/output/stacked_bar_keynote.png"
   end
 
 
@@ -60,42 +50,7 @@ class TestGruffStackedBar < Test::Unit::TestCase
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
-
-    g.write("test/output/stacked_bar_keynote_small.png")
+    g.write "test/output/stacked_bar_keynote_small.png"
   end
-
-  def test_bar_image_bg
-    g = Gruff::StackedBar.new
-    g.title = "Stacked 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/stacked_bar_image.png")
-
-    g = Gruff::StackedBar.new(400)
-    g.title = "Stacked 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/stacked_bar_image_small.png")
-
-  end
-
   
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-02-03
+  version: 0.1.1
+date: 2006-02-14
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
   - lib
@@ -27,7 +27,7 @@ platform: ruby
 authors: 
   - Geoffrey Grosenbach
 files: 
-  - rakefile
+  - Rakefile
   - README
   - CHANGELOG
   - MIT-LICENSE