gruff 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6da763173e4c2d9acfb25a240f68edc12c49bd2d35a835ea52b4306f727b5aa
-  data.tar.gz: 7ce9635d6efacb40300c959db94f40fcd09205491c33e8bbac3269e64b1f9048
+  metadata.gz: 26b395dec8d012e9a7cee4013081d689b7decd86aeda0dc1ffd8fc66c6e71db6
+  data.tar.gz: 6cc57c03116dff4ba0a0c6e8adb0f36d247431bba05e292bb6d422a8b9d1b1c5
 SHA512:
-  metadata.gz: 736e2cfb7ecadcd212a0ac92c78a84ff1e69184c440e2a5dc2b9b465f5bbbc25cd6f84215def0306e2b9d27039c939c6f54a3f6b302b7b164b4e48c03e3917b3
-  data.tar.gz: 45a7508c2722f357b95578aa9a4b1d68576caa3c662b35c6cde983be258835d485ff5ee32f7f525a3791d6e3c3971e332eee9bbc0c79318f29b6ae92b866cfd9
+  metadata.gz: 7b155ccb54f177475c81c1176401fd95147152300e48da0c96951d8767bf8b861cbc7a4f2e27da32e727cb64e1f9fe31b5fa7a8bee49d2747e0a3e883a72a636
+  data.tar.gz: c2ec8dd6104836dfa234a8300c0e1ba40e212b2faac3c77ec504fd9db7d01408a75bbe486a487a3744965c54487c114961f5c58f79ca66c8e974b3dd4b135d05

data/.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['3.0']
+        ruby-version: ['3.4']
         imagemagick-version:
           - { full: 7.1.1-33, major-minor: '7.1' }
     name: Lint (Ruby ${{ matrix.ruby-version }}, ImageMagick ${{ matrix.imagemagick-version.major-minor }})

data/.rubocop.yml

@@ -2,6 +2,7 @@ plugins:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rake
+  - rubocop-rbs_inline
 
 AllCops:
     EnabledByDefault: true

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.28.0
+
+- Fix Gruff::Line to prevent unknown lines drawing (#664)
+
+## 0.27.1
+
+- RBS: Fix wrong type declarations (#662)
+
 ## 0.27.0
 
 - Add RBS signatures (#661)

data/Gemfile

@@ -19,5 +19,6 @@ 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 'rubocop-rbs_inline', '~> 1.4'
   gem 'steep', '~> 1.10'
 end

data/lib/gruff/base.rb

@@ -855,7 +855,7 @@ module Gruff
     end
 
     # @rbs index: Integer
-    # @rbs &: () -> void
+    # @rbs yields: () -> void
     def draw_unique_label(index)
       return if hide_labels?
 

data/lib/gruff/helper/bar_value_label.rb

@@ -44,7 +44,7 @@ module Gruff::BarValueLabel
   class Bar < Base
     # @rbs format: nil | String | Proc
     # @rbs proc_text_metrics: Proc
-    # @rbs &: (Float | Integer, Float | Integer, String, Float, Float) -> void
+    # @rbs yields: (Float | Integer, Float | Integer, String, Float, Float) -> void
     def prepare_rendering(format, proc_text_metrics)
       left_x, left_y, _right_x, _right_y = @coordinate
       val, metrics = Gruff::BarValueLabel.metrics(@value, format, proc_text_metrics)
@@ -58,7 +58,7 @@ module Gruff::BarValueLabel
   class SideBar < Base
     # @rbs format: nil | String | Proc
     # @rbs proc_text_metrics: Proc
-    # @rbs &: (Float | Integer, Float | Integer, String, Float, Float) -> void
+    # @rbs yields: (Float | Integer, Float | Integer, String, Float, Float) -> void
     def prepare_rendering(format, proc_text_metrics)
       left_x, left_y, right_x, _right_y = @coordinate
       val, metrics = Gruff::BarValueLabel.metrics(@value, format, proc_text_metrics)

data/lib/gruff/line.rb

@@ -229,13 +229,10 @@ private
 
     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)
+    prev_x = prev_y = nil
 
     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
@@ -249,24 +246,24 @@ private
         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 << []
+          prev_x = prev_y = nil
           next
         end
 
         new_y = @graph_top + (@graph_height - (y_data * @graph_height))
 
-        poly_points << new_x
-        poly_points << new_y
-
         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
-
-      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?
+        if !@hide_lines && prev_x && prev_y
+          # Renderer::Polyline may cause unknown lines to be drawn with complex graphs.
+          # Probably it is related to ImageMagick behavior.
+          # To avoid this problem, we use the Renderer::Line instead.
+          Gruff::Renderer::Line.new(renderer, color: data_row.color, width: stroke_width)
+                               .render(prev_x, prev_y, new_x, new_y)
         end
+        prev_x = new_x
+        prev_y = new_y
       end
     end
   end

data/lib/gruff/pie.rb

@@ -92,7 +92,7 @@ private
 
   # General Helper Methods
 
-  # @rbs degree: Float | Integer
+  # @rbs degrees: Float | Integer
   def update_chart_degrees_with(degrees)
     @chart_degrees = chart_degrees + degrees
   end

data/lib/gruff/version.rb

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

data/sig/generated/gruff/base.rbs

@@ -492,8 +492,8 @@ module Gruff
     def draw_label: (Float | Integer x, Integer index, ?untyped gravity) { () -> void } -> untyped
 
     # @rbs index: Integer
-    # @rbs &: () -> void
-    def draw_unique_label: (Integer index) { () -> void } -> untyped
+    # @rbs yields: () -> void
+    def draw_unique_label: (Integer index) -> untyped
 
     # @rbs width: Float | Integer
     # @rbs height: Float | Integer

data/sig/generated/gruff/helper/bar_value_label.rbs

@@ -27,15 +27,15 @@ module Gruff::BarValueLabel
   class Bar < Base
     # @rbs format: nil | String | Proc
     # @rbs proc_text_metrics: Proc
-    # @rbs &: (Float | Integer, Float | Integer, String, Float, Float) -> void
-    def prepare_rendering: (nil | String | Proc format, Proc proc_text_metrics) { (Float | Integer, Float | Integer, String, Float, Float) -> void } -> untyped
+    # @rbs yields: (Float | Integer, Float | Integer, String, Float, Float) -> void
+    def prepare_rendering: (nil | String | Proc format, Proc proc_text_metrics) -> untyped
   end
 
   # @private
   class SideBar < Base
     # @rbs format: nil | String | Proc
     # @rbs proc_text_metrics: Proc
-    # @rbs &: (Float | Integer, Float | Integer, String, Float, Float) -> void
-    def prepare_rendering: (nil | String | Proc format, Proc proc_text_metrics) { (Float | Integer, Float | Integer, String, Float, Float) -> void } -> untyped
+    # @rbs yields: (Float | Integer, Float | Integer, String, Float, Float) -> void
+    def prepare_rendering: (nil | String | Proc format, Proc proc_text_metrics) -> untyped
   end
 end

data/sig/generated/gruff/pie.rbs

@@ -50,8 +50,8 @@ class Gruff::Pie < Gruff::Base
 
   def slices: () -> untyped
 
-  # @rbs degree: Float | Integer
-  def update_chart_degrees_with: (untyped degrees) -> untyped
+  # @rbs degrees: Float | Integer
+  def update_chart_degrees_with: (Float | Integer degrees) -> untyped
 
   # @rbs return: Float | Integer
   def chart_degrees: () -> (Float | Integer)

metadata

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