gruff 0.23.0-java → 0.24.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccbe03d82324858d43ef208c29e5fe685df853100bdd7e2a5541b5b35e9cd82e
-  data.tar.gz: 19578cbb0ca970e05c2a64a87fa9cee93398552b643dacaa2ad7ffa4737054b5
+  metadata.gz: 7ef07020e21d2f77bf04e8c90d0990bbd00a64bb5e44fbceb8d485f255d8f3ce
+  data.tar.gz: e6073f86bff07eb0b02045ff8da1c2f5937efee11f6574667091cd8fc21f5767
 SHA512:
-  metadata.gz: f0681e1a7f9798f151de44df7af54508d9b8d4b98361357049550a3adc89bc65ffdb526c4a8576eed3f81249384e10a7e2dc97103d4afd04a0c9a80eec1001e5
-  data.tar.gz: 3eba1ccf0e2ebab141946bc814dd6a6b638a4dd4da9641988dae36f0f3ec53b0529499ac5b1f2f78fa9387251d9a98f7cda9a8c00c5a3f481aecbe06965463a2
+  metadata.gz: b919327dfe6fb6b1a7ab52a262b12768e7c759d3d73e1b58e25a580f3e19241f3e983fca931917950352a6bc53a2d45f53a0c9438ca7302794b6c389d481c961
+  data.tar.gz: 6d99017cb356942f66cae454d364ce059a2abc32e79ff7aba0ceb03e4f5335ce3b885188e4ee18cc26639ca409a049afc325e58469a47429656e0e6e18f876ec

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
@@ -26,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.2.1
+      uses: r7kamura/rubocop-problem-matchers-action@v1
     - name: Run tests
       run: bundle exec rubocop
 
@@ -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,5 +1,11 @@
 # 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)
 

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.23.0'
+  VERSION = '0.24.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.