gruff 0.10.0-java → 0.13.0-java

data/gruff.gemspec

@@ -13,7 +13,9 @@ Gem::Specification.new do |s|
   s.date = Date.today.to_s
   s.description = 'Beautiful graphs for one or multiple datasets. Can be used on websites or in documents.'
   s.email = 'boss@topfunky.com'
-  s.files = `git ls-files`.split($/).reject { |f| f =~ /^test/ }
+  s.files = `git ls-files`.split.reject do |f|
+    f =~ /^test|^docker|^Rakefile/
+  end
   s.homepage = 'https://github.com/topfunky/gruff'
   s.require_paths = %w[lib]
   s.summary = 'Beautiful graphs for one or multiple datasets.'
@@ -27,12 +29,15 @@ Gem::Specification.new do |s|
     s.add_dependency 'rmagick4j'
   else
     s.add_dependency 'rmagick'
-    s.add_development_dependency 'rubocop', '~> 0.81.0'
+    s.add_development_dependency 'rubocop', '~> 1.12.1'
+    s.add_development_dependency 'rubocop-performance', '~> 1.10.2'
   end
   s.add_dependency 'histogram'
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.4.0'
 
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'parallel'
   s.add_development_dependency 'minitest-reporters'
+  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard', '~> 0.9.25'
 end

data/lib/gruff.rb

@@ -9,8 +9,13 @@ require 'gruff/version'
   patch/rmagick
   patch/string
 
-  themes
   base
+
+  helper/bar_conversion.rb
+  helper/stacked_mixin
+  helper/bar_value_label
+
+  themes
   area
   bar
   bezier
@@ -22,10 +27,10 @@ require 'gruff/version'
   pie
   scatter
   spider
+  side_bar
   stacked_area
   stacked_bar
   side_stacked_bar
-  side_bar
   accumulator_bar
 
   scene
@@ -43,7 +48,7 @@ require 'gruff/version'
   renderer/text
 
   store/store
-  store/base_data
+  store/basic_data
   store/custom_data
   store/xy_data
 

data/lib/gruff/accumulator_bar.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 #
 # Gruff::AccumulatorBar is a special bar graph that shows a
 # single dataset as a set of stacked bars.

data/lib/gruff/area.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 #
 # Gruff::Area provides an area graph which displays graphically
 # quantitative data.
@@ -17,10 +15,10 @@ require 'gruff/base'
 #
 class Gruff::Area < Gruff::Base
   # Specifies the filling opacity in area graph. Default is +0.85+.
-  attr_accessor :fill_opacity
+  attr_writer :fill_opacity
 
   # Specifies the stroke width in line around area graph. Default is +2.0+.
-  attr_accessor :stroke_width
+  attr_writer :stroke_width
 
   def initialize_ivars
     super
@@ -59,7 +57,5 @@ class Gruff::Area < Gruff::Base
 
       Gruff::Renderer::Polygon.new(color: data_row.color, width: @stroke_width, opacity: @fill_opacity).render(poly_points)
     end
-
-    Gruff::Renderer.finish
   end
 end

data/lib/gruff/bar.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-require 'gruff/helper/bar_conversion'
-
 #
 # Gruff::Bar provide a bar graph that presents categorical data
 # with rectangular bars.
@@ -20,24 +17,29 @@ require 'gruff/helper/bar_conversion'
 #
 class Gruff::Bar < Gruff::Base
   # Spacing factor applied between bars.
-  attr_accessor :bar_spacing
+  attr_writer :bar_spacing
 
   # Spacing factor applied between a group of bars belonging to the same label.
-  attr_accessor :group_spacing
+  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_accessor :label_formatting
+  attr_writer :label_formatting
 
   # Output the values for the bars on a bar graph.
   # Default is +false+.
-  attr_accessor :show_labels_for_bar_values
+  attr_writer :show_labels_for_bar_values
+
+  # Prevent drawing of column labels below a bar graph.  Default is +false+.
+  attr_writer :hide_labels
 
   def initialize_ivars
     super
     @spacing_factor = 0.9
+    @group_spacing = 10
     @label_formatting = nil
     @show_labels_for_bar_values = false
+    @hide_labels = false
   end
   private :initialize_ivars
 
@@ -67,35 +69,35 @@ class Gruff::Bar < Gruff::Base
 
 protected
 
+  def hide_labels?
+    @hide_labels
+  end
+
+  def hide_left_label_area?
+    @hide_line_markers
+  end
+
+  def hide_bottom_label_area?
+    hide_labels?
+  end
+
+  # Value to avoid completely overwriting the coordinate axis
+  AXIS_MARGIN = 0.5
+
   def draw_bars
     # Setup spacing.
     #
     # Columns sit side-by-side.
     @bar_spacing ||= @spacing_factor # space between the bars
-    @group_spacing ||= 10
 
     bar_width = (@graph_width - calculate_spacing) / (column_count * store.length).to_f
     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|
@@ -107,11 +109,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.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)
@@ -119,18 +121,16 @@ 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, true)
+          end
         end
       end
     end
 
     # Draw the last label if requested
     draw_label(@graph_right, column_count, Magick::NorthWestGravity) if @center_labels_over_point
-
-    Gruff::Renderer.finish
   end
 
   def calculate_spacing

data/lib/gruff/base.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'rmagick'
 require 'bigdecimal'
 
 ##
@@ -17,31 +16,34 @@ require 'bigdecimal'
 #
 # See {Gruff::Base#theme=} for setting themes.
 module Gruff
+  using String::GruffCommify
+
+  # A common base class inherited from class of drawing a graph.
   class Base
     # Space around text elements. Mostly used for vertical spacing.
     LEGEND_MARGIN = TITLE_MARGIN = 20.0
-    LABEL_MARGIN = 10.0
+    LABEL_MARGIN = 15.0
     DEFAULT_MARGIN = 20.0
 
     DEFAULT_TARGET_WIDTH = 800.0
 
     # Blank space above the graph. Default is +20+.
-    attr_accessor :top_margin
+    attr_writer :top_margin
 
     # Blank space below the graph. Default is +20+.
-    attr_accessor :bottom_margin
+    attr_writer :bottom_margin
 
     # Blank space to the right of the graph. Default is +20+.
-    attr_accessor :right_margin
+    attr_writer :right_margin
 
     # Blank space to the left of the graph. Default is +20+.
-    attr_accessor :left_margin
+    attr_writer :left_margin
 
     # Blank space below the title. Default is +20+.
-    attr_accessor :title_margin
+    attr_writer :title_margin
 
     # Blank space below the legend. Default is +20+.
-    attr_accessor :legend_margin
+    attr_writer :legend_margin
 
     # A hash of names for the individual columns, where the key is the array
     # index for the column this label represents.
@@ -50,118 +52,115 @@ module Gruff
     #
     # @example
     #   { 0 => 2005, 3 => 2006, 5 => 2007, 7 => 2008 }
-    attr_accessor :labels
+    attr_writer :labels
 
     # Used internally for spacing.
     #
     # By default, labels are centered over the point they represent.
-    attr_accessor :center_labels_over_point
+    attr_writer :center_labels_over_point
 
     # Used internally for horizontal graph types. Default is +false+.
-    attr_accessor :has_left_labels
+    attr_writer :has_left_labels
 
     # Set a label for the bottom of the graph.
-    attr_accessor :x_axis_label
+    attr_writer :x_axis_label
 
     # Set a label for the left side of the graph.
-    attr_accessor :y_axis_label
+    attr_writer :y_axis_label
 
     # Set increment of the vertical marking lines.
-    attr_accessor :x_axis_increment
+    attr_writer :x_axis_increment
 
     # Set increment of the horizontal marking lines.
-    attr_accessor :y_axis_increment
+    attr_writer :y_axis_increment
 
     # Height of staggering between labels (Bar graph only).
-    attr_accessor :label_stagger_height
+    attr_writer :label_stagger_height
 
     # Truncates labels if longer than max specified.
-    attr_accessor :label_max_size
+    attr_writer :label_max_size
 
-    # How truncated labels visually appear if they exceed {#label_max_size}.
+    # How truncated labels visually appear if they exceed {#label_max_size=}.
     #
     # - +:absolute+ - does not show trailing dots to indicate truncation. This is the default.
-    # - +:trailing_dots+ - shows trailing dots to indicate truncation (note that {#label_max_size}
+    # - +:trailing_dots+ - shows trailing dots to indicate truncation (note that {#label_max_size=}
     #   must be greater than 3).
-    attr_accessor :label_truncation_style
+    attr_writer :label_truncation_style
 
     # Get or set the list of colors that will be used to draw the bars or lines.
     attr_accessor :colors
 
     # Set the large title of the graph displayed at the top.
-    attr_accessor :title
-
-    # Font used for titles, labels, etc. Works best if you provide the full
-    # path to the TTF font file.  RMagick must be built with the Freetype
-    # libraries for this to work properly.
-    attr_reader :font
+    attr_writer :title
 
-    # Same as {#font} but for the title.
-    attr_accessor :title_font
+    # Same as {#font=} but for the title.
+    attr_writer :title_font
 
     # Specifies whether to draw the title bolded or not. Default is +true+.
-    attr_accessor :bold_title
+    attr_writer :bold_title
 
     # Specifies the text color.
-    attr_accessor :font_color
+    attr_writer :font_color
 
     # Prevent drawing of line markers. Default is +false+.
-    attr_accessor :hide_line_markers
+    attr_writer :hide_line_markers
 
     # Prevent drawing of the legend. Default is +false+.
-    attr_accessor :hide_legend
+    attr_writer :hide_legend
 
     # Prevent drawing of the title. Default is +false+.
-    attr_accessor :hide_title
+    attr_writer :hide_title
 
     # Prevent drawing of line numbers. Default is +false+.
-    attr_accessor :hide_line_numbers
+    attr_writer :hide_line_numbers
 
     # Set a message shown when there is no data. Fits up to 20 characters. Defaults
     # to +"No Data."+.
-    attr_accessor :no_data_message
+    attr_writer :no_data_message
 
     # Set the font size of the large title at the top of the graph. Default is +36+.
-    attr_accessor :title_font_size
+    attr_writer :title_font_size
 
     # Optionally set the size of the font. Based on an 800x600px graph.
     # Default is +20+.
     #
     # Will be scaled down if the graph is smaller than 800px wide.
-    attr_accessor :legend_font_size
+    attr_writer :legend_font_size
 
     # Display the legend under the graph. Default is +false+.
-    attr_accessor :legend_at_bottom
+    attr_writer :legend_at_bottom
 
     # The font size of the labels around the graph. Default is +21+.
-    attr_accessor :marker_font_size
+    attr_writer :marker_font_size
 
     # Set the color of the auxiliary lines.
-    attr_accessor :marker_color
+    attr_writer :marker_color
 
     # Set the shadow color of the auxiliary lines.
-    attr_accessor :marker_shadow_color
+    attr_writer :marker_shadow_color
 
     # Set the number of horizontal lines shown for reference.
-    attr_accessor :marker_count
+    attr_writer :marker_count
 
     # Set to +true+ if you want the data sets sorted with largest avg values drawn
     # first. Default is +false+.
-    attr_accessor :sort
+    attr_writer :sort
 
     # Set to +true+ if you want the data sets drawn with largest avg values drawn
     # first. This does not affect the legend. Default is +false+.
-    attr_accessor :sorted_drawing
+    attr_writer :sorted_drawing
 
     # Optionally set the size of the colored box by each item in the legend.
     # Default is +20.0+.
     #
     # Will be scaled down if graph is smaller than 800px wide.
-    attr_accessor :legend_box_size
+    attr_writer :legend_box_size
+
+    # Allow passing lambdas to format labels for x axis.
+    attr_writer :x_axis_label_format
 
-    # With Side Bars use the data label for the marker value to the left of the bar.
-    # Default is +false+.
-    attr_accessor :use_data_label
+    # Allow passing lambdas to format labels for y axis.
+    attr_writer :y_axis_label_format
 
     # If one numerical argument is given, the graph is drawn at 4/3 ratio
     # according to the given width (+800+ results in 800x600, +400+ gives 400x300,
@@ -173,9 +172,7 @@ module Gruff
     #
     def initialize(target_width = DEFAULT_TARGET_WIDTH)
       if target_width.is_a?(String)
-        geometric_width, geometric_height = target_width.split('x')
-        @columns = geometric_width.to_f
-        @rows = geometric_height.to_f
+        @columns, @rows = target_width.split('x').map(&:to_f)
       else
         @columns = target_width.to_f
         @rows = target_width.to_f * 0.75
@@ -183,19 +180,14 @@ module Gruff
       @columns.freeze
       @rows.freeze
 
+      initialize_graph_scale
       initialize_ivars
+      initialize_store
 
       self.theme = Themes::KEYNOTE
     end
 
-    # Set instance variables for this object.
-    #
-    # Subclasses can override this, call super, then set values separately.
-    #
-    # This makes it possible to set defaults in a subclass but still allow
-    # developers to change this values in their program.
-    def initialize_ivars
-      # Internal for calculations
+    def initialize_graph_scale
       @raw_columns = DEFAULT_TARGET_WIDTH
       @raw_rows = DEFAULT_TARGET_WIDTH * (@rows / @columns)
       @raw_columns.freeze
@@ -203,16 +195,29 @@ module Gruff
 
       @scale = @columns / @raw_columns
       @scale.freeze
+    end
+    protected :initialize_graph_scale
 
+    def initialize_store
+      @store = Gruff::Store.new(Gruff::Store::BasicData)
+    end
+    protected :initialize_store
+
+    # Initialize instance variable of attributes
+    #
+    # Subclasses can override this, call super, then set values separately.
+    #
+    # This makes it possible to set defaults in a subclass but still allow
+    # developers to change this values in their program.
+    def initialize_ivars
       @marker_count = nil
       @maximum_value = @minimum_value = nil
-      @increment = nil
       @labels = {}
       @sort = false
       @sorted_drawing = false
       @title = nil
-      @title_font = nil
 
+      @title_font = nil
       @font = nil
       @bold_title = true
 
@@ -235,14 +240,12 @@ module Gruff
       @label_max_size = 0
       @label_truncation_style = :absolute
 
-      @theme_options = {}
-
-      @use_data_label = false
       @x_axis_increment = nil
       @x_axis_label = @y_axis_label = nil
       @y_axis_increment = nil
 
-      @store = Gruff::Store.new(Gruff::Store::BaseData)
+      @x_axis_label_format = nil
+      @y_axis_label_format = nil
     end
     protected :initialize_ivars
 
@@ -298,11 +301,20 @@ module Gruff
     #   graph.theme = {
     #     colors: %w(orange purple green white red),
     #     marker_color: 'blue',
-    #     background_colors: ['black', 'grey', :top_bottom]
+    #     background_colors: ['black', 'grey'],
+    #     background_direction: :top_bottom
     #   }
     #
     # +background_image: 'squirrel.png'+ is also possible.
     #
+    # +background_direction+ accepts one of following parameters.
+    # - +:top_bottom+
+    # - +:bottom_top+
+    # - +:left_right+
+    # - +:right_left+
+    # - +:topleft_bottomright+
+    # - +:topright_bottomleft+
+    #
     # (Or hopefully something better looking than that.)
     #
     # @param options [Hash] The optional setting for theme
@@ -408,14 +420,40 @@ module Gruff
     # @example
     #   write('graphs/my_pretty_graph.png')
     def write(file_name = 'graph.png')
-      draw
-      Gruff::Renderer.write(file_name)
+      to_image.write(file_name)
+    end
+
+    # Return a rendered graph image.
+    # This can use RMagick's methods to adjust the image before saving.
+    #
+    # @return [Magick::Image] The rendered image.
+    #
+    # @example
+    #   g = Gruff::Line.new
+    #   g.data :Jimmy, [25, 36, 86, 39, 25, 31, 79, 88]
+    #   g.data :Charles, [80, 54, 67, 54, 68, 70, 90, 95]
+    #   image = g.to_image
+    #   image = image.resize(400, 300).quantize(128, Magick::RGBColorspace)
+    #   image.write('test.png')
+    #
+    def to_image
+      @to_image ||= begin
+        draw
+        Gruff::Renderer.finish
+        Gruff::Renderer.instance.image
+      end
     end
 
     # Return the graph as a rendered binary blob.
-    def to_blob(file_format = 'PNG')
-      draw
-      Gruff::Renderer.to_blob(file_format)
+    #
+    # @param image_format [String] The image format of binary blob.
+    #
+    # @deprecated Please use +to_image.to_blob+ instead.
+    def to_blob(image_format = 'PNG')
+      warn '#to_blob is deprecated. Please use `to_image.to_blob` instead'
+      to_image.to_blob do
+        self.format = image_format
+      end
     end
 
   protected
@@ -478,6 +516,18 @@ module Gruff
       store.columns
     end
 
+    def marker_count
+      @marker_count ||= begin
+        count = nil
+        (3..7).each do |lines|
+          if @spread.to_f % lines == 0.0
+            count = lines and break
+          end
+        end
+        count || 4
+      end
+    end
+
     # Make copy of data with values scaled between 0-100
     def normalize
       store.normalize(minimum: minimum_value, spread: @spread)
@@ -492,61 +542,33 @@ module Gruff
       @hide_title || @title.nil? || @title.empty?
     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)
-      @title_caps_height = hide_title? ? 0 : calculate_caps_height(@title_font_size) * @title.lines.to_a.size
-      @legend_caps_height = @hide_legend ? 0 : calculate_caps_height(@legend_font_size)
-
-      if @hide_line_markers
-        @graph_left = @left_margin
-        @graph_right_margin = @right_margin
-        @graph_bottom_margin = @bottom_margin
-      else
-        if @has_left_labels
-          longest_left_label_width = calculate_width(@marker_font_size,
-                                                     labels.values.reduce('') { |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, @increment))
-        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)
+    def hide_labels?
+      @hide_line_markers
+    end
 
-        @graph_left = @left_margin + line_number_width + (@y_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN * 2)
+    def hide_left_label_area?
+      @hide_line_markers
+    end
 
-        # 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.max.to_i
-        extra_room_for_long_label = begin
-          (last_label >= (column_count - 1) && @center_labels_over_point) ? calculate_width(@marker_font_size, @labels[last_label]) / 2.0 : 0
-        end
-        @graph_right_margin = @right_margin + extra_room_for_long_label
+    def hide_bottom_label_area?
+      @hide_line_markers
+    end
 
-        @graph_bottom_margin = @bottom_margin + @marker_caps_height + LABEL_MARGIN
-      end
+    ##
+    # Calculates size of drawable area, general font dimensions, etc.
 
-      @graph_right = @raw_columns - @graph_right_margin
-      @graph_width = @raw_columns - @graph_left - @graph_right_margin
+    def setup_graph_measurements
+      @marker_caps_height = setup_marker_caps_height
+      @title_caps_height = setup_title_caps_height
+      @legend_caps_height = setup_legend_caps_height
 
-      # When @hide title, leave a title_margin space for aesthetics.
-      # Same with @hide_legend
-      @graph_top = begin
-        if @legend_at_bottom
-          @top_margin
-        else
-          @top_margin +
-            (hide_title? ? title_margin : @title_caps_height + title_margin) +
-            (@hide_legend ? legend_margin : @legend_caps_height + legend_margin)
-        end
-      end
+      margin_on_right = graph_right_margin
+      @graph_right = @raw_columns - margin_on_right
+      @graph_left = setup_left_margin
+      @graph_top = setup_top_margin
+      @graph_bottom = setup_bottom_margin
 
-      x_axis_label_height = @x_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN
-      # FIXME: Consider chart types other than bar
-      @graph_bottom = @raw_rows - @graph_bottom_margin - x_axis_label_height - @label_stagger_height
+      @graph_width = @raw_columns - @graph_left - margin_on_right
       @graph_height = @graph_bottom - @graph_top
     end
 
@@ -556,17 +578,17 @@ module Gruff
         # X Axis
         # Centered vertically and horizontally by setting the
         # height to 1.0 and the width to the width of the graph.
-        x_axis_label_y_coordinate = @graph_bottom + LABEL_MARGIN * 2 + @marker_caps_height
+        x_axis_label_y_coordinate = @graph_bottom + LABEL_MARGIN + @marker_caps_height
 
         # TODO: Center between graph area
         text_renderer = Gruff::Renderer::Text.new(@x_axis_label, font: @font, size: @marker_font_size, color: @font_color)
-        text_renderer.render(@raw_columns, 1.0, 0.0, x_axis_label_y_coordinate)
+        text_renderer.add_to_render_queue(@raw_columns, 1.0, 0.0, x_axis_label_y_coordinate)
       end
 
       if @y_axis_label
         # Y Axis, rotated vertically
         text_renderer = Gruff::Renderer::Text.new(@y_axis_label, font: @font, size: @marker_font_size, color: @font_color, rotation: -90)
-        text_renderer.render(1.0, @raw_rows, @left_margin + @marker_caps_height / 2.0, 0.0, Magick::CenterGravity)
+        text_renderer.add_to_render_queue(1.0, @raw_rows, @left_margin + @marker_caps_height / 2.0, 0.0, Magick::CenterGravity)
       end
     end
 
@@ -577,31 +599,21 @@ module Gruff
       increment_scaled = @graph_height.to_f / (@spread / @increment)
 
       # Draw horizontal line markers and annotate with numbers
-      (0..@marker_count).each do |index|
+      (0..marker_count).each do |index|
         y = @graph_top + @graph_height - index.to_f * increment_scaled
 
-        Gruff::Renderer::Line.new(color: @marker_color).render(@graph_left, y, @graph_right, y)
-        #If the user specified a marker shadow color, draw a shadow just below it
-        if @marker_shadow_color
-          Gruff::Renderer::Line.new(color: @marker_shadow_color).render(@graph_left, y + 1, @graph_right, y + 1)
-        end
+        line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
+        line_renderer.render(@graph_left, y, @graph_right, y)
 
         unless @hide_line_numbers
           marker_label = BigDecimal(index.to_s) * BigDecimal(@increment.to_s) + BigDecimal(minimum_value.to_s)
-          label = label(marker_label, @increment)
+          label = y_axis_label(marker_label, @increment)
           text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @marker_font_size, color: @font_color)
-          text_renderer.render(@graph_left - LABEL_MARGIN, 1.0, 0.0, y, Magick::EastGravity)
+          text_renderer.add_to_render_queue(@graph_left - LABEL_MARGIN, 1.0, 0.0, y, Magick::EastGravity)
         end
       end
     end
 
-    # Return the sum of values in an array.
-    #
-    # Duplicated to not conflict with active_support in Rails.
-    def sum(arr)
-      arr.reduce(0) { |i, m| m + i }
-    end
-
     # Return a calculation of center
     def center(size)
       (@raw_columns - size) / 2
@@ -613,27 +625,15 @@ module Gruff
       return if @hide_legend
 
       legend_labels = store.data.map(&:label)
-
       legend_square_width = @legend_box_size # small square with color of this item
+      label_widths = calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
 
-      # May fix legend drawing problem at small sizes
-      label_widths = [[]] # Used to calculate line wrap
-      legend_labels.each do |label|
-        width = calculate_width(@legend_font_size, label)
-        label_width = 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 = center(sum(label_widths.first))
+      current_x_offset = center(label_widths.first.sum)
       current_y_offset = begin
         if @legend_at_bottom
-          @graph_height + title_margin
+          @graph_bottom + @legend_margin + @legend_caps_height + LABEL_MARGIN
         else
-          hide_title? ? @top_margin + title_margin : @top_margin + title_margin + @title_caps_height
+          hide_title? ? @top_margin + @title_margin : @top_margin + @title_margin + @title_caps_height
         end
       end
 
@@ -642,7 +642,7 @@ module Gruff
 
         # Draw label
         text_renderer = Gruff::Renderer::Text.new(legend_label, font: @font, size: @legend_font_size, color: @font_color)
-        text_renderer.render(@raw_columns, 1.0, current_x_offset + (legend_square_width * 1.7), current_y_offset, Magick::WestGravity)
+        text_renderer.add_to_render_queue(@raw_columns, 1.0, current_x_offset + (legend_square_width * 1.7), current_y_offset, Magick::WestGravity)
 
         # Now draw box with color of this dataset
         rect_renderer = Gruff::Renderer::Rectangle.new(color: store.data[index].color)
@@ -651,23 +651,19 @@ module Gruff
                              current_x_offset + legend_square_width,
                              current_y_offset + legend_square_width / 2.0)
 
-        width = calculate_width(legend_font_size, legend_label)
-        current_string_offset = width + (legend_square_width * 2.7)
+        width = calculate_width(@legend_font_size, legend_label)
+        current_x_offset += width + (legend_square_width * 2.7)
+        label_widths.first.shift
 
         # Handle wrapping
-        label_widths.first.shift
         if label_widths.first.empty?
           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
+          current_x_offset = center(label_widths.first.sum) unless label_widths.empty?
+          line_height = [@legend_caps_height, legend_square_width].max + @legend_margin
           unless label_widths.empty?
             # 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
     end
@@ -680,12 +676,12 @@ module Gruff
       font_weight = @bold_title ? Magick::BoldWeight : Magick::NormalWeight
       font_size = @title_font_size
 
-      metrics = Renderer::Text.metrics(@title, font_size, font_weight)
+      metrics = Renderer::Text.metrics(@title, font, font_size, font_weight)
       if metrics.width > @raw_columns
         font_size = font_size * (@raw_columns / metrics.width) * 0.95
       end
       text_renderer = Gruff::Renderer::Text.new(@title, font: font, size: font_size, color: @font_color, weight: font_weight)
-      text_renderer.render(@raw_columns, 1.0, 0, @top_margin)
+      text_renderer.add_to_render_queue(@raw_columns, 1.0, 0, @top_margin)
     end
 
     # Draws column labels below graph, centered over x_offset
@@ -700,17 +696,14 @@ module Gruff
         # TODO: See if index.odd? is the best stragegy
         y_offset += @label_stagger_height if index.odd?
 
-        label_text = truncate_label_text(labels[index].to_s)
-
         if x_offset >= @graph_left && x_offset <= @graph_right
-          text_renderer = Gruff::Renderer::Text.new(label_text, font: @font, size: @marker_font_size, color: @font_color)
-          text_renderer.render(1.0, 1.0, x_offset, y_offset, gravity)
+          draw_label_at(1.0, 1.0, x_offset, y_offset, @labels[index], gravity)
         end
       end
     end
 
     def draw_unique_label(index)
-      return if @hide_line_markers
+      return if hide_labels?
 
       @labels_seen ||= {}
       if !@labels[index].nil? && @labels_seen[index].nil?
@@ -719,18 +712,24 @@ module Gruff
       end
     end
 
+    def draw_label_at(width, height, x, y, text, gravity = Magick::NorthGravity)
+      label_text = truncate_label_text(text)
+      text_renderer = Gruff::Renderer::Text.new(label_text, font: @font, size: @marker_font_size, color: @font_color)
+      text_renderer.add_to_render_queue(width, height, x, y, gravity)
+    end
+
     # Draws the data value over the data point in bar graphs
     def draw_value_label(x_offset, y_offset, data_point, bar_value = false)
       return if @hide_line_markers && !bar_value
 
       text_renderer = Gruff::Renderer::Text.new(data_point, font: @font, size: @marker_font_size, color: @font_color)
-      text_renderer.render(1.0, 1.0, x_offset, y_offset)
+      text_renderer.add_to_render_queue(1.0, 1.0, x_offset, y_offset)
     end
 
     # Shows an error message because you have no data.
     def draw_no_data
       text_renderer = Gruff::Renderer::Text.new(@no_data_message, font: @font, size: 80, color: @font_color)
-      text_renderer.render(@raw_columns, @raw_rows / 2.0, 0, 10, Magick::CenterGravity)
+      text_renderer.render(@raw_columns, @raw_rows, 0, 0, Magick::CenterGravity)
     end
 
     # Resets everything to defaults (except data).
@@ -794,7 +793,67 @@ module Gruff
 
   private
 
+    def setup_marker_caps_height
+      hide_bottom_label_area? ? 0 : calculate_caps_height(@marker_font_size)
+    end
+
+    def setup_title_caps_height
+      hide_title? ? 0 : calculate_caps_height(@title_font_size) * @title.lines.to_a.size
+    end
+
+    def setup_legend_caps_height
+      @hide_legend ? 0 : calculate_caps_height(@legend_font_size)
+    end
+
+    def graph_right_margin
+      @hide_line_markers ? @right_margin : @right_margin + extra_room_for_long_label
+    end
+
+    def extra_room_for_long_label
+      # 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.max.to_i
+      (last_label >= (column_count - 1) && @center_labels_over_point) ? calculate_width(@marker_font_size, @labels[last_label]) / 2.0 : 0
+    end
+
+    def setup_left_margin
+      return @left_margin if hide_left_label_area?
+
+      text = begin
+        if @has_left_labels
+          @labels.values.reduce('') { |value, memo| (value.to_s.length > memo.to_s.length) ? value : memo }
+        else
+          y_axis_label(maximum_value.to_f, @increment)
+        end
+      end
+      longest_left_label_width = calculate_width(@marker_font_size, truncate_label_text(text))
+      longest_left_label_width *= 1.25 if @has_left_labels
+
+      # 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)
+
+      @left_margin + line_number_width + (@y_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN * 2)
+    end
+
+    def setup_top_margin
+      # When @hide title, leave a title_margin space for aesthetics.
+      # Same with @hide_legend
+      @top_margin +
+        (hide_title? ? @title_margin : @title_caps_height + @title_margin) +
+        ((@hide_legend || @legend_at_bottom) ? @legend_margin : calculate_legend_height + @legend_margin)
+    end
+
+    def setup_bottom_margin
+      graph_bottom_margin = hide_bottom_label_area? ? @bottom_margin : @bottom_margin + @marker_caps_height + LABEL_MARGIN
+      graph_bottom_margin += (calculate_legend_height + @legend_margin) if @legend_at_bottom
+
+      x_axis_label_height = @x_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN
+      # FIXME: Consider chart types other than bar
+      @raw_rows - graph_bottom_margin - x_axis_label_height - @label_stagger_height
+    end
+
     def truncate_label_text(text)
+      text = text.to_s
       return text if text.size <= @label_max_size
 
       if @label_truncation_style == :trailing_dots
@@ -823,7 +882,7 @@ module Gruff
                 else
                   value.to_s
                 end
-              elsif (@spread.to_f % (@marker_count.to_f == 0 ? 1 : @marker_count.to_f) == 0) || !@y_axis_increment.nil?
+              elsif (@spread.to_f % (marker_count.to_f == 0 ? 1 : marker_count.to_f) == 0) || !@y_axis_increment.nil?
                 value.to_i.to_s
               elsif @spread > 10.0
                 sprintf('%0i', value)
@@ -838,17 +897,74 @@ module Gruff
       parts.join('.')
     end
 
+    def x_axis_label(value, increment)
+      if @x_axis_label_format
+        @x_axis_label_format.call(value)
+      else
+        label(value, increment)
+      end
+    end
+
+    def y_axis_label(value, increment)
+      if @y_axis_label_format
+        @y_axis_label_format.call(value)
+      else
+        label(value, increment)
+      end
+    end
+
+    def calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
+      # May fix legend drawing problem at small sizes
+      label_widths = [[]] # Used to calculate line wrap
+      legend_labels.each do |label|
+        width = calculate_width(@legend_font_size, label)
+        label_width = width + legend_square_width * 2.7
+        label_widths.last.push label_width
+
+        if label_widths.last.sum > (@raw_columns * 0.9)
+          label_widths.push [label_widths.last.pop]
+        end
+      end
+
+      label_widths
+    end
+
+    def calculate_legend_height
+      return 0.0 if @hide_legend
+
+      legend_labels = store.data.map(&:label)
+      legend_square_width = @legend_box_size
+      label_widths = calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
+      legend_height = 0.0
+
+      legend_labels.each_with_index do |legend_label, _index|
+        next if legend_label.empty?
+
+        label_widths.first.shift
+        if label_widths.first.empty?
+          label_widths.shift
+          line_height = [@legend_caps_height, legend_square_width].max + @legend_margin
+          unless label_widths.empty?
+            # Wrap to next line and shrink available graph dimensions
+            legend_height += line_height
+          end
+        end
+      end
+
+      legend_height + @legend_caps_height
+    end
+
     # Returns the height of the capital letter 'X' for the current font and
     # size.
     #
     # Not scaled since it deals with dimensions that the regular scaling will
     # handle.
     def calculate_caps_height(font_size)
-      metrics = Renderer::Text.metrics('X', font_size)
+      metrics = Renderer::Text.metrics('X', @font, font_size)
       metrics.height
     end
 
-    # Returns the width of a string at this pointsize.
+    # Returns the width of a string at this point size.
     #
     # Not scaled since it deals with dimensions that the regular
     # scaling will handle.
@@ -856,7 +972,7 @@ module Gruff
       text = text.to_s
       return 0 if text.empty?
 
-      metrics = Renderer::Text.metrics(text, font_size)
+      metrics = Renderer::Text.metrics(text, @font, font_size)
       metrics.width
     end
 
@@ -865,19 +981,10 @@ module Gruff
         # Try to use a number of horizontal lines that will come out even.
         #
         # TODO Do the same for larger numbers...100, 75, 50, 25
-        if @marker_count.nil?
-          (3..7).each do |lines|
-            if @spread % lines == 0.0
-              @marker_count = lines
-              break
-            end
-          end
-          @marker_count ||= 4
-        end
-        @increment = (@spread > 0 && @marker_count > 0) ? significant(@spread / @marker_count) : 1
+        @increment = (@spread > 0 && marker_count > 0) ? significant(@spread / marker_count) : 1
       else
         # TODO: Make this work for negative values
-        @marker_count = (@spread / @y_axis_increment).to_i
+        self.marker_count = (@spread / @y_axis_increment).to_i
         @increment = @y_axis_increment
       end
     end