gruff 0.18.0-java → 0.19.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00db2218eaaafaa261ece0433671849fae44f4eccbf7e53fdb28767f11022ea
-  data.tar.gz: 904fe6ad5c4694308b20740e12adde7483b11f16eb7eea75061af57935a6c285
+  metadata.gz: fa39c23fc44be66931c2b7f05ad88021b82a8a900ce7894eb962ddaf9ba895f3
+  data.tar.gz: c1bbf2d54c4ad2760e66352626fc07b7b3f89ee4c8d9edcaa87270c173572c4d
 SHA512:
-  metadata.gz: 2e33b0cfbbe2f1c99d8bca06a9914ce0e53b060d3b01434f2a3c15a49795fc2ba2b8dc94964c99cd548a8d466de865d92430f39d863f040ffa6d68ab8aadb28c
-  data.tar.gz: 7d6673cf33d50a250e9f1cde7d7caa23b2a0edcf9a780e0feb784f24dbac36eb768dee29409291e7968ca445a38ba06caea52c210678e50c429cfb1a39c635f4
+  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

@@ -11,7 +11,7 @@ permissions:
 
 jobs:
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     name: Lint
     steps:
@@ -31,13 +31,13 @@ jobs:
       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-39, major-minor: '7.0' }
+          - { full: 7.1.0-45, major-minor: '7.0' }
     name: Ruby ${{ matrix.ruby-version }}
     steps:
     - uses: actions/checkout@v3
@@ -63,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/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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)

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.

data/gruff.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.summary = 'Beautiful graphs for one or multiple datasets.'
   s.license = 'MIT'
   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'

data/lib/gruff/base.rb

@@ -469,7 +469,8 @@ module Gruff
     #
     # Set it after you have given all your data to the graph object.
     def minimum_value
-      (@minimum_value || store.min).to_f
+      min = [0.0, store.min.to_f].min
+      (@minimum_value || min).to_f
     end
     attr_writer :minimum_value
 

data/lib/gruff/bezier.rb

@@ -24,6 +24,9 @@ private
   def draw_graph
     x_increment = (@graph_width / (column_count - 1)).to_f
 
+    renderer_class = RUBY_PLATFORM == 'java' ? Gruff::Renderer::Polyline : Gruff::Renderer::Bezier
+    stroke_width = clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 4.0), 5.0)
+
     store.norm_data.each do |data_row|
       next if data_row[1].empty?
 
@@ -45,13 +48,7 @@ private
         draw_label(new_x, index)
       end
 
-      stroke_width = clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 4), 5.0)
-
-      if RUBY_PLATFORM == 'java'
-        Gruff::Renderer::Polyline.new(renderer, color: data_row.color, width: stroke_width).render(poly_points)
-      else
-        Gruff::Renderer::Bezier.new(renderer, color: data_row.color, width: stroke_width).render(poly_points)
-      end
+      renderer_class.new(renderer, color: data_row.color, width: stroke_width).render(poly_points)
     end
   end
 end

data/lib/gruff/dot.rb

@@ -29,7 +29,7 @@ private
 
     items_width = @graph_height / column_count
     item_width = items_width * spacing_factor / store.length
-    padding = (items_width * (1 - spacing_factor)) / 2
+    padding = (items_width * (1 - spacing_factor)) / 2.0
 
     store.norm_data.each_with_index do |data_row, row_index|
       data_row.points.each_with_index do |data_point, point_index|

data/lib/gruff/line.rb

@@ -208,12 +208,15 @@ private
       draw_vertical_reference_line(curr_reference_line) if curr_reference_line.key?(:index)
     end
 
-    store.norm_data.each do |data_row|
-      prev_x = prev_y = nil
+    stroke_width  = @line_width || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 4.0), 5.0)
+    circle_radius = @dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 2.5), 5.0)
 
-      one_point = contains_one_point_only?(data_row)
+    store.norm_data.each do |data_row|
+      poly_points_group = [[]]
 
       data_row.coordinates.each_with_index do |(x_data, y_data), index|
+        poly_points = poly_points_group.last
+
         new_x = begin
           if x_data.nil?
             # use the old method: equally spaced points along the x-axis
@@ -224,28 +227,27 @@ private
         end
         draw_label_for_x_data(x_data, new_x, index)
 
-        unless y_data # we can't draw a line for a null data point, we can still label the axis though
-          prev_x = prev_y = nil
+        unless y_data
+          # we can't draw a line for a null data point, we can still label the axis though.
+          # Split the polygonal line into separate groups of points for polyline.
+          poly_points_group << []
           next
         end
 
         new_y = @graph_top + (@graph_height - (y_data * @graph_height))
 
-        # Reset each time to avoid thin-line errors
-        stroke_width  = @line_width || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 4), 5.0)
-        circle_radius = @dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 2.5), 5.0)
+        poly_points << new_x
+        poly_points << new_y
 
-        if !@hide_lines && prev_x && prev_y
-          Gruff::Renderer::Line.new(renderer, color: data_row.color, width: stroke_width)
-                               .render(prev_x, prev_y, new_x, new_y)
-        end
-
-        if one_point || !@hide_dots
+        if contains_one_point_only?(data_row) || !@hide_dots
           Gruff::Renderer::Dot.new(renderer, @dot_style, color: data_row.color, width: stroke_width).render(new_x, new_y, circle_radius)
         end
+      end
 
-        prev_x = new_x
-        prev_y = new_y
+      unless @hide_lines
+        poly_points_group.each do |poly_points|
+          Gruff::Renderer::Polyline.new(renderer, color: data_row.color, width: stroke_width).render(poly_points) unless poly_points.empty?
+        end
       end
     end
   end

data/lib/gruff/mini/bar.rb

@@ -28,7 +28,7 @@ module Gruff
         @hide_line_numbers = true
 
         @marker_font.size = 50.0
-        @legend_font.size = 60.0
+        @legend_font.size = 50.0
 
         @minimum_value = 0.0
       end

data/lib/gruff/mini/pie.rb

@@ -26,8 +26,8 @@ module Gruff
         @hide_title = true
         @hide_line_numbers = true
 
-        @marker_font.size = 60.0
-        @legend_font.size = 60.0
+        @marker_font.size = 50.0
+        @legend_font.size = 50.0
       end
 
       def setup_data

data/lib/gruff/net.rb

@@ -60,6 +60,8 @@ private
 
   def draw_graph
     store.norm_data.each do |data_row|
+      poly_points = []
+
       data_row.points.each_with_index do |data_point, index|
         next if data_point.nil?
 
@@ -67,6 +69,10 @@ private
         point_distance = data_point * @radius
         start_x = @center_x + (Math.sin(rad_pos) * point_distance)
         start_y = @center_y - (Math.cos(rad_pos) * point_distance)
+        if poly_points.empty?
+          poly_points << start_x
+          poly_points << start_y
+        end
 
         next_index = index + 1 < data_row.points.length ? index + 1 : 0
 
@@ -74,14 +80,16 @@ private
         next_point_distance = data_row.points[next_index] * @radius
         end_x = @center_x + (Math.sin(next_rad_pos) * next_point_distance)
         end_y = @center_y - (Math.cos(next_rad_pos) * next_point_distance)
-
-        Gruff::Renderer::Line.new(renderer, color: data_row.color, width: @stroke_width).render(start_x, start_y, end_x, end_y)
+        poly_points << end_x
+        poly_points << end_y
 
         unless @hide_dots
           circle_renderer = Gruff::Renderer::Circle.new(renderer, color: data_row.color, width: @stroke_width)
           circle_renderer.render(start_x, start_y, start_x - @circle_radius, start_y)
         end
       end
+
+      Gruff::Renderer::Polyline.new(renderer, color: data_row.color, width: @stroke_width).render(poly_points) unless poly_points.empty?
     end
   end
 

data/lib/gruff/renderer/bezier.rb

@@ -11,8 +11,8 @@ module Gruff
 
     def render(points)
       @renderer.draw.push
-      @renderer.draw.stroke(@color)
       @renderer.draw.stroke_width(@width)
+      @renderer.draw.stroke(@color)
       @renderer.draw.fill_opacity(0.0)
       @renderer.draw.bezier(*points)
       @renderer.draw.pop

data/lib/gruff/renderer/circle.rb

@@ -12,10 +12,10 @@ module Gruff
 
     def render(origin_x, origin_y, perim_x, perim_y)
       @renderer.draw.push
-      @renderer.draw.fill(@color)
-      @renderer.draw.fill_opacity(@opacity)
-      @renderer.draw.stroke(@color)
       @renderer.draw.stroke_width(@width)
+      @renderer.draw.stroke(@color)
+      @renderer.draw.fill_opacity(@opacity)
+      @renderer.draw.fill(@color)
       @renderer.draw.circle(origin_x, origin_y, perim_x, perim_y)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/dash_line.rb

@@ -13,9 +13,9 @@ module Gruff
     def render(start_x, start_y, end_x, end_y)
       @renderer.draw.push
       @renderer.draw.stroke_color(@color)
-      @renderer.draw.fill_opacity(0.0)
       @renderer.draw.stroke_dasharray(*@dasharray)
       @renderer.draw.stroke_width(@width)
+      @renderer.draw.fill_opacity(0.0)
       @renderer.draw.line(start_x, start_y, end_x, end_y)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/dot.rb

@@ -15,8 +15,8 @@ module Gruff
       @renderer.draw.push
       @renderer.draw.stroke_width(@width)
       @renderer.draw.stroke(@color)
-      @renderer.draw.fill(@color)
       @renderer.draw.fill_opacity(@opacity)
+      @renderer.draw.fill(@color)
       case @style.to_sym
       when :square
         square(new_x, new_y, radius)

data/lib/gruff/renderer/line.rb

@@ -30,9 +30,9 @@ module Gruff
       end
 
       @renderer.draw.push
+      @renderer.draw.stroke_width(@width) if @width
       @renderer.draw.stroke(color)
       @renderer.draw.fill(color)
-      @renderer.draw.stroke_width(@width) if @width
       @renderer.draw.line(start_x, start_y, end_x, end_y)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/polygon.rb

@@ -14,8 +14,8 @@ module Gruff
       @renderer.draw.push
       @renderer.draw.stroke_width(@width)
       @renderer.draw.stroke(@color)
-      @renderer.draw.fill(@color)
       @renderer.draw.fill_opacity(@opacity)
+      @renderer.draw.fill(@color)
       @renderer.draw.polygon(*points)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/polyline.rb

@@ -3,17 +3,19 @@
 module Gruff
   # @private
   class Renderer::Polyline
-    def initialize(renderer, color:, width:)
+    def initialize(renderer, color:, width: 1.0, linejoin: 'bevel')
       @renderer = renderer
       @color = color
       @width = width
+      @linejoin = linejoin
     end
 
     def render(points)
       @renderer.draw.push
+      @renderer.draw.stroke_linejoin(@linejoin)
+      @renderer.draw.stroke_width(@width)
       @renderer.draw.stroke(@color)
       @renderer.draw.fill('transparent')
-      @renderer.draw.stroke_width(@width)
       @renderer.draw.polyline(*points)
       @renderer.draw.pop
     end

data/lib/gruff/scatter.rb

@@ -142,6 +142,9 @@ private
   end
 
   def draw_graph
+    stroke_width  = @stroke_width  || clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 4.0), 5.0)
+    circle_radius = @circle_radius || clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 2.5), 5.0)
+
     store.norm_data.each do |data_row|
       data_row.coordinates.each do |x_value, y_value|
         next if y_value.nil? || x_value.nil?
@@ -149,9 +152,6 @@ private
         new_x = @graph_left + (x_value * @graph_width)
         new_y = @graph_bottom - (y_value * @graph_height)
 
-        # Reset each time to avoid thin-line errors
-        stroke_width  = @stroke_width  || clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 4.0), 5.0)
-        circle_radius = @circle_radius || clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 2.5), 5.0)
         Gruff::Renderer::Circle.new(renderer, color: data_row.color, width: stroke_width).render(new_x, new_y, new_x - circle_radius, new_y)
       end
     end

data/lib/gruff/stacked_bar.rb

@@ -78,7 +78,7 @@ private
     #
     # Columns sit stacked.
     bar_width = @graph_width / column_count
-    padding = (bar_width * (1 - @bar_spacing)) / 2
+    padding = (bar_width * (1 - @bar_spacing)) / 2.0
 
     # Setup the BarConversion Object
     conversion = Gruff::BarConversion.new(

data/lib/gruff/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-26 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/devcontainer.json"
 - ".editorconfig"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/workflows/ci.yml"