gruff 0.0.6 → 0.0.7

data/lib/gruff.rb

@@ -7,3 +7,4 @@ require File.dirname(__FILE__) + '/gruff/area'
 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'

data/lib/gruff/base.rb

@@ -7,17 +7,13 @@
 #
 #
 
-begin
-  require 'rmagick'
-rescue LoadError
-  require 'RMagick' # capitalized on Windows
-end
+require 'RMagick'
 
 require 'yaml'
 
 module Gruff
   
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
   
   class Base
   
@@ -170,8 +166,11 @@ module Gruff
       @column_count = (data_points.length > @column_count) ? data_points.length : @column_count
 
       # Pre-normalize
-      data_points.each do |data_point|
-        @maximum_value = (data_point > @maximum_value) ? data_point : @maximum_value
+      data_points.each_with_index do |data_point, index|
+        next if data_point.nil?
+        
+       @maximum_value = larger_than_max?(data_point, index) ? max(data_point, index) : @maximum_value
+#        @maximum_value = (data_point > @maximum_value) ? data_point : @maximum_value
         if @maximum_value > 0
           @has_data = true
         end
@@ -211,7 +210,11 @@ protected
     # - legend
     # - title
     def setup_drawing
-      return unless @has_data # Maybe should be done in one of the following functions for more granularity.
+      # Maybe should be done in one of the following functions for more granularity.
+      unless @has_data
+        draw_no_data()
+        return
+      end
       
       normalize()
       setup_graph_measurements()
@@ -230,7 +233,11 @@ protected
         @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 data_point.nil?
+              norm_data_points << nil
+            else
+              norm_data_points << (data_point.to_f/@maximum_value.to_f)
+            end
           end
           @norm_data << [data_row[0], norm_data_points]
         end
@@ -248,7 +255,7 @@ protected
     # 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
@@ -362,6 +369,19 @@ protected
       end
     end
 
+    def draw_no_data
+        @d.fill = @marker_color
+        @d.font = @font
+        @d.stroke = 'transparent'
+        @d.font_weight = NormalWeight
+        @d.pointsize = scale_fontsize(80)
+        @d.gravity = CenterGravity
+        @d = @d.annotate_scaled( @base_image, 
+                        @raw_columns, @raw_rows/2.0,
+                        0, 10, 
+                        'No Data', @scale)
+    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, 
@@ -411,6 +431,16 @@ protected
       (value > max_value) ? max_value : value
     end
 
+    # Overridden by subclasses such as stacked bar.
+    def larger_than_max?(data_point, index=0)
+      data_point > @maximum_value
+    end
+
+    def max(data_point, index)
+      data_point
+    end
+
+
     # round down to significant digits
     def significant(inc)
       factor = 1.0
@@ -440,7 +470,7 @@ protected
 
     def sums(data_set)
       total_sum = 0
-      data_set.collect {|num| total_sum += num }
+      data_set.collect {|num| total_sum += num.to_f }
       total_sum
     end
 

data/lib/gruff/line.rb

@@ -3,6 +3,12 @@ require File.dirname(__FILE__) + '/base'
 
 class Gruff::Line < Gruff::Base
 
+  # Draw a dashed line at the given value
+  attr_accessor :baseline_value
+	
+  # Color of the baseline
+  attr_accessor :baseline_color
+	
   #
   # Call with target pixel width of graph (800, 400, 300), and/or 'false' to omit lines (points only).
   #
@@ -19,6 +25,7 @@ class Gruff::Line < Gruff::Base
       super args.shift
     end
     @lines = args.empty? || args.shift # draw lines by default
+    @baseline_color = 'red'
   end
 
   def draw
@@ -31,15 +38,29 @@ class Gruff::Line < Gruff::Base
 
     @d = @d.stroke_opacity 1.0
     @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 4), 5.0)
-    
+ 
+    if (defined?(@norm_baseline)) then
+     level = @graph_top + (@graph_height - @norm_baseline * @graph_height)
+     @d = @d.push
+     @d.stroke_color @baseline_color
+     @d.fill_opacity 0.0
+     @d.stroke_dasharray(10, 20)
+     @d.stroke_width 5
+     @d.line(@graph_left, level, @graph_left + @graph_width, level)
+     @d = @d.pop
+    end
+
     @norm_data.each do |data_row|
       prev_x = prev_y = 0.0
       @d = @d.stroke current_color
       @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)
+        draw_label(new_x, index)
+
+        next if data_point.nil?
+
         new_y = @graph_top + (@graph_height - data_point * @graph_height)
 
         if @lines and prev_x > 0 and prev_y > 0 then
@@ -47,8 +68,6 @@ class Gruff::Line < Gruff::Base
         end
         @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y)
 
-        draw_label(new_x, index)
-
         prev_x = new_x
         prev_y = new_y
       end
@@ -59,5 +78,8 @@ class Gruff::Line < Gruff::Base
     @d.draw(@base_image)
   end
 
-
+  def normalize
+    super
+    @norm_baseline = (@baseline_value.to_f / @maximum_value.to_f) if @baseline_value
+  end
 end

data/lib/gruff/stacked_bar.rb

@@ -0,0 +1,59 @@
+
+require File.dirname(__FILE__) + '/base'
+
+class Gruff::StackedBar < Gruff::Base
+
+    def draw
+      super
+
+      return unless @has_data
+
+      # Setup spacing.
+      #
+      # Columns sit stacked.
+      spacing_factor = 0.9
+      @bar_width = @graph_width / @column_count.to_f
+    
+      @d = @d.stroke_opacity 0.0
+      
+      height = Array.new(@column_count, 0)
+    
+      @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|
+          # Use incremented x and scaled y
+          left_x = @graph_left + (@bar_width * point_index)
+          left_y = @graph_top + (@graph_height -
+                                 data_point * @graph_height - 
+                                 height[point_index]) + 1
+          right_x = left_x + @bar_width * spacing_factor
+          right_y = @graph_top + @graph_height - height[point_index] - 1
+          
+          # update the total height of the current stacked bar
+          height[point_index] += (data_point * @graph_height - 2)
+          
+          @d = @d.rectangle(left_x, left_y, right_x, right_y)
+          
+          # Calculate center based on bar_width and current row
+          label_center = @graph_left + (@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/test/line_test.rb

@@ -22,29 +22,8 @@ class TestGruffLine < Test::Unit::TestCase
   end
   
   def test_line_graph_with_themes
-    g = Gruff::Line.new
-    g.title = "Visual Multi-Line 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/line_keynote.png")
-    
-    g.theme_37signals
-    g.write("test/output/line_37signals.png")
-    
-    g.theme_rails_keynote
-    g.write("test/output/line_rails_keynote.png")
-    
-    g.theme_odeo
-    g.write("test/output/line_odeo.png")
+    line_graph_with_themes()
+    line_graph_with_themes(400)
   end
   
   def test_line_small_values    
@@ -80,39 +59,15 @@ class TestGruffLine < Test::Unit::TestCase
 
     g = Gruff::Line.new
     g.title = "Very Large Values Line Graph Test"
+    g.baseline_value = 50_000
+    g.baseline_color = 'green'
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
 
     g.write("test/output/line_large.png")
   end
-  
-  def test_resize
-    g = Gruff::Line.new(400)
-    g.title = "Small Size Multi-Line 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/line_keynote_small.png")
     
-    g.theme_37signals
-    g.write("test/output/line_37signals_small.png")
-    
-    g.theme_rails_keynote
-    g.write("test/output/line_rails_keynote_small.png")
-    
-    g.theme_odeo
-    g.write("test/output/line_odeo_small.png")    
-  end
-  
   def test_long_title
     
   end
@@ -260,9 +215,9 @@ class TestGruffLine < Test::Unit::TestCase
   end
 
 
-  def test_no_data_other
+  def test_all_zeros
     g = Gruff::Line.new(400)
-    g.title = "No Data Other"
+    g.title = "All Zeros"
 
     g.data(:gus, [0,0,0,0])
 
@@ -270,6 +225,59 @@ class TestGruffLine < Test::Unit::TestCase
     g.write("test/output/line_no_data_other.png")    
   end
 
+
+  def test_some_nil_points
+    g = Gruff::Line.new
+    g.title = "Some Nil Points"
+
+    @datasets = [
+      [:data1, [1, 2, 3, nil, 3, 5, 6]],
+      [:data2, [5, nil, nil, nil, nil, nil, 5]],
+      [:data3, [4, nil, 2, 1, 0]]
+      ]
+
+    @datasets.each do |data|
+      g.data(*data)
+    end
+
+    # Default theme
+    g.write("test/output/line_some_nil_points.png")    
+  end
+
+protected
+
+  def line_graph_with_themes(size=nil)
+    if !size.nil?
+      g = Gruff::Line.new(size)
+    else
+      g = Gruff::Line.new
+    end
+
+    g.title = "Multi-Line Graph Test #{size}"
+    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
+
+    g.baseline_value = 90
+
+    # Default theme
+    g.write("test/output/line_theme_keynote_#{size}.png")
+  
+    g.theme_37signals
+    g.write("test/output/line_theme_37signals_#{size}.png")
+  
+    g.theme_rails_keynote
+    g.write("test/output/line_theme_rails_keynote_#{size}.png")
+  
+    g.theme_odeo
+    g.write("test/output/line_theme_odeo_#{size}.png")
+  end
   
 end
 

data/test/stacked_bar_test.rb

@@ -0,0 +1,116 @@
+#!/usr/bin/ruby
+
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+#$:.unshift File.dirname(__FILE__) + "/fixtures/helpers"
+
+require 'test/unit'
+require 'gruff'
+
+class TestGruffStackedBar < 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]],
+      ]
+  end
+
+  def test_bar_graph
+    g = Gruff::StackedBar.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/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")
+  end
+
+
+  def test_bar_graph_small
+    g = Gruff::StackedBar.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/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
+
+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,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
-date: 2005-11-22 00:00:00 -08:00
+  version: 0.0.7
+date: 2005-12-04 00:00:00 -08:00
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
   - lib
@@ -40,13 +40,16 @@ files:
   - 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
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []