gruff 0.0.5 → 0.0.6

data/CHANGELOG

@@ -1,5 +1,9 @@
 CHANGELOG
 
+== 0.0.6
+
+* Fixed hang when no data is passed.
+
 == 0.0.4
 
 * Added bar graphs

data/lib/gruff.rb

@@ -1,7 +1,9 @@
 
-require 'gruff/base'
+# Extra full path added to fix some require errors on some installations.
 
-require 'gruff/area'
-require 'gruff/bar'
-require 'gruff/line'
-require 'gruff/pie'
+require File.dirname(__FILE__) + '/gruff/base'
+
+require File.dirname(__FILE__) + '/gruff/area'
+require File.dirname(__FILE__) + '/gruff/bar'
+require File.dirname(__FILE__) + '/gruff/line'
+require File.dirname(__FILE__) + '/gruff/pie'

data/lib/gruff/area.rb

@@ -1,11 +1,13 @@
 
-require 'gruff/base'
+require File.dirname(__FILE__) + '/base'
 
 class Gruff::Area < Gruff::Base
 
   def draw
     super
 
+    return unless @has_data
+
     @x_increment = @graph_width / (@column_count - 1).to_f
     @d = @d.stroke 'transparent'
 

data/lib/gruff/bar.rb

@@ -1,11 +1,13 @@
 
-require 'gruff/base'
+require File.dirname(__FILE__) + '/base'
 
 class Gruff::Bar < Gruff::Base
 
     def draw
       super
 
+      return unless @has_data
+
       # Setup spacing.
       #
       # Columns sit side-by-side.

data/lib/gruff/base.rb

@@ -17,7 +17,7 @@ require 'yaml'
 
 module Gruff
   
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
   
   class Base
   
@@ -53,6 +53,7 @@ module Gruff
       @graph_width = 590.0
       @column_count = 0
       @maximum_value = 0
+      @has_data = false
       @data = Array.new
       @labels = Hash.new
       @labels_seen = Hash.new
@@ -171,6 +172,9 @@ module Gruff
       # Pre-normalize
       data_points.each do |data_point|
         @maximum_value = (data_point > @maximum_value) ? data_point : @maximum_value
+        if @maximum_value > 0
+          @has_data = true
+        end
       end
     end
 
@@ -207,6 +211,8 @@ protected
     # - legend
     # - title
     def setup_drawing
+      return unless @has_data # Maybe should be done in one of the following functions for more granularity.
+      
       normalize()
       setup_graph_measurements()
       
@@ -219,6 +225,8 @@ protected
     def normalize
       if @norm_data.nil?
         @norm_data = Array.new
+        return unless @has_data
+        
         @data.each do |data_row|
           norm_data_points = Array.new
           data_row[1].each do |data_point|

data/lib/gruff/line.rb

@@ -1,5 +1,5 @@
 
-require 'gruff/base'
+require File.dirname(__FILE__) + '/base'
 
 class Gruff::Line < Gruff::Base
 
@@ -24,6 +24,8 @@ class Gruff::Line < Gruff::Base
   def draw
     super
 
+    return unless @has_data
+      
     @x_increment = @graph_width / (@column_count - 1).to_f
     circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 2.5), 5.0)
 

data/lib/gruff/pie.rb

@@ -1,5 +1,5 @@
 
-require 'gruff/base'
+require File.dirname(__FILE__) + '/base'
 
 class Gruff::Pie < Gruff::Base
 
@@ -8,6 +8,8 @@ class Gruff::Pie < Gruff::Base
     
     super
 
+    return unless @has_data
+
     diameter = @graph_height
     radius = @graph_height / 2.0
     top_x = @graph_left + (@graph_width - diameter) / 2.0

data/test/line_test.rb

@@ -251,84 +251,24 @@ class TestGruffLine < Test::Unit::TestCase
     g.write("test/output/line_dots_tiny.png")
   end
 
-=begin
-  def test_very_small_graphs
-    [300, 200, 100].each do |size|
-      g = Gruff::Line.new(size)
-      g.title = "#{size}px 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_#{size}.png")
-    end
-  end
-=end
-
-=begin
-  def test_for_blog
-    g = Gruff::Line.new
-    g.labels = {
-      0 => '2002', 
-      2 => '2003', 
-      4 => '2004', 
-      6 => '2005', 
-    }
-    @datasets.each do |data|
-      g.data(data[0], data[1])
-    end
+  def test_no_data
+    g = Gruff::Line.new(400)
+    g.title = "No Data"
 
     # Default theme
-    g.title = "Gruff...graphs"
-    g.write("test/output/1.png")
-
-    g.theme_odeo
-    g.title = "Themes, Colors, and Fonts!"
-    g.font = File.expand_path('CREABBRG.TTF', ENV['MAGICK_FONT_PATH'])
-    g.write("test/output/2.png")
-        
-    g.theme_rails_keynote
-    g.title = "Source Coming Soon..."
-    g.font = File.expand_path('Vera.ttf', ENV['MAGICK_FONT_PATH'])
-    g.write("test/output/3.png")
-    
+    g.write("test/output/line_no_data.png")    
   end
 
-  def test_for_blog_small
+
+  def test_no_data_other
     g = Gruff::Line.new(400)
-    g.labels = {
-      0 => '2002', 
-      2 => '2003', 
-      4 => '2004', 
-      6 => '2005', 
-    }
-    @datasets.each do |data|
-      g.data(data[0], data[1])
-    end
+    g.title = "No Data Other"
 
-    # Default theme
-    g.title = "Gruff...graphs"
-    g.write("test/output/1_small.png")
+    g.data(:gus, [0,0,0,0])
 
-    g.theme_odeo
-    g.title = "Themes, Colors, and Fonts!"
-    g.font = File.expand_path('CREABBRG.TTF', ENV['MAGICK_FONT_PATH'])
-    g.write("test/output/2_small.png")
-        
-    g.theme_rails_keynote
-    g.title = "Source Coming Soon..."
-    g.font = File.expand_path('Vera.ttf', ENV['MAGICK_FONT_PATH'])
-    g.write("test/output/3_small.png")
-    
+    # Default theme
+    g.write("test/output/line_no_data_other.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.5
-date: 2005-11-17 00:00:00 -08:00
+  version: 0.0.6
+date: 2005-11-22 00:00:00 -08:00
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
   - lib
@@ -41,7 +41,7 @@ files:
   - lib/gruff/line.rb
   - lib/gruff/pie.rb
   - assets/bubble.png
-  - assets/plastik-yellow.png
+  - assets/plastik
   - test/area_test.rb
   - test/bar_test.rb
   - test/line_test.rb