gruff 0.16.0-java → 0.19.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03a1c8455536dad68e5d325a51416807d32595aee6e4be75ef214c1b00e0df06
-  data.tar.gz: fa90b50b714c8464f6b82260f3ec9598edb57cf4b03ffcb8b451083e9bd1a307
+  metadata.gz: fa39c23fc44be66931c2b7f05ad88021b82a8a900ce7894eb962ddaf9ba895f3
+  data.tar.gz: c1bbf2d54c4ad2760e66352626fc07b7b3f89ee4c8d9edcaa87270c173572c4d
 SHA512:
-  metadata.gz: 180bb66623c99daf3b89febea4059ed0d1f655b5fdee1da046e78174d0ea2efdf26e3fbc1de8bc18765cf9ab5cbe8bc52cb22fd01deeb25c377210340506bcfb
-  data.tar.gz: 05e9d6c86ee5ccee8bafc37fe1843f041f2a91f82aa7bbfb77c11fd05c9d64b2192d4b56dfaff0bc3f5d5db925e13ba057179843e0265873d2e1c7659582235d
+  metadata.gz: d82e25b5eefc2e5c8ead58a5e3968b5df4952066032d5fa7c80dd69516b726644c76e91d7e136389cc5c0a6899291b2ac6a4a57548116fd8c53ced4bf347d3b8
+  data.tar.gz: 0d9e8d013c78269a606c85fbf3313302dd9048b37c3fd3eeae55894823a1754fc389073aa4381a4598511fbb31bdc1c2d56b565bc1bc2fac922b3a38261540e8

data/.devcontainer/devcontainer.json

@@ -0,0 +1,26 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.0/containers/docker-existing-dockerfile
+{
+	"name": "Existing Dockerfile",
+
+	// Sets the run context to one level up instead of the .devcontainer folder.
+	"context": "..",
+
+	// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
+	"dockerFile": "../Dockerfile"
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Uncomment the next line to run commands after the container is created - for example installing curl.
+	// "postCreateCommand": "apt-get update && apt-get install -y curl",
+
+	// Uncomment when using a ptrace-based debugger like C++, Go, and Rust
+	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+
+	// Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
+	// "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
+
+	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
+	// "remoteUser": "vscode"
+}

data/.github/workflows/ci.yml

@@ -6,9 +6,12 @@ on:
   pull_request:
     branches: [ master ]
 
+permissions:
+  contents: read
+
 jobs:
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     name: Lint
     steps:
@@ -23,18 +26,18 @@ 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
 
   test-ruby:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     strategy:
       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-45, major-minor: '7.0' }
     name: Ruby ${{ matrix.ruby-version }}
     steps:
     - uses: actions/checkout@v3
@@ -60,11 +63,11 @@ jobs:
       run: bundle exec rake
 
   test-jruby:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['9.2.20.1', '9.3.4.0']
+        ruby-version: ['9.2.21.0', '9.3.7.0']
     name: JRuby ${{ 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,37 @@
 # Change Log
 
+## 0.19.0
+- Draw the graph starting from zero point by default (#609)
+- Improve joints in Gruff::Net using polyline method (#608)
+- Improve joints in Gruff::Line using polyline method (#607)
+- Adjust default font size in Gruff::Mini::{Bar, Pie}
+
+## 0.18.0
+- Add Gruff::Bubble (#604)
+- Rename Gruff::BoxPlot to Gruff::Box (#603)
+- Mark Gruff::Scatter#disable_significant_rounding_x_axis= as deprecated (#602)
+- Mark Gruff::Scatter#x_label_margin= as deprecated (#601)
+- Mark Gruff::Scatter#use_vertical_x_labels= as deprecated (#600)
+
+## 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/README.md

@@ -1,6 +1,6 @@
 # Gruff Graphs
 
-[![Build Status](https://travis-ci.org/topfunky/gruff.svg?branch=master)](https://travis-ci.org/topfunky/gruff)
+[![CI](https://github.com/topfunky/gruff/actions/workflows/ci.yml/badge.svg)](https://github.com/topfunky/gruff/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/gruff.svg)](https://badge.fury.io/rb/gruff)
 
 A library for making beautiful graphs.
@@ -126,14 +126,18 @@ In progress!
 
 ![Histogram chart](https://raw.github.com/topfunky/gruff/master/test/expected/histogram.png)
 
-### Box plot
+### Box chart
 
-![Box plot](https://raw.github.com/topfunky/gruff/master/test/expected/box_plot.png)
+![Box chart](https://raw.github.com/topfunky/gruff/master/test/expected/box.png)
 
 ### Candlestick
 
 ![Candlestick](https://raw.github.com/topfunky/gruff/master/test/expected/candlestick.png)
 
+### Bubble chart
+
+![Bubble chart](https://raw.github.com/topfunky/gruff/master/test/expected/bubble.png)
+
 ## Documentation
 
 http://www.rubydoc.info/github/topfunky/gruff/frames

data/gruff.gemspec

@@ -16,16 +16,14 @@ 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
 
   if defined? JRUBY_VERSION
     s.platform = 'java'
     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 +33,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

@@ -30,9 +30,11 @@ private
   end
 
   def draw_graph
-    x_increment = @graph_width / (column_count - 1)
+    x_increment = (@graph_width / (column_count - 1)).to_f
 
     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,32 @@ private
       minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
     )
 
-    proc_text_metrics = ->(text) { text_metrics(@marker_font, text) }
+    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
@@ -149,6 +147,10 @@ private
   end
 
   def calculate_spacing
-    @scale * @group_spacing * (column_count - 1)
+    @group_spacing * (column_count - 1)
+  end
+
+  def proc_text_metrics
+    ->(text) { text_metrics(@marker_font, text) }
   end
 end