gruff 0.18.0-java → 0.20.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00db2218eaaafaa261ece0433671849fae44f4eccbf7e53fdb28767f11022ea
-  data.tar.gz: 904fe6ad5c4694308b20740e12adde7483b11f16eb7eea75061af57935a6c285
+  metadata.gz: 0470a845dea66723f512a991696cefcec76110bc625720c9de2e06b248968dfb
+  data.tar.gz: d6d93d5ac547d1b588e8b936b8faf1bdbdd86b1f6b05859c62569dcc2096ddf0
 SHA512:
-  metadata.gz: 2e33b0cfbbe2f1c99d8bca06a9914ce0e53b060d3b01434f2a3c15a49795fc2ba2b8dc94964c99cd548a8d466de865d92430f39d863f040ffa6d68ab8aadb28c
-  data.tar.gz: 7d6673cf33d50a250e9f1cde7d7caa23b2a0edcf9a780e0feb784f24dbac36eb768dee29409291e7968ca445a38ba06caea52c210678e50c429cfb1a39c635f4
+  metadata.gz: d57209f9c7dc7d3739feea9d1d1cfb41afd85db57d3723a768c17f37413f689becaabba7a119f33a97ed7e4fab7a4906c8a334a8d230cee537fa164d62cd3f01
+  data.tar.gz: 697e7f71c16e5c8d5351144b5cd9fff0bef80a7d9f2dee100dd5e6f90daf712ca041cf8acd581830de8763b697a9c8b66b7b3ddd51df7cd40ece16fac0bc37f7

data/.devcontainer/devcontainer.json

@@ -0,0 +1,26 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.0/containers/docker-existing-dockerfile
+{
+	"name": "Existing Dockerfile",
+
+	// Sets the run context to one level up instead of the .devcontainer folder.
+	"context": "..",
+
+	// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
+	"dockerFile": "../Dockerfile"
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Uncomment the next line to run commands after the container is created - for example installing curl.
+	// "postCreateCommand": "apt-get update && apt-get install -y curl",
+
+	// Uncomment when using a ptrace-based debugger like C++, Go, and Rust
+	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+
+	// Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
+	// "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
+
+	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
+	// "remoteUser": "vscode"
+}

data/.github/workflows/ci.yml

@@ -11,17 +11,17 @@ permissions:
 
 jobs:
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     name: Lint
     steps:
     - uses: actions/checkout@v3
       with:
         ref: ${{ github.event.pull_request.head.sha }}
-    - name: Set up Ruby 2.5
+    - name: Set up Ruby 2.6
       uses: ruby/setup-ruby@master
       with:
-        ruby-version: '2.5'
+        ruby-version: '2.6'
         bundler-cache: true
     - name: Install dependencies
       run: bundle install --path=vendor/bundle --jobs 4 --retry 3
@@ -31,13 +31,13 @@ jobs:
       run: bundle exec rubocop
 
   test-ruby:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
         imagemagick-version:
-          - { full: 7.1.0-39, major-minor: '7.0' }
+          - { full: 7.1.0-55, major-minor: '7.1' }
     name: Ruby ${{ matrix.ruby-version }}
     steps:
     - uses: actions/checkout@v3
@@ -63,11 +63,11 @@ jobs:
       run: bundle exec rake
 
   test-jruby:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['9.2.20.1', '9.3.4.0']
+        ruby-version: ['9.3.10.0', '9.4.2.0']
     name: JRuby ${{ matrix.ruby-version }}
     steps:
     - uses: actions/checkout@v3

data/.rubocop.yml

@@ -1,10 +1,11 @@
 require:
+  - rubocop-minitest
   - rubocop-performance
   - rubocop-rake
 
 AllCops:
     EnabledByDefault: true
-    TargetRubyVersion: 2.5
+    TargetRubyVersion: 2.6
     Exclude:
         - 'vendor/bundle/**/*'
         - 'rails_generators/gruff/**/*'
@@ -12,6 +13,12 @@ AllCops:
 Metrics:
   Enabled: false
 
+Gemspec/DependencyVersion:
+  Enabled: false
+
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
 Gemspec/OrderedDependencies:
   Enabled: false
 
@@ -21,6 +28,9 @@ Gemspec/RequiredRubyVersion:
 Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
+Layout/ClassStructure:
+  Enabled: false
+
 Layout/FirstMethodArgumentLineBreak:
   Enabled: false
 
@@ -111,11 +121,17 @@ Style/OptionHash:
 Style/RedundantBegin:
   Enabled: false
 
+Style/RequireOrder:
+  Enabled: false
+
 Style/SingleLineBlockParams:
   Enabled: false
 
 Style/StructInheritance:
   Enabled: false
 
+Style/YodaExpression:
+  Enabled: false
+
 Performance/ChainArrayAllocation:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 0.20.0
+- Fix legend position when blank labels present (#614)
+- Fixed NoMethodError (undefined method `format=' for Gruff::Line (#612)
+- Drop Ruby 2.5 support (#611)
+- Fix deprecation warning for Base#to_blob (#610)
+
+## 0.19.0
+- Draw the graph starting from zero point by default (#609)
+- Improve joints in Gruff::Net using polyline method (#608)
+- Improve joints in Gruff::Line using polyline method (#607)
+- Adjust default font size in Gruff::Mini::{Bar, Pie}
+
 ## 0.18.0
 - Add Gruff::Bubble (#604)
 - Rename Gruff::BoxPlot to Gruff::Box (#603)

data/README.md

@@ -1,6 +1,6 @@
 # Gruff Graphs
 
-[![Build Status](https://travis-ci.org/topfunky/gruff.svg?branch=master)](https://travis-ci.org/topfunky/gruff)
+[![CI](https://github.com/topfunky/gruff/actions/workflows/ci.yml/badge.svg)](https://github.com/topfunky/gruff/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/gruff.svg)](https://badge.fury.io/rb/gruff)
 
 A library for making beautiful graphs.

data/gruff.gemspec

@@ -17,19 +17,19 @@ Gem::Specification.new do |s|
   s.summary = 'Beautiful graphs for one or multiple datasets.'
   s.license = 'MIT'
   s.executables = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  s.specification_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
 
   if defined? JRUBY_VERSION
     s.platform = 'java'
     s.add_dependency 'rmagick4j'
   else
     s.add_dependency 'rmagick', '>= 4.2'
-    s.add_development_dependency 'rubocop', '~> 1.28.2'
-    s.add_development_dependency 'rubocop-performance', '~> 1.13.3'
+    s.add_development_dependency 'rubocop', '~> 1.50.2'
+    s.add_development_dependency 'rubocop-minitest', '~> 0.30.0'
+    s.add_development_dependency 'rubocop-performance', '~> 1.17.1'
     s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
   end
   s.add_dependency 'histogram'
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest-reporters'

data/lib/gruff/bar.rb

@@ -48,7 +48,7 @@ class Gruff::Bar < Gruff::Base
   #
   # 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)
+    raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' if (space_percent < 0) || (space_percent > 1)
 
     @spacing_factor = (1 - space_percent)
   end

data/lib/gruff/base.rb

@@ -218,7 +218,7 @@ module Gruff
     #   g.labels = ['2005', nil, nil, '2006', nil, nil, '2007', nil, nil, '2008'] # same labels for columns
     def labels=(labels)
       if labels.is_a?(Array)
-        labels = labels.each_with_index.each_with_object({}) do |(label, index), hash|
+        labels = labels.each_with_index.with_object({}) do |(label, index), hash|
           hash[index] = label
         end
       end
@@ -469,7 +469,8 @@ module Gruff
     #
     # Set it after you have given all your data to the graph object.
     def minimum_value
-      (@minimum_value || store.min).to_f
+      min = [0.0, store.min.to_f].min
+      (@minimum_value || min).to_f
     end
     attr_writer :minimum_value
 
@@ -521,9 +522,8 @@ module Gruff
     # @deprecated Please use +to_image.to_blob+ instead.
     def to_blob(image_format = 'PNG')
       warn '#to_blob is deprecated. Please use `to_image.to_blob` instead'
-      to_image.to_blob do
-        self.format = image_format
-      end
+      to_image.format = image_format
+      to_image.to_blob
     end
 
     # Draw a graph.
@@ -821,7 +821,7 @@ module Gruff
     end
 
     def clip_value_if_greater_than(value, max_value)
-      value > max_value ? max_value : value
+      [value, max_value].min
     end
 
     def significant(i)
@@ -907,7 +907,7 @@ module Gruff
       bottom_label_width = extra_left_room_for_long_label
 
       margin = line_number_width + y_axis_label_width
-      @left_margin + (margin > bottom_label_width ? margin : bottom_label_width)
+      @left_margin + [margin, bottom_label_width].max
     end
 
     def setup_right_margin
@@ -1035,7 +1035,7 @@ module Gruff
     def calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
       label_widths = [[]]
       label_lines = [[]]
-      legend_labels.each do |label|
+      legend_labels.reject(&:empty?).each do |label|
         width = calculate_width(@legend_font, label)
         label_width = width + (legend_square_width * 2.7)
         label_widths.last.push label_width
@@ -1129,7 +1129,7 @@ module Gruff
           -(width / 2.0)
         end
       end
-      y_offset = (height / 2.0) > margin ? (height / 2.0) : margin
+      y_offset = [(height / 2.0), margin].max
 
       [x_offset, y_offset]
     end

data/lib/gruff/bezier.rb

@@ -24,6 +24,9 @@ private
   def draw_graph
     x_increment = (@graph_width / (column_count - 1)).to_f
 
+    renderer_class = RUBY_PLATFORM == 'java' ? Gruff::Renderer::Polyline : Gruff::Renderer::Bezier
+    stroke_width = clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 4.0), 5.0)
+
     store.norm_data.each do |data_row|
       next if data_row[1].empty?
 
@@ -45,13 +48,7 @@ private
         draw_label(new_x, index)
       end
 
-      stroke_width = clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 4), 5.0)
-
-      if RUBY_PLATFORM == 'java'
-        Gruff::Renderer::Polyline.new(renderer, color: data_row.color, width: stroke_width).render(poly_points)
-      else
-        Gruff::Renderer::Bezier.new(renderer, color: data_row.color, width: stroke_width).render(poly_points)
-      end
+      renderer_class.new(renderer, color: data_row.color, width: stroke_width).render(poly_points)
     end
   end
 end

data/lib/gruff/box.rb

@@ -23,7 +23,7 @@ class Gruff::Box < Gruff::Base
   #
   # Default value is +0.8+.
   def spacing_factor=(space_percent)
-    raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' unless (space_percent >= 0) && (space_percent <= 1)
+    raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' if (space_percent < 0) || (space_percent > 1)
 
     @spacing_factor = (1 - space_percent)
   end
@@ -134,7 +134,7 @@ private
     end
 
     def median
-      if points.size.zero?
+      if points.empty?
         0
       elsif points.size.odd?
         points[points.size / 2]
@@ -144,7 +144,7 @@ private
     end
 
     def first_quartile
-      if points.size.zero?
+      if points.empty?
         0
       elsif points.size.odd?
         points[points.size / 4]
@@ -154,7 +154,7 @@ private
     end
 
     def third_quartile
-      if points.size.zero?
+      if points.empty?
         0
       elsif points.size.odd?
         points[(points.size * 3) / 4]

data/lib/gruff/candlestick.rb

@@ -33,7 +33,7 @@ class Gruff::Candlestick < Gruff::Base
   #
   # 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)
+    raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' if (space_percent < 0) || (space_percent > 1)
 
     @spacing_factor = (1 - space_percent)
   end
@@ -90,10 +90,10 @@ private
       Gruff::Renderer::Rectangle.new(renderer, color: color, opacity: @fill_opacity, width: @stroke_width).render(left_x, open_y, right_x, close_y)
 
       low_y, = conversion.get_top_bottom_scaled(candlestick.low)
-      y = open_y < close_y ? close_y : open_y
+      y = [open_y, close_y].max
       Gruff::Renderer::Line.new(renderer, color: color, width: @stroke_width).render(center_x, low_y, center_x, y)
       high_y, = conversion.get_top_bottom_scaled(candlestick.high)
-      y = open_y > close_y ? close_y : open_y
+      y = [open_y, close_y].min
       Gruff::Renderer::Line.new(renderer, color: color, width: @stroke_width).render(center_x, y, center_x, high_y)
     end
   end

data/lib/gruff/dot.rb

@@ -29,7 +29,7 @@ private
 
     items_width = @graph_height / column_count
     item_width = items_width * spacing_factor / store.length
-    padding = (items_width * (1 - spacing_factor)) / 2
+    padding = (items_width * (1 - spacing_factor)) / 2.0
 
     store.norm_data.each_with_index do |data_row, row_index|
       data_row.points.each_with_index do |data_point, point_index|

data/lib/gruff/line.rb

@@ -208,12 +208,15 @@ private
       draw_vertical_reference_line(curr_reference_line) if curr_reference_line.key?(:index)
     end
 
-    store.norm_data.each do |data_row|
-      prev_x = prev_y = nil
+    stroke_width  = @line_width || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 4.0), 5.0)
+    circle_radius = @dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 2.5), 5.0)
 
-      one_point = contains_one_point_only?(data_row)
+    store.norm_data.each do |data_row|
+      poly_points_group = [[]]
 
       data_row.coordinates.each_with_index do |(x_data, y_data), index|
+        poly_points = poly_points_group.last
+
         new_x = begin
           if x_data.nil?
             # use the old method: equally spaced points along the x-axis
@@ -224,28 +227,27 @@ private
         end
         draw_label_for_x_data(x_data, new_x, index)
 
-        unless y_data # we can't draw a line for a null data point, we can still label the axis though
-          prev_x = prev_y = nil
+        unless y_data
+          # we can't draw a line for a null data point, we can still label the axis though.
+          # Split the polygonal line into separate groups of points for polyline.
+          poly_points_group << []
           next
         end
 
         new_y = @graph_top + (@graph_height - (y_data * @graph_height))
 
-        # Reset each time to avoid thin-line errors
-        stroke_width  = @line_width || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 4), 5.0)
-        circle_radius = @dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 2.5), 5.0)
+        poly_points << new_x
+        poly_points << new_y
 
-        if !@hide_lines && prev_x && prev_y
-          Gruff::Renderer::Line.new(renderer, color: data_row.color, width: stroke_width)
-                               .render(prev_x, prev_y, new_x, new_y)
-        end
-
-        if one_point || !@hide_dots
+        if contains_one_point_only?(data_row) || !@hide_dots
           Gruff::Renderer::Dot.new(renderer, @dot_style, color: data_row.color, width: stroke_width).render(new_x, new_y, circle_radius)
         end
+      end
 
-        prev_x = new_x
-        prev_y = new_y
+      unless @hide_lines
+        poly_points_group.each do |poly_points|
+          Gruff::Renderer::Polyline.new(renderer, color: data_row.color, width: stroke_width).render(poly_points) unless poly_points.empty?
+        end
       end
     end
   end

data/lib/gruff/mini/bar.rb

@@ -12,36 +12,31 @@
 #   g.data :Science, [2, 15, 8, 11]
 #   g.write('mini_bar.png')
 #
-module Gruff
-  module Mini
-    # A class for drawing a small bar graph.
-    class Bar < Gruff::Bar
-    private
+class Gruff::Mini::Bar < Gruff::Bar
+private
 
-      include Gruff::Mini::Legend
+  include Gruff::Mini::Legend
 
-      def initialize_attributes
-        super
+  def initialize_attributes
+    super
 
-        @hide_legend = true
-        @hide_title = true
-        @hide_line_numbers = true
+    @hide_legend = true
+    @hide_title = true
+    @hide_line_numbers = true
 
-        @marker_font.size = 50.0
-        @legend_font.size = 60.0
+    @marker_font.size = 50.0
+    @legend_font.size = 50.0
 
-        @minimum_value = 0.0
-      end
+    @minimum_value = 0.0
+  end
 
-      def setup_data
-        expand_canvas_for_vertical_legend
-        super
-      end
+  def setup_data
+    expand_canvas_for_vertical_legend
+    super
+  end
 
-      def draw_graph
-        super
-        draw_vertical_legend
-      end
-    end
+  def draw_graph
+    super
+    draw_vertical_legend
   end
 end

data/lib/gruff/mini/legend.rb

@@ -1,110 +1,98 @@
 # frozen_string_literal: true
 
-module Gruff
-  module Mini
-    # A module to handle the small legend.
-    # @private
-    module Legend
-      attr_accessor :hide_mini_legend, :legend_position
-
-      def initialize(*)
-        @hide_mini_legend = false
-        @legend_position = nil
-        super
-      end
-
-      ##
-      # The canvas needs to be bigger so we can put the legend beneath it.
-
-      def expand_canvas_for_vertical_legend
-        return if @hide_mini_legend
-
-        @legend_labels = store.data.map(&:label)
-
-        legend_height = scale((store.length * calculate_line_height) + @top_margin + @bottom_margin)
-
-        @original_rows = @raw_rows
-        @original_columns = @raw_columns
-
-        case @legend_position
-        when :right
-          @rows = [@rows, legend_height].max
-          @columns += calculate_legend_width + @left_margin
-        else
-          font = @legend_font.dup
-          font.size = scale(font.size)
-          @rows += store.length * calculate_caps_height(font) * 1.7
-        end
-
-        @renderer = Gruff::Renderer.new(@columns, @rows, @scale, @theme_options)
-      end
-
-      def calculate_line_height
-        calculate_caps_height(@legend_font) * 1.7
-      end
-
-      def calculate_legend_width
-        width = @legend_labels.map { |label| calculate_width(@legend_font, label) }.max
-        scale(width + (40 * 1.7))
-      end
-
-      ##
-      # Draw the legend beneath the existing graph.
-
-      def draw_vertical_legend
-        return if @hide_mini_legend
-
-        legend_square_width = 40.0 # small square with color of this item
-        @legend_left_margin = 100.0
-        legend_top_margin = 40.0
-
-        case @legend_position
-        when :right
-          current_x_offset = @original_columns + @left_margin
-          current_y_offset = @top_margin + legend_top_margin
-        else
-          current_x_offset = @legend_left_margin
-          current_y_offset = @original_rows + legend_top_margin
-        end
-
-        @legend_labels.each_with_index do |legend_label, index|
-          # Draw label
-          x_offset = current_x_offset + (legend_square_width * 1.7)
-          label = truncate_legend_label(legend_label, x_offset)
-          text_renderer = Gruff::Renderer::Text.new(renderer, label, font: @legend_font)
-          text_renderer.add_to_render_queue(@raw_columns, 1.0, x_offset, current_y_offset, Magick::WestGravity)
-
-          # 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 - (legend_square_width / 2.0),
-                               current_x_offset + legend_square_width,
-                               current_y_offset + (legend_square_width / 2.0))
-
-          current_y_offset += calculate_line_height
-        end
-      end
-
-      ##
-      # Shorten long labels so they will fit on the canvas.
-      #
-      #   Department of Hu...
-
-      def truncate_legend_label(label, x_offset)
-        truncated_label = label.to_s
-
-        font = @legend_font.dup
-        font.size = scale(font.size)
-        max_width = @columns - scale(x_offset) - @right_margin
-        while calculate_width(font, "#{truncated_label}...") > max_width && truncated_label.length > 1
-          truncated_label = truncated_label[0..truncated_label.length - 2]
-        end
-        truncated_label + (truncated_label.length < label.to_s.length ? '...' : '')
-      end
-
-      def scale(value)
-        value * @scale
-      end
+# A module to handle the small legend.
+# @private
+module Gruff::Mini::Legend
+  attr_accessor :hide_mini_legend, :legend_position
+
+  def initialize(*)
+    @hide_mini_legend = false
+    @legend_position = nil
+    super
+  end
+
+  # The canvas needs to be bigger so we can put the legend beneath it.
+  def expand_canvas_for_vertical_legend
+    return if @hide_mini_legend
+
+    @legend_labels = store.data.map(&:label)
+
+    legend_height = scale((store.length * calculate_line_height) + @top_margin + @bottom_margin)
+
+    @original_rows = @raw_rows
+    @original_columns = @raw_columns
+
+    case @legend_position
+    when :right
+      @rows = [@rows, legend_height].max
+      @columns += calculate_legend_width + @left_margin
+    else
+      font = @legend_font.dup
+      font.size = scale(font.size)
+      @rows += store.length * calculate_caps_height(font) * 1.7
+    end
+
+    @renderer = Gruff::Renderer.new(@columns, @rows, @scale, @theme_options)
+  end
+
+  def calculate_line_height
+    calculate_caps_height(@legend_font) * 1.7
+  end
+
+  def calculate_legend_width
+    width = @legend_labels.map { |label| calculate_width(@legend_font, label) }.max
+    scale(width + (40 * 1.7))
+  end
+
+  # Draw the legend beneath the existing graph.
+  def draw_vertical_legend
+    return if @hide_mini_legend
+
+    legend_square_width = 40.0 # small square with color of this item
+    @legend_left_margin = 100.0
+    legend_top_margin = 40.0
+
+    case @legend_position
+    when :right
+      current_x_offset = @original_columns + @left_margin
+      current_y_offset = @top_margin + legend_top_margin
+    else
+      current_x_offset = @legend_left_margin
+      current_y_offset = @original_rows + legend_top_margin
     end
+
+    @legend_labels.each_with_index do |legend_label, index|
+      # Draw label
+      x_offset = current_x_offset + (legend_square_width * 1.7)
+      label = truncate_legend_label(legend_label, x_offset)
+      text_renderer = Gruff::Renderer::Text.new(renderer, label, font: @legend_font)
+      text_renderer.add_to_render_queue(@raw_columns, 1.0, x_offset, current_y_offset, Magick::WestGravity)
+
+      # 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 - (legend_square_width / 2.0),
+                           current_x_offset + legend_square_width,
+                           current_y_offset + (legend_square_width / 2.0))
+
+      current_y_offset += calculate_line_height
+    end
+  end
+
+  # Shorten long labels so they will fit on the canvas.
+  def truncate_legend_label(label, x_offset)
+    truncated_label = label.to_s
+
+    font = @legend_font.dup
+    font.size = scale(font.size)
+    max_width = @columns - scale(x_offset) - @right_margin
+    while calculate_width(font, "#{truncated_label}...") > max_width && truncated_label.length > 1
+      truncated_label = truncated_label[0..truncated_label.length - 2]
+    end
+    truncated_label + (truncated_label.length < label.to_s.length ? '...' : '')
+  end
+
+  def scale(value)
+    value * @scale
   end
 end

data/lib/gruff/mini/pie.rb

@@ -11,34 +11,29 @@
 #   g.data 'Hamburgers', 50
 #   g.write("mini_pie_keynote.png")
 #
-module Gruff
-  module Mini
-    # A class for drawing a small pie graph.
-    class Pie < Gruff::Pie
-    private
+class Gruff::Mini::Pie < Gruff::Pie
+private
 
-      include Gruff::Mini::Legend
+  include Gruff::Mini::Legend
 
-      def initialize_attributes
-        super
+  def initialize_attributes
+    super
 
-        @hide_legend = true
-        @hide_title = true
-        @hide_line_numbers = true
+    @hide_legend = true
+    @hide_title = true
+    @hide_line_numbers = true
 
-        @marker_font.size = 60.0
-        @legend_font.size = 60.0
-      end
+    @marker_font.size = 50.0
+    @legend_font.size = 50.0
+  end
 
-      def setup_data
-        expand_canvas_for_vertical_legend
-        super
-      end
+  def setup_data
+    expand_canvas_for_vertical_legend
+    super
+  end
 
-      def draw_graph
-        super
-        draw_vertical_legend
-      end
-    end
+  def draw_graph
+    super
+    draw_vertical_legend
   end
 end

data/lib/gruff/mini/side_bar.rb

@@ -19,33 +19,28 @@
 #   g.data :Science, [2, 15, 8, 11]
 #   g.write('mini_sidebar.png')
 #
-module Gruff
-  module Mini
-    # A class for drawing a small side bar graph.
-    class SideBar < Gruff::SideBar
-    private
+class Gruff::Mini::SideBar < Gruff::SideBar
+private
 
-      include Gruff::Mini::Legend
+  include Gruff::Mini::Legend
 
-      def initialize_attributes
-        super
-        @hide_legend = true
-        @hide_title = true
-        @hide_line_numbers = true
+  def initialize_attributes
+    super
+    @hide_legend = true
+    @hide_title = true
+    @hide_line_numbers = true
 
-        @marker_font.size = 50.0
-        @legend_font.size = 50.0
-      end
+    @marker_font.size = 50.0
+    @legend_font.size = 50.0
+  end
 
-      def setup_data
-        expand_canvas_for_vertical_legend
-        super
-      end
+  def setup_data
+    expand_canvas_for_vertical_legend
+    super
+  end
 
-      def draw_graph
-        super
-        draw_vertical_legend
-      end
-    end
+  def draw_graph
+    super
+    draw_vertical_legend
   end
 end

data/lib/gruff/net.rb

@@ -60,6 +60,8 @@ private
 
   def draw_graph
     store.norm_data.each do |data_row|
+      poly_points = []
+
       data_row.points.each_with_index do |data_point, index|
         next if data_point.nil?
 
@@ -67,6 +69,10 @@ private
         point_distance = data_point * @radius
         start_x = @center_x + (Math.sin(rad_pos) * point_distance)
         start_y = @center_y - (Math.cos(rad_pos) * point_distance)
+        if poly_points.empty?
+          poly_points << start_x
+          poly_points << start_y
+        end
 
         next_index = index + 1 < data_row.points.length ? index + 1 : 0
 
@@ -74,14 +80,16 @@ private
         next_point_distance = data_row.points[next_index] * @radius
         end_x = @center_x + (Math.sin(next_rad_pos) * next_point_distance)
         end_y = @center_y - (Math.cos(next_rad_pos) * next_point_distance)
-
-        Gruff::Renderer::Line.new(renderer, color: data_row.color, width: @stroke_width).render(start_x, start_y, end_x, end_y)
+        poly_points << end_x
+        poly_points << end_y
 
         unless @hide_dots
           circle_renderer = Gruff::Renderer::Circle.new(renderer, color: data_row.color, width: @stroke_width)
           circle_renderer.render(start_x, start_y, start_x - @circle_radius, start_y)
         end
       end
+
+      Gruff::Renderer::Polyline.new(renderer, color: data_row.color, width: @stroke_width).render(poly_points) unless poly_points.empty?
     end
   end
 

data/lib/gruff/patch/rmagick.rb

@@ -7,8 +7,8 @@ module Magick
     refine Draw do
       # Additional method to scale annotation text since Draw.scale doesn't.
       def annotate_scaled(img, width, height, x, y, text, scale)
-        scaled_width = (width * scale) >= 1 ? (width * scale) : 1
-        scaled_height = (height * scale) >= 1 ? (height * scale) : 1
+        scaled_width = [(width * scale), 1].max
+        scaled_height = [(height * scale), 1].max
 
         annotate(img,
                  scaled_width, scaled_height,

data/lib/gruff/renderer/bezier.rb

@@ -11,8 +11,8 @@ module Gruff
 
     def render(points)
       @renderer.draw.push
-      @renderer.draw.stroke(@color)
       @renderer.draw.stroke_width(@width)
+      @renderer.draw.stroke(@color)
       @renderer.draw.fill_opacity(0.0)
       @renderer.draw.bezier(*points)
       @renderer.draw.pop

data/lib/gruff/renderer/circle.rb

@@ -12,10 +12,10 @@ module Gruff
 
     def render(origin_x, origin_y, perim_x, perim_y)
       @renderer.draw.push
-      @renderer.draw.fill(@color)
-      @renderer.draw.fill_opacity(@opacity)
-      @renderer.draw.stroke(@color)
       @renderer.draw.stroke_width(@width)
+      @renderer.draw.stroke(@color)
+      @renderer.draw.fill_opacity(@opacity)
+      @renderer.draw.fill(@color)
       @renderer.draw.circle(origin_x, origin_y, perim_x, perim_y)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/dash_line.rb

@@ -13,9 +13,9 @@ module Gruff
     def render(start_x, start_y, end_x, end_y)
       @renderer.draw.push
       @renderer.draw.stroke_color(@color)
-      @renderer.draw.fill_opacity(0.0)
       @renderer.draw.stroke_dasharray(*@dasharray)
       @renderer.draw.stroke_width(@width)
+      @renderer.draw.fill_opacity(0.0)
       @renderer.draw.line(start_x, start_y, end_x, end_y)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/dot.rb

@@ -15,8 +15,8 @@ module Gruff
       @renderer.draw.push
       @renderer.draw.stroke_width(@width)
       @renderer.draw.stroke(@color)
-      @renderer.draw.fill(@color)
       @renderer.draw.fill_opacity(@opacity)
+      @renderer.draw.fill(@color)
       case @style.to_sym
       when :square
         square(new_x, new_y, radius)

data/lib/gruff/renderer/line.rb

@@ -30,9 +30,9 @@ module Gruff
       end
 
       @renderer.draw.push
+      @renderer.draw.stroke_width(@width) if @width
       @renderer.draw.stroke(color)
       @renderer.draw.fill(color)
-      @renderer.draw.stroke_width(@width) if @width
       @renderer.draw.line(start_x, start_y, end_x, end_y)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/polygon.rb

@@ -14,8 +14,8 @@ module Gruff
       @renderer.draw.push
       @renderer.draw.stroke_width(@width)
       @renderer.draw.stroke(@color)
-      @renderer.draw.fill(@color)
       @renderer.draw.fill_opacity(@opacity)
+      @renderer.draw.fill(@color)
       @renderer.draw.polygon(*points)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/polyline.rb

@@ -3,17 +3,19 @@
 module Gruff
   # @private
   class Renderer::Polyline
-    def initialize(renderer, color:, width:)
+    def initialize(renderer, color:, width: 1.0, linejoin: 'bevel')
       @renderer = renderer
       @color = color
       @width = width
+      @linejoin = linejoin
     end
 
     def render(points)
       @renderer.draw.push
+      @renderer.draw.stroke_linejoin(@linejoin)
+      @renderer.draw.stroke_width(@width)
       @renderer.draw.stroke(@color)
       @renderer.draw.fill('transparent')
-      @renderer.draw.stroke_width(@width)
       @renderer.draw.polyline(*points)
       @renderer.draw.pop
     end

data/lib/gruff/scatter.rb

@@ -142,6 +142,9 @@ private
   end
 
   def draw_graph
+    stroke_width  = @stroke_width  || clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 4.0), 5.0)
+    circle_radius = @circle_radius || clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 2.5), 5.0)
+
     store.norm_data.each do |data_row|
       data_row.coordinates.each do |x_value, y_value|
         next if y_value.nil? || x_value.nil?
@@ -149,9 +152,6 @@ private
         new_x = @graph_left + (x_value * @graph_width)
         new_y = @graph_bottom - (y_value * @graph_height)
 
-        # Reset each time to avoid thin-line errors
-        stroke_width  = @stroke_width  || clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 4.0), 5.0)
-        circle_radius = @circle_radius || clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 2.5), 5.0)
         Gruff::Renderer::Circle.new(renderer, color: data_row.color, width: stroke_width).render(new_x, new_y, new_x - circle_radius, new_y)
       end
     end

data/lib/gruff/stacked_bar.rb

@@ -78,7 +78,7 @@ private
     #
     # Columns sit stacked.
     bar_width = @graph_width / column_count
-    padding = (bar_width * (1 - @bar_spacing)) / 2
+    padding = (bar_width * (1 - @bar_spacing)) / 2.0
 
     # Setup the BarConversion Object
     conversion = Gruff::BarConversion.new(

data/lib/gruff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gruff
-  VERSION = '0.18.0'
+  VERSION = '0.20.0'
 end

data/lib/gruff.rb

@@ -45,6 +45,7 @@ module Gruff
   autoload :Layer, Gruff.libpath('scene')
   autoload :Themes, Gruff.libpath('themes')
 
+  # @private
   class Renderer
     autoload :Bezier, Gruff.libpath('renderer/bezier')
     autoload :Circle, Gruff.libpath('renderer/circle')
@@ -58,12 +59,14 @@ module Gruff
     autoload :Text, Gruff.libpath('renderer/text')
   end
 
+  # @private
   class Store
     autoload :BasicData, Gruff.libpath('store/basic_data')
     autoload :XYData, Gruff.libpath('store/xy_data')
     autoload :XYPointsizeData, Gruff.libpath('store/xy_pointsizes_data')
   end
 
+  # A module for small graphs
   module Mini
     autoload :Bar, Gruff.libpath('mini/bar')
     autoload :Legend, Gruff.libpath('mini/legend')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.20.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-26 00:00:00.000000000 Z
+date: 2023-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/devcontainer.json"
 - ".editorconfig"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/workflows/ci.yml"
@@ -182,14 +183,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.