topfunky-gruff 0.3.2 → 0.3.3

data/Manifest.txt

@@ -37,6 +37,7 @@ lib/gruff/area.rb
 lib/gruff/bar.rb
 lib/gruff/bar_conversion.rb
 lib/gruff/base.rb
+lib/gruff/bullet.rb
 lib/gruff/deprecated.rb
 lib/gruff/line.rb
 lib/gruff/mini/bar.rb
@@ -61,6 +62,7 @@ test/test_accumulator_bar.rb
 test/test_area.rb
 test/test_bar.rb
 test/test_base.rb
+test/test_bullet.rb
 test/test_legend.rb
 test/test_line.rb
 test/test_mini_bar.rb
@@ -73,4 +75,5 @@ test/test_scene.rb
 test/test_side_bar.rb
 test/test_sidestacked_bar.rb
 test/test_spider.rb
+test/test_stacked_area.rb
 test/test_stacked_bar.rb

data/lib/gruff/area.rb

@@ -16,7 +16,7 @@ class Gruff::Area < Gruff::Base
       prev_x = prev_y = 0.0
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
-      data_row[1].each_with_index do |data_point, index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
         # Use incremented x and scaled y
         new_x = @graph_left + (@x_increment * index)
         new_y = @graph_top + (@graph_height - data_point * @graph_height)

data/lib/gruff/bar.rb

@@ -51,7 +51,7 @@ protected
     # iterate over all normalised data
     @norm_data.each_with_index do |data_row, row_index|
 
-      data_row[1].each_with_index do |data_point, point_index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
         # Use incremented x and scaled y
         # x
         left_x = @graph_left + (@bar_width * (row_index + point_index + ((@data.length - 1) * point_index)))

data/lib/gruff/base.rb

@@ -3,6 +3,7 @@ require 'RMagick'
 
 require File.dirname(__FILE__) + '/deprecated'
 
+##
 # = Gruff. Graphs.
 #
 # Author:: Geoffrey Grosenbach boss@topfunky.com
@@ -15,10 +16,11 @@ require File.dirname(__FILE__) + '/deprecated'
 # Breijs, Richard Cowin, and a cast of thousands.
 #
 # See Gruff::Base#theme= for setting themes.
+
 module Gruff
 
   # This is the version of Gruff you are using.
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 
   class Base
 
@@ -26,7 +28,7 @@ module Gruff
     include Deprecated
 
     # Draw extra lines showing where the margins and text centers are
-    DEBUG = false
+    DEBUG = true
 
     # Used for navigating the array of data to plot
     DATA_LABEL_INDEX = 0
@@ -176,7 +178,7 @@ module Gruff
         @rows = geometric_height.to_f
       else
         @columns = target_width.to_f
-        @rows = target_width.to_f * 0.75        
+        @rows = target_width.to_f * 0.75
       end
 
       initialize_ivars
@@ -213,7 +215,7 @@ module Gruff
       @marker_font_size = 21.0
       @legend_font_size = 20.0
       @title_font_size = 36.0
-      
+
       @legend_box_size = 20.0
 
       @no_data_message = "No Data"
@@ -222,10 +224,10 @@ module Gruff
       @center_labels_over_point = true
       @has_left_labels = false
 
-      @additional_line_values = []      
+      @additional_line_values = []
       @additional_line_colors = []
       @theme_options = {}
-      
+
       @x_axis_label = @y_axis_label = nil
       @y_axis_increment = nil
       @stacked = nil
@@ -276,7 +278,7 @@ module Gruff
     #
     def theme=(options)
       reset_themes()
-      
+
       defaults = {
         :colors => ['black', 'white'],
         :additional_line_colors => [],
@@ -291,7 +293,7 @@ module Gruff
       @marker_color = @theme_options[:marker_color]
       @font_color = @theme_options[:font_color] || @marker_color
       @additional_line_colors = @theme_options[:additional_line_colors]
-      
+
       render_background
     end
 
@@ -347,7 +349,7 @@ module Gruff
       @light_grey = '#999999'
       @black = 'black'
       @colors = [@green, @grey, @orange, @red, @white, @light_grey, @black]
-      
+
       self.theme = {
         :colors => @colors,
         :marker_color => 'white',
@@ -367,7 +369,7 @@ module Gruff
       @dark_blue = '#3a5b87'
       @black = 'black'
       @colors = [@grey, @white, @dark_blue, @dark_pink, @green, @light_grey, @black]
-      
+
       self.theme = {
         :colors => @colors,
         :marker_color => 'white',
@@ -380,15 +382,15 @@ module Gruff
     def theme_pastel
       # Colors
       @colors = [
-          '#a9dada', # blue
-          '#aedaa9', # green
-          '#daaea9', # peach
-          '#dadaa9', # yellow
-          '#a9a9da', # dk purple
-          '#daaeda', # purple
-          '#dadada' # grey
-        ]
-      
+        '#a9dada', # blue
+        '#aedaa9', # green
+        '#daaea9', # peach
+        '#dadaa9', # yellow
+        '#a9a9da', # dk purple
+        '#daaeda', # purple
+        '#dadada' # grey
+      ]
+
       self.theme = {
         :colors => @colors,
         :marker_color => '#aea9a9', # Grey
@@ -401,14 +403,14 @@ module Gruff
     def theme_greyscale
       # Colors
       @colors = [
-          '#282828', # 
-          '#383838', # 
-          '#686868', # 
-          '#989898', # 
-          '#c8c8c8', # 
-          '#e8e8e8', # 
-        ]
-      
+        '#282828', #
+        '#383838', #
+        '#686868', #
+        '#989898', #
+        '#c8c8c8', #
+        '#e8e8e8', #
+      ]
+
       self.theme = {
         :colors => @colors,
         :marker_color => '#aea9a9', # Grey
@@ -440,7 +442,7 @@ module Gruff
       # Pre-normalize
       data_points.each_with_index do |data_point, index|
         next if data_point.nil?
-        
+
         # Setup max/min so spread starts at the low end of the data points
         if @maximum_value.nil? && @minimum_value.nil?
           @maximum_value = @minimum_value = data_point
@@ -450,9 +452,9 @@ module Gruff
         # Original: @maximum_value = larger_than_max?(data_point, index) ? max(data_point, index) : @maximum_value
         @maximum_value = larger_than_max?(data_point) ? data_point : @maximum_value
         @has_data = true if @maximum_value > 0
-        
+
         @minimum_value = less_than_min?(data_point) ? data_point : @minimum_value
-     	  @has_data = true if @minimum_value < 0
+        @has_data = true if @minimum_value < 0
       end
     end
 
@@ -469,13 +471,13 @@ module Gruff
     def to_blob(fileformat='PNG')
       draw()
       return @base_image.to_blob do
-         self.format = fileformat
+        self.format = fileformat
       end
     end
 
-    
 
-protected
+
+    protected
 
     # Overridden by subclasses to do the actual plotting of the graph.
     #
@@ -483,11 +485,11 @@ protected
     def draw
       make_stacked if @stacked
       setup_drawing
-      
+
       debug {
         # Outer margin
-        @d.rectangle( @left_margin, @top_margin, 
-                            @raw_columns - @right_margin, @raw_rows - @bottom_margin)
+        @d.rectangle( @left_margin, @top_margin,
+        @raw_columns - @right_margin, @raw_rows - @bottom_margin)
         # Graph area box
         @d.rectangle( @graph_left, @graph_top, @graph_right, @graph_bottom)
       }
@@ -504,11 +506,11 @@ protected
         draw_no_data()
         return
       end
-      
+
       normalize()
       setup_graph_measurements()
       sort_norm_data() if @sort # Sort norm_data with avg largest values set first (for display)
-      
+
       draw_legend()
       draw_line_markers()
       draw_axis_labels()
@@ -520,9 +522,9 @@ protected
       if @norm_data.nil? || force
         @norm_data = []
         return unless @has_data
-                
+
         calculate_spread
-        
+
         @data.each do |data_row|
           norm_data_points = []
           data_row[DATA_VALUES_INDEX].each do |data_point|
@@ -542,47 +544,50 @@ protected
       @spread = @spread > 0 ? @spread : 1
     end
 
+    ##
     # Calculates size of drawable area, general font dimensions, etc.
+
     def setup_graph_measurements
       @marker_caps_height = @hide_line_markers ? 0 :
-                              calculate_caps_height(@marker_font_size)
+      calculate_caps_height(@marker_font_size)
       @title_caps_height = @hide_title ? 0 :
-                              calculate_caps_height(@title_font_size)
+      calculate_caps_height(@title_font_size)
       @legend_caps_height = @hide_legend ? 0 :
-                              calculate_caps_height(@legend_font_size)
+      calculate_caps_height(@legend_font_size)
 
       if @hide_line_markers
         (@graph_left,
-         @graph_right_margin,
-         @graph_bottom_margin) = [@left_margin, @right_margin, @bottom_margin]
+        @graph_right_margin,
+        @graph_bottom_margin) = [@left_margin, @right_margin, @bottom_margin]
       else
         longest_left_label_width = 0
         if @has_left_labels
           longest_left_label_width =  calculate_width(@marker_font_size,
-                                      labels.values.inject('') { |value, memo| (value.to_s.length > memo.to_s.length) ? value : memo }) * 1.25
+          labels.values.inject('') { |value, memo| (value.to_s.length > memo.to_s.length) ? value : memo }) * 1.25
         else
-          longest_left_label_width = calculate_width(@marker_font_size, 
-                          label(@maximum_value.to_f))
+          longest_left_label_width = calculate_width(@marker_font_size,
+          label(@maximum_value.to_f))
         end
 
         # Shift graph if left line numbers are hidden
-        line_number_width = @hide_line_numbers && !@has_left_labels ? 
-                              0.0 : 
-                              (longest_left_label_width + LABEL_MARGIN * 2)
+        line_number_width = @hide_line_numbers && !@has_left_labels ?
+        0.0 :
+        (longest_left_label_width + LABEL_MARGIN * 2)
+
+        @graph_left = @left_margin +
+        line_number_width +
+        (@y_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN * 2)
 
-        @graph_left = @left_margin + 
-                      line_number_width + 
-                      (@y_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN * 2)
         # Make space for half the width of the rightmost column label.
         # Might be greater than the number of columns if between-style bar markers are used.
         last_label = @labels.keys.sort.last.to_i
         extra_room_for_long_label = (last_label >= (@column_count-1) && @center_labels_over_point) ?
-          calculate_width(@marker_font_size, @labels[last_label])/2.0 :
-          0
-        @graph_right_margin =   @right_margin + extra_room_for_long_label
-                                
-        @graph_bottom_margin =  @bottom_margin + 
-                                @marker_caps_height + LABEL_MARGIN
+        calculate_width(@marker_font_size, @labels[last_label]) / 2.0 :
+        0
+        @graph_right_margin = @right_margin + extra_room_for_long_label
+
+        @graph_bottom_margin = @bottom_margin +
+        @marker_caps_height + LABEL_MARGIN
       end
 
       @graph_right = @raw_columns - @graph_right_margin
@@ -590,12 +595,12 @@ protected
 
       # When @hide title, leave a TITLE_MARGIN space for aesthetics.
       # Same with @hide_legend
-      @graph_top = @top_margin + 
-                    (@hide_title ? TITLE_MARGIN : @title_caps_height + TITLE_MARGIN * 2) +
-                    (@hide_legend ? LEGEND_MARGIN : @legend_caps_height + LEGEND_MARGIN * 2)
+      @graph_top = @top_margin +
+      (@hide_title  ? TITLE_MARGIN  : @title_caps_height  + TITLE_MARGIN  * 2) +
+      (@hide_legend ? LEGEND_MARGIN : @legend_caps_height + LEGEND_MARGIN * 2)
 
       x_axis_label_height = @x_axis_label.nil? ? 0.0 :
-                              @marker_caps_height + LABEL_MARGIN
+      @marker_caps_height + LABEL_MARGIN
       @graph_bottom = @raw_rows - @graph_bottom_margin - x_axis_label_height
       @graph_height = @graph_bottom - @graph_top
     end
@@ -614,10 +619,10 @@ protected
         @d.stroke('transparent')
         @d.pointsize = scale_fontsize(@marker_font_size)
         @d.gravity = NorthGravity
-        @d = @d.annotate_scaled( @base_image, 
-                          @raw_columns, 1.0, 
-                          0.0, x_axis_label_y_coordinate, 
-                          @x_axis_label, @scale)
+        @d = @d.annotate_scaled( @base_image,
+        @raw_columns, 1.0,
+        0.0, x_axis_label_y_coordinate,
+        @x_axis_label, @scale)
         debug { @d.line 0.0, x_axis_label_y_coordinate, @raw_columns, x_axis_label_y_coordinate }
       end
 
@@ -625,10 +630,10 @@ protected
         # Y Axis, rotated vertically
         @d.rotation = 90.0
         @d.gravity = CenterGravity
-        @d = @d.annotate_scaled( @base_image, 
-                          1.0, @raw_rows,
-                          @left_margin + @marker_caps_height / 2.0, 0.0, 
-                          @y_axis_label, @scale)
+        @d = @d.annotate_scaled( @base_image,
+        1.0, @raw_rows,
+        @left_margin + @marker_caps_height / 2.0, 0.0,
+        @y_axis_label, @scale)
         @d.rotation = -90.0
       end
     end
@@ -636,9 +641,9 @@ protected
     # Draws horizontal background lines and labels
     def draw_line_markers
       return if @hide_line_markers
-      
+
       @d = @d.stroke_antialias false
-            
+
       if @y_axis_increment.nil?
         # Try to use a number of horizontal lines that will come out even.
         #
@@ -659,7 +664,7 @@ protected
         @minimum_value = @minimum_value.floor
         calculate_spread
         normalize(true)
-        
+
         @marker_count = (@spread / @y_axis_increment).to_i
         @increment = @y_axis_increment
       end
@@ -668,7 +673,7 @@ protected
       # Draw horizontal line markers and annotate with numbers
       (0..@marker_count).each do |index|
         y = @graph_top + @graph_height - index.to_f * @increment_scaled
-        
+
         @d = @d.stroke(@marker_color)
         @d = @d.stroke_width 1
         @d = @d.line(@graph_left, y, @graph_right, y)
@@ -681,43 +686,61 @@ protected
           @d.stroke('transparent')
           @d.pointsize = scale_fontsize(@marker_font_size)
           @d.gravity = EastGravity
-        
+
           # Vertically center with 1.0 for the height
-          @d = @d.annotate_scaled( @base_image, 
-                            @graph_left - LABEL_MARGIN, 1.0,
-                            0.0, y,
-                            label(marker_label), @scale)
+          @d = @d.annotate_scaled( @base_image,
+          @graph_left - LABEL_MARGIN, 1.0,
+          0.0, y,
+          label(marker_label), @scale)
         end
       end
-      
+
       # # Submitted by a contibutor...the utility escapes me
       # i = 0
       # @additional_line_values.each do |value|
       #   @increment_scaled = @graph_height.to_f / (@maximum_value.to_f / value)
-      # 
+      #
       #   y = @graph_top + @graph_height - @increment_scaled
-      # 
+      #
       #   @d = @d.stroke(@additional_line_colors[i])
       #   @d = @d.line(@graph_left, y, @graph_right, y)
-      # 
-      # 
+      #
+      #
       #   @d.fill = @additional_line_colors[i]
       #   @d.font = @font if @font
       #   @d.stroke('transparent')
       #   @d.pointsize = scale_fontsize(@marker_font_size)
       #   @d.gravity = EastGravity
-      #   @d = @d.annotate_scaled( @base_image, 
+      #   @d = @d.annotate_scaled( @base_image,
       #                     100, 20,
-      #                     -10, y - (@marker_font_size/2.0), 
+      #                     -10, y - (@marker_font_size/2.0),
       #                     "", @scale)
-      #   i += 1   
+      #   i += 1
       # end
-      
+
       @d = @d.stroke_antialias true
     end
 
-    # Draws a legend with the names of the datasets matched to the colors used
-    # to draw them.
+    ##
+    # Return the sum of values in an array.
+    #
+    # Duplicated to not conflict with active_support in Rails.
+
+    def sum(arr)
+      arr.inject(0) { |i, m| m + i }
+    end
+
+    ##
+    # Return a calculation of center
+
+    def center(size)
+      (@raw_columns - size) / 2
+    end
+
+    ##
+    # Draws a legend with the names of the datasets matched
+    # to the colors used to draw them.
+
     def draw_legend
       return if @hide_legend
 
@@ -729,23 +752,23 @@ protected
       @d.font = @font if @font
       @d.pointsize = @legend_font_size
 
-      metrics = @d.get_type_metrics(@base_image, @legend_labels.join(''))
-      legend_text_width = metrics.width
-      legend_width = legend_text_width + 
-                    (@legend_labels.length * legend_square_width * 2.7)
-      legend_left = (@raw_columns - legend_width) / 2
-      legend_increment = legend_width / @legend_labels.length.to_f
+      label_widths = [[]] # Used to calculate line wrap
+      @legend_labels.each do |label|
+        metrics = @d.get_type_metrics(@base_image, label.to_s)
+        label_width = metrics.width + legend_square_width * 2.7
+        label_widths.last.push label_width
+
+        if sum(label_widths.last) > (@raw_columns * 0.9)
+          label_widths.push [label_widths.last.pop]
+        end
+      end
 
-      current_x_offset = legend_left
-      current_y_offset =  @hide_title ? 
-                          @top_margin + LEGEND_MARGIN : 
-                          @top_margin + 
-                          TITLE_MARGIN + @title_caps_height +
-                          LEGEND_MARGIN
+      current_x_offset = center(sum(label_widths.first))
+      current_y_offset =  @hide_title ?
+      @top_margin + LEGEND_MARGIN :
+      @top_margin + TITLE_MARGIN + @title_caps_height + LEGEND_MARGIN
 
-      debug { @d.line 0.0, current_y_offset, @raw_columns, current_y_offset }
-                                                    
-      @legend_labels.each_with_index do |legend_label, index|        
+      @legend_labels.each_with_index do |legend_label, index|
 
         # Draw label
         @d.fill = @font_color
@@ -754,23 +777,40 @@ protected
         @d.stroke('transparent')
         @d.font_weight = NormalWeight
         @d.gravity = WestGravity
-        @d = @d.annotate_scaled( @base_image, 
-                          @raw_columns, 1.0,
-                          current_x_offset + (legend_square_width * 1.7), current_y_offset, 
-                          legend_label.to_s, @scale)
-        
+        @d = @d.annotate_scaled( @base_image,
+        @raw_columns, 1.0,
+        current_x_offset + (legend_square_width * 1.7), current_y_offset,
+        legend_label.to_s, @scale)
+
         # Now draw box with color of this dataset
         @d = @d.stroke('transparent')
         @d = @d.fill @data[index][DATA_COLOR_INDEX]
-        @d = @d.rectangle(current_x_offset, 
-                          current_y_offset - legend_square_width / 2.0, 
-                          current_x_offset + legend_square_width, 
-                          current_y_offset + legend_square_width / 2.0)
+        @d = @d.rectangle(current_x_offset,
+        current_y_offset - legend_square_width / 2.0,
+        current_x_offset + legend_square_width,
+        current_y_offset + legend_square_width / 2.0)
 
         @d.pointsize = @legend_font_size
         metrics = @d.get_type_metrics(@base_image, legend_label.to_s)
         current_string_offset = metrics.width + (legend_square_width * 2.7)
-        current_x_offset += current_string_offset
+
+        # Handle wrapping
+        label_widths.first.shift
+        if label_widths.first.empty?
+          debug { @d.line 0.0, current_y_offset, @raw_columns, current_y_offset }
+
+          label_widths.shift
+          current_x_offset = center(sum(label_widths.first)) unless label_widths.empty?
+          line_height = [@legend_caps_height, legend_square_width].max + LEGEND_MARGIN
+          if label_widths.length > 0
+            # Wrap to next line and shrink available graph dimensions
+            current_y_offset += line_height
+            @graph_top += line_height
+            @graph_height = @graph_bottom - @graph_top
+          end
+        else
+          current_x_offset += current_string_offset
+        end
       end
       @color_index = 0
     end
@@ -785,10 +825,10 @@ protected
       @d.pointsize = scale_fontsize(@title_font_size)
       @d.font_weight = BoldWeight
       @d.gravity = NorthGravity
-      @d = @d.annotate_scaled( @base_image, 
-                        @raw_columns, 1.0,
-                        0, @top_margin, 
-                        @title, @scale)
+      @d = @d.annotate_scaled( @base_image,
+      @raw_columns, 1.0,
+      0, @top_margin,
+      @title, @scale)
     end
 
     # Draws column labels below graph, centered over x_offset
@@ -807,9 +847,9 @@ protected
         @d.pointsize = scale_fontsize(@marker_font_size)
         @d.gravity = NorthGravity
         @d = @d.annotate_scaled(@base_image,
-                                1.0, 1.0,
-                                x_offset, y_offset,
-                                @labels[index], @scale)
+        1.0, 1.0,
+        x_offset, y_offset,
+        @labels[index], @scale)
         @labels_seen[index] = 1
         debug { @d.line 0.0, y_offset, @raw_columns, y_offset }
       end
@@ -817,16 +857,16 @@ protected
 
     # Shows an error message because you have no data.
     def draw_no_data
-        @d.fill = @font_color
-        @d.font = @font if @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_message, @scale)
+      @d.fill = @font_color
+      @d.font = @font if @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_message, @scale)
     end
 
     # Finds the best background to render based on the provided theme options.
@@ -852,8 +892,8 @@ protected
 
     # 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))
+      Image.new(@columns, @rows,
+      GradientFill.new(0, 0, 100, 0, top_color, bottom_color))
     end
 
     # Use with a theme to use an image (800x600 original) background.
@@ -903,7 +943,7 @@ protected
       data_point > @maximum_value
     end
 
-	  def less_than_min?(data_point, index=0) # :nodoc:
+    def less_than_min?(data_point, index=0) # :nodoc:
       data_point < @minimum_value
     end
 
@@ -913,7 +953,7 @@ protected
     end
 
     # Overridden by subclasses that need it.
-	  def min(data_point, index) # :nodoc:
+    def min(data_point, index) # :nodoc:
       data_point
     end
 
@@ -941,7 +981,7 @@ protected
     # Sort with largest overall summed value at front of array so it shows up
     # correctly in the drawn graph.
     def sort_norm_data
-      @norm_data.sort! { |a,b| sums(b[1]) <=> sums(a[1]) }
+      @norm_data.sort! { |a,b| sums(b[DATA_VALUES_INDEX]) <=> sums(a[DATA_VALUES_INDEX]) }
     end
 
     def sums(data_set) # :nodoc:
@@ -973,14 +1013,14 @@ protected
     def make_stacked # :nodoc:
       stacked_values = Array.new(@column_count, 0)
       @data.each do |value_set|
-        value_set[1].each_with_index do |value, index|
+        value_set[DATA_VALUES_INDEX].each_with_index do |value, index|
           stacked_values[index] += value
         end
-        value_set[1] = stacked_values.dup
+        value_set[DATA_VALUES_INDEX] = stacked_values.dup
       end
     end
 
-private
+    private
 
     # Takes a block and draws it if DEBUG is true.
     #
@@ -1039,7 +1079,7 @@ private
 
     # Returns the width of a string at this pointsize.
     #
-    # Not scaled since it deals with dimensions that the regular 
+    # Not scaled since it deals with dimensions that the regular
     # scaling will handle.
     def calculate_width(font_size, text)
       @d.pointsize = font_size
@@ -1062,12 +1102,11 @@ module Magick
       scaled_height = (height * scale) >= 1 ? (height * scale) : 1
 
       self.annotate( img,
-                      scaled_width, scaled_height,
-                      x * scale, y * scale,
-                      text)
+      scaled_width, scaled_height,
+      x * scale, y * scale,
+      text)
     end
 
   end
 
 end # Magick
-

data/lib/gruff/bullet.rb

@@ -0,0 +1,109 @@
+require File.dirname(__FILE__) + '/base'
+
+class Gruff::Bullet < Gruff::Base
+
+  def initialize(target_width="400x40")
+    if not Numeric === target_width
+      geometric_width, geometric_height = target_width.split('x')
+      @columns = geometric_width.to_f
+      @rows = geometric_height.to_f
+    else
+      @columns = target_width.to_f
+      @rows = target_width.to_f / 5.0
+    end
+
+    initialize_ivars
+
+    reset_themes
+    theme_greyscale
+    @title_font_size = 20
+  end
+
+  def data(value, maximum_value, options={})
+    @value = value.to_f
+    @maximum_value = maximum_value.to_f
+    @options = options
+    @options.map { |k, v| @options[k] = v.to_f if v === Numeric }
+  end
+
+  # def setup_drawing
+  #   # 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()
+  #   sort_norm_data() if @sort # Sort norm_data with avg largest values set first (for display)
+  #
+  #   draw_legend()
+  #   draw_line_markers()
+  #   draw_axis_labels()
+  #   draw_title
+  # end
+
+  def draw
+    # TODO Left label
+    # TODO Bottom labels and markers
+    # @graph_bottom
+    # Calculations are off 800x???
+
+    @colors.reverse!
+
+    draw_title
+
+    @margin       = 30.0
+    @thickness    = @raw_rows / 6.0
+    @right_margin = @margin
+    @graph_left   = @title_width * 1.3 rescue @margin # HACK Need to calculate real width
+    @graph_width  = @raw_columns - @graph_left - @right_margin
+    @graph_height = @thickness * 3.0
+
+    # Background
+    @d = @d.fill @colors[0]
+    @d = @d.rectangle(@graph_left, 0, @graph_left + @graph_width, @graph_height)
+
+    [:high, :low].each_with_index do |indicator, index|
+      next unless @options.has_key?(indicator)
+      @d = @d.fill @colors[index + 1]
+      indicator_width_x  = @graph_left + @graph_width * (@options[indicator] / @maximum_value)
+      @d = @d.rectangle(@graph_left, 0, indicator_width_x, @graph_height)
+    end
+
+    if @options.has_key?(:target)
+      @d = @d.fill @font_color
+      target_x = @graph_left + @graph_width * (@options[:target] / @maximum_value)
+      half_thickness = @thickness / 2.0
+      @d = @d.rectangle(target_x, half_thickness, target_x + half_thickness, @thickness * 2 + half_thickness)
+    end
+
+    # Value
+    @d = @d.fill @font_color
+    @d = @d.rectangle(@graph_left, @thickness, @graph_left + @graph_width * (@value / @maximum_value), @thickness * 2)
+
+    @d.draw(@base_image)
+  end
+
+  def draw_title
+    return unless @title
+
+    @font_height = calculate_caps_height(scale_fontsize(@title_font_size))
+    @title_width = calculate_width(@title_font_size, @title)
+
+    @d.fill        = @font_color
+    @d.font        = @font if @font
+    @d.stroke('transparent')
+    @d.font_weight = NormalWeight
+    @d.pointsize   = scale_fontsize(@title_font_size)
+    @d.gravity     = NorthWestGravity
+    @d             = @d.annotate_scaled(*[
+      @base_image,
+      1.0, 1.0,
+      @font_height/2, @font_height/2,
+      @title,
+      @scale
+    ])
+  end
+
+end

data/lib/gruff/line.rb

@@ -67,7 +67,7 @@ class Gruff::Line < Gruff::Base
     @norm_data.each do |data_row|      
       prev_x = prev_y = nil
 
-      data_row[1].each_with_index do |data_point, index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
         new_x = @graph_left + (@x_increment * index)
         next if data_point.nil?
 
@@ -79,12 +79,12 @@ class Gruff::Line < Gruff::Base
         @d = @d.stroke data_row[DATA_COLOR_INDEX]
         @d = @d.fill data_row[DATA_COLOR_INDEX]
         @d = @d.stroke_opacity 1.0
-        @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 4), 5.0)
+        @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 4), 5.0)
 
         if !@hide_lines and !prev_x.nil? and !prev_y.nil? then          
           @d = @d.line(prev_x, prev_y, new_x, new_y)
         end
-        circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 2.5), 5.0)
+        circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 2.5), 5.0)
         @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y) unless @hide_dots
 
         prev_x = new_x

data/lib/gruff/net.rb

@@ -24,10 +24,10 @@ class Gruff::Net < Gruff::Base
     @center_y = @graph_top + (@graph_height / 2.0) - 10 # Move graph up a bit
 
     @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)
+    circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 2.5), 5.0)
 
     @d = @d.stroke_opacity 1.0
-    @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 4), 5.0)
+    @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 4), 5.0)
 
     if (defined?(@norm_baseline)) then
       level = @graph_top + (@graph_height - @norm_baseline * @graph_height)
@@ -45,7 +45,7 @@ class Gruff::Net < Gruff::Base
       @d = @d.stroke data_row[DATA_COLOR_INDEX]
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
-      data_row[1].each_with_index do |data_point, index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
         next if data_point.nil?
 
         rad_pos = index * Math::PI * 2 / @column_count
@@ -53,10 +53,10 @@ class Gruff::Net < Gruff::Base
         start_x = @center_x + Math::sin(rad_pos) * point_distance
         start_y = @center_y - Math::cos(rad_pos) * point_distance
 
-        next_index = index + 1 < data_row[1].length ? index + 1 : 0
+        next_index = index + 1 < data_row[DATA_VALUES_INDEX].length ? index + 1 : 0
 
         next_rad_pos = next_index * Math::PI * 2 / @column_count
-        next_point_distance = data_row[1][next_index] * @radius
+        next_point_distance = data_row[DATA_VALUES_INDEX][next_index] * @radius
         end_x = @center_x + Math::sin(next_rad_pos) * next_point_distance
         end_y = @center_y - Math::cos(next_rad_pos) * next_point_distance
 

data/lib/gruff/photo_bar.rb

@@ -48,7 +48,7 @@ class Gruff::PhotoBar < Gruff::Base
 
     @norm_data.each_with_index do |data_row, row_index|
   
-      data_row[1].each_with_index do |data_point, point_index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
         data_point = 0 if data_point.nil?
         # Use incremented x and scaled y
         left_x = @graph_left + (@bar_width * (row_index + point_index + ((@data.length - 1) * point_index)))

data/lib/gruff/pie.rb

@@ -40,14 +40,14 @@ class Gruff::Pie < Gruff::Base
     prev_degrees = @zero_degree
 
     # Use full data since we can easily calculate percentages
-    data = (@sort ? @data.sort{ |a, b| a[DATA_VALUES_INDEX][0] <=> b[DATA_VALUES_INDEX][0] } : @data)
+    data = (@sort ? @data.sort{ |a, b| a[DATA_VALUES_INDEX].first <=> b[DATA_VALUES_INDEX].first } : @data)
     data.each do |data_row|
-      if data_row[DATA_VALUES_INDEX][0] > 0
+      if data_row[DATA_VALUES_INDEX].first > 0
         @d = @d.stroke data_row[DATA_COLOR_INDEX]
         @d = @d.fill 'transparent'
         @d.stroke_width(radius) # stroke width should be equal to radius. we'll draw centered on (radius / 2)
 
-        current_degrees = (data_row[DATA_VALUES_INDEX][0] / total_sum) * 360.0 
+        current_degrees = (data_row[DATA_VALUES_INDEX].first / total_sum) * 360.0 
 
         # ellipse will draw the the stroke centered on the first two parameters offset by the second two.
         # therefore, in order to draw a circle of the proper diameter we must center the stroke at
@@ -63,7 +63,7 @@ class Gruff::Pie < Gruff::Base
         # unless @hide_line_markers then
           # End the string with %% to escape the single %.
           # RMagick must use sprintf with the string and % has special significance.
-          label_string = ((data_row[DATA_VALUES_INDEX][0] / total_sum) *
+          label_string = ((data_row[DATA_VALUES_INDEX].first / total_sum) *
                           100.0).round.to_s + '%%'
           @d = draw_label(center_x,center_y, half_angle,
                           radius + (radius * TEXT_OFFSET_PERCENTAGE),
@@ -109,7 +109,7 @@ private
 
   def sums_for_pie
     total_sum = 0.0
-    @data.collect {|data_row| total_sum += data_row[DATA_VALUES_INDEX][0] }
+    @data.collect {|data_row| total_sum += data_row[DATA_VALUES_INDEX].first }
     total_sum
   end
 

data/lib/gruff/side_bar.rb

@@ -24,7 +24,7 @@ class Gruff::SideBar < Gruff::Base
     @norm_data.each_with_index do |data_row, row_index|
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
-      data_row[1].each_with_index do |data_point, point_index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
 
         # Using the original calcs from the stacked bar chart
         # to get the difference between

data/lib/gruff/side_stacked_bar.rb

@@ -31,7 +31,7 @@ class Gruff::SideStackedBar < Gruff::SideBar
     @norm_data.each_with_index do |data_row, row_index|
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
-      data_row[1].each_with_index do |data_point, point_index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
 
     	  ## using the original calcs from the stacked bar chart to get the difference between
     	  ## part of the bart chart we wish to stack.
@@ -67,7 +67,7 @@ class Gruff::SideStackedBar < Gruff::SideBar
   end
 
   def max(data_point, index)
-    @data.inject(0) {|sum, item| sum + item[1][index]}
+    @data.inject(0) {|sum, item| sum + item[DATA_VALUES_INDEX][index]}
   end
 
 end

data/lib/gruff/spider.rb

@@ -101,7 +101,7 @@ private
               center_x + x_offset,
               center_y + y_offset)
             
-      draw_label(center_x, center_y, current_angle, radius, data_row[0].to_s) unless hide_text
+      draw_label(center_x, center_y, current_angle, radius, data_row[DATA_LABEL_INDEX].to_s) unless hide_text
             
       current_angle += additive_angle
     end
@@ -111,8 +111,8 @@ private
     points = []
     current_angle = 0.0
     @data.each do |data_row|
-      points << center_x + normalize_points(data_row[1][0]) * Math.cos(current_angle)
-      points << center_y + normalize_points(data_row[1][0]) * Math.sin(current_angle)
+      points << center_x + normalize_points(data_row[DATA_VALUES_INDEX].first) * Math.cos(current_angle)
+      points << center_y + normalize_points(data_row[DATA_VALUES_INDEX].first) * Math.sin(current_angle)
       current_angle += additive_angle
     end
     
@@ -124,7 +124,7 @@ private
   end
   
   def sums_for_spider
-    @data.inject(0.0) {|sum, data_row| sum += data_row[1][0]}
+    @data.inject(0.0) {|sum, data_row| sum += data_row[DATA_VALUES_INDEX].first}
   end
 
 end

data/lib/gruff/stacked_area.rb

@@ -7,6 +7,7 @@ class Gruff::StackedArea < Gruff::Base
   attr_accessor :last_series_goes_on_bottom
   
   def draw
+    get_maximum_by_stack
     super
 
     return unless @has_data
@@ -24,7 +25,7 @@ class Gruff::StackedArea < Gruff::Base
         
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
-      data_row[1].each_with_index do |data_point, index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
         # Use incremented x and scaled y
         new_x = @graph_left + (@x_increment * index)
         new_y = @graph_top + (@graph_height - data_point * @graph_height - height[index])

data/lib/gruff/stacked_bar.rb

@@ -21,10 +21,10 @@ class Gruff::StackedBar < Gruff::Base
       
       height = Array.new(@column_count, 0)
     
-      @norm_data.each_with_index do |data_row, row_index|
-        @d = @d.fill data_row[DATA_COLOR_INDEX]
-      
-        data_row[1].each_with_index do |data_point, point_index|
+      @norm_data.each_with_index do |data_row, row_index|      
+        data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
+          @d = @d.fill data_row[DATA_COLOR_INDEX]
+          
           # 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)

data/test/test_bar.rb

@@ -114,12 +114,12 @@ class TestGruffBar < GruffTestCase
 
   def test_set_legend_box_size
     g = setup_basic_graph(400)
-    g.title = "Set Legend Box Size"
+    g.title = "Set Small Legend Box Size"
     g.legend_box_size = 10.0
     g.write("test/output/bar_set_legend_box_size_sm.png")
     
     g = setup_basic_graph(400)
-    g.title = "Set Legend Box Size"
+    g.title = "Set Large Legend Box Size"
     g.legend_box_size = 50.0
     g.write("test/output/bar_set_legend_box_size_lg.png")
   end

data/test/test_legend.rb

@@ -27,45 +27,42 @@ class TestGruffLegend < GruffTestCase
       }      
   end
 
-  ## TODO Fix implementation
+  def full_suite_for(name, type)
+    [800, 400].each do |width|
+      [nil, 4, 16, 30].each do |font_size|
+        g = type.new(width)
+        g.title = "Wrapped Legend Bar Test #{font_size}pts #{width}px"
+        g.labels = @sample_labels
+        0xEFD250.step(0xFF0000, 60) do |num|
+          g.colors << "#%x" % num
+        end
+  
+        @datasets.each do |data|
+          g.data(data[0], data[1])
+        end
+  
+        g.legend_font_size = font_size unless font_size.nil?
+        g.write("test/output/#{name}_wrapped_legend_#{font_size}_#{width}.png")
+      end
+    end
+  end
 
-  # def test_bar_legend_wrap
-  #   [800, 400].each do |width|
-  #     [nil, 4, 16, 30].each do |font_size|
-  #       g = Gruff::Bar.new(width)
-  #       g.title = "Wrapped Legend Bar Test #{font_size}pts #{width}px"
-  #       g.labels = @sample_labels
-  #       0xEFD250.step(0xFF0000, 60) do |num|
-  #         g.colors << "#%x" % num
-  #       end
-  # 
-  #       @datasets.each do |data|
-  #         g.data(data[0], data[1])
-  #       end
-  # 
-  #       g.legend_font_size = font_size unless font_size.nil?
-  #       g.write("test/output/bar_wrapped_legend_#{font_size}_#{width}.png")
-  #     end
-  #   end
-  # end
-  # 
-  # def test_pie_legend_wrap    
-  #   [800, 400].each do |width|
-  #     [nil, 4, 16, 30].each do |font_size|
-  #       g = Gruff::Pie.new(width)
-  #       g.title = "Wrapped Legend Pie Test #{font_size}pts #{width}px"
-  #       g.labels = @sample_labels
-  #       0xEFD250.step(0xFF0000, 60) do |num|
-  #         g.colors << "#%x" % num
-  #       end
-  # 
-  #       @datasets.each do |data|
-  #         g.data(data[0], data[1])
-  #       end
-  # 
-  #       g.legend_font_size = font_size unless font_size.nil?
-  #       g.write("test/output/pie_wrapped_legend_#{font_size}_#{width}.png")
-  #     end
-  #   end
-  # end
+  def test_bar_legend_wrap
+    full_suite_for(:bar, Gruff::Bar)
+  end
+  
+  def test_pie_legend_wrap
+    full_suite_for(:pie, Gruff::Pie)
+  end
+  
+  def test_more_than_two_lines_of_legends
+    @datasets = @datasets + [[:Julie2, [22, 29, 35, 38, 36, 40, 46, 57]],
+                             [:Jane2, [95, 95, 95, 90, 85, 80, 88, 100]],
+                             [:Philip2, [90, 34, 23, 12, 78, 89, 98, 88]],
+                             ["Arthur2", [5, 10, 13, 11, 6, 16, 22, 32]],
+                             ["Vincent2", [5, 10, 13, 11, 6, 16, 22, 32]],
+                             ["Jake2", [5, 10, 13, 11, 6, 16, 22, 32]],
+                             ["Stephen2", [5, 10, 13, 11, 6, 16, 22, 32]]]
+    full_suite_for(:bar2, Gruff::Bar)
+  end
 end

data/test/test_stacked_area.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/ruby
+
+require File.dirname(__FILE__) + "/gruff_test_case"
+
+class TestGruffStackedArea < GruffTestCase
+
+  def setup
+    @datasets = [
+      [:Jimmy, [25, 36, 86, 39]],
+      [:Charles, [80, 54, 67, 54]],
+      [:Julie, [22, 29, 35, 38]],
+      ]
+    @sample_labels = {
+        0 => '5/6', 
+        1 => '5/15', 
+        2 => '5/24'
+      }      
+
+  end
+
+  def test_area_graph
+    g = Gruff::StackedArea.new
+    g.title = "Visual Stacked Area 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_area_keynote.png"
+  end
+
+
+  def test_area_graph_small
+    g = Gruff::StackedArea.new(400)
+    g.title = "Visual Stacked Area 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_area_keynote_small.png"
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: topfunky-gruff
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-06 00:00:00 -07:00
+date: 2008-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.7.0
     version: 
 description: Beautiful graphs for one or multiple datasets. Can be used on websites or in documents.
 email: boss@topfunky.com
@@ -71,6 +71,7 @@ files:
 - lib/gruff/bar.rb
 - lib/gruff/bar_conversion.rb
 - lib/gruff/base.rb
+- lib/gruff/bullet.rb
 - lib/gruff/deprecated.rb
 - lib/gruff/line.rb
 - lib/gruff/mini/bar.rb
@@ -95,6 +96,7 @@ files:
 - test/test_area.rb
 - test/test_bar.rb
 - test/test_base.rb
+- test/test_bullet.rb
 - test/test_legend.rb
 - test/test_line.rb
 - test/test_mini_bar.rb
@@ -107,8 +109,8 @@ files:
 - test/test_side_bar.rb
 - test/test_sidestacked_bar.rb
 - test/test_spider.rb
+- test/test_stacked_area.rb
 - test/test_stacked_bar.rb
-- test/test_bullet.rb
 has_rdoc: true
 homepage: http://nubyonrails.com/pages/gruff
 post_install_message: 
@@ -132,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gruff
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Beautiful graphs for one or multiple datasets.
@@ -154,4 +156,5 @@ test_files:
 - test/test_side_bar.rb
 - test/test_sidestacked_bar.rb
 - test/test_spider.rb
+- test/test_stacked_area.rb
 - test/test_stacked_bar.rb