gruff 0.11.0-java → 0.14.0-java

data/gruff.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
 lib = File.expand_path('lib')
@@ -10,10 +9,11 @@ Gem::Specification.new do |s|
   s.name = 'gruff'
   s.version = Gruff::VERSION
   s.authors = ['Geoffrey Grosenbach', 'Uwe Kubosch']
-  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/i
+  end
   s.homepage = 'https://github.com/topfunky/gruff'
   s.require_paths = %w[lib]
   s.summary = 'Beautiful graphs for one or multiple datasets.'
@@ -27,12 +27,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'
+    s.add_development_dependency 'rubocop-rake', '~> 0.5.1'
   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 'minitest-reporters'
+  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard', '~> 0.9.25'
 end

data/lib/gruff.rb

@@ -9,8 +9,14 @@ require 'gruff/version'
   patch/rmagick
   patch/string
 
-  themes
+  font
   base
+
+  helper/bar_conversion.rb
+  helper/stacked_mixin
+  helper/bar_value_label
+
+  themes
   area
   bar
   bezier
@@ -22,10 +28,10 @@ require 'gruff/version'
   pie
   scatter
   spider
+  side_bar
   stacked_area
   stacked_bar
   side_stacked_bar
-  side_bar
   accumulator_bar
 
   scene
@@ -43,7 +49,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.
@@ -16,7 +14,9 @@ require 'gruff/base'
 #   g.write('accumulator_bar.png')
 #
 class Gruff::AccumulatorBar < Gruff::StackedBar
-  def draw
+private
+
+  def setup_data
     raise(Gruff::IncorrectNumberOfDatasetsException) unless store.length == 1
 
     accum_array = store.data.first.points[0..-2].reduce([0]) { |a, v| a << a.last + v }

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.
@@ -22,19 +20,16 @@ class Gruff::Area < Gruff::Base
   # Specifies the stroke width in line around area graph. Default is +2.0+.
   attr_writer :stroke_width
 
-  def initialize_ivars
+private
+
+  def initialize_attributes
     super
     @sorted_drawing = true
     @fill_opacity = 0.85
     @stroke_width = 2.0
   end
-  private :initialize_ivars
-
-  def draw
-    super
-
-    return unless data_given?
 
+  def draw_graph
     x_increment = @graph_width / (column_count - 1).to_f
 
     store.norm_data.each do |data_row|
@@ -57,9 +52,7 @@ class Gruff::Area < Gruff::Base
       poly_points << @graph_left
       poly_points << @graph_bottom - 1
 
-      Gruff::Renderer::Polygon.new(color: data_row.color, width: @stroke_width, opacity: @fill_opacity).render(poly_points)
+      Gruff::Renderer::Polygon.new(renderer, 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.
@@ -25,7 +22,7 @@ class Gruff::Bar < Gruff::Base
   # 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
 
@@ -33,42 +30,57 @@ class Gruff::Bar < Gruff::Base
   # Default is +false+.
   attr_writer :show_labels_for_bar_values
 
-  def initialize_ivars
+  # Prevent drawing of column labels below a bar graph.  Default is +false+.
+  attr_writer :hide_labels
+
+  # 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
     @label_formatting = nil
     @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?
+  end
 
-    draw_bars
+  def hide_labels?
+    @hide_labels
   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)
+  def hide_left_label_area?
+    @hide_line_markers
+  end
 
-    @spacing_factor = (1 - space_percent)
+  def hide_bottom_label_area?
+    hide_labels?
   end
 
-protected
+  # Value to avoid completely overwriting the coordinate axis
+  AXIS_MARGIN = 0.5
 
-  def draw_bars
+  def draw_graph
     # Setup spacing.
     #
     # Columns sit side-by-side.
@@ -78,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|
@@ -107,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)
@@ -119,18 +117,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)
+          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,6 +16,9 @@ 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
@@ -91,15 +93,6 @@ module Gruff
     # Set the large title of the graph displayed at the top.
     attr_writer :title
 
-    # Same as {#font=} but for the title.
-    attr_writer :title_font
-
-    # Specifies whether to draw the title bolded or not. Default is +true+.
-    attr_writer :bold_title
-
-    # Specifies the text color.
-    attr_writer :font_color
-
     # Prevent drawing of line markers. Default is +false+.
     attr_writer :hide_line_markers
 
@@ -116,21 +109,9 @@ module Gruff
     # to +"No Data."+.
     attr_writer :no_data_message
 
-    # Set the font size of the large title at the top of the graph. Default is +36+.
-    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_writer :legend_font_size
-
     # Display the legend under the graph. Default is +false+.
     attr_writer :legend_at_bottom
 
-    # The font size of the labels around the graph. Default is +21+.
-    attr_writer :marker_font_size
-
     # Set the color of the auxiliary lines.
     attr_writer :marker_color
 
@@ -154,9 +135,11 @@ module Gruff
     # Will be scaled down if graph is smaller than 800px wide.
     attr_writer :legend_box_size
 
-    # With Side Bars use the data label for the marker value to the left of the bar.
-    # Default is +false+.
-    attr_writer :use_data_label
+    # Allow passing lambdas to format labels for x axis.
+    attr_writer :x_axis_label_format
+
+    # 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,
@@ -177,7 +160,7 @@ module Gruff
       @rows.freeze
 
       initialize_graph_scale
-      initialize_ivars
+      initialize_attributes
       initialize_store
 
       self.theme = Themes::KEYNOTE
@@ -195,31 +178,27 @@ module Gruff
     protected :initialize_graph_scale
 
     def initialize_store
-      @store = Gruff::Store.new(Gruff::Store::BaseData)
+      @store = Gruff::Store.new(Gruff::Store::BasicData)
     end
     protected :initialize_store
 
-    # Initialize instance variable of attribures
+    # 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
+    def initialize_attributes
       @marker_count = nil
       @maximum_value = @minimum_value = nil
       @labels = {}
       @sort = false
       @sorted_drawing = false
       @title = nil
-      @title_font = nil
 
-      @font = nil
-      @bold_title = true
-
-      @marker_font_size = 21.0
-      @legend_font_size = 20.0
-      @title_font_size = 36.0
+      @title_font = Gruff::Font.new(size: 36.0, bold: true)
+      @marker_font = Gruff::Font.new(size: 21.0)
+      @legend_font = Gruff::Font.new(size: 20.0)
 
       @top_margin = @bottom_margin = @left_margin = @right_margin = DEFAULT_MARGIN
       @legend_margin = LEGEND_MARGIN
@@ -236,12 +215,14 @@ module Gruff
       @label_max_size = 0
       @label_truncation_style = :absolute
 
-      @use_data_label = false
       @x_axis_increment = nil
       @x_axis_label = @y_axis_label = nil
       @y_axis_increment = nil
+
+      @x_axis_label_format = nil
+      @y_axis_label_format = nil
     end
-    protected :initialize_ivars
+    protected :initialize_attributes
 
     # Sets the top, bottom, left and right margins to +margin+.
     #
@@ -256,8 +237,62 @@ module Gruff
     # @param font_path [String] The path to font.
     #
     def font=(font_path)
-      @font = font_path
-      Gruff::Renderer.font = @font
+      @title_font.path = font_path unless @title_font.path
+      @marker_font.path = font_path
+      @legend_font.path = font_path
+    end
+
+    # Same as {#font=} but for the title.
+    #
+    # @param font_path [String] The path to font.
+    #
+    def title_font=(font_path)
+      @title_font.path = font_path
+    end
+
+    # Set the font size of the large title at the top of the graph. Default is +36+.
+    #
+    # @param value [Numeric] title font size
+    #
+    def title_font_size=(value)
+      @title_font.size = value
+    end
+
+    # The font size of the labels around the graph. Default is +21+.
+    #
+    # @param value [Numeric] marker font size
+    #
+    def marker_font_size=(value)
+      @marker_font.size = value
+    end
+
+    # 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.
+    #
+    # @param value [Numeric] legend font size
+    #
+    def legend_font_size=(value)
+      @legend_font.size = value
+    end
+
+    # Specifies whether to draw the title bolded or not. Default is +true+.
+    #
+    # @param value [Boolean] specifies whether to draw the title bolded or not.
+    #
+    def bold_title=(value)
+      @title_font.bold = value
+    end
+
+    # Specifies the text color.
+    #
+    # @param value [String] color
+    #
+    def font_color=(value)
+      @title_font.color = value
+      @marker_font.color = value
+      @legend_font.color = value
     end
 
     # Add a color to the list of available colors for lines.
@@ -326,12 +361,13 @@ module Gruff
       }
       @theme_options = defaults.merge options
 
+      self.marker_color = @theme_options[:marker_color]
+      self.font_color = @theme_options[:font_color] || @marker_color
+
       @colors = @theme_options[:colors]
-      @marker_color = @theme_options[:marker_color]
       @marker_shadow_color = @theme_options[:marker_shadow_color]
-      @font_color = @theme_options[:font_color] || @marker_color
 
-      Gruff::Renderer.setup(@columns, @rows, @font, @scale, @theme_options)
+      @renderer = Gruff::Renderer.new(@columns, @rows, @scale, @theme_options)
     end
 
     # Apply Apple's keynote theme.
@@ -414,39 +450,65 @@ 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
+        renderer.finish
+        renderer.image
+      end
     end
 
     # Return the graph as a rendered binary blob.
     #
     # @param image_format [String] The image format of binary blob.
+    #
+    # @deprecated Please use +to_image.to_blob+ instead.
     def to_blob(image_format = 'PNG')
-      draw
-      Gruff::Renderer.to_blob(image_format)
+      warn '#to_blob is deprecated. Please use `to_image.to_blob` instead'
+      to_image.to_blob do
+        self.format = image_format
+      end
     end
 
-  protected
-
-    # Overridden by subclasses to do the actual plotting of the graph.
-    #
-    # Subclasses should start by calling super() for this method.
+    # Draw a graph.
     def draw
+      setup_data
+
       # Maybe should be done in one of the following functions for more granularity.
       unless data_given?
         draw_no_data
         return
       end
 
-      setup_data
       setup_drawing
 
       draw_legend
       draw_line_markers
       draw_axis_labels
       draw_title
+      draw_graph
     end
 
+  protected
+
+    attr_reader :renderer
+
     # Perform data manipulation before calculating chart measurements
     def setup_data # :nodoc:
       if @y_axis_increment && !@hide_line_markers
@@ -486,6 +548,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)
@@ -500,6 +574,18 @@ module Gruff
       @hide_title || @title.nil? || @title.empty?
     end
 
+    def hide_labels?
+      @hide_line_markers
+    end
+
+    def hide_left_label_area?
+      @hide_line_markers
+    end
+
+    def hide_bottom_label_area?
+      @hide_line_markers
+    end
+
     ##
     # Calculates size of drawable area, general font dimensions, etc.
 
@@ -527,13 +613,13 @@ module Gruff
         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 = Gruff::Renderer::Text.new(renderer, @x_axis_label, font: @marker_font)
         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 = Gruff::Renderer::Text.new(renderer, @y_axis_label, font: @marker_font, rotation: -90)
         text_renderer.add_to_render_queue(1.0, @raw_rows, @left_margin + @marker_caps_height / 2.0, 0.0, Magick::CenterGravity)
       end
     end
@@ -545,28 +631,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
 
-        line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
+        line_renderer = Gruff::Renderer::Line.new(renderer, 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)
-          text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @marker_font_size, color: @font_color)
+          label = y_axis_label(marker_label, @increment)
+          text_renderer = Gruff::Renderer::Text.new(renderer, label, font: @marker_font)
           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
@@ -581,10 +660,10 @@ module Gruff
       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)
 
-      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
         end
@@ -594,30 +673,28 @@ module Gruff
         next if legend_label.empty?
 
         # Draw label
-        text_renderer = Gruff::Renderer::Text.new(legend_label, font: @font, size: @legend_font_size, color: @font_color)
+        text_renderer = Gruff::Renderer::Text.new(renderer, legend_label, font: @legend_font)
         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)
+        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: store.data[index].color)
         rect_renderer.render(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)
 
-        width = calculate_width(@legend_font_size, legend_label)
+        width = calculate_width(@legend_font, legend_label)
         current_x_offset += width + (legend_square_width * 2.7)
         label_widths.first.shift
 
         # Handle wrapping
         if label_widths.first.empty?
           label_widths.shift
-          current_x_offset = center(sum(label_widths.first)) unless label_widths.empty?
+          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
         end
       end
@@ -627,15 +704,12 @@ module Gruff
     def draw_title
       return if hide_title?
 
-      font = @title_font || @font
-      font_weight = @bold_title ? Magick::BoldWeight : Magick::NormalWeight
-      font_size = @title_font_size
-
-      metrics = Renderer::Text.metrics(@title, font_size, font_weight)
+      metrics = Gruff::Renderer::Text.new(renderer, @title, font: @title_font).metrics
       if metrics.width > @raw_columns
-        font_size = font_size * (@raw_columns / metrics.width) * 0.95
+        @title_font.size = @title_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 = Gruff::Renderer::Text.new(renderer, @title, font: @title_font)
       text_renderer.add_to_render_queue(@raw_columns, 1.0, 0, @top_margin)
     end
 
@@ -651,17 +725,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.add_to_render_queue(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?
@@ -670,20 +741,33 @@ 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(renderer, label_text, font: @marker_font)
+      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
+    def draw_value_label(x_offset, y_offset, data_point)
+      return if @hide_line_markers
 
-      text_renderer = Gruff::Renderer::Text.new(data_point, font: @font, size: @marker_font_size, color: @font_color)
+      text_renderer = Gruff::Renderer::Text.new(renderer, data_point, font: @marker_font)
       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)
+      font = @title_font.dup
+      font.size = 80
+      font.bold = false
+      text_renderer = Gruff::Renderer::Text.new(renderer, @no_data_message, font: font)
       text_renderer.render(@raw_columns, @raw_rows, 0, 0, Magick::CenterGravity)
     end
 
+    def draw_graph
+      raise 'Should implement this method at inherited class.'
+    end
+
     # Resets everything to defaults (except data).
     def reset_themes
       @theme_options = {}
@@ -746,15 +830,15 @@ module Gruff
   private
 
     def setup_marker_caps_height
-      @hide_line_markers ? 0 : calculate_caps_height(@marker_font_size)
+      hide_bottom_label_area? ? 0 : calculate_caps_height(@marker_font)
     end
 
     def setup_title_caps_height
-      hide_title? ? 0 : calculate_caps_height(@title_font_size) * @title.lines.to_a.size
+      hide_title? ? 0 : calculate_caps_height(@title_font) * @title.lines.to_a.size
     end
 
     def setup_legend_caps_height
-      @hide_legend ? 0 : calculate_caps_height(@legend_font_size)
+      @hide_legend ? 0 : calculate_caps_height(@legend_font)
     end
 
     def graph_right_margin
@@ -765,19 +849,22 @@ module Gruff
       # 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
+      (last_label >= (column_count - 1) && @center_labels_over_point) ? calculate_width(@marker_font, @labels[last_label]) / 2.0 : 0
     end
 
     def setup_left_margin
-      return @left_margin if @hide_line_markers
+      return @left_margin if hide_left_label_area?
 
-      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))
+      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, 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)
 
@@ -785,17 +872,16 @@ module Gruff
     end
 
     def setup_top_margin
-      return @top_margin if @legend_at_bottom
-
       # 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_margin : @legend_caps_height + @legend_margin)
+        ((@hide_legend || @legend_at_bottom) ? @legend_margin : calculate_legend_height + @legend_margin)
     end
 
     def setup_bottom_margin
-      graph_bottom_margin = @hide_line_markers ? @bottom_margin : @bottom_margin + @marker_caps_height + LABEL_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
@@ -803,6 +889,7 @@ module Gruff
     end
 
     def truncate_label_text(text)
+      text = text.to_s
       return text if text.size <= @label_max_size
 
       if @label_truncation_style == :trailing_dots
@@ -817,44 +904,62 @@ module Gruff
     # Return a formatted string representing a number value that should be
     # printed as a label.
     def label(value, increment)
-      label = if increment
-                if increment >= 10 || (increment * 1) == (increment * 1).to_i.to_f
-                  sprintf('%0i', value)
-                elsif increment >= 1.0 || (increment * 10) == (increment * 10).to_i.to_f
-                  sprintf('%0.1f', value)
-                elsif increment >= 0.1 || (increment * 100) == (increment * 100).to_i.to_f
-                  sprintf('%0.2f', value)
-                elsif increment >= 0.01 || (increment * 1000) == (increment * 1000).to_i.to_f
-                  sprintf('%0.3f', value)
-                elsif increment >= 0.001 || (increment * 10000) == (increment * 10000).to_i.to_f
-                  sprintf('%0.4f', value)
-                else
-                  value.to_s
-                end
-              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)
-              elsif @spread >= 3.0
-                sprintf('%0.2f', value)
-              else
-                value.to_s
-              end
+      label = begin
+        if increment
+          if increment >= 10 || (increment * 1) == (increment * 1).to_i.to_f
+            sprintf('%0i', value)
+          elsif increment >= 1.0 || (increment * 10) == (increment * 10).to_i.to_f
+            sprintf('%0.1f', value)
+          elsif increment >= 0.1 || (increment * 100) == (increment * 100).to_i.to_f
+            sprintf('%0.2f', value)
+          elsif increment >= 0.01 || (increment * 1000) == (increment * 1000).to_i.to_f
+            sprintf('%0.3f', value)
+          elsif increment >= 0.001 || (increment * 10000) == (increment * 10000).to_i.to_f
+            sprintf('%0.4f', value)
+          else
+            value.to_s
+          end
+        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)
+        elsif @spread >= 3.0
+          sprintf('%0.2f', value)
+        else
+          value.to_s
+        end
+      end
 
       parts = label.split('.')
       parts[0] = parts[0].commify
       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)
+        width = calculate_width(@legend_font, label)
         label_width = width + legend_square_width * 2.7
         label_widths.last.push label_width
 
-        if sum(label_widths.last) > (@raw_columns * 0.9)
+        if label_widths.last.sum > (@raw_columns * 0.9)
           label_widths.push [label_widths.last.pop]
         end
       end
@@ -862,25 +967,50 @@ module Gruff
       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)
+    def calculate_caps_height(font)
+      metrics = Gruff::Renderer::Text.new(renderer, 'X', font: font).metrics
       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.
-    def calculate_width(font_size, text)
+    def calculate_width(font, text)
       text = text.to_s
       return 0 if text.empty?
 
-      metrics = Renderer::Text.metrics(text, font_size)
+      metrics = Gruff::Renderer::Text.new(renderer, text, font: font).metrics
       metrics.width
     end
 
@@ -889,19 +1019,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