gruff 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aafd0b8a799ce4587742f327c4a9dfe8dd993b16a78c31572eb20bd61079b6c2
-  data.tar.gz: 3ad0c1459a791f1f16ebeeb270c0785fb53057e60a12db0f1427b3a777388aaa
+  metadata.gz: e181e214f060da981e6c156e2d6944cd95d4027755508ecc7e2b21a04a167f10
+  data.tar.gz: 07a12faf510f8210d5265f1b1861a9996df22d57cc17141c4d7e3406ffccccc7
 SHA512:
-  metadata.gz: 02aa6b7edbe83b1498a015c12414a47d9923c1a661fecce9c9bfc44cda06753e7180e7c1c223c6efaaac0fbc9f76fd0d3126189de49d50a1fd8aa244151cfcd9
-  data.tar.gz: 2929fe565e5e8a1c14f81f1823ade644b7decccc085653753159d1b9154e76d5a8626f7edf41175e774f0aa7445645028c522302497d3a139bef8a54c9889b61
+  metadata.gz: 1bf50811b2efbfe2020b1b68dbc1547f6c60e25e4d1de62f327f920944b158fe210d0b24da4687ea2cf66c0952bae37a9b6d1fd7d8f9bc5ac5d91b4943db1e73
+  data.tar.gz: 585d55b1c181ec016e8add6ca4499f500adcc4ab805fef949c703a913f138d1735ca364271d52c0096d18a4da47c13204b5dde97d55ca9e1bceeeabfd6531b54

data/.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         ruby-version: ['4.0']
         imagemagick-version:
-          - { full: 7.1.2-10, major-minor: '7.1' }
+          - { full: 7.1.2-22, major-minor: '7.1' }
     name: Lint (Ruby ${{ matrix.ruby-version }}, ImageMagick ${{ matrix.imagemagick-version.major-minor }})
     steps:
     - uses: actions/checkout@v6
@@ -51,7 +51,7 @@ jobs:
       matrix:
         ruby-version: ['4.0']
         imagemagick-version:
-          - { full: 7.1.2-10, major-minor: '7.1' }
+          - { full: 7.1.2-22, major-minor: '7.1' }
     name: Check RBS (Ruby ${{ matrix.ruby-version }}, ImageMagick ${{ matrix.imagemagick-version.major-minor }})
     steps:
     - uses: actions/checkout@v6
@@ -87,7 +87,7 @@ jobs:
       matrix:
         ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
         imagemagick-version:
-          - { full: 7.1.2-10, major-minor: '7.1' }
+          - { full: 7.1.2-22, major-minor: '7.1' }
     name: Ruby ${{ matrix.ruby-version }}
     steps:
     - uses: actions/checkout@v6

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## 0.32.0
+### Added
+* Add floating legend support (#679)
+  * The legend is now rendered as a modern floating box over the graph area by default.
+  * `legend_position=`
+    * Allows setting the corner position of the floating legend. Accepts `:top_right` (default), `:top_left`, `:bottom_right`, or `:bottom_left`.
+  * `legend_spacing=`
+    * Sets the vertical spacing between individual legend items (default: `5.0`).
+  * `legend_padding=`
+    * Sets the inner padding between the legend frame and its contents (default: `7.0`).
+  * Tweaked default sizes for a cleaner look
+    * `legend_font` size reduced to `12.0`, `legend_box_size` to `10.0`, and `legend_margin` to `10.0`.
+
+### Deprecated
+* `legend_at_bottom=`
+  * This attribute is deprecated and no longer has any effect. Use `legend_position = :bottom_left` or `:bottom_right` instead.
+
 ## 0.31.0
 
 - RBS: Add missing RBS signatures (#677)

data/lib/gruff/bar.rb

@@ -90,11 +90,6 @@ private
     @hide_line_markers && @y_axis_label.nil?
   end
 
-  # @rbs return: bool
-  def hide_bottom_label_area?
-    hide_labels? && @x_axis_label.nil? && @legend_at_bottom == false
-  end
-
   # @rbs return: void
   def setup_graph_measurements
     super

data/lib/gruff/base.rb

@@ -23,7 +23,7 @@ module Gruff
   # A common base class inherited from class of drawing a graph.
   class Base
     # Space around text elements. Mostly used for vertical spacing.
-    LEGEND_MARGIN = 20.0
+    LEGEND_MARGIN = 10.0
     TITLE_MARGIN = 20.0
     LABEL_MARGIN = 15.0
     DEFAULT_MARGIN = 20.0
@@ -48,9 +48,6 @@ module Gruff
     # Blank space below the title. Default is +20+.
     attr_writer :title_margin #: Float | Integer
 
-    # Blank space below the legend. Default is +20+.
-    attr_writer :legend_margin #: Float | Integer
-
     # Truncates labels if longer than max specified.
     attr_writer :label_max_size #: Float | Integer
 
@@ -115,13 +112,16 @@ module Gruff
     # first. This does not affect the legend. Default is +false+.
     attr_writer :sorted_drawing #: bool
 
-    # Display the legend under the graph. Default is +false+.
-    attr_writer :legend_at_bottom #: bool
+    # Blank space below the legend. Default is +20+.
+    attr_writer :legend_margin #: Float | Integer
 
-    # 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.
+    # Set the vertical spacing between individual legend items. Default is +5.0+.
+    attr_writer :legend_spacing #: Float | Integer
+
+    # Set the inner padding between the legend frame and its contents. Default is +7.0+.
+    attr_writer :legend_padding #: Float | Integer
+
+    # Optionally set the size of the colored box by each item in the legend. Default is +20.0+.
     attr_writer :legend_box_size #: Float | Integer
 
     # If one numerical argument is given, the graph is drawn at 4/3 ratio
@@ -190,19 +190,22 @@ module Gruff
 
       @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)
+      @legend_font = Gruff::Font.new(size: 12.0)
       @no_data_font = Gruff::Font.new(size: 80.0)
 
       @label_margin = LABEL_MARGIN
       @top_margin = @bottom_margin = @left_margin = @right_margin = DEFAULT_MARGIN
-      @legend_margin = LEGEND_MARGIN
       @title_margin = TITLE_MARGIN
 
-      @legend_box_size = 20.0
+      @legend_margin = LEGEND_MARGIN
+      @legend_spacing = 5.0
+      @legend_padding = 7.0
+      @legend_box_size = 10.0
+      @legend_position = :top_right
 
       @no_data_message = 'No Data'
 
-      @hide_line_markers = @hide_legend = @hide_title = @hide_line_numbers = @legend_at_bottom = false
+      @hide_line_markers = @hide_legend = @hide_title = @hide_line_numbers = false
       @label_max_size = 0
       @label_truncation_style = :absolute
       @label_rotation = 0
@@ -255,6 +258,20 @@ module Gruff
       @label_rotation = rotation.to_f
     end
 
+    # Set the corner position of the floating legend. Accepts +:top_right+ (default),
+    # +:top_left+, +:bottom_right+, or +:bottom_left+.
+    #
+    # @param position [Symbol] the position.
+    # @rbs position: Symbol
+    # @rbs return: void
+    def legend_position=(position)
+      unless %i[top_right top_left bottom_right bottom_left].include?(position)
+        raise ArgumentError, 'Invalid legend position. Must be :top_right, :top_left, :bottom_right, or :bottom_left.'
+      end
+
+      @legend_position = position
+    end
+
     # Height of staggering between labels.
     # @deprecated
     # @rbs return: void
@@ -262,6 +279,13 @@ module Gruff
       warn '#label_stagger_height= is deprecated. It is no longer effective.'
     end
 
+    # Set the legend position to the bottom of the graph.
+    # @deprecated
+    # @rbs return: void
+    def legend_at_bottom=(_value)
+      warn '#legend_at_bottom= is deprecated. It is no longer effective.'
+    end
+
     # Set the large title of the graph displayed at the top.
     # You can draw a multi-line title by putting a line break in the string
     # or by setting an array as argument.
@@ -629,11 +653,11 @@ module Gruff
 
       setup_drawing
 
-      draw_legend
       draw_line_markers
       draw_axis_labels
       draw_title
       draw_graph
+      draw_legend
     end
 
   protected
@@ -822,46 +846,57 @@ module Gruff
     def draw_legend
       return if @hide_legend
 
-      legend_labels = store.data.map(&:label)
-      legend_square_width = @legend_box_size # small square with color of this item
-      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_y_offset = begin
-        if @legend_at_bottom
-          @graph_bottom + @legend_margin + labels_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
-        end
+      legend_labels = store.data.map(&:label).reject(&:empty?)
+      return if legend_labels.empty?
+
+      line_height = [legend_caps_height, @legend_box_size].max + @legend_spacing
+      max_legend_label_width = legend_labels.map { |l| calculate_width(@legend_font, l) }.max || 0.0
+
+      legend_content_width  = (@legend_box_size * 1.5) + max_legend_label_width
+      legend_content_height = (line_height * (legend_labels.size - 1)) + @legend_box_size
+
+      case @legend_position
+      when :top_left
+        current_x_offset = @graph_left + @legend_margin
+        current_y_offset = @graph_top  + @legend_margin + @legend_spacing
+      when :bottom_right
+        current_x_offset = @graph_right  - @legend_margin - legend_content_width
+        current_y_offset = @graph_bottom - @legend_margin - legend_content_height
+      when :bottom_left
+        current_x_offset = @graph_left + @legend_margin
+        current_y_offset = @graph_bottom - @legend_margin - legend_content_height
+      else # :top_right (default)
+        current_x_offset = @graph_right - @legend_margin - legend_content_width
+        current_y_offset = @graph_top + @legend_margin + @legend_spacing
       end
 
-      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
+      legend_items_end_x = current_x_offset + legend_content_width
+      legend_items_end_y = current_y_offset + legend_content_height
+
+      frame_renderer = Gruff::Renderer::Rectangle.new(renderer, color: @marker_color, width: 1.1, opacity: 0.2, round: true)
+      frame_renderer.render(current_x_offset - @legend_padding,
+                            current_y_offset - @legend_padding,
+                            legend_items_end_x + @legend_padding,
+                            legend_items_end_y + @legend_padding)
+
+      store.data.each do |data_row|
+        legend_label = data_row.label
+        next if legend_label.empty?
+
+        legend_label_width = calculate_width(@legend_font, legend_label)
+
+        text_renderer = Gruff::Renderer::Text.new(renderer, legend_label, font: @legend_font)
+        text_renderer.add_to_render_queue(legend_label_width,
+                                          @legend_box_size,
+                                          current_x_offset + (@legend_box_size * 1.5),
+                                          current_y_offset,
+                                          Magick::CenterGravity)
+
+        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: data_row.color)
+        rect_renderer.render(current_x_offset,
+                             current_y_offset,
+                             current_x_offset + @legend_box_size,
+                             current_y_offset + @legend_box_size)
 
         current_y_offset += line_height
       end
@@ -1123,14 +1158,12 @@ module Gruff
       # 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)
     end
 
     # @rbs return: Float
     def setup_bottom_margin
       graph_bottom_margin = hide_bottom_label_area? ? @bottom_margin : @bottom_margin + labels_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 * 2)
       @raw_rows - graph_bottom_margin - x_axis_label_height
@@ -1211,42 +1244,6 @@ module Gruff
       end
     end
 
-    # @rbs legend_labels: Array[String]
-    # @rbs legend_square_width: Float | Integer
-    # @rbs return: Array[Array[Float | Integer]]
-    def calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
-      label_widths = [[]]
-      label_lines = [[]]
-      legend_labels.each do |label|
-        if label.empty?
-          label_width = 0.0
-        else
-          width = calculate_width(@legend_font, label)
-          label_width = width + (legend_square_width * 2.7)
-        end
-        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.map(&:sum).zip(label_lines)
-    end
-
-    # @rbs return: Float
-    def calculate_legend_height
-      return 0.0 if @hide_legend
-
-      legend_labels = store.data.map(&:label)
-      legend_label_lines = calculate_legend_label_widths_for_each_line(legend_labels, @legend_box_size)
-      line_height = [legend_caps_height, @legend_box_size].max
-
-      (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
     # size.
     #

data/lib/gruff/dot.rb

@@ -45,11 +45,6 @@ private
     hide_labels? && @y_axis_label.nil?
   end
 
-  # @rbs return: bool
-  def hide_bottom_label_area?
-    @hide_line_markers && @x_axis_label.nil? && @legend_at_bottom == false
-  end
-
   # @rbs return: void
   def draw_graph
     # Setup spacing.

data/lib/gruff/renderer/rectangle.rb

@@ -9,12 +9,14 @@ module Gruff
     # @rbs color: String
     # @rbs width: Float | Integer
     # @rbs opacity: Float | Integer
+    # @rbs round: bool
     # @rbs return: void
-    def initialize(renderer, color: nil, width: 1.0, opacity: 1.0)
+    def initialize(renderer, color: nil, width: 1.0, opacity: 1.0, round: false)
       @renderer = renderer
       @color = color
       @width = width
       @opacity = opacity
+      @round = round
     end
 
     # @rbs upper_left_x: Float | Integer
@@ -25,10 +27,17 @@ module Gruff
     def render(upper_left_x, upper_left_y, lower_right_x, lower_right_y)
       @renderer.draw.push
       @renderer.draw.stroke_width(@width)
-      @renderer.draw.stroke(@color) if @color && @width > 1.0
-      @renderer.draw.fill_opacity(@opacity)
-      @renderer.draw.fill(@color) if @color
-      @renderer.draw.rectangle(upper_left_x, upper_left_y, lower_right_x, lower_right_y)
+      if @color
+        @renderer.draw.stroke(@color) if @width > 1.0
+        @renderer.draw.fill_opacity(@opacity)
+        @renderer.draw.fill(@color)
+      end
+
+      if @round
+        @renderer.draw.roundrectangle(upper_left_x, upper_left_y, lower_right_x, lower_right_y, 3, 3)
+      else
+        @renderer.draw.rectangle(upper_left_x, upper_left_y, lower_right_x, lower_right_y)
+      end
       @renderer.draw.pop
     end
   end

data/lib/gruff/side_bar.rb

@@ -83,11 +83,6 @@ private
     hide_labels? && @y_axis_label.nil?
   end
 
-  # @rbs return: bool
-  def hide_bottom_label_area?
-    @hide_line_markers && @x_axis_label.nil? && @legend_at_bottom == false
-  end
-
   # @rbs return: void
   def setup_graph_measurements
     super

data/lib/gruff/stacked_bar.rb

@@ -134,11 +134,6 @@ private
     @hide_line_markers && @y_axis_label.nil?
   end
 
-  # @rbs return: bool
-  def hide_bottom_label_area?
-    hide_labels? && @x_axis_label.nil? && @legend_at_bottom == false
-  end
-
   # @rbs return: Proc
   def proc_text_metrics
     ->(text) { text_metrics(@marker_font, text) }

data/lib/gruff/version.rb

@@ -3,5 +3,5 @@
 # rbs_inline: enabled
 
 module Gruff
-  VERSION = '0.31.0'
+  VERSION = '0.32.0'
 end

data/sig/generated/gruff/bar.rbs

@@ -62,9 +62,6 @@ class Gruff::Bar < Gruff::Base
   # @rbs return: bool
   def hide_left_label_area?: () -> bool
 
-  # @rbs return: bool
-  def hide_bottom_label_area?: () -> bool
-
   # @rbs return: void
   def setup_graph_measurements: () -> void
 

data/sig/generated/gruff/base.rbs

@@ -45,9 +45,6 @@ module Gruff
     # Blank space below the title. Default is +20+.
     attr_writer title_margin: Float | Integer
 
-    # Blank space below the legend. Default is +20+.
-    attr_writer legend_margin: Float | Integer
-
     # Truncates labels if longer than max specified.
     attr_writer label_max_size: Float | Integer
 
@@ -112,13 +109,16 @@ module Gruff
     # first. This does not affect the legend. Default is +false+.
     attr_writer sorted_drawing: bool
 
-    # Display the legend under the graph. Default is +false+.
-    attr_writer legend_at_bottom: bool
+    # Blank space below the legend. Default is +20+.
+    attr_writer legend_margin: Float | Integer
 
-    # 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.
+    # Set the vertical spacing between individual legend items. Default is +5.0+.
+    attr_writer legend_spacing: Float | Integer
+
+    # Set the inner padding between the legend frame and its contents. Default is +7.0+.
+    attr_writer legend_padding: Float | Integer
+
+    # Optionally set the size of the colored box by each item in the legend. Default is +20.0+.
     attr_writer legend_box_size: Float | Integer
 
     # If one numerical argument is given, the graph is drawn at 4/3 ratio
@@ -176,11 +176,24 @@ module Gruff
     # @rbs return: void
     def label_rotation=: (Float | Integer rotation) -> void
 
+    # Set the corner position of the floating legend. Accepts +:top_right+ (default),
+    # +:top_left+, +:bottom_right+, or +:bottom_left+.
+    #
+    # @param position [Symbol] the position.
+    # @rbs position: Symbol
+    # @rbs return: void
+    def legend_position=: (Symbol position) -> void
+
     # Height of staggering between labels.
     # @deprecated
     # @rbs return: void
     def label_stagger_height=: (untyped _value) -> void
 
+    # Set the legend position to the bottom of the graph.
+    # @deprecated
+    # @rbs return: void
+    def legend_at_bottom=: (untyped _value) -> void
+
     # Set the large title of the graph displayed at the top.
     # You can draw a multi-line title by putting a line break in the string
     # or by setting an array as argument.
@@ -657,14 +670,6 @@ module Gruff
     # @rbs return: String
     def y_axis_label: (Float | Integer | BigDecimal value, Float | Integer increment) -> String
 
-    # @rbs legend_labels: Array[String]
-    # @rbs legend_square_width: Float | Integer
-    # @rbs return: Array[Array[Float | Integer]]
-    def calculate_legend_label_widths_for_each_line: (Array[String] legend_labels, Float | Integer legend_square_width) -> Array[Array[Float | Integer]]
-
-    # @rbs return: Float
-    def calculate_legend_height: () -> Float
-
     # Returns the height of the capital letter 'X' for the current font and
     # size.
     #

data/sig/generated/gruff/dot.rbs

@@ -31,9 +31,6 @@ class Gruff::Dot < Gruff::Base
   # @rbs return: bool
   def hide_left_label_area?: () -> bool
 
-  # @rbs return: bool
-  def hide_bottom_label_area?: () -> bool
-
   # @rbs return: void
   def draw_graph: () -> void
 

data/sig/generated/gruff/renderer/rectangle.rbs

@@ -7,8 +7,9 @@ module Gruff
     # @rbs color: String
     # @rbs width: Float | Integer
     # @rbs opacity: Float | Integer
+    # @rbs round: bool
     # @rbs return: void
-    def initialize: (Gruff::Renderer renderer, ?color: String, ?width: Float | Integer, ?opacity: Float | Integer) -> void
+    def initialize: (Gruff::Renderer renderer, ?color: String, ?width: Float | Integer, ?opacity: Float | Integer, ?round: bool) -> void
 
     # @rbs upper_left_x: Float | Integer
     # @rbs upper_left_y: Float | Integer

data/sig/generated/gruff/side_bar.rbs

@@ -61,9 +61,6 @@ class Gruff::SideBar < Gruff::Base
   # @rbs return: bool
   def hide_left_label_area?: () -> bool
 
-  # @rbs return: bool
-  def hide_bottom_label_area?: () -> bool
-
   # @rbs return: void
   def setup_graph_measurements: () -> void
 

data/sig/generated/gruff/stacked_bar.rbs

@@ -53,9 +53,6 @@ class Gruff::StackedBar < Gruff::Base
   # @rbs return: bool
   def hide_left_label_area?: () -> bool
 
-  # @rbs return: bool
-  def hide_bottom_label_area?: () -> bool
-
   # @rbs return: Proc
   def proc_text_metrics: () -> Proc
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Geoffrey Grosenbach
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.
 test_files: []