gruff 0.2.7 → 0.2.8

data/CHANGELOG

@@ -1,5 +1,11 @@
 CHANGELOG
 
+== 0.2.8
+
+* New accumulator bar graph (experimental)
+* Better mini graphs
+* Bug fixes
+
 == 0.2.7
 
 * Regenerated Manifest.txt

data/Manifest.txt

@@ -30,6 +30,7 @@ lib/gruff.rb
 lib/gruff/area.rb
 lib/gruff/bar.rb
 lib/gruff/bar_conversion.rb
+lib/gruff/accumulator_bar.rb
 lib/gruff/base.rb
 lib/gruff/deprecated.rb
 lib/gruff/line.rb
@@ -48,6 +49,7 @@ lib/gruff/mini/side_bar.rb
 test/gruff_test_case.rb
 test/output
 test/test_area.rb
+test/test_accumulator_bar.rb
 test/test_bar.rb
 test/test_base.rb
 test/test_legend.rb

data/lib/gruff.rb

@@ -11,6 +11,7 @@
   stacked_bar
   side_stacked_bar
   side_bar
+  accumulator_bar
 
   scene
 

data/lib/gruff/accumulator_bar.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/base'
+
+##
+# A special bar graph that shows a single dataset as a set of
+# stacked bars. The bottom bar shows the running total and 
+# the top bar shows the new value being added to the array.
+
+class Gruff::AccumulatorBar < Gruff::StackedBar
+
+  def draw
+    raise(Gruff::IncorrectNumberOfDatasetsException) unless @data.length == 1
+    
+    accumulator_array = []
+    index = 0
+
+    increment_array = @data.first[DATA_VALUES_INDEX].inject([]) {|memo, value| 
+        memo << ((index > 0) ? (value + memo.max) : value)
+        accumulator_array << memo[index] - value
+        index += 1
+        memo
+      }
+    data "Accumulator", accumulator_array
+    
+    super
+  end
+
+end

data/lib/gruff/base.rb

@@ -20,7 +20,7 @@ require File.dirname(__FILE__) + '/deprecated'
 
 module Gruff
   
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
   
   class Base
   
@@ -88,6 +88,9 @@ module Gruff
     # Message shown when there is no data. Fits up to 20 characters. Defaults to "No Data."
     attr_accessor :no_data_message
 
+    # The font size of the large title at the top of the graph
+    attr_accessor :title_font_size
+
     # 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.
@@ -102,8 +105,6 @@ module Gruff
     # The number of horizontal lines shown for reference
     attr_accessor :marker_count
     
-    # The font size of the large title at the top of the graph
-    attr_accessor :title_font_size
 
     # You can manually set a minimum value instead of having the values guessed for you.
     #
@@ -754,14 +755,26 @@ protected
     # Creates a @base_image to draw on.
     #
     def render_background
-      if not @theme_options[:background_colors].nil?
+      case @theme_options[:background_colors]
+      when Array
         @base_image = render_gradiated_background(*@theme_options[:background_colors])
+      when String
+        @base_image = render_solid_background(@theme_options[:background_colors])
       else
         @base_image = render_image_background(*@theme_options[:background_image])
       end
     end
 
-    # Use with a theme definition method to draw a gradiated (or solid color) background.
+    ##
+    # Make a new image at the current size with a solid +color+.
+    
+    def render_solid_background(color)
+      Image.new(@columns, @rows) {
+        self.background_color = color
+      }
+    end
+
+    # Use with a theme definition method to draw a gradiated background.
     def render_gradiated_background(top_color, bottom_color)
       Image.new(@columns, @rows, 
           GradientFill.new(0, 0, 100, 0, top_color, bottom_color))
@@ -862,6 +875,11 @@ protected
       total_sum
     end
 
+    ##
+    # Used by StackedBar and child classes.
+    #
+    # May need to be moved to the StackedBar class.
+    
     def get_maximum_by_stack
       # Get sum of each stack
       max_hash = {}
@@ -872,7 +890,7 @@ protected
         end
       end
 
-      @maximum_value = 0
+      # @maximum_value = 0
       max_hash.keys.each do |key|
         @maximum_value = max_hash[key] if max_hash[key] > @maximum_value
       end
@@ -915,7 +933,6 @@ private
           # Start over
           @color_index = 0
           return @colors[-1]
-          #raise(ColorlistExhaustedException, "There are no more colors left to use.")
         end
       end
     end
@@ -961,8 +978,8 @@ private
 
   end # Gruff::Base
   
-  class ColorlistExhaustedException < StandardError; end
-      
+  class IncorrectNumberOfDatasetsException < StandardError; end
+          
 end # Gruff
 
 

data/lib/gruff/mini/bar.rb

@@ -14,7 +14,7 @@ module Gruff
         @hide_title = true
         @hide_line_numbers = true
 
-        @marker_font_size = 40.0
+        @marker_font_size = 50.0
         @minimum_value = 0.0
         @legend_font_size = 60.0
 

data/lib/gruff/mini/side_bar.rb

@@ -13,7 +13,7 @@ module Gruff
         @hide_title = true
         @hide_line_numbers = true
 
-        @marker_font_size = 40.0
+        @marker_font_size = 50.0
       end
       
     end

data/lib/gruff/side_bar.rb

@@ -32,7 +32,7 @@ class Gruff::SideBar < Gruff::Base
       marker_label = diff.abs * increment
 
       unless @hide_line_numbers
-        @d.fill      = @marker_color
+        @d.fill      = @font_color
         @d.font      = @font if @font
         @d.stroke    = 'transparent'
         @d.pointsize = scale_fontsize(@marker_font_size)
@@ -51,7 +51,7 @@ class Gruff::SideBar < Gruff::Base
   
   def draw_label(y_offset, index)
     if !@labels[index].nil? && @labels_seen[index].nil?
-      @d.fill             = @marker_color
+      @d.fill             = @font_color
       @d.font             = @font if @font
       @d.stroke           = 'transparent'
       @d.font_weight      = NormalWeight

data/test/gruff_test_case.rb

@@ -108,6 +108,7 @@ protected
     g.title = "My Bar Graph"
     g.labels = @labels
 
+
     @datasets.each do |data|
       g.data(data[0], data[1])
     end

data/test/test_accumulator_bar.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + "/gruff_test_case"
+
+class TestGruffAccumulatorBar < GruffTestCase
+
+  # TODO Delete old output files once when starting tests
+
+  def setup
+    @datasets = [
+      (1..20).to_a.map { rand(10) }
+    ]
+  end
+
+  def test_accumulator
+    g = Gruff::AccumulatorBar.new 500
+    g.title = "Your Savings"
+    g.hide_legend = true
+
+    # g.font = File.expand_path(File.dirname(__FILE__) + "/../assets/fonts/ATMA____.TTF")
+
+    g.marker_font_size = 18
+    
+    g.theme = {
+      :colors => ['#aedaa9', '#12a702'], # 3077a9 blue, aedaa9 light green
+      :marker_color => '#dddddd',
+      :font_color => 'black',      
+      :background_colors => "white"
+      # :background_image => File.expand_path(File.dirname(__FILE__) + "/../assets/backgrounds/43things.png")
+    }
+
+    # Attempt at negative numbers
+    # g.data 'Savings', (1..20).to_a.map { rand(10) * (rand(2) > 0 ? 1 : -1) }
+    g.data 'Savings', (1..12).to_a.map { rand(100) }
+    g.labels = (0..11).to_a.inject({}) {|memo, index| {index => '12-26'}.merge(memo)}
+
+    g.maximum_value = 1000
+    g.minimum_value = 0
+
+    g.write("test/output/accum_bar.png")
+  end
+
+  def test_too_many_args
+    assert_raise(Gruff::IncorrectNumberOfDatasetsException) {
+      g = Gruff::AccumulatorBar.new
+      g.data 'First', [1,1,1]
+      g.data 'Too Many', [1,1,1]
+      g.write("test/output/_SHOULD_NOT_ACTUALLY_BE_WRITTEN.png")
+    }
+  end
+
+end

data/test/test_bar.rb

@@ -132,33 +132,6 @@ class TestGruffBar < GruffTestCase
     g.write("test/output/bar_x_y_labels.png")    
   end
 
-  def test_fireball
-    g = Gruff::Bar.new
-    g.title = "Daring Fireball-type Accumulation Graph"
-    g.hide_line_numbers = true
-    
-    running_totals = []
-    new_additions = []
-    
-    (0..19).each do |i|
-      add = rand(10)
-      case i
-      when 0
-        running_totals << 0
-        new_additions  << add
-      else
-        running_totals << new_additions[i-1]
-        new_additions  << running_totals[i-1] + add
-      end
-    end
-    
-    g.data '1', running_totals
-    g.data '2', new_additions
-    
-    g.write("test/output/bar_fireball.png")
-  end
-
-
   def test_wide_graph
     g = setup_basic_graph('800x400')
     g.title = "Wide Graph"

data/test/test_line.rb

@@ -13,7 +13,7 @@ class TestGruffLine < GruffTestCase
   
   def test_one_value
     g = Gruff::Line.new
-    g.title = "One Value Graph Test"
+    g.title = "One Value"
     g.labels = {
       0 => '1', 
       1 => '2'
@@ -25,7 +25,7 @@ class TestGruffLine < GruffTestCase
 
   def test_one_value_array
     g = Gruff::Line.new
-    g.title = "One Value Graph Test"
+    g.title = "One Value in an Array"
     g.labels = {
       0 => '1', 
       1 => '2'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
-date: 2006-11-03 00:00:00 -08:00
+  version: 0.2.8
+date: 2006-11-06 00:00:00 -08:00
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
 - lib
@@ -62,6 +62,7 @@ files:
 - lib/gruff/area.rb
 - lib/gruff/bar.rb
 - lib/gruff/bar_conversion.rb
+- lib/gruff/accumulator_bar.rb
 - lib/gruff/base.rb
 - lib/gruff/deprecated.rb
 - lib/gruff/line.rb
@@ -80,6 +81,7 @@ files:
 - test/gruff_test_case.rb
 - test/output
 - test/test_area.rb
+- test/test_accumulator_bar.rb
 - test/test_bar.rb
 - test/test_base.rb
 - test/test_legend.rb