gruff 0.1.2 → 0.2.3

data/lib/gruff/deprecated.rb

@@ -0,0 +1,39 @@
+
+##
+# A mixin for methods that need to be deleted or have been
+# replaced by cleaner code.
+
+module Gruff
+  module Deprecated
+  
+    def scale_measurements
+      setup_graph_measurements
+    end
+    
+    def total_height
+      @rows + 10
+    end
+    
+    def graph_top
+      @graph_top * @scale
+    end
+    
+    def graph_height
+      @graph_height * @scale
+    end
+    
+    def graph_left 
+      @graph_left * @scale 
+    end
+    
+    def graph_width
+      @graph_width * @scale
+    end
+    
+    # TODO Should be calculate_graph_height
+    # def setup_graph_height
+    #   @graph_height = @graph_bottom - @graph_top
+    # end
+  
+  end
+end

data/lib/gruff/line.rb

@@ -37,8 +37,10 @@ class Gruff::Line < Gruff::Base
     super
 
     return unless @has_data
-      
-    @x_increment = @graph_width / (@column_count - 1).to_f
+    
+    # Check to see if more than one datapoint was given. NaN can result otherwise.  
+    @x_increment = (@column_count > 1) ? (@graph_width / (@column_count - 1).to_f) : @graph_width
+    
     circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 2.5), 5.0)
 
     @d = @d.stroke_opacity 1.0

data/lib/gruff/pie.rb

@@ -11,7 +11,7 @@ class Gruff::Pie < Gruff::Base
     return unless @has_data
 
     diameter = @graph_height
-    radius = [@graph_width, @graph_height].min / 2.0 
+    radius = ([@graph_width, @graph_height].min / 2.0) * 0.8
     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) - 10 # Move graph up a bit

data/lib/gruff/scene.rb

@@ -2,10 +2,7 @@
 require "observer"
 require File.dirname(__FILE__) + '/base'
 
-# EXPERIMENTAL!
-#
-# Started by Geoffrey Grosenbach at Canada on Rails, April 2006.
-#
+##
 # A scene is a non-linear graph that assembles layers together to tell a story.
 # Layers are folders with appropriately named files (see below). You can group 
 # layers and control them together or just set their values individually.
@@ -147,6 +144,8 @@ class Gruff::Layer
                           else
                             select_default
                           end
+    # Finally, try to use 'default' if we're still blank
+    @selected_filename ||= select_default
   end
 
   # Returns the full path to the selected image, or a blank string
@@ -185,12 +184,14 @@ private
   end
   
   def select_default
-    file_exists_or_blank "default"
+    @filenames.include?("default.png") ? "default.png" : ''
   end
 
-  # Returns the string "#{filename}.png", if it exists
+  # Returns the string "#{filename}.png", if it exists.
+  #
+  # Failing that, it returns default.png, or '' if that doesn't exist.
   def file_exists_or_blank(filename)
-    @filenames.include?("#{filename}.png") ? "#{filename}.png" : ''
+    @filenames.include?("#{filename}.png") ? "#{filename}.png" : select_default
   end
   
 end

data/test/bar_test.rb

@@ -18,45 +18,18 @@ class TestGruffBar < GruffTestCase
   end
 
   def test_bar_graph
-    g = Gruff::Bar.new
-    g.title = "Visual Multi-Line 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 = setup_basic_graph
+    g.title = "Bar Graph Test"
     g.write("test/output/bar_keynote.png")
         
-    g = Gruff::Bar.new
+    g = setup_basic_graph
     g.title = "Visual Multi-Line Bar Graph Test"
-    g.labels = {
-      0 => '5/6', 
-      1 => '5/15', 
-      2 => '5/24', 
-      3 => '5/30', 
-    }
     g.theme_rails_keynote
-    @datasets.each do |data|
-      g.data(data[0], data[1])
-    end
     g.write("test/output/bar_rails_keynote.png")
     
-    g = Gruff::Bar.new
+    g = setup_basic_graph
     g.title = "Visual Multi-Line Bar Graph Test"
-    g.labels = {
-      0 => '5/6', 
-      1 => '5/15', 
-      2 => '5/24', 
-      3 => '5/30', 
-    }
     g.theme_odeo
-    @datasets.each do |data|
-      g.data(data[0], data[1])
-    end
     g.write("test/output/bar_odeo.png")
   end
 
@@ -94,13 +67,13 @@ class TestGruffBar < GruffTestCase
     g.write("test/output/bar_keynote_small.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
+  # Somewhat worthless test. Should an error be thrown?
+  # 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
@@ -110,6 +83,44 @@ class TestGruffBar < GruffTestCase
     g.write("test/output/bar_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/bar_no_legend.png")    
+  end
+
+  def test_no_title
+    g = setup_basic_graph(400)
+    g.title = "No Title"
+    g.hide_title = true
+    g.write("test/output/bar_no_title.png")    
+  end
+  
+  def test_no_title_or_legend
+    g = setup_basic_graph(400)
+    g.title = "No Title or Legend"
+    g.hide_legend = true
+    g.hide_title = true
+    g.write("test/output/bar_no_title_or_legend.png")    
+  end
+
+  def test_set_marker_count
+    g = setup_basic_graph(400)
+    g.title = "Set marker"
+    g.marker_count = 10
+    g.write("test/output/bar_set_marker.png")
+  end
+
+  def test_x_y_labels
+    g = setup_basic_graph(400)
+    g.title = "X Y Labels"
+    g.x_axis_label = 'Score (%)'
+    g.y_axis_label = "Students"
+    g.write("test/output/bar_x_y_labels.png")    
+  end
+
+
   def test_wide_graph
     g = setup_basic_graph('800x400')
     g.title = "Wide Graph"
@@ -121,6 +132,17 @@ class TestGruffBar < GruffTestCase
   end
 
 
+  def test_tall_graph
+    g = setup_basic_graph('400x600')
+    g.title = "Tall Graph"
+    g.write("test/output/bar_tall_graph.png")
+
+    g = setup_basic_graph('200x400')
+    g.title = "Tall Graph Small"
+    g.write("test/output/bar_tall_graph_small.png")
+  end
+
+
   def test_one_value
     g = Gruff::Bar.new
     g.title = "One Value Graph Test"
@@ -163,13 +185,36 @@ class TestGruffBar < GruffTestCase
     g.data(:peaches, [4, 3, 2, 1])
     g.minimum_value = 0
     g.maximum_value = 10
-    g.write("test/output/bar_nearly_zero.png")
+    g.write("test/output/bar_nearly_zero_max_10.png")
+  end
+
+  def test_y_axis_increment
+    generate_with_y_axis_increment 2.0
+    generate_with_y_axis_increment 1
+    generate_with_y_axis_increment 5
+    generate_with_y_axis_increment 20
+  end
+
+  def generate_with_y_axis_increment(increment)
+    g = Gruff::Bar.new
+    g.title = "Y Axis Set to #{increment}"
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
+    g.y_axis_increment = increment
+    g.data(:apples, [1, 0.2, 0.5, 0.7])
+    g.data(:peaches, [2.5, 2.3, 2, 6.1])
+    g.write("test/output/bar_y_increment_#{increment}.png")
   end
 
 
   def test_custom_theme
     g = Gruff::Bar.new
     g.title = "Custom Theme"
+    g.font = File.expand_path('CREABBRG.TTF', ENV['MAGICK_FONT_PATH'])
     g.title_font_size = 60
     g.legend_font_size = 32
     g.marker_font_size = 32
@@ -192,6 +237,17 @@ class TestGruffBar < GruffTestCase
     g.write("test/output/bar_themed.png")
   end
 
+  def test_july_enhancements
+    g = Gruff::Bar.new(600)
+    g.hide_legend = true
+    g.title = "Full speed ahead"
+    g.labels = (0..10).inject({}) { |memo, i| memo.merge({ i => (i*10).to_s}) }
+    g.data(:apples, (0..9).map { rand(20)/10.0 })
+    g.y_axis_increment = 1.0
+    g.x_axis_label = 'Score (%)'
+    g.y_axis_label = 'Students'
+    write_test_file g, 'enhancements.png'
+  end
 
 
 protected

data/test/gruff_test_case.rb

@@ -9,5 +9,27 @@ class GruffTestCase < Test::Unit::TestCase
     assert true
   end
 
+protected
+
+  # Generate graphs at several sizes.
+  #
+  # Also writes the graph to disk.
+  #
+  #   graph_sized 'bar_basic' do |g|
+  #     g.data('students', [1, 2, 3, 4])
+  #   end
+  #
+  def graph_sized(filename, &block)
+    class_name = self.class.name.gsub(/^TestGruff/, '')
+    ['', 400].each do |size|
+      g = instance_eval("Gruff::#{class_name}.new #{size}")
+      block.call g
+      write_test_file g, "#{filename}#{size}.png"
+    end
+  end
+
+  def write_test_file(graph, filename)
+    graph.write(File.dirname(__FILE__) + "/output/#{filename}")
+  end
 
 end

data/test/line_test.rb

@@ -33,6 +33,50 @@ class TestGruffLine < GruffTestCase
     line_graph_with_themes(400)
   end
   
+  def test_one_value
+    g = Gruff::Line.new
+    g.title = "One Value Graph Test"
+    g.labels = {
+      0 => '1', 
+      1 => '2'
+    }
+    g.data('one', 1)
+
+    g.write("test/output/line_one_value.png")
+  end
+
+  def test_one_value_array
+    g = Gruff::Line.new
+    g.title = "One Value Graph Test"
+    g.labels = {
+      0 => '1', 
+      1 => '2'
+    }
+    g.data('one', [1])
+
+    g.write("test/output/line_one_value_array.png")
+  end
+
+
+  def test_fix_hang
+    g = Gruff::Line.new(320)
+    g.title = "Hang Value Graph Test"
+    g.data('test', [0,0,100])
+
+    g.write("test/output/line_hang_value.png")
+  end
+
+#   def test_fix_crash
+#     g = Gruff::Line.new(370)
+#     g.title = "Crash Test"
+#     g.data "ichi", [5]
+#     g.data "ni", [0]
+#     g.data "san", [0]
+#     g.data "shi", [0]
+#     g.write("test/output/line_crash_fix_test.png")
+#   end
+
+  
   def test_line_small_values    
     @datasets = [
       [:small, [0.1, 0.14356, 0.0, 0.5674839, 0.456]],
@@ -121,6 +165,7 @@ class TestGruffLine < GruffTestCase
       50 => 'September', 
     }
     g.data('many points', (0..50).collect {|i| rand(100) })
+    g.x_axis_label = "Months"
 
     # Default theme
     g.write("test/output/line_many.png")
@@ -137,6 +182,7 @@ class TestGruffLine < GruffTestCase
     g.title = "Similar High End Values With Floor"
     g.data('similar points', %w(29.43 29.459 29.498 29.53 29.548 29.589 29.619 29.66 29.689 29.849 29.878 29.74 29.769 29.79 29.808 29.828).collect {|i| i.to_f} )
     g.minimum_value = 0
+    g.y_axis_label = "Barometric Pressure"
     g.write("test/output/line_similar_high_end_values_with_floor.png")
   end
 
@@ -378,7 +424,6 @@ class TestGruffLine < GruffTestCase
     g.write('test/output/line_many_numbers.png')
   end
 
-
 protected
 
   # TODO Reset data after each theme
@@ -449,6 +494,7 @@ protected
     return g
   end
 
+
   def setup_all_neg(size=800)
     g = Gruff::Line.new(size)
     g.title = "All Neg Line Graph Test"

data/test/pie_test.rb

@@ -70,6 +70,18 @@ class TestGruffPie < GruffTestCase
     g.write("test/output/pie_zero.png")
   end
 
+
+  def test_pie_graph_one_val
+    g = Gruff::Pie.new
+    g.title = "Pie Graph One Val"
+        
+    g.data(:Bert, 53)
+    g.data(:Adam, 29)
+
+    g.write("test/output/pie_one_val.png")
+  end
+
+
   def test_wide
     g = setup_basic_graph('800x400')
     g.title = "Wide Pie"

data/test/scene_test.rb

@@ -79,6 +79,12 @@ class TestGruffScene < GruffTestCase
     l = LayerStub.new(File.expand_path("../assets/city_scene", File.dirname(__FILE__)), "sky")
     l.update Time.mktime(2006, 7, 4, 4, 00) # 04:00, July 4, 2006
     assert_equal '0400.png', l.selected_filename
+    
+    # TODO Need number_sample folder
+    # l = LayerStub.new(File.expand_path("../assets/city_scene", File.dirname(__FILE__)), "number_sample")
+    # assert_equal %w(1.png 2.png default.png), l.filenames
+    # l.update 3
+    # assert_equal 'default.png', l.selected_filename
   end
 
 private

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2006-04-20 00:00:00 -07:00
+  version: 0.2.3
+date: 2006-09-21 00:00:00 -07:00
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
 - lib
@@ -32,12 +32,14 @@ files:
 - README
 - CHANGELOG
 - MIT-LICENSE
+- lib/CocoaMagick.rb
 - lib/gruff
 - lib/gruff.rb
 - lib/gruff/area.rb
 - lib/gruff/bar.rb
 - lib/gruff/bar_conversion.rb
 - lib/gruff/base.rb
+- lib/gruff/deprecated.rb
 - lib/gruff/line.rb
 - lib/gruff/net.rb
 - lib/gruff/photo_bar.rb