gruff 0.24.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8ff88f3f42e4e18cbada5384d6bc3ddad3c19c216bd3bd11787d45625559780
-  data.tar.gz: 199aa40584af1ece67f4aa2f1b9ff12c80d1591d664c529e2e41de393925307a
+  metadata.gz: e3c04a6fc48f83e530a5a26a084a1f79993cbb7781e7b6b06ad7208ee205a787
+  data.tar.gz: 52cd0e2ef0f9f4f6a433e65a9c65cba9c7fb4420203ece2ccd461b876ad43042
 SHA512:
-  metadata.gz: c87fa241d9f6130689d54145ad78ce2d8520d0c0eaebd256c4df3428325eda2765287621287e12f596f474b4912f0c036772366a707e6a4d584544a3bc9d77f1
-  data.tar.gz: 404de18f0980fb59ed3afe9db6fac75e56903ecbc532604cceb879c3666396c8d86c7206941829757c70d725738109126d151eb90b120ae96d555347538b2831
+  metadata.gz: b41c3bcd833b9bbbf2e36541552015c0a714e51b79f168c8875e891ad7d51db5bc1b03438f1ce419c55fcc4b3299274c24f4e817d681b748a649222a8c92db88
+  data.tar.gz: f9c017e0264b608160d779526f3ddcd1a9daf129dbd55dbb0eb96193aa2902e5a6cd1c439cdd101c43686fac6fad4130bf0eab2d2ec226439a05df13e12ec07a

data/.editorconfig

@@ -7,8 +7,8 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = spaces
+indent_style = space
 tab_width = 2
 
-[{*.{rb,yml,md}]
+[*.{rb,yml,md}]
 indent_size = 2

data/.github/ISSUE_TEMPLATE/report.yml

@@ -0,0 +1,41 @@
+name: Report
+description: Create a report.
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A description of the bug or feature.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to Reproduce
+      description: |
+        List of steps, sample code, failing test or link to a project that reproduces the behavior.
+        Make sure you place a stack trace inside a code (```) block to avoid linking unrelated issues.
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: System Configuration
+      description: Tell us about the environment where you are experiencing the bug.
+      value: |
+        - ImageMagick version:
+        - RMagick version:
+        - Gruff version:
+        - Ruby version:
+        - Environment (Operating system, version and so on):
+        - Additional information:
+      render: markdown
+    validations:
+      required: true
+  - type: textarea
+    id: addtional-context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.
+    validations:
+      required: false

data/.github/workflows/ci.yml

@@ -11,17 +11,33 @@ permissions:
 
 jobs:
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 20
-    name: Lint
+    strategy:
+      matrix:
+        ruby-version: ['3.0']
+        imagemagick-version:
+          - { full: 7.1.1-33, major-minor: '7.1' }
+    name: Lint (Ruby ${{ matrix.ruby-version }}, ImageMagick ${{ matrix.imagemagick-version.major-minor }})
     steps:
     - uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
-    - name: Set up Ruby 2.6
+    - name: Cache ImageMagick
+      uses: actions/cache@v4
+      with:
+        path: ./build-ImageMagick
+        key: v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
+        restore-keys: |
+          v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
+    - name: Install ImageMagick ${{ matrix.imagemagick-version.full }}
+      run: |
+        export IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }}
+        ./before_install_linux.sh
+    - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@master
       with:
-        ruby-version: '2.6'
+        ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
     - name: Install dependencies
       run: bundle install --path=vendor/bundle --jobs 4 --retry 3
@@ -31,13 +47,13 @@ jobs:
       run: bundle exec rubocop
 
   test-ruby:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
         imagemagick-version:
-          - { full: 7.1.1-15, major-minor: '7.1' }
+          - { full: 7.1.1-33, major-minor: '7.1' }
     name: Ruby ${{ matrix.ruby-version }}
     steps:
     - uses: actions/checkout@v4
@@ -63,11 +79,11 @@ jobs:
       run: bundle exec rake
 
   test-jruby:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['9.3.10.0', '9.4.3.0']
+        ruby-version: ['9.4.7.0']
     name: JRuby ${{ matrix.ruby-version }}
     steps:
     - uses: actions/checkout@v4

data/.rubocop.yml

@@ -1,25 +1,26 @@
-require:
+plugins:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rake
 
 AllCops:
     EnabledByDefault: true
-    TargetRubyVersion: 2.6
+    TargetRubyVersion: 3.0
     Exclude:
         - 'vendor/bundle/**/*'
         - 'rails_generators/gruff/**/*'
+        - 'build-ImageMagick/**/*'
 
 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 +68,9 @@ Naming/VariableNumber:
 Style/AccessorGrouping:
   Enabled: false
 
+Style/ArrayFirstLast:
+  Enabled: false
+
 Style/ClassAndModuleChildren:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.26.0
+
+- Allow customizing No Data font size (#642)
+
+## 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)

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.66'
+  gem 'rubocop-minitest', '~> 0.36'
+  gem 'rubocop-performance', '~> 1.21'
+  gem 'rubocop-rake', '~> 0.6'
+end
+
+gem 'minitest-reporters'
+gem 'rake'
+gem 'simplecov'
+gem 'yard', '~> 0.9.28'

data/README.md

@@ -144,8 +144,8 @@ http://www.rubydoc.info/github/topfunky/gruff/frames
 
 ## Supported Ruby Versions
 
-- Ruby 2.6 or later
-- JRuby 9.3.x or later
+- Ruby 3.0 or later
+- JRuby 9.4.x or later
 
 ## Development
 1. Build docker image

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

@@ -182,6 +182,7 @@ module Gruff
       @title_font = Gruff::Font.new(size: 36.0, bold: true)
       @marker_font = Gruff::Font.new(size: 21.0)
       @legend_font = Gruff::Font.new(size: 20.0)
+      @no_data_font = Gruff::Font.new(size: 80.0)
 
       @label_margin = LABEL_MARGIN
       @top_margin = @bottom_margin = @left_margin = @right_margin = DEFAULT_MARGIN
@@ -283,6 +284,7 @@ module Gruff
       @title_font.path = font_path unless @title_font.path
       @marker_font.path = font_path
       @legend_font.path = font_path
+      @no_data_font.path = font_path
     end
 
     # Same as {#font=} but for the title.
@@ -320,6 +322,14 @@ module Gruff
       @legend_font.size = value
     end
 
+    # Set the font size of the no data message. Default is +80+.
+    #
+    # @param value [Numeric] no data font size
+    #
+    def no_data_font_size=(value)
+      @no_data_font.size = value
+    end
+
     # Specifies whether to draw the title bolded or not. Default is +true+.
     #
     # @param value [Boolean] specifies whether to draw the title bolded or not.
@@ -336,6 +346,7 @@ module Gruff
       @title_font.color = value
       @marker_font.color = value
       @legend_font.color = value
+      @no_data_font.color = value
     end
 
     # Add a color to the list of available colors for lines.
@@ -791,7 +802,7 @@ module Gruff
     # Draws column labels below graph, centered over x
     def draw_label(x, index, gravity = Magick::NorthGravity, &block)
       draw_unique_label(index) do
-        if x >= @graph_left && x <= @graph_right
+        if x.between?(@graph_left, @graph_right)
           y = @graph_bottom
           x_offset, y_offset = calculate_label_offset(@marker_font, @labels[index], @label_margin, @label_rotation)
 
@@ -826,9 +837,7 @@ module Gruff
 
     # Shows an error message because you have no data.
     def draw_no_data
-      font = @title_font.dup
-      font.size = 80
-      font.bold = false
+      font = @no_data_font
       text_renderer = Gruff::Renderer::Text.new(renderer, @no_data_message, font: font)
       text_renderer.render(@raw_columns, @raw_rows, 0, 0, Magick::CenterGravity)
     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,6 +23,12 @@ 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]
 
@@ -36,8 +42,13 @@ module Gruff
       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+.
@@ -82,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/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.24.0'
+  VERSION = '0.26.0'
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Geoffrey Grosenbach
 - Uwe Kubosch
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -17,140 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.5'
 - !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.50.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.50.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.30.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.30.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.17.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.17.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: histogram
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  name: histogram
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.28
-  type: :development
-  prerelease: false
-  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
@@ -161,6 +62,7 @@ files:
 - ".devcontainer/devcontainer.json"
 - ".editorconfig"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/ISSUE_TEMPLATE/report.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -230,8 +132,9 @@ 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: []
 require_paths:
 - lib
@@ -239,15 +142,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.5.3
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.
 test_files: []