gruff 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53adc2df58a382381368665252e0e5862ea81ebd4d513e051058aa5369d379a9
-  data.tar.gz: a63a2c06b2f2f936a8ee663463248faab871cab07ba0b58c84febff858b3c08b
+  metadata.gz: f16153da348397448dc35f4d6435860b53040b14b0a7cbc3ca84bcaf9dd68b90
+  data.tar.gz: 68efd965f5b00403281ff46cc377fae9503b3b4290f49b66e6ceb424d24b4d27
 SHA512:
-  metadata.gz: fa57dd19908889380ac8ca2ad4cf3d71da6349370ad90e6c318a01aa79fafd1db9c09f5118a4c1034aaad026596d5b42e4a5837e69ea360909c2b16e054c9fa3
-  data.tar.gz: 2334380acbf92ebbcfc2c090912e79955c5d28f6de4fb714f2d30de4a4b2b922fd661068641a4057ba94bba90359bd1a45fd0902da941e246df93bf80e9a0601
+  metadata.gz: c2436acee944766653a6497854eb89493fc67f940d846e7299bdf92e2a31c8f7e267f508dad3b8593d596d31a277702983a58b7a2282b00395c33c152c657407
+  data.tar.gz: 7d75accebb94e9ae9362ae487265de84b7bbd6b6b90087c3ce5bd0f0e573d51d270f74bd04f3451d64aedba189fc09d5ef69b3a8c14785cb1b7d2c24b8581cc5

data/.github/workflows/ci.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ master ]
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-20.04
@@ -23,7 +26,7 @@ jobs:
     - name: Install dependencies
       run: bundle install --path=vendor/bundle --jobs 4 --retry 3
     - name: RuboCop Problem Matchers
-      uses: r7kamura/rubocop-problem-matchers-action@v1.1.0
+      uses: r7kamura/rubocop-problem-matchers-action@v1
     - name: Run tests
       run: bundle exec rubocop
 
@@ -34,7 +37,7 @@ jobs:
       matrix:
         ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1']
         imagemagick-version:
-          - { full: 7.1.0-31, major-minor: '7.0' }
+          - { full: 7.1.0-35, major-minor: '7.0' }
     name: Ruby ${{ matrix.ruby-version }}
     steps:
     - uses: actions/checkout@v3

data/.gitignore

@@ -1,6 +1,7 @@
 *~
 /.idea/
 /pkg/
+/doc/
 /coverage/
 /vendor/
 /test/output/

data/.rubocop.yml

@@ -48,9 +48,6 @@ Lint/FloatComparison:
 Lint/NumberConversion:
   Enabled: false
 
-Naming/MemoizedInstanceVariableName:
-  Enabled: false
-
 Naming/MethodParameterName:
   Enabled: false
 
@@ -122,6 +119,3 @@ Style/StructInheritance:
 
 Performance/ChainArrayAllocation:
   Enabled: false
-
-Performance/StringReplacement:
-  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## 0.17.0
+- Add Gruff::Base#label_rotation= method to rotate bottom label (#599)
+- Mark #label_stagger_height= as deprecated (#598)
+- Fixed truncation of long legends in mini graph (#597)
+- Fix error when input empty data in Gruff::Bezier (#596)
+- Fix error when input empty data in Gruff::StackedArea (#595)
+- Fix error when input empty data in Gruff::BoxPlot (#594)
+- Fix error when input empty data in Gruff::Spider (#593)
+- 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)
+- 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)
+- Ensure to raise an exception if use sort feature in Candlestick
+- Fix column_count in BoxPlot/Candlestick (#581)
+- Fix left/right graph margin (#579)
+
 ## 0.16.0
 - Add Candlestick (#575)
 - Add BoxPlot (#574)

data/gruff.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
   s.summary = 'Beautiful graphs for one or multiple datasets.'
   s.license = 'MIT'
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.executables = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   s.specification_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
 
@@ -25,7 +24,7 @@ Gem::Specification.new do |s|
     s.add_dependency 'rmagick4j'
   else
     s.add_dependency 'rmagick', '>= 4.2'
-    s.add_development_dependency 'rubocop', '~> 1.27.0'
+    s.add_development_dependency 'rubocop', '~> 1.28.2'
     s.add_development_dependency 'rubocop-performance', '~> 1.13.3'
     s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
   end
@@ -35,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest-reporters'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'yard', '~> 0.9.25'
+  s.add_development_dependency 'yard', '~> 0.9.28'
 
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/gruff/area.rb

@@ -33,6 +33,8 @@ private
     x_increment = @graph_width / (column_count - 1)
 
     store.norm_data.each do |data_row|
+      next if data_row.points.empty?
+
       poly_points = []
 
       data_row.points.each_with_index do |data_point, index|

data/lib/gruff/bar.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'helper/bar_mixin'
+
 #
 # Gruff::Bar provide a bar graph that presents categorical data
 # with rectangular bars.
@@ -16,6 +18,8 @@
 #   g.write('bar.png')
 #
 class Gruff::Bar < Gruff::Base
+  include BarMixin
+
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
 
@@ -86,8 +90,6 @@ private
     return if @hide_line_markers
 
     if @show_labels_for_bar_values
-      proc_text_metrics = ->(text) { text_metrics(@marker_font, text) }
-
       if maximum_value >= 0
         _, metrics = Gruff::BarValueLabel.metrics(maximum_value, @label_formatting, proc_text_metrics)
         @graph_top += metrics.height
@@ -112,36 +114,33 @@ private
       minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
     )
 
-    proc_text_metrics = ->(text) { text_metrics(@marker_font, text) }
+    group_spacing = @group_spacing * @scale
+    group_left_x = @graph_left
 
-    # iterate over all normalised data
-    store.norm_data.each_with_index do |data_row, row_index|
-      data_row.points.each_with_index do |data_point, point_index|
-        group_spacing = @group_spacing * @scale * point_index
-
-        # Use incremented x and scaled y
-        # x
-        left_x = @graph_left + (bar_width * (row_index + point_index + ((store.length - 1) * point_index))) + padding + group_spacing
+    normalized_group_bars.each_with_index do |group_bars, group_index|
+      right_x = 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)
-        # y
-        left_y, right_y = conversion.get_top_bottom_scaled(data_point)
-
-        # create new bar
-        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: data_row.color)
-        rect_renderer.render(left_x, left_y - AXIS_MARGIN, right_x, right_y - AXIS_MARGIN)
 
-        # Calculate center based on bar_width and current row
-        label_center = @graph_left + group_spacing + (store.length * bar_width * point_index) + (store.length * bar_width / 2.0)
+        top_y, bottom_y = conversion.get_top_bottom_scaled(bar.point)
+        if bar.point != 0
+          rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: bar.color)
+          rect_renderer.render(left_x, bottom_y - AXIS_MARGIN, right_x, top_y)
+        end
 
-        # Subtract half a bar width to center left if requested
-        draw_label(label_center, point_index)
-        if @show_labels_for_bar_values
-          bar_value_label = Gruff::BarValueLabel::Bar.new([left_x, left_y, right_x, right_y], store.data[row_index].points[point_index])
+        if @show_labels_for_bar_values && bar.value
+          bar_value_label = Gruff::BarValueLabel::Bar.new([left_x, top_y, right_x, bottom_y], bar.value)
           bar_value_label.prepare_rendering(@label_formatting, proc_text_metrics) do |x, y, text, _text_width, text_height|
             draw_value_label(bar_width * @bar_spacing, text_height, x, y, text)
           end
         end
       end
+
+      label_center = group_left_x + ((right_x - group_left_x) / 2.0)
+      draw_label(label_center, group_index)
+
+      group_left_x = right_x + padding + group_spacing
     end
 
     # Draw the last label if requested
@@ -151,4 +150,8 @@ private
   def calculate_spacing
     @scale * @group_spacing * (column_count - 1)
   end
+
+  def proc_text_metrics
+    ->(text) { text_metrics(@marker_font, text) }
+  end
 end