gruff 0.13.0 → 0.16.0

data/lib/gruff/base.rb

@@ -54,20 +54,18 @@ module Gruff
     #   { 0 => 2005, 3 => 2006, 5 => 2007, 7 => 2008 }
     attr_writer :labels
 
-    # Used internally for spacing.
-    #
-    # By default, labels are centered over the point they represent.
-    attr_writer :center_labels_over_point
-
-    # Used internally for horizontal graph types. Default is +false+.
-    attr_writer :has_left_labels
-
     # Set a label for the bottom of the graph.
     attr_writer :x_axis_label
 
     # Set a label for the left side of the graph.
     attr_writer :y_axis_label
 
+    # Allow passing lambda to format labels for x axis.
+    attr_writer :x_axis_label_format
+
+    # Allow passing lambda to format labels for y axis.
+    attr_writer :y_axis_label_format
+
     # Set increment of the vertical marking lines.
     attr_writer :x_axis_increment
 
@@ -93,15 +91,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
 
@@ -118,21 +107,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
 
@@ -156,12 +133,6 @@ module Gruff
     # Will be scaled down if graph is smaller than 800px wide.
     attr_writer :legend_box_size
 
-    # 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,
     # etc.).
@@ -180,8 +151,11 @@ module Gruff
       @columns.freeze
       @rows.freeze
 
+      @has_left_labels = false
+      @center_labels_over_point = true
+
       initialize_graph_scale
-      initialize_ivars
+      initialize_attributes
       initialize_store
 
       self.theme = Themes::KEYNOTE
@@ -209,7 +183,7 @@ module Gruff
     #
     # 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 = {}
@@ -217,13 +191,9 @@ module Gruff
       @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
@@ -234,8 +204,6 @@ module Gruff
       @no_data_message = 'No Data'
 
       @hide_line_markers = @hide_legend = @hide_title = @hide_line_numbers = @legend_at_bottom = false
-      @center_labels_over_point = true
-      @has_left_labels = false
       @label_stagger_height = 0
       @label_max_size = 0
       @label_truncation_style = :absolute
@@ -247,7 +215,7 @@ module Gruff
       @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+.
     #
@@ -262,8 +230,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.
@@ -332,12 +354,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.
@@ -399,7 +422,7 @@ module Gruff
     #
     # Set it after you have given all your data to the graph object.
     def minimum_value
-      @minimum_value || store.min
+      (@minimum_value || store.min).to_f
     end
     attr_writer :minimum_value
 
@@ -409,7 +432,7 @@ module Gruff
     # If you use this, you must set it after you have given all your data to
     # the graph object.
     def maximum_value
-      @maximum_value || store.max
+      (@maximum_value || store.max).to_f
     end
     attr_writer :maximum_value
 
@@ -439,8 +462,8 @@ module Gruff
     def to_image
       @to_image ||= begin
         draw
-        Gruff::Renderer.finish
-        Gruff::Renderer.instance.image
+        renderer.finish
+        renderer.image
       end
     end
 
@@ -456,32 +479,34 @@ module Gruff
       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
-        self.maximum_value = [@y_axis_increment, maximum_value, (maximum_value.to_f / @y_axis_increment).round * @y_axis_increment].max
-        self.minimum_value = [minimum_value, (minimum_value.to_f / @y_axis_increment).round * @y_axis_increment].min
+        self.maximum_value = [@y_axis_increment, maximum_value, (maximum_value / @y_axis_increment).round * @y_axis_increment].max
+        self.minimum_value = [minimum_value, (minimum_value / @y_axis_increment).round * @y_axis_increment].min
       end
     end
 
@@ -520,7 +545,7 @@ module Gruff
       @marker_count ||= begin
         count = nil
         (3..7).each do |lines|
-          if @spread.to_f % lines == 0.0
+          if @spread % lines == 0.0
             count = lines and break
           end
         end
@@ -533,8 +558,8 @@ module Gruff
       store.normalize(minimum: minimum_value, spread: @spread)
     end
 
-    def calculate_spread # :nodoc:
-      @spread = maximum_value.to_f - minimum_value.to_f
+    def calculate_spread
+      @spread = maximum_value - minimum_value
       @spread = @spread > 0 ? @spread : 1
     end
 
@@ -547,28 +572,24 @@ module Gruff
     end
 
     def hide_left_label_area?
-      @hide_line_markers
+      @hide_line_markers && @y_axis_label.nil?
     end
 
     def hide_bottom_label_area?
-      @hide_line_markers
+      @hide_line_markers && @x_axis_label.nil?
     end
 
     ##
     # Calculates size of drawable area, general font dimensions, etc.
 
     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
-
       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
 
-      @graph_width = @raw_columns - @graph_left - margin_on_right
+      @graph_width = @graph_right - @graph_left
       @graph_height = @graph_bottom - @graph_top
     end
 
@@ -578,17 +599,16 @@ 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 + @marker_caps_height
+        x_axis_label_y_coordinate = @graph_bottom + (LABEL_MARGIN * 2) + 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.add_to_render_queue(1.0, @raw_rows, @left_margin + @marker_caps_height / 2.0, 0.0, Magick::CenterGravity)
+        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
 
@@ -596,19 +616,19 @@ module Gruff
     def draw_line_markers
       return if @hide_line_markers
 
-      increment_scaled = @graph_height.to_f / (@spread / @increment)
+      increment_scaled = @graph_height / (@spread / @increment)
 
       # Draw horizontal line markers and annotate with numbers
       (0..marker_count).each do |index|
-        y = @graph_top + @graph_height - index.to_f * increment_scaled
+        y = @graph_top + @graph_height - (index * increment_scaled)
 
-        line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
-        line_renderer.render(@graph_left, y, @graph_right, y)
+        Gruff::Renderer::Line.new(renderer, color: @marker_color).render(@graph_left, y, @graph_right, y)
+        Gruff::Renderer::Line.new(renderer, color: @marker_shadow_color).render(@graph_left, y + 1, @graph_right, y + 1) if @marker_shadow_color
 
         unless @hide_line_numbers
-          marker_label = BigDecimal(index.to_s) * BigDecimal(@increment.to_s) + BigDecimal(minimum_value.to_s)
+          marker_label = (BigDecimal(index.to_s) * BigDecimal(@increment.to_s)) + BigDecimal(minimum_value.to_s)
           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 = 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
@@ -626,45 +646,46 @@ module Gruff
 
       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)
+      legend_label_lines = calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
+      line_height = [legend_caps_height, legend_square_width].max + @legend_margin
 
-      current_x_offset = center(label_widths.first.sum)
       current_y_offset = begin
         if @legend_at_bottom
-          @graph_bottom + @legend_margin + @legend_caps_height + LABEL_MARGIN
+          @graph_bottom + @legend_margin + legend_caps_height + LABEL_MARGIN + (@x_axis_label ? (LABEL_MARGIN * 2) + marker_caps_height : 0)
         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
 
-      legend_labels.each_with_index do |legend_label, index|
-        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.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.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)
-        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(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
+      index = 0
+      legend_label_lines.each do |(legend_labels_width, legend_labels_line)|
+        current_x_offset = center(legend_labels_width)
+
+        legend_labels_line.each do |legend_label|
+          unless legend_label.empty?
+            legend_label_width = calculate_width(@legend_font, legend_label)
+
+            # Draw label
+            text_renderer = Gruff::Renderer::Text.new(renderer, legend_label, font: @legend_font)
+            text_renderer.add_to_render_queue(legend_label_width,
+                                              legend_square_width,
+                                              current_x_offset + (legend_square_width * 1.7),
+                                              current_y_offset,
+                                              Magick::CenterGravity)
+
+            # Now draw box with color of this dataset
+            rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: store.data[index].color)
+            rect_renderer.render(current_x_offset,
+                                 current_y_offset,
+                                 current_x_offset + legend_square_width,
+                                 current_y_offset + legend_square_width)
+
+            current_x_offset += legend_label_width + (legend_square_width * 2.7)
           end
+          index += 1
         end
+
+        current_y_offset += line_height
       end
     end
 
@@ -672,32 +693,24 @@ 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, font_size, font_weight)
+      metrics = text_metrics(@title_font, @title)
       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
 
     # Draws column labels below graph, centered over x_offset
-    #--
-    # TODO Allow WestGravity as an option
-    def draw_label(x_offset, index, gravity = Magick::NorthGravity)
+    def draw_label(x_offset, index, gravity = Magick::NorthGravity, &block)
       draw_unique_label(index) do
         y_offset = @graph_bottom + LABEL_MARGIN
-
-        # TESTME
-        # FIXME: Consider chart types other than bar
-        # TODO: See if index.odd? is the best stragegy
         y_offset += @label_stagger_height if index.odd?
 
         if x_offset >= @graph_left && x_offset <= @graph_right
           draw_label_at(1.0, 1.0, x_offset, y_offset, @labels[index], gravity)
+          yield if block
         end
       end
     end
@@ -714,24 +727,30 @@ module Gruff
 
     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 = 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(width, height, x_offset, y_offset, data_point, gravity = Magick::CenterGravity)
+      return if @hide_line_markers
 
-      text_renderer = Gruff::Renderer::Text.new(data_point, font: @font, size: @marker_font_size, color: @font_color)
-      text_renderer.add_to_render_queue(1.0, 1.0, x_offset, y_offset)
+      draw_label_at(width, height, x_offset, y_offset, data_point, gravity)
     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 = {}
@@ -747,7 +766,7 @@ module Gruff
     end
 
     def clip_value_if_greater_than(value, max_value) # :nodoc:
-      (value > max_value) ? max_value : value
+      value > max_value ? max_value : value
     end
 
     def significant(i) # :nodoc:
@@ -793,16 +812,16 @@ module Gruff
 
   private
 
-    def setup_marker_caps_height
-      hide_bottom_label_area? ? 0 : calculate_caps_height(@marker_font_size)
+    def marker_caps_height
+      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
+    def title_caps_height
+      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)
+    def legend_caps_height
+      @hide_legend ? 0 : calculate_caps_height(@legend_font)
     end
 
     def graph_right_margin
@@ -813,7 +832,11 @@ 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
+      if last_label >= (column_count - 1) && @center_labels_over_point
+        calculate_width(@marker_font, truncate_label_text(@labels[last_label])) / 2.0
+      else
+        0
+      end
     end
 
     def setup_left_margin
@@ -821,34 +844,32 @@ module Gruff
 
       text = begin
         if @has_left_labels
-          @labels.values.reduce('') { |value, memo| (value.to_s.length > memo.to_s.length) ? value : memo }
+          @labels.values.reduce('') { |value, memo| value.to_s.length > memo.to_s.length ? value : memo }
         else
-          y_axis_label(maximum_value.to_f, @increment)
+          y_axis_label(maximum_value, @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
+      longest_left_label_width = calculate_width(@marker_font, truncate_label_text(text))
 
       # 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 = !@has_left_labels && (@hide_line_markers || @hide_line_numbers) ? 0.0 : (longest_left_label_width + LABEL_MARGIN)
 
-      @left_margin + line_number_width + (@y_axis_label.nil? ? 0.0 : @marker_caps_height + 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)
+        (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 = 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
+      x_axis_label_height = @x_axis_label.nil? ? 0.0 : marker_caps_height + (LABEL_MARGIN * 2)
       @raw_rows - graph_bottom_margin - x_axis_label_height - @label_stagger_height
     end
 
@@ -868,29 +889,31 @@ 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 * 10_000) == (increment * 10_000).to_i.to_f
+            sprintf('%0.4f', value)
+          else
+            value.to_s
+          end
+        elsif (@spread % (marker_count == 0 ? 1 : marker_count) == 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
@@ -914,44 +937,31 @@ module Gruff
     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
+      label_widths = [[]]
+      label_lines = [[]]
       legend_labels.each do |label|
-        width = calculate_width(@legend_font_size, label)
-        label_width = width + legend_square_width * 2.7
+        width = calculate_width(@legend_font, label)
+        label_width = width + (legend_square_width * 2.7)
         label_widths.last.push label_width
+        label_lines.last.push label
 
         if label_widths.last.sum > (@raw_columns * 0.9)
           label_widths.push [label_widths.last.pop]
+          label_lines.push [label_lines.last.pop]
         end
       end
 
-      label_widths
+      label_widths.map(&:sum).zip(label_lines)
     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_label_lines = calculate_legend_label_widths_for_each_line(legend_labels, @legend_box_size)
+      line_height = [legend_caps_height, @legend_box_size].max
 
-      legend_height + @legend_caps_height
+      (line_height * legend_label_lines.count) + (@legend_margin * (legend_label_lines.count - 1))
     end
 
     # Returns the height of the capital letter 'X' for the current font and
@@ -959,8 +969,19 @@ module Gruff
     #
     # 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, font_size)
+    def calculate_caps_height(font)
+      calculate_height(font, 'X')
+    end
+
+    # Returns the height of a string at this point size.
+    #
+    # Not scaled since it deals with dimensions that the regular scaling will
+    # handle.
+    def calculate_height(font, text)
+      text = text.to_s
+      return 0 if text.empty?
+
+      metrics = text_metrics(font, text)
       metrics.height
     end
 
@@ -968,20 +989,24 @@ module Gruff
     #
     # 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, font_size)
+      metrics = text_metrics(font, text)
       metrics.width
     end
 
+    def text_metrics(font, text)
+      Gruff::Renderer::Text.new(renderer, text, font: font).metrics
+    end
+
     def calculate_increment
       if @y_axis_increment.nil?
         # Try to use a number of horizontal lines that will come out even.
         #
         # TODO Do the same for larger numbers...100, 75, 50, 25
-        @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
         self.marker_count = (@spread / @y_axis_increment).to_i
@@ -989,9 +1014,13 @@ module Gruff
       end
     end
 
-    # Used for degree => radian conversions
+    # Used for degree <=> radian conversions
     def deg2rad(angle)
-      angle * (Math::PI / 180.0)
+      (angle * Math::PI) / 180.0
+    end
+
+    def rad2deg(angle)
+      (angle / Math::PI) * 180.0
     end
   end