gruff 0.10.0-java → 0.11.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6efd63c58b0b6e99141a8f96acac661c53bf7c3c36b9821e3ff6e39846de6601
-  data.tar.gz: f1a55c5c16668094c461de8a201e6358ce23054829687af411e6b4b343949803
+  metadata.gz: f2eb363f545e171df5a5d457b5d34e867a060dc4d84eda87d77b2447172d2c04
+  data.tar.gz: fa7708d508f2a016c11af3c08d2b877ff65eaf62955658c9b57fbd08b9f45659
 SHA512:
-  metadata.gz: feecb5cf63e6b621b9a4b17f1b71d83f2e1ddfc1d4f09eb0efe432b767f484fdb672a1bda4712da0df628ecde9f234553c18eeb5de59f08ed3cdb196026f534e
-  data.tar.gz: 1cf1098579f7c942cced3ab22fef432245b1708aa0a3fcfdcf6d69556c378ab0801dfcbe52060c36b77d3be4035940693f04ff919c7ee7ad904e2aca00349853
+  metadata.gz: 06d22482b55dd1f478f9ad8ae660f8fe96a4f4b8c7f651207b3de2d1cacf9c1399cf6d88ebd3fdad3178acb020371924f189fa86ee6107d240850788dd9156f3
+  data.tar.gz: 61461cbe1691e7aec5a6c178778c0f40ede97d496857f6a797867be3ae6f52565b33ad8556654ce592aec2717e11e7512bf2cfb25e7cfcdff9797da1faeb9b01

data/.rubocop.yml

@@ -18,9 +18,6 @@ Layout/AccessModifierIndentation:
 Layout/ClassStructure:
   Enabled: false
 
-Layout/CommentIndentation:
-  Enabled: false
-
 Layout/FirstMethodArgumentLineBreak:
   Enabled: false
 
@@ -39,6 +36,9 @@ Lint/AssignmentInCondition:
 Lint/NumberConversion:
   Enabled: false
 
+Style/ClassAndModuleChildren:
+  Enabled: false
+
 Style/ConditionalAssignment:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -41,7 +41,7 @@ Metrics/BlockLength:
 # Offense count: 12
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 634
+  Max: 637
 
 # Offense count: 12
 # Configuration parameters: IgnoredMethods.
@@ -85,24 +85,6 @@ Security/Eval:
   Exclude:
     - 'test/gruff_test_case.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'test/test_accumulator_bar.rb'
-
-# Offense count: 33
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
-# SupportedStyles: nested, compact
-Style/ClassAndModuleChildren:
-  Enabled: false
-
 # Offense count: 39
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## 0.11.0
+- Fix regression in empty data handling (#445)
+- Rendering text in front most (#439)
+- Allow to change settings even after entered the data in Gruff::Histogram (#437)
+- Adjust label position in Gruff::Net (#436)
+- Adjust LABEL_MARGIN value (#435)
+- Add shadow line in marker line into Gruff::{Dot, SideBar, Scatter} (#430)
+- Move no data message to the vertical center (#428)
+- Remove the getter method in attributes for configuration (#424)
+- Fix title margin in Gruff::Bullet if empty title was given (#422)
+
 ## 0.10.0
 
 * Add Histogram chart (#419)

data/Rakefile

@@ -20,4 +20,28 @@ namespace :test do
       system "ruby #{file}"
     end
   end
+
+  desc 'Update expected image with output'
+  task :"image:update" do
+    require 'rmagick'
+    require 'fileutils'
+
+    update_expected_images = lambda do |expect_dir, output_dir|
+      Dir.glob("#{output_dir}/*.png") do |output_path|
+        file_name = File.basename(output_path)
+        expected_path = "#{expect_dir}/#{file_name}"
+
+        expected_image = Magick::Image.read(expected_path).first
+        output_image = Magick::Image.read(output_path).first
+        _, error = expected_image.compare_channel(output_image, Magick::PeakAbsoluteErrorMetric)
+
+        if error != 0.0
+          FileUtils.copy(output_path, expected_path)
+        end
+      end
+    end
+
+    update_expected_images.call('test/expected', 'test/output')
+    update_expected_images.call('test/expected_java', 'test/output_java')
+  end
 end

data/lib/gruff/area.rb

@@ -17,10 +17,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

data/lib/gruff/bar.rb

@@ -20,22 +20,23 @@ 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.
   # 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
 
   def initialize_ivars
     super
     @spacing_factor = 0.9
+    @group_spacing = 10
     @label_formatting = nil
     @show_labels_for_bar_values = false
   end
@@ -72,7 +73,6 @@ protected
     #
     # 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

data/lib/gruff/base.rb

@@ -20,28 +20,28 @@ module Gruff
   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 +50,113 @@ 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
+    attr_writer :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
-
-    # 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
 
     # 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
+    attr_writer :use_data_label
 
     # 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 +168,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 +176,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,10 +191,23 @@ module Gruff
 
       @scale = @columns / @raw_columns
       @scale.freeze
+    end
+    protected :initialize_graph_scale
+
+    def initialize_store
+      @store = Gruff::Store.new(Gruff::Store::BaseData)
+    end
+    protected :initialize_store
 
+    # Initialize instance variable of attribures
+    #
+    # 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
@@ -235,14 +236,10 @@ 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)
     end
     protected :initialize_ivars
 
@@ -298,11 +295,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
@@ -413,9 +419,11 @@ module Gruff
     end
 
     # Return the graph as a rendered binary blob.
-    def to_blob(file_format = 'PNG')
+    #
+    # @param image_format [String] The image format of binary blob.
+    def to_blob(image_format = 'PNG')
       draw
-      Gruff::Renderer.to_blob(file_format)
+      Gruff::Renderer.to_blob(image_format)
     end
 
   protected
@@ -496,57 +504,17 @@ module Gruff
     # 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)
-
-        @graph_left = @left_margin + line_number_width + (@y_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN * 2)
-
-        # Make space for half the width of the rightmost column label.
-        # Might be greater than the number of columns if between-style bar markers are used.
-        last_label = @labels.keys.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
-
-        @graph_bottom_margin = @bottom_margin + @marker_caps_height + LABEL_MARGIN
-      end
-
-      @graph_right = @raw_columns - @graph_right_margin
-      @graph_width = @raw_columns - @graph_left - @graph_right_margin
+      @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 +524,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
 
@@ -580,17 +548,14 @@ module Gruff
       (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)
           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
@@ -613,27 +578,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
-
-      # 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
+      label_widths = calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
 
       current_x_offset = center(sum(label_widths.first))
       current_y_offset = begin
         if @legend_at_bottom
-          @graph_height + title_margin
+          @graph_height + @title_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 +595,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 +604,21 @@ 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
+          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
@@ -685,7 +636,7 @@ module Gruff
         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,11 +651,11 @@ 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)
+        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)
+          text_renderer.add_to_render_queue(1.0, 1.0, x_offset, y_offset, gravity)
         end
       end
     end
@@ -724,13 +675,13 @@ module Gruff
       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,6 +745,63 @@ module Gruff
 
   private
 
+    def setup_marker_caps_height
+      @hide_line_markers ? 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_line_markers
+
+      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)
+
+      @left_margin + line_number_width + (@y_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN * 2)
+    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)
+    end
+
+    def setup_bottom_margin
+      graph_bottom_margin = @hide_line_markers ? @bottom_margin : @bottom_margin + @marker_caps_height + LABEL_MARGIN
+
+      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)
       return text if text.size <= @label_max_size
 
@@ -838,6 +846,22 @@ module Gruff
       parts.join('.')
     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 sum(label_widths.last) > (@raw_columns * 0.9)
+          label_widths.push [label_widths.last.pop]
+        end
+      end
+
+      label_widths
+    end
+
     # Returns the height of the capital letter 'X' for the current font and
     # size.
     #