gruff 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79572698484a762e000b269890c2575523d452453fc6a00d5e6302acae126c89
-  data.tar.gz: 06a6b5e010af0c354bbc9547b594ea6e3412f3f30662d985c3bcb7143cb92fbf
+  metadata.gz: 75e12531ea04a32fe92c5d2eb922eee2b4464c266a7291fca8b50a3aaf772aeb
+  data.tar.gz: b5ad337b9e726f30ab9dbcf97612d83fb32e0842a788e9d1ce427a53b0d8ff3a
 SHA512:
-  metadata.gz: 0c557571a807ac8157c8f43401514374a052e61c1b22482169c9baf8b5b1c686b715fe222bd7d838118e33e536cdf2cf4639c75a0e5d21c8ab268993dc457ef8
-  data.tar.gz: 22ccb5f2c70327d30c8de0cafb13d9f1ec05d13b53cfef37a27e9a3d23b66f8009d13c90dc12425dcf460bf518d84eca2cff3140028629916be70964af928592
+  metadata.gz: f98f73af84275229589343c3e5dc8a7ca0aca73f044cfd918bfcd3efb3c7072ae6e04d307061c8ac7ed33c3c9221bc588505ee6dc737c083d61263aeca32e46c
+  data.tar.gz: 9ec8af554b9ddc3d6dbcdb99742aeffa4b4574b8a5800883058fa80951991cf3192a875f70372cd3a151b10b5528cfa5fb1bc49406cef41986e92cc06ed8e21b

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'monthly'

data/.github/workflows/ci.yml

@@ -15,16 +15,16 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['3.4']
+        ruby-version: ['4.0']
         imagemagick-version:
-          - { full: 7.1.1-33, major-minor: '7.1' }
+          - { full: 7.1.2-10, major-minor: '7.1' }
     name: Lint (Ruby ${{ matrix.ruby-version }}, ImageMagick ${{ matrix.imagemagick-version.major-minor }})
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Cache ImageMagick
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ./build-ImageMagick
         key: v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
@@ -35,12 +35,10 @@ jobs:
         export IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }}
         ./before_install_linux.sh
     - name: Set up Ruby ${{ matrix.ruby-version }}
-      uses: ruby/setup-ruby@master
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
-    - name: Install dependencies
-      run: bundle install --path=vendor/bundle --jobs 4 --retry 3
     - name: RuboCop Problem Matchers
       uses: r7kamura/rubocop-problem-matchers-action@v1
     - name: Run tests
@@ -51,16 +49,16 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['3.4']
+        ruby-version: ['4.0']
         imagemagick-version:
-          - { full: 7.1.1-33, major-minor: '7.1' }
+          - { full: 7.1.2-10, major-minor: '7.1' }
     name: Check RBS (Ruby ${{ matrix.ruby-version }}, ImageMagick ${{ matrix.imagemagick-version.major-minor }})
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Cache ImageMagick
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ./build-ImageMagick
         key: v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
@@ -71,12 +69,10 @@ jobs:
         export IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }}
         ./before_install_linux.sh
     - name: Set up Ruby ${{ matrix.ruby-version }}
-      uses: ruby/setup-ruby@master
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
-    - name: Install dependencies
-      run: bundle install --path=vendor/bundle --jobs 4 --retry 3
     - name: Run tests
       run: |
         bundle exec rake rbs:update
@@ -87,15 +83,16 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 20
     strategy:
+      fail-fast: false
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
         imagemagick-version:
-          - { full: 7.1.1-33, major-minor: '7.1' }
+          - { full: 7.1.2-10, major-minor: '7.1' }
     name: Ruby ${{ matrix.ruby-version }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Cache ImageMagick
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ./build-ImageMagick
         key: v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
@@ -106,12 +103,10 @@ jobs:
         export IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }}
         ./before_install_linux.sh
     - name: Set up Ruby
-      uses: ruby/setup-ruby@master
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: false
-    - name: Install dependencies
-      run: bundle install --path=vendor/bundle --jobs 4 --retry 3
+        bundler-cache: true
     - name: Run tests
       run: bundle exec rake
 
@@ -123,13 +118,11 @@ jobs:
         ruby-version: ['9.4.7.0']
     name: JRuby ${{ matrix.ruby-version }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Ruby
-      uses: ruby/setup-ruby@master
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: jruby-${{ matrix.ruby-version }}
         bundler-cache: true
-    - name: Install dependencies
-      run: bundle install --path=vendor/bundle --jobs 4 --retry 3
     - name: Run tests
       run: bundle exec rake

data/.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 plugins:
   - rubocop-minitest
   - rubocop-performance
@@ -84,6 +86,9 @@ Style/ConstantVisibility:
 Style/Copyright:
   Enabled: false
 
+Style/OneClassPerFile:
+  Enabled: false
+
 Style/Documentation:
   Enabled: true
 
@@ -117,6 +122,9 @@ Style/MethodCallWithArgsParentheses:
 Style/MissingElse:
   Enabled: false
 
+Style/NegativeArrayIndex:
+  Enabled: false
+
 Style/Next:
   Enabled: false
 
@@ -126,6 +134,9 @@ Style/NumericPredicate:
 Style/OptionHash:
   Enabled: false
 
+Style/CollectionQuerying:
+  Enabled: false
+
 Style/RedundantBegin:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -0,0 +1,17 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2026-03-29 02:09:03 UTC using RuboCop version 1.86.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 726
+# Configuration parameters: EnforcedStyle, Visibility.
+# SupportedStyles: doc_style, doc_style_and_return_annotation, method_type_signature, method_type_signature_or_return_annotation
+Style/RbsInline/MissingTypeAnnotation:
+  Enabled: false
+
+# Offense count: 193
+Style/RbsInline/UntypedInstanceVariable:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.30.0
+
+- RBS: Add missing signatures (#674)
+- Candlestick: Fix graph width calculation (#671)
+
 ## 0.29.0
 
 - Line graph: reset previous point between dataxy series to prevent unwanted poly‑line connection (#665)

data/Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 source 'https://rubygems.org'
 
@@ -12,6 +13,7 @@ unless defined? JRUBY_VERSION
   gem 'rubocop-rake', '~> 0.6'
 end
 
+gem 'minitest', '~> 5.0'
 gem 'minitest-reporters'
 gem 'rake'
 gem 'simplecov'

data/gruff.gemspec

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 lib = File.expand_path('lib')
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

data/init.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 # For Rails
 require 'gruff'

data/lib/gruff/candlestick.rb

@@ -81,7 +81,7 @@ private
       minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
     )
 
-    width = (@graph_width - calculate_spacing) / column_count
+    width = @graph_width / calculate_spacing
     bar_width = width * @spacing_factor
     padding = width - bar_width
 
@@ -115,9 +115,9 @@ private
     normalized_candlesticks.size
   end
 
-  # @rbs return: Integer
+  # @rbs return: Float
   def calculate_spacing
-    column_count - 1
+    column_count.to_f
   end
 
   # @rbs return: bool

data/lib/gruff/mini/bar.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 #
 # Makes a small bar graph suitable for display at 200px or even smaller.

data/lib/gruff/mini/legend.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 # A module to handle the small legend.
 # @private
@@ -95,7 +96,7 @@ module Gruff::Mini::Legend
     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]
+      truncated_label = truncated_label[0..(truncated_label.length - 2)]
     end
     truncated_label + (truncated_label.length < label.to_s.length ? '...' : '')
     # steep:ignore:end

data/lib/gruff/mini/pie.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 #
 # Makes a small pie graph suitable for display at 200px or even smaller.

data/lib/gruff/mini/side_bar.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 #
 # Makes a small side bar graph suitable for display at 200px or even smaller.

data/lib/gruff/net.rb

@@ -98,7 +98,7 @@ private
     return if @hide_line_markers
 
     # Draw horizontal line markers and annotate with numbers
-    (0..column_count - 1).each do |index|
+    (0..(column_count - 1)).each do |index|
       rad_pos = index * Math::PI * 2 / column_count
 
       Gruff::Renderer::Line.new(renderer, color: @marker_color)

data/lib/gruff/patch/rmagick.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 # @private
 module Magick

data/lib/gruff/patch/string.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 # @private
 module String::GruffCommify

data/lib/gruff/renderer/polygon.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 module Gruff
   # @private

data/lib/gruff/version.rb

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

data/sig/generated/gruff/candlestick.rbs

@@ -58,8 +58,8 @@ class Gruff::Candlestick < Gruff::Base
   # @rbs return: Integer
   def column_count: () -> Integer
 
-  # @rbs return: Integer
-  def calculate_spacing: () -> Integer
+  # @rbs return: Float
+  def calculate_spacing: () -> Float
 
   # @rbs return: bool
   def show_marker_vertical_line?: () -> bool

data/sig/generated/gruff/mini/bar.rbs

@@ -0,0 +1,24 @@
+# Generated from lib/gruff/mini/bar.rb with RBS::Inline
+
+#
+#  Makes a small bar graph suitable for display at 200px or even smaller.
+#
+#  Here's how to set up a Gruff::Mini::Bar.
+#
+#    g = Gruff::Mini::Bar.new
+#    g.title = 'Mini Bar Graph'
+#    g.data :Art, [0, 5, 8, 15]
+#    g.data :Philosophy, [10, 3, 2, 8]
+#    g.data :Science, [2, 15, 8, 11]
+#    g.write('mini_bar.png')
+class Gruff::Mini::Bar < Gruff::Bar
+  private
+
+  include Gruff::Mini::Legend
+
+  def initialize_attributes: () -> untyped
+
+  def setup_data: () -> untyped
+
+  def draw_graph: () -> untyped
+end

data/sig/generated/gruff/mini/legend.rbs

@@ -0,0 +1,26 @@
+# Generated from lib/gruff/mini/legend.rb with RBS::Inline
+
+# A module to handle the small legend.
+# @private
+module Gruff::Mini::Legend
+  attr_accessor hide_mini_legend: untyped
+
+  attr_accessor legend_position: untyped
+
+  def initialize: (*untyped) -> untyped
+
+  # The canvas needs to be bigger so we can put the legend beneath it.
+  def expand_canvas_for_vertical_legend: () -> untyped
+
+  def calculate_line_height: () -> untyped
+
+  def calculate_legend_width: () -> untyped
+
+  # Draw the legend beneath the existing graph.
+  def draw_vertical_legend: () -> untyped
+
+  # Shorten long labels so they will fit on the canvas.
+  def truncate_legend_label: (untyped label, untyped x_offset) -> untyped
+
+  def scale: (untyped value) -> untyped
+end

data/sig/generated/gruff/mini/pie.rbs

@@ -0,0 +1,23 @@
+# Generated from lib/gruff/mini/pie.rb with RBS::Inline
+
+#
+#  Makes a small pie graph suitable for display at 200px or even smaller.
+#
+#  Here's how to set up a Gruff::Mini::Pie.
+#
+#    g = Gruff::Mini::Pie.new
+#    g.title = "Visual Pie Graph Test"
+#    g.data 'Fries', 20
+#    g.data 'Hamburgers', 50
+#    g.write("mini_pie_keynote.png")
+class Gruff::Mini::Pie < Gruff::Pie
+  private
+
+  include Gruff::Mini::Legend
+
+  def initialize_attributes: () -> untyped
+
+  def setup_data: () -> untyped
+
+  def draw_graph: () -> untyped
+end

data/sig/generated/gruff/mini/side_bar.rbs

@@ -0,0 +1,31 @@
+# Generated from lib/gruff/mini/side_bar.rb with RBS::Inline
+
+#
+#  Makes a small side bar graph suitable for display at 200px or even smaller.
+#
+#  Here's how to set up a Gruff::Mini::SideBar.
+#
+#    g = Gruff::Mini::SideBar.new
+#    g.title = 'SideBar Graph'
+#    g.labels = {
+#      0 => '5/6',
+#      1 => '5/15',
+#      2 => '5/24',
+#      3 => '5/30',
+#    }
+#    g.group_spacing = 20
+#    g.data :Art, [0, 5, 8, 15]
+#    g.data :Philosophy, [10, 3, 2, 8]
+#    g.data :Science, [2, 15, 8, 11]
+#    g.write('mini_sidebar.png')
+class Gruff::Mini::SideBar < Gruff::SideBar
+  private
+
+  include Gruff::Mini::Legend
+
+  def initialize_attributes: () -> untyped
+
+  def setup_data: () -> untyped
+
+  def draw_graph: () -> untyped
+end

data/sig/generated/gruff/patch/rmagick.rbs

@@ -0,0 +1,15 @@
+# Generated from lib/gruff/patch/rmagick.rb with RBS::Inline
+
+# @private
+module Magick
+  # @private
+  module GruffAnnotate
+    # Additional method to scale annotation text since Draw.scale doesn't.
+    def annotate_scaled: (untyped img, untyped width, untyped height, untyped x, untyped y, untyped text, untyped scale) -> untyped
+
+    # FIXME(uwe):  We should NOT need to implement this method.
+    #              Remove this method as soon as RMagick4J Issue #16 is fixed.
+    #              https://github.com/Serabe/RMagick4J/issues/16
+    def fill=: (untyped fill) -> untyped
+  end
+end

data/sig/generated/gruff/patch/string.rbs

@@ -0,0 +1,9 @@
+# Generated from lib/gruff/patch/string.rb with RBS::Inline
+
+# @private
+module String::GruffCommify
+  THOUSAND_SEPARATOR: ::String
+
+  # Taken from http://codesnippets.joyent.com/posts/show/330
+  def commify: (?untyped delimiter) -> untyped
+end

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

@@ -0,0 +1,16 @@
+# Generated from lib/gruff/renderer/polygon.rb with RBS::Inline
+
+module Gruff
+  # @private
+  class Renderer::Polygon
+    # @rbs renderer: Gruff::Renderer
+    # @rbs color: String
+    # @rbs width: Float | Integer
+    # @rbs opacity: Float | Integer
+    # @rbs return: void
+    def initialize: (Gruff::Renderer renderer, color: String, ?width: Float | Integer, ?opacity: Float | Integer) -> void
+
+    # @rbs points: Array[Float | Integer]
+    def render: (Array[Float | Integer] points) -> untyped
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Geoffrey Grosenbach
@@ -63,9 +63,11 @@ files:
 - ".editorconfig"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/ISSUE_TEMPLATE/report.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -146,7 +148,13 @@ files:
 - sig/generated/gruff/helper/stacked_mixin.rbs
 - sig/generated/gruff/histogram.rbs
 - sig/generated/gruff/line.rbs
+- sig/generated/gruff/mini/bar.rbs
+- sig/generated/gruff/mini/legend.rbs
+- sig/generated/gruff/mini/pie.rbs
+- sig/generated/gruff/mini/side_bar.rbs
 - sig/generated/gruff/net.rbs
+- sig/generated/gruff/patch/rmagick.rbs
+- sig/generated/gruff/patch/string.rbs
 - sig/generated/gruff/pie.rbs
 - sig/generated/gruff/renderer/bezier.rbs
 - sig/generated/gruff/renderer/circle.rbs
@@ -154,6 +162,7 @@ files:
 - sig/generated/gruff/renderer/dot.rbs
 - sig/generated/gruff/renderer/ellipse.rbs
 - sig/generated/gruff/renderer/line.rbs
+- sig/generated/gruff/renderer/polygon.rbs
 - sig/generated/gruff/renderer/polyline.rbs
 - sig/generated/gruff/renderer/rectangle.rbs
 - sig/generated/gruff/renderer/renderer.rbs
@@ -191,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.
 test_files: []