gruff 0.23.0-java → 0.25.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccbe03d82324858d43ef208c29e5fe685df853100bdd7e2a5541b5b35e9cd82e
-  data.tar.gz: 19578cbb0ca970e05c2a64a87fa9cee93398552b643dacaa2ad7ffa4737054b5
+  metadata.gz: 25e07b14aea532cd3028f414074893612a930266e45f8f9d92e89d5c8e385f8f
+  data.tar.gz: 82b241d691cd579fd654fef22d1571dbcb64168cc6b0243ff99048af7babdcf8
 SHA512:
-  metadata.gz: f0681e1a7f9798f151de44df7af54508d9b8d4b98361357049550a3adc89bc65ffdb526c4a8576eed3f81249384e10a7e2dc97103d4afd04a0c9a80eec1001e5
-  data.tar.gz: 3eba1ccf0e2ebab141946bc814dd6a6b638a4dd4da9641988dae36f0f3ec53b0529499ac5b1f2f78fa9387251d9a98f7cda9a8c00c5a3f481aecbe06965463a2
+  metadata.gz: f498d0d6c7703ae51b85335c77ce8f17f9e4e4cccfe86b7bab167612fd7c59a5c1fa3f06c24d366f93ca39a9d6393f12ec7aa430b5e249eadd6e0c4ce0b7f588
+  data.tar.gz: 23ee70685ba4c293104bd4f3c1a6a6e960e1fc6fa9200476d69dcc27f253c71b7d20d4acd859bfe8a5fb93db1aeb940eab006470bed3b955d184bdb47e1db53b

data/.github/workflows/ci.yml

@@ -15,18 +15,18 @@ 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
+    - name: Set up Ruby 3.0
       uses: ruby/setup-ruby@master
       with:
-        ruby-version: '2.6'
+        ruby-version: '3.0'
         bundler-cache: true
     - 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: ['3.0', '3.1', '3.2', '3.3']
         imagemagick-version:
-          - { full: 7.1.0-55, major-minor: '7.1' }
+          - { full: 7.1.1-29, 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.4.6.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/.rubocop.yml

@@ -5,7 +5,7 @@ require:
 
 AllCops:
     EnabledByDefault: true
-    TargetRubyVersion: 2.6
+    TargetRubyVersion: 3.0
     Exclude:
         - 'vendor/bundle/**/*'
         - 'rails_generators/gruff/**/*'
@@ -13,13 +13,13 @@ AllCops:
 Metrics:
   Enabled: false
 
-Gemspec/DependencyVersion:
+Bundler/GemComment:
   Enabled: false
 
-Gemspec/DevelopmentDependencies:
+Bundler/GemVersion:
   Enabled: false
 
-Gemspec/OrderedDependencies:
+Gemspec/DependencyVersion:
   Enabled: false
 
 Gemspec/RequiredRubyVersion:
@@ -67,6 +67,9 @@ Naming/VariableNumber:
 Style/AccessorGrouping:
   Enabled: false
 
+Style/ArrayFirstLast:
+  Enabled: false
+
 Style/ClassAndModuleChildren:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## 0.25.0
+- Add bigdecimal gem as dependency for Ruby 3.4
+- Update dependent RMagick version to 5.5.0 or later
+- Drop Ruby 2.6 and 2.7 support (#632)
+
+## 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/Gemfile

@@ -4,3 +4,15 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gruff.gemspec
 gemspec
+
+unless defined? JRUBY_VERSION
+  gem 'rubocop', '~> 1.63.4'
+  gem 'rubocop-minitest', '~> 0.35.0'
+  gem 'rubocop-performance', '~> 1.21'
+  gem 'rubocop-rake', '~> 0.6.0'
+end
+
+gem 'minitest-reporters'
+gem 'rake'
+gem 'simplecov'
+gem 'yard', '~> 0.9.28'

data/gruff.gemspec

@@ -22,19 +22,13 @@ Gem::Specification.new do |s|
     s.platform = 'java'
     s.add_dependency 'rmagick4j'
   else
-    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'
-    s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+    s.add_dependency 'rmagick', '>= 5.5'
   end
+  s.add_dependency 'bigdecimal', '>= 3.0'
   s.add_dependency 'histogram'
-  s.required_ruby_version = '>= 2.6.0'
-
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'minitest-reporters'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'yard', '~> 0.9.28'
+  s.required_ruby_version = '>= 3.0.0'
 
+  s.metadata['bug_tracker_uri'] = 'https://github.com/topfunky/gruff/issues'
+  s.metadata['changelog_uri'] = 'https://github.com/topfunky/gruff/blob/master/CHANGELOG.md'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

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/line.rb

@@ -53,7 +53,7 @@ class Gruff::Line < Gruff::Base
     if args.empty? || (!args.first.is_a?(Numeric) && !args.first.is_a?(String))
       super()
     else
-      super args.shift
+      super(args.shift)
     end
   end
 
@@ -308,7 +308,7 @@ private
     if x_data.nil?
       draw_label(new_x, index)
     else
-      @labels.each do |label_pos, _|
+      @labels.each_key do |label_pos|
         draw_label(@graph_left + (((label_pos - @minimum_x_value) * @graph_width) / (@maximum_x_value - @minimum_x_value)), label_pos)
       end
     end

data/lib/gruff/renderer/dot.rb

@@ -5,7 +5,7 @@ module Gruff
   class Renderer::Dot
     def initialize(renderer, style, color:, width: 1.0, opacity: 1.0)
       @renderer = renderer
-      @style = style
+      @style = style.to_sym
       @color = color
       @width = width
       @opacity = opacity
@@ -17,7 +17,7 @@ module Gruff
       @renderer.draw.stroke(@color)
       @renderer.draw.fill_opacity(@opacity)
       @renderer.draw.fill(@color)
-      case @style.to_sym
+      case @style
       when :square
         square(new_x, new_y, radius)
       when :diamond
@@ -28,6 +28,8 @@ module Gruff
       @renderer.draw.pop
     end
 
+  private
+
     def circle(new_x, new_y, radius)
       @renderer.draw.circle(new_x, new_y, new_x - radius, new_y)
     end

data/lib/gruff/renderer/rectangle.rb

@@ -13,7 +13,7 @@ module Gruff
     def render(upper_left_x, upper_left_y, lower_right_x, lower_right_y)
       @renderer.draw.push
       @renderer.draw.stroke_width(@width)
-      @renderer.draw.stroke(@color) if @width > 1.0
+      @renderer.draw.stroke(@color) if @color && @width > 1.0
       @renderer.draw.fill_opacity(@opacity)
       @renderer.draw.fill(@color) if @color
       @renderer.draw.rectangle(upper_left_x, upper_left_y, lower_right_x, lower_right_y)

data/lib/gruff/renderer/renderer.rb

@@ -23,19 +23,32 @@ module Gruff
       end
     end
 
+    def transparent_background(columns, rows)
+      @image = render_transparent_background(columns, rows)
+    end
+
+  private
+
     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
 
-    def transparent_background(columns, rows)
-      @image = render_transparent_background(columns, rows)
+    # Use with a theme to use an image (800x600 original) background.
+    def image_background(scale, image_path)
+      image = Magick::Image.read(image_path)
+      if scale != 1.0
+        image[0].resize!(scale) # TODO: Resize with new scale (crop if necessary for wide graph)
+      end
+      image[0]
     end
 
     # Make a new image at the current size with a solid +color+.
@@ -80,17 +93,6 @@ module Gruff
       end
     end
 
-  private
-
-    # Use with a theme to use an image (800x600 original) background.
-    def image_background(scale, image_path)
-      image = Magick::Image.read(image_path)
-      if scale != 1.0
-        image[0].resize!(scale) # TODO: Resize with new scale (crop if necessary for wide graph)
-      end
-      image[0]
-    end
-
     # Use with a theme to make a transparent background
     def render_transparent_background(columns, rows)
       Magick::Image.new(columns, rows) do |img|

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/store/store.rb

@@ -35,21 +35,21 @@ module Gruff
     end
 
     def min
-      @min ||= @data.map(&:min).compact.min
+      @min ||= @data.filter_map(&:min).min
     end
     alias min_y min
 
     def max
-      @max ||= @data.map(&:max).compact.max
+      @max ||= @data.filter_map(&:max).max
     end
     alias max_y max
 
     def min_x
-      @min_x ||= @data.map(&:min_x).compact.min
+      @min_x ||= @data.filter_map(&:min_x).min
     end
 
     def max_x
-      @max_x ||= @data.map(&:max_x).compact.max
+      @max_x ||= @data.filter_map(&:max_x).max
     end
 
     def sort_data!

data/lib/gruff/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.25.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-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -18,22 +18,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rmagick4j
-  prerelease: false
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: histogram
   prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -44,57 +30,29 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: rake
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: minitest-reporters
+        version: '3.0'
+  name: bigdecimal
+  type: :runtime
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: simplecov
+  name: histogram
+  type: :runtime
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.28
-  name: yard
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.28
 description: Beautiful graphs for one or multiple datasets. Can be used on websites
   or in documents.
 email: boss@topfunky.com
@@ -174,6 +132,8 @@ homepage: https://github.com/topfunky/gruff
 licenses:
 - MIT
 metadata:
+  bug_tracker_uri: https://github.com/topfunky/gruff/issues
+  changelog_uri: https://github.com/topfunky/gruff/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -183,14 +143,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.