gruff 0.12.2 → 0.15.0

data/lib/gruff/bar.rb

@@ -16,15 +16,13 @@
 #   g.write('bar.png')
 #
 class Gruff::Bar < Gruff::Base
-  using String::GruffCommify
-
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
 
   # Spacing factor applied between a group of bars belonging to the same label.
   attr_writer :group_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
   attr_writer :label_formatting
 
@@ -35,7 +33,21 @@ class Gruff::Bar < Gruff::Base
   # Prevent drawing of column labels below a bar graph.  Default is +false+.
   attr_writer :hide_labels
 
-  def initialize_ivars
+  # Can be used to adjust the spaces between the bars.
+  # Accepts values between 0.00 and 1.00 where 0.00 means no spacing at all
+  # and 1 means that each bars' width is nearly 0 (so each bar is a simple
+  # line with no x dimension).
+  #
+  # Default value is +0.9+.
+  def spacing_factor=(space_percent)
+    raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' unless (space_percent >= 0) && (space_percent <= 1)
+
+    @spacing_factor = (1 - space_percent)
+  end
+
+private
+
+  def initialize_attributes
     super
     @spacing_factor = 0.9
     @group_spacing = 10
@@ -43,34 +55,16 @@ class Gruff::Bar < Gruff::Base
     @show_labels_for_bar_values = false
     @hide_labels = false
   end
-  private :initialize_ivars
 
-  def draw
+  def setup_drawing
     # Labels will be centered over the left of the bar if
     # there are more labels than columns. This is basically the same
     # as where it would be for a line graph.
     @center_labels_over_point = (@labels.keys.length > column_count)
 
     super
-    return unless data_given?
-
-    draw_bars
   end
 
-  # Can be used to adjust the spaces between the bars.
-  # Accepts values between 0.00 and 1.00 where 0.00 means no spacing at all
-  # and 1 means that each bars' width is nearly 0 (so each bar is a simple
-  # line with no x dimension).
-  #
-  # Default value is +0.9+.
-  def spacing_factor=(space_percent)
-    raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' unless (space_percent >= 0) && (space_percent <= 1)
-
-    @spacing_factor = (1 - space_percent)
-  end
-
-protected
-
   def hide_labels?
     @hide_labels
   end
@@ -83,7 +77,10 @@ protected
     hide_labels?
   end
 
-  def draw_bars
+  # Value to avoid completely overwriting the coordinate axis
+  AXIS_MARGIN = 0.5
+
+  def draw_graph
     # Setup spacing.
     #
     # Columns sit side-by-side.
@@ -93,24 +90,10 @@ protected
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
     # Setup the BarConversion Object
-    conversion = Gruff::BarConversion.new
-    conversion.graph_height = @graph_height
-    conversion.graph_top = @graph_top
-
-    # Set up the right mode [1,2,3] see BarConversion for further explanation
-    if minimum_value >= 0
-      # all bars go from zero to positive
-      conversion.mode = 1
-    elsif maximum_value <= 0
-      # all bars go from 0 to negative
-      conversion.mode = 2
-    else
-      # bars either go from zero to negative or to positive
-      conversion.mode = 3
-      conversion.spread = @spread
-      conversion.minimum_value = minimum_value
-      conversion.zero = -minimum_value / @spread
-    end
+    conversion = Gruff::BarConversion.new(
+      top: @graph_top, bottom: @graph_bottom,
+      minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
+    )
 
     # iterate over all normalised data
     store.norm_data.each_with_index do |data_row, row_index|
@@ -122,11 +105,11 @@ protected
         left_x = @graph_left + (bar_width * (row_index + point_index + ((store.length - 1) * point_index))) + padding + group_spacing
         right_x = left_x + bar_width * @bar_spacing
         # y
-        left_y, right_y = conversion.get_left_y_right_y_scaled(data_point)
+        left_y, right_y = conversion.get_top_bottom_scaled(data_point)
 
         # create new bar
-        rect_renderer = Gruff::Renderer::Rectangle.new(color: data_row.color)
-        rect_renderer.render(left_x, left_y, right_x, right_y)
+        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: data_row.color)
+        rect_renderer.render(left_x, left_y - AXIS_MARGIN, right_x, right_y - AXIS_MARGIN)
 
         # Calculate center based on bar_width and current row
         label_center = @graph_left + group_spacing + (store.length * bar_width * point_index) + (store.length * bar_width / 2.0)
@@ -134,10 +117,10 @@ protected
         # Subtract half a bar width to center left if requested
         draw_label(label_center, point_index)
         if @show_labels_for_bar_values
-          raw_value = store.data[row_index].points[point_index]
-          val = (@label_formatting || '%.2f') % raw_value
-          y = raw_value >= 0 ? left_y - 30 : left_y + 12
-          draw_value_label(left_x + (right_x - left_x) / 2, y, val.commify, true)
+          bar_value_label = Gruff::BarValueLabel::Bar.new([left_x, left_y, right_x, right_y], store.data[row_index].points[point_index])
+          bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
+            draw_value_label(x, y, text)
+          end
         end
       end
     end