gruff 0.22.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94b068b7869b405ca194785d34d320aba16ff0cff793982571039498590b31e8
-  data.tar.gz: 1e423203482f8b02d5a678f48237c627f39d09b3bbe7921b758284caf2a3f978
+  metadata.gz: e8ff88f3f42e4e18cbada5384d6bc3ddad3c19c216bd3bd11787d45625559780
+  data.tar.gz: 199aa40584af1ece67f4aa2f1b9ff12c80d1591d664c529e2e41de393925307a
 SHA512:
-  metadata.gz: 30e1d06427a70bb4dd5c551f7154a34825f3800890f96fb56649e0b95f0eb0d8539c636535f292217b6730c0ff27652246d7444a20d60aa49c4ef50ca2eca59b
-  data.tar.gz: 03af63b9451e5e7f62ed7260026cf6e968694f82f43d50f6eb0efd7dbf03b112d3ea6a00deb63b0b20248321f847ad1bb3c5bccd0148e337ae755526bc85ccc7
+  metadata.gz: c87fa241d9f6130689d54145ad78ce2d8520d0c0eaebd256c4df3428325eda2765287621287e12f596f474b4912f0c036772366a707e6a4d584544a3bc9d77f1
+  data.tar.gz: 404de18f0980fb59ed3afe9db6fac75e56903ecbc532604cceb879c3666396c8d86c7206941829757c70d725738109126d151eb90b120ae96d555347538b2831

data/.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 20
     name: Lint
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Set up Ruby 2.6
@@ -35,14 +35,14 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
         imagemagick-version:
-          - { full: 7.1.0-55, major-minor: '7.1' }
+          - { full: 7.1.1-15, major-minor: '7.1' }
     name: Ruby ${{ matrix.ruby-version }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Cache ImageMagick
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ./build-ImageMagick
         key: v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
@@ -67,10 +67,10 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['9.3.10.0', '9.4.2.0']
+        ruby-version: ['9.3.10.0', '9.4.3.0']
     name: JRuby ${{ matrix.ruby-version }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@master
       with:

data/CHANGELOG.md

@@ -1,9 +1,18 @@
 # Change Log
 
+## 0.24.0
+- Add the way to make background transparent (#631)
+- Adjust line number position on side graph (#624)
+- Add hide_labels attribute in Gruff::Dot (#623)
+- Fix where SideBar's labels were sometimes missing by incorrect left margin
+
+## 0.23.0
+- Update dependent RMagick version to 5.3.0 or later (#622)
+
 ## 0.22.0
-Fix Gruff::Bar and Gruff::SideBar in order to draw positive and negative mixed graph (#620)
-Allow to override label margin value (#618)
-Accept image format in Base#to_image in order to fix `no decode delegate for this image format` error (#619)
+- Fix Gruff::Bar and Gruff::SideBar in order to draw positive and negative mixed graph (#620)
+- Allow to override label margin value (#618)
+- Accept image format in Base#to_image in order to fix `no decode delegate for this image format` error (#619)
 
 ## 0.21.0
 - Fix legend color with empty label (#615)

data/gruff.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
     s.platform = 'java'
     s.add_dependency 'rmagick4j'
   else
-    s.add_dependency 'rmagick', '>= 4.2'
+    s.add_dependency 'rmagick', '>= 5.3'
     s.add_development_dependency 'rubocop', '~> 1.50.2'
     s.add_development_dependency 'rubocop-minitest', '~> 0.30.0'
     s.add_development_dependency 'rubocop-performance', '~> 1.17.1'

data/lib/gruff/base.rb

@@ -367,6 +367,14 @@ module Gruff
       @colors = color_list
     end
 
+    # Set whether to make background transparent.
+    #
+    # @param value [Boolean] Specify whether to make background transparent.
+    #
+    def transparent_background=(value)
+      @renderer.transparent_background(@columns, @rows) if value
+    end
+
     # You can set a theme manually. Assign a hash to this method before you
     # send your data.
     #
@@ -378,7 +386,13 @@ module Gruff
     #     background_direction: :top_bottom
     #   }
     #
-    # +background_image: 'squirrel.png'+ is also possible.
+    # +background_colors+
+    # - Array<String> format value - background has gradation. (ex. +background_colors: ['black', 'grey']+)
+    # - String value - background has solid color. (ex. +background_colors: 'orange'+)
+    # - nil - background has transparent. (ex. +background_colors: nil+)
+    #
+    # +background_image+:
+    # - Specify the path to image file when it draw the image as background.
     #
     # +background_direction+ accepts one of following parameters.
     # - +:top_bottom+
@@ -400,7 +414,7 @@ module Gruff
         marker_color: 'white',
         marker_shadow_color: nil,
         font_color: 'black',
-        background_colors: nil,
+        background_colors: 'gray',
         background_image: nil
       }
       @theme_options = defaults.merge options
@@ -894,14 +908,14 @@ module Gruff
     def setup_left_margin
       return @left_margin if hide_left_label_area?
 
-      text = begin
+      longest_left_label_width = begin
         if @has_left_labels
-          @labels.values.reduce('') { |value, memo| value.to_s.length > memo.to_s.length ? value : memo }
+          @labels.values.map { |value| calculate_width(@marker_font, truncate_label_text(value.to_s)) }.max || 0
         else
-          y_axis_label(maximum_value, @increment)
+          label = y_axis_label(maximum_value, @increment)
+          calculate_width(@marker_font, truncate_label_text(label))
         end
       end
-      longest_left_label_width = calculate_width(@marker_font, truncate_label_text(text))
 
       line_number_width = begin
         if !@has_left_labels && (@hide_line_markers || @hide_line_numbers)

data/lib/gruff/dot.rb

@@ -14,6 +14,9 @@
 #   g.write('dot.png')
 #
 class Gruff::Dot < Gruff::Base
+  # Prevent drawing of column labels below a stacked bar graph.  Default is +false+.
+  attr_writer :hide_labels
+
   def initialize(*)
     super
     @has_left_labels = true
@@ -22,6 +25,23 @@ class Gruff::Dot < Gruff::Base
 
 private
 
+  def initialize_attributes
+    super
+    @hide_labels = false
+  end
+
+  def hide_labels?
+    @hide_labels
+  end
+
+  def hide_left_label_area?
+    hide_labels? && @y_axis_label.nil?
+  end
+
+  def hide_bottom_label_area?
+    @hide_line_markers && @x_axis_label.nil? && @legend_at_bottom == false
+  end
+
   def draw_graph
     # Setup spacing.
     #
@@ -58,8 +78,9 @@ private
 
       unless @hide_line_numbers
         label = y_axis_label(marker_label, @increment)
+        y = @graph_bottom + @label_margin + (labels_caps_height / 2.0) + 5 # 5px offset for tick_mark_mode
         text_renderer = Gruff::Renderer::Text.new(renderer, label, font: @marker_font)
-        text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + (@label_margin * 1.5), Magick::CenterGravity)
+        text_renderer.add_to_render_queue(0, 0, x, y, Magick::CenterGravity)
       end
     end
   end

data/lib/gruff/renderer/renderer.rb

@@ -24,13 +24,15 @@ module Gruff
     end
 
     def background(columns, rows, scale, theme_options)
+      return image_background(scale, *theme_options[:background_image]) if theme_options[:background_image]
+
       case theme_options[:background_colors]
       when Array
         gradated_background(columns, rows, *theme_options[:background_colors][0..1], theme_options[:background_direction])
       when String
         solid_background(columns, rows, theme_options[:background_colors])
       else
-        image_background(scale, *theme_options[:background_image])
+        transparent_background(columns, rows)
       end
     end
 

data/lib/gruff/side_bar.rb

@@ -159,8 +159,9 @@ private
         diff = index - number_of_lines
         marker_label = (BigDecimal(diff.abs.to_s) * BigDecimal(increment.to_s)) + BigDecimal(minimum_value.to_s)
         label = x_axis_label(marker_label, @increment)
+        y = @graph_bottom + @label_margin + (labels_caps_height / 2.0)
         text_renderer = Gruff::Renderer::Text.new(renderer, label, font: @marker_font)
-        text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + @label_margin, Magick::CenterGravity)
+        text_renderer.add_to_render_queue(0, 0, x, y, Magick::CenterGravity)
       end
     end
   end

data/lib/gruff/spider.rb

@@ -24,10 +24,6 @@ class Gruff::Spider < Gruff::Base
     @max_value = max_value
   end
 
-  def transparent_background=(value)
-    renderer.transparent_background(@columns, @rows) if value
-  end
-
   def hide_text=(value)
     @hide_title = @hide_text = value
   end

data/lib/gruff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gruff
-  VERSION = '0.22.0'
+  VERSION = '0.24.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-17 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.