gruff 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3c04a6fc48f83e530a5a26a084a1f79993cbb7781e7b6b06ad7208ee205a787
-  data.tar.gz: 52cd0e2ef0f9f4f6a433e65a9c65cba9c7fb4420203ece2ccd461b876ad43042
+  metadata.gz: f6da763173e4c2d9acfb25a240f68edc12c49bd2d35a835ea52b4306f727b5aa
+  data.tar.gz: 7ce9635d6efacb40300c959db94f40fcd09205491c33e8bbac3269e64b1f9048
 SHA512:
-  metadata.gz: b41c3bcd833b9bbbf2e36541552015c0a714e51b79f168c8875e891ad7d51db5bc1b03438f1ce419c55fcc4b3299274c24f4e817d681b748a649222a8c92db88
-  data.tar.gz: f9c017e0264b608160d779526f3ddcd1a9daf129dbd55dbb0eb96193aa2902e5a6cd1c439cdd101c43686fac6fad4130bf0eab2d2ec226439a05df13e12ec07a
+  metadata.gz: 736e2cfb7ecadcd212a0ac92c78a84ff1e69184c440e2a5dc2b9b465f5bbbc25cd6f84215def0306e2b9d27039c939c6f54a3f6b302b7b164b4e48c03e3917b3
+  data.tar.gz: 45a7508c2722f357b95578aa9a4b1d68576caa3c662b35c6cde983be258835d485ff5ee32f7f525a3791d6e3c3971e332eee9bbc0c79318f29b6ae92b866cfd9

data/.github/ISSUE_TEMPLATE/report.yml

@@ -33,7 +33,7 @@ body:
     validations:
       required: true
   - type: textarea
-    id: addtional-context
+    id: additional-context
     attributes:
       label: Additional context
       description: Add any other context about the problem here.

data/.github/workflows/ci.yml

@@ -46,6 +46,43 @@ jobs:
     - name: Run tests
       run: bundle exec rubocop
 
+  RBS:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        ruby-version: ['3.4']
+        imagemagick-version:
+          - { full: 7.1.1-33, major-minor: '7.1' }
+    name: Check RBS (Ruby ${{ matrix.ruby-version }}, ImageMagick ${{ matrix.imagemagick-version.major-minor }})
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+    - name: Cache ImageMagick
+      uses: actions/cache@v4
+      with:
+        path: ./build-ImageMagick
+        key: v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
+        restore-keys: |
+          v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
+    - name: Install ImageMagick ${{ matrix.imagemagick-version.full }}
+      run: |
+        export IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }}
+        ./before_install_linux.sh
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@master
+      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
+        git --no-pager diff --exit-code
+        bundle exec steep check
+
   test-ruby:
     runs-on: ubuntu-24.04
     timeout-minutes: 20

data/.rubocop.yml

@@ -35,6 +35,9 @@ Layout/ClassStructure:
 Layout/FirstMethodArgumentLineBreak:
   Enabled: false
 
+Layout/LeadingCommentSpace:
+  Enabled: false
+
 Layout/LineLength:
   Max: 150
 

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## 0.27.0
+
+- Add RBS signatures (#661)
+- Fix Gruff::Bezier raises exception if data contains nil (#660)
+- Fix Gruff::Pie raises exception if data contains nil (#659)
+- Fix Gruff::Net raises exception if data contains nil (#658)
+- Fix Gruff::Histogram raises exception if data contains nil (#657)
+- Fix Gruff::Dot raises exception if data contains nil (#656)
+- Fix Gruff::Candlestick raises exception if data contains nil (#655)
+- Fix Gruff::AccumulatorBar raises exception if data contains nil (#654)
+- Fix Gruff::Area raises exception if data contains nil (#653)
+- Fix Gruff::StackedArea raises exception if data contains nil (#652)
+- Stop using Struct to make it easier to write type definitions (#651)
+- Fix Gruff::Box raises exception if data contains nil (#648)
+- Fix Gruff::SideStackedBar raises exception if data contains nil (#647)
+- Fix Gruff::StackedBar raises exception if data contains nil (#646)
+
 ## 0.26.0
 
 - Allow customizing No Data font size (#642)
@@ -56,7 +73,7 @@
 - Fix error when input empty data in Gruff::Histogram (#592)
 - Fix error when input empty data in Gruff::Area (#591)
 - Stop adjusting the square radius in Gruff::Line (#589)
-- Add diamond dot stype in Gruff::Line (#588)
+- Add diamond dot style in Gruff::Line (#588)
 - Allow title to be set as an array (#587)
 - Allow labels to be set as an array corresponding to the data values (#586)
 - Fixed a bug that breaks the colors in the theme when using the add_color method (#583)

data/Gemfile

@@ -16,3 +16,8 @@ gem 'minitest-reporters'
 gem 'rake'
 gem 'simplecov'
 gem 'yard', '~> 0.9.28'
+
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1') && !RUBY_PLATFORM.include?('java')
+  gem 'rbs-inline', '~> 0.11'
+  gem 'steep', '~> 1.10'
+end

data/README.md

@@ -6,7 +6,7 @@
 A library for making beautiful graphs.
 
 Built on top of [rmagick](https://github.com/rmagick/rmagick); see its web page
-for a list of the system-level prerequisities (ImageMagick etc) and how to install them.
+for a list of the system-level prerequisites (ImageMagick etc) and how to install them.
 
 ## Installation
 
@@ -169,6 +169,12 @@ If you have made changes that involve updating the expected image, you need to u
 $ bundle exec rake test:image:update
 ```
 
+If you change the method, you need to update RBS signatures.
+
+```
+$ rake rbs:update
+```
+
 ## Contributing
 
 ### Source

data/gruff.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.authors = ['Geoffrey Grosenbach', 'Uwe Kubosch']
   s.description = 'Beautiful graphs for one or multiple datasets. Can be used on websites or in documents.'
   s.email = 'boss@topfunky.com'
-  s.files = `git ls-files`.split.grep_v(/^test|^docker|^before_install_linux.sh|^Rakefile/i)
+  s.files = `git ls-files`.split.grep_v(/^test|^docker|^before_install_linux.sh|^Rakefile|^Steepfile/i)
   s.homepage = 'https://github.com/topfunky/gruff'
   s.require_paths = %w[lib]
   s.summary = 'Beautiful graphs for one or multiple datasets.'

data/lib/gruff/accumulator_bar.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rbs_inline: enabled
+
 #
 # Gruff::AccumulatorBar is a special bar graph that shows a
 # single dataset as a set of stacked bars.
@@ -19,7 +21,7 @@ private
   def setup_data
     raise(Gruff::IncorrectNumberOfDatasetsException) unless store.length == 1
 
-    accum_array = store.data.first.points[0..-2].reduce([0]) { |a, v| a << (a.last + v) }
+    accum_array = store.data.first.points[0..-2].reduce([0]) { |a, v| a << (a.last + v.to_f) } # steep:ignore
     data 'Accumulator', accum_array
     set_colors
     store.reverse!

data/lib/gruff/area.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rbs_inline: enabled
+
 #
 # Gruff::Area provides an area graph which displays graphically
 # quantitative data.
@@ -15,10 +17,10 @@
 #
 class Gruff::Area < Gruff::Base
   # Specifies the filling opacity in area graph. Default is +0.85+.
-  attr_writer :fill_opacity
+  attr_writer :fill_opacity #: Float | Integer
 
   # Specifies the stroke width in line around area graph. Default is +2.0+.
-  attr_writer :stroke_width
+  attr_writer :stroke_width #: Float | Integer
 
 private
 
@@ -38,6 +40,7 @@ private
       poly_points = []
 
       data_row.points.each_with_index do |data_point, index|
+        data_point = data_point.to_f
         # Use incremented x and scaled y
         new_x = @graph_left + (x_increment * index)
         new_y = @graph_top + (@graph_height - (data_point * @graph_height))

data/lib/gruff/bar.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rbs_inline: enabled
+
 require_relative 'helper/bar_mixin'
 
 #
@@ -18,24 +20,24 @@ require_relative 'helper/bar_mixin'
 #   g.write('bar.png')
 #
 class Gruff::Bar < Gruff::Base
-  include BarMixin
+  include Gruff::Base::BarMixin
 
   # Spacing factor applied between bars.
-  attr_writer :bar_spacing
+  attr_writer :bar_spacing #: Float | Integer
 
   # Spacing factor applied between a group of bars belonging to the same label.
-  attr_writer :group_spacing
+  attr_writer :group_spacing #: Float | Integer
 
   # Set the number output format string or lambda.
   # Default is +"%.2f"+.
-  attr_writer :label_formatting
+  attr_writer :label_formatting #: nil | String | Proc
 
   # Output the values for the bars on a bar graph.
   # Default is +false+.
-  attr_writer :show_labels_for_bar_values
+  attr_writer :show_labels_for_bar_values #: bool
 
   # Prevent drawing of column labels below a bar graph.  Default is +false+.
-  attr_writer :hide_labels
+  attr_writer :hide_labels #: bool
 
   # Value to avoid completely overwriting the coordinate axis
   AXIS_MARGIN = 0.5
@@ -47,10 +49,12 @@ class Gruff::Bar < Gruff::Base
   # line with no x dimension).
   #
   # Default value is +0.9+.
+  #
+  # @rbs space_percent: Float | Integer
   def spacing_factor=(space_percent)
     raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' if (space_percent < 0) || (space_percent > 1)
 
-    @spacing_factor = (1 - space_percent)
+    @spacing_factor = (1.0 - space_percent)
   end
 
 private
@@ -73,14 +77,17 @@ private
     super
   end
 
+  # @rbs return: bool
   def hide_labels?
     @hide_labels
   end
 
+  # @rbs return: bool
   def hide_left_label_area?
     @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
@@ -106,7 +113,7 @@ private
     @bar_spacing ||= @spacing_factor # space between the bars
 
     bar_width = (@graph_width - calculate_spacing) / (column_count * store.length)
-    padding = (bar_width * (1 - @bar_spacing)) / 2.0
+    padding = (bar_width * (1.0 - @bar_spacing)) / 2.0
 
     # Setup the BarConversion Object
     conversion = Gruff::BarConversion.new(
@@ -117,7 +124,7 @@ private
     group_left_x = @graph_left
 
     normalized_group_bars.each_with_index do |group_bars, group_index|
-      right_x = 0
+      right_x = 0.0
       group_bars.each_with_index do |bar, index|
         left_x = group_left_x + (bar_width * index) + padding
         right_x = left_x + (bar_width * @bar_spacing)
@@ -146,10 +153,12 @@ private
     draw_label(@graph_right, column_count, Magick::NorthWestGravity) if @center_labels_over_point
   end
 
+  # @rbs return: Float | Integer
   def calculate_spacing
     @group_spacing * (column_count - 1)
   end
 
+  # @rbs return: Proc
   def proc_text_metrics
     ->(text) { text_metrics(@marker_font, text) }
   end