gruff 0.3.7 → 0.4.0

data/test/test_net.rb

@@ -5,6 +5,7 @@ require File.dirname(__FILE__) + "/gruff_test_case"
 class TestGruffNet < GruffTestCase
 
   def setup
+    super
     @datasets = [
       [:Jimmy, [25, 36, 86, 39, 25, 31, 79, 88]],
       [:Charles, [80, 54, 67, 54, 68, 70, 90, 95]],
@@ -23,7 +24,7 @@ class TestGruffNet < GruffTestCase
         5 => '6/12', 
         6 => '6/21', 
         7 => '6/28', 
-      }      
+      }
   end
     
   def test_net_small_values    

data/test/test_pie.rb

@@ -30,7 +30,7 @@ class TestGruffPie < GruffTestCase
   def test_pie_graph_greyscale
     g = Gruff::Pie.new
     g.title = "Greyscale Pie Graph Test"
-    g.theme_greyscale
+    g.theme = Gruff::Themes::GREYSCALE
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
@@ -41,7 +41,7 @@ class TestGruffPie < GruffTestCase
 
   def test_pie_graph_pastel
     g = Gruff::Pie.new
-    g.theme_pastel
+    g.theme = Gruff::Themes::PASTEL
     g.title = "Pastel Pie Graph Test"
     @datasets.each do |data|
       g.data(data[0], data[1])

data/test/test_scatter.rb

@@ -1,68 +1,68 @@
 #!/usr/bin/ruby
 
-require File.dirname(__FILE__) + "/gruff_test_case"
+require File.dirname(__FILE__) + '/gruff_test_case'
 
 class TestGruffScatter < Test::Unit::TestCase
-  
+
   def setup
     @datasets = [
-      [:Chuck, [20,10,5,12,11,6,10,7], [5,10,19,6,9,1,14,8] ],
-      [:Brown, [5,10,20,6,9,12,14,8], [20,10,5,12,11,6,10,7] ],
-      [:Lucy, [19,9,6,11,12,7,15,8], [6,11,18,8,12,8,10,6] ]
+        [:Chuck, [20, 10, 5, 12, 11, 6, 10, 7], [5, 10, 19, 6, 9, 1, 14, 8]],
+        [:Brown, [5, 10, 20, 6, 9, 12, 14, 8], [20, 10, 5, 12, 11, 6, 10, 7]],
+        [:Lucy, [19, 9, 6, 11, 12, 7, 15, 8], [6, 11, 18, 8, 12, 8, 10, 6]]
     ]
   end
-  
+
   # Done
   def test_scatter_graph
     g = setup_basic_graph
-    g.title = "Basic Scatter Plot Test"
-    g.write("test/output/scatter_basic.png")
+    g.title = 'Basic Scatter Plot Test'
+    g.write('test/output/scatter_basic.png')
   end
-  
+
   #~ # Done
   def test_many_datapoints
     g = Gruff::Scatter.new
-    g.title = "Many Datapoint Graph Test"
-    y_values = (0..50).collect {|i| rand(100) }
-    x_values = (0..50).collect {|i| rand(100) }
+    g.title = 'Many Datapoint Graph Test'
+    y_values = (0..50).map { rand(100) }
+    x_values = (0..50).map { rand(100) }
     g.data('many points', y_values, x_values)
 
     # Default theme
-    g.write("test/output/scatter_many.png")
+    g.write('test/output/scatter_many.png')
   end
-  
+
   # Done
   def test_no_data
     g = Gruff::Scatter.new(400)
-    g.title = "No Data"
+    g.title = 'No Data'
     # Default theme
-    g.write("test/output/scatter_no_data.png")
-    
+    g.write('test/output/scatter_no_data.png')
+
     g = Gruff::Scatter.new(400)
-    g.title = "No Data Title"
+    g.title = 'No Data Title'
     g.no_data_message = 'There is no data'
-    g.write("test/output/scatter_no_data_msg.png")
+    g.write('test/output/scatter_no_data_msg.png')
   end
-  
+
   # Done
   def test_all_zeros
     g = Gruff::Scatter.new(400)
-    g.title = "All Zeros"
+    g.title = 'All Zeros'
 
-    g.data(:gus, [0,0,0,0], [0,0,0,0])
+    g.data(:gus, [0, 0, 0, 0], [0, 0, 0, 0])
 
     # Default theme
-    g.write("test/output/scatter_no_data_other.png")    
+    g.write('test/output/scatter_no_data_other.png')
   end
-  
+
   # Done
   def test_some_nil_points
     g = Gruff::Scatter.new
-    g.title = "Some Nil Points"
+    g.title = 'Some Nil Points'
 
     @datasets = [
-      [:data1, [1, 2, 3, nil, 3, 5, 6], [5, nil, nil, nil, nil, 5, 7] ]
-      ]
+        [:data1, [1, 2, 3, nil, 3, 5, 6], [5, nil, nil, nil, nil, 5, 7]]
+    ]
 
     @datasets.each do |data|
       assert_raise ArgumentError do
@@ -70,164 +70,164 @@ class TestGruffScatter < Test::Unit::TestCase
       end
     end
   end
-  
+
   # Done
   def test_unequal_number_of_x_and_y_values
     g = Gruff::Scatter.new
-    g.title = "Unequal number of X and Y values"
-    
+    g.title = 'Unequal number of X and Y values'
+
     @datasets = [
-      [:data1, [1,2,3], [1,2]],
-      [:data2, [1,2,3,4,5], [1,2,3,4,5,6]],
+        [:data1, [1, 2, 3], [1, 2]],
+        [:data2, [1, 2, 3, 4, 5], [1, 2, 3, 4, 5, 6]],
     ]
-    
+
     @datasets.each do |data|
       assert_raise ArgumentError do
         g.data(*data)
       end
     end
   end
-  
+
   # Done
   def test_empty_set_of_axis_values
     g = Gruff::Scatter.new
-    g.title = "Missing Axis Values"
-    
+    g.title = 'Missing Axis Values'
+
     @datasets = [
-      [:data1, [1,2,3,4,5]]
+        [:data1, [1, 2, 3, 4, 5]]
     ]
-    
+
     @datasets.each do |data|
       assert_raise ArgumentError do
         g.data(*data)
       end
     end
   end
-  
+
   # Done
   def test_no_title
     g = Gruff::Scatter.new(400)
-    g.data(:data1, [1,2,3,4,5], [1,2,3,4,5])
-    g.write("test/output/scatter_no_title.png")
+    g.data(:data1, [1, 2, 3, 4, 5], [1, 2, 3, 4, 5])
+    g.write('test/output/scatter_no_title.png')
   end
 
   # Done
   def test_no_line_markers
     g = setup_basic_graph(400)
-    g.title = "No Line Markers"
+    g.title = 'No Line Markers'
     g.hide_line_markers = true
-    g.write("test/output/scatter_no_line_markers.png")    
+    g.write('test/output/scatter_no_line_markers.png')
   end
 
   # Done
   def test_no_legend
     g = setup_basic_graph(400)
-    g.title = "No Legend"
+    g.title = 'No Legend'
     g.hide_legend = true
-    g.write("test/output/scatter_no_legend.png")
+    g.write('test/output/scatter_no_legend.png')
   end
 
   # Done
   def test_nothing_but_the_graph
     g = setup_basic_graph(400)
-    g.title = "THIS TITLE SHOULD NOT DISPLAY!!!"
+    g.title = 'THIS TITLE SHOULD NOT DISPLAY!!!'
     g.hide_line_markers = true
     g.hide_legend = true
     g.hide_title = true
-    g.write("test/output/scatter_nothing_but_the_graph.png")    
+    g.write('test/output/scatter_nothing_but_the_graph.png')
   end
-  
+
   # TODO Implement baselines on x and y axis
   #~ def test_baseline_larger_than_data
-    #~ g = setup_basic_graph(400)
-    #~ g.title = "Baseline Larger Than Data"
-    #~ g.baseline_value = 150
-    #~ g.write("test/output/scatter_large_baseline.png")    
+  #~ g = setup_basic_graph(400)
+  #~ g.title = "Baseline Larger Than Data"
+  #~ g.baseline_value = 150
+  #~ g.write("test/output/scatter_large_baseline.png")
   #~ end
-  
+
   # Done
   def test_wide_graph
     g = setup_basic_graph('800x400')
-    g.title = "Wide Graph"
-    g.write("test/output/scatter_wide_graph.png")    
+    g.title = 'Wide Graph'
+    g.write('test/output/scatter_wide_graph.png')
 
     g = setup_basic_graph('400x200')
-    g.title = "Wide Graph Small"
-    g.write("test/output/scatter_wide_graph_small.png")
+    g.title = 'Wide Graph Small'
+    g.write('test/output/scatter_wide_graph_small.png')
   end
-  
+
   # Done
   def test_negative
     g = setup_pos_neg(800)
-    g.write("test/output/scatter_pos_neg.png")
-    
+    g.write('test/output/scatter_pos_neg.png')
+
     g = setup_pos_neg(400)
     g.title = 'Pos/Neg Line Test Small'
-    g.write("test/output/scatter_pos_neg_400.png")
+    g.write('test/output/scatter_pos_neg_400.png')
   end
 
   # Done
   def test_all_negative
     g = setup_all_neg(800)
-    g.write("test/output/scatter_all_neg.png")
-    
+    g.write('test/output/scatter_all_neg.png')
+
     g = setup_all_neg(400)
     g.title = 'All Neg Line Test Small'
-    g.write("test/output/scatter_all_neg_400.png")
+    g.write('test/output/scatter_all_neg_400.png')
   end
-  
+
   # Done
   def test_no_hide_line_no_labels
     g = Gruff::Scatter.new
-    g.title = "No Hide Line No Labels"
+    g.title = 'No Hide Line No Labels'
     @datasets.each do |data|
       g.data(data[0], data[1], data[2])
     end
     g.hide_line_markers = false
     g.write('test/output/scatter_no_hide.png')
   end
-  
+
   def test_no_set_labels
     g = Gruff::Scatter.new
-    g.title = "Setting Labels Test"
+    g.title = 'Setting Labels Test'
     g.labels = {
-      0 => 'This', 
-      1 => 'should', 
-      2 => 'not', 
-      3 => 'show', 
-      4 => 'up'
+        0 => 'This',
+        1 => 'should',
+        2 => 'not',
+        3 => 'show',
+        4 => 'up'
     }
     @datasets.each do |data|
       g.data(data[0], data[1], data[2])
     end
     g.write('test/output/scatter_no_labels.png')
   end
-  
-protected 
-  
+
+  protected
+
   def setup_basic_graph(size=800)
     g = Gruff::Scatter.new(size)
-    g.title = "Rad Graph"
+    g.title = 'Rad Graph'
     @datasets.each do |data|
       g.data(data[0], data[1], data[2])
     end
     g
   end
-  
+
   def setup_pos_neg(size=800)
     g = Gruff::Scatter.new(size)
-    g.title = "Pos/Neg Scatter Graph Test"
+    g.title = 'Pos/Neg Scatter Graph Test'
     g.data(:apples, [-1, 0, 4, -4], [-5, -1, 3, 4])
     g.data(:peaches, [10, 8, 6, 3], [-1, 1, 3, 3])
-    return g
+    g
   end
-  
+
   def setup_all_neg(size=800)
     g = Gruff::Scatter.new(size)
-    g.title = "Neg Scatter Graph Test"
+    g.title = 'Neg Scatter Graph Test'
     g.data(:apples, [-1, -1, -4, -4], [-5, -1, -3, -4])
     g.data(:peaches, [-10, -8, -6, -3], [-1, -1, -3, -3])
-    return g
+    g
   end
-  
-end # end GruffTestCase
+
+end # end GruffTestCase

data/test/test_side_bar.rb

@@ -38,6 +38,19 @@ class TestGruffSideBar < GruffTestCase
     g.labels = {0 => '2003', 2 => '2004', 4 => '2005'}
     g.write("test/output/side_bar_data_range.png")
   end
+  
+  def test_bar_labels
+    g = Gruff::SideBar.new('400x300')
+    g.title = 'Should show labels for each bar'
+    g.data("Grapes", [8])
+    g.data("Apples", [24])
+    g.data("Oranges", [32])
+    g.data("Watermelon", [8])
+    g.data("Peaches", [12])
+    g.labels = {0 => '2003', 2 => '2004', 4 => '2005'}
+    g.show_labels_for_bar_values = true
+    g.write("test/output/side_bar_labels.png")
+  end
 
 end
 

data/test/test_sidestacked_bar.rb

@@ -72,6 +72,22 @@ class TestGruffSideStackedBar < GruffTestCase
     end
     g.write "test/output/side_stacked_bar_long_label.png"
   end
+  
+  def test_bar_labels
+     g = Gruff::SideStackedBar.new
+     g.title = "Stacked Bar Long Label"
+     g.labels = {
+       0 => 'September', 
+       1 => 'Oct', 
+       2 => 'Nov', 
+       3 => 'Dec', 
+     }
+     @datasets.each do |data|
+       g.data(data[0], data[1])
+     end
+     g.show_labels_for_bar_values = true
+     g.write "test/output/side_stacked_bar_labels.png"
+   end
 
 protected
 

data/test/test_spider.rb

@@ -106,7 +106,7 @@ class TestGruffSpider < GruffTestCase
      g.data(data[0], data[1])
     end
 
-    g.theme_37signals
+    g.theme = Gruff::Themes::THIRTYSEVEN_SIGNALS
 
     # Default theme
     g.write("test/output/spider_37signals.png")
@@ -201,6 +201,16 @@ class TestGruffSpider < GruffTestCase
     g.write("test/output/spider_lots_of_data_normal_names.png")
   end
   
+  def test_rotation
+    g = Gruff::Spider.new(20)
+    g.title = "Rotation"
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    g.rotation = 45 # degrees
+    g.write("test/output/spider_rotation.png")
+  end
 
 protected
 

data/test/test_stacked_area.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-require File.dirname(__FILE__) + "/gruff_test_case"
+require File.dirname(__FILE__) + '/gruff_test_case'
 
 class TestGruffStackedArea < GruffTestCase
 
@@ -20,7 +20,7 @@ class TestGruffStackedArea < GruffTestCase
 
   def test_area_graph
     g = Gruff::StackedArea.new
-    g.title = "Visual Stacked Area Graph Test"
+    g.title = 'Visual Stacked Area Graph Test'
     g.labels = {
       0 => '5/6', 
       1 => '5/15', 
@@ -30,13 +30,13 @@ class TestGruffStackedArea < GruffTestCase
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
-    g.write "test/output/stacked_area_keynote.png"
+    g.write 'test/output/stacked_area_keynote.png'
   end
 
 
   def test_area_graph_small
     g = Gruff::StackedArea.new(400)
-    g.title = "Visual Stacked Area Graph Test"
+    g.title = 'Visual Stacked Area Graph Test'
     g.labels = {
       0 => '5/6', 
       1 => '5/15', 
@@ -46,7 +46,7 @@ class TestGruffStackedArea < GruffTestCase
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
-    g.write "test/output/stacked_area_keynote_small.png"
+    g.write 'test/output/stacked_area_keynote_small.png'
   end
   
 end