gruff 0.10.0-java → 0.13.0-java

data/lib/gruff/store/{base_data.rb → basic_data.rb}

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 module Gruff
-  # @private
   class Store
-    class BaseData < Struct.new(:label, :points, :color)
+    # @private
+    class BasicData < Struct.new(:label, :points, :color)
       def initialize(label, points, color)
-        self.label = label.to_s
-        self.points = Array(points)
-        self.color = color
+        super(label.to_s, Array(points), color)
+      end
+
+      def empty?
+        points.empty?
       end
 
       def columns
@@ -22,9 +24,9 @@ module Gruff
         points.compact.max
       end
 
-      def normalize(args = {})
+      def normalize(minimum:, spread:)
         norm_points = points.map do |point|
-          point.nil? ? nil : (point.to_f - args[:minimum].to_f) / args[:spread]
+          point.nil? ? nil : (point.to_f - minimum.to_f) / spread
         end
 
         self.class.new(label, norm_points, color)

data/lib/gruff/store/custom_data.rb

@@ -2,12 +2,14 @@
 
 module Gruff
   class Store
+    # @private
     class CustomData < Struct.new(:label, :points, :color, :custom)
       def initialize(label, points, color, custom = nil)
-        self.label = label.to_s
-        self.points = Array(points)
-        self.color = color
-        self.custom = custom
+        super(label.to_s, Array(points), color, custom)
+      end
+
+      def empty?
+        points.empty?
       end
 
       def columns
@@ -22,9 +24,9 @@ module Gruff
         points.compact.max
       end
 
-      def normalize(args = {})
+      def normalize(minimum:, spread:)
         norm_points = points.map do |point|
-          point.nil? ? nil : (point.to_f - args[:minimum].to_f) / args[:spread]
+          point.nil? ? nil : (point.to_f - minimum.to_f) / spread
         end
 
         self.class.new(label, norm_points, color, custom)

data/lib/gruff/store/store.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Store
     attr_reader :data, :norm_data
 
@@ -15,10 +16,10 @@ module Gruff
       @data << @data_class.new(*args)
     end
 
-    def normalize(args = {})
+    def normalize(**keywords)
       unless @normalized
         @data.each do |data_row|
-          @norm_data << data_row.normalize(args)
+          @norm_data << data_row.normalize(**keywords)
         end
 
         @normalized = true
@@ -26,7 +27,7 @@ module Gruff
     end
 
     def empty?
-      @data.empty?
+      @data.all?(&:empty?)
     end
 
     def length
@@ -56,11 +57,11 @@ module Gruff
     end
 
     def sort_data!
-      @data = @data.sort_by { |a| -a.points.reduce(0) { |acc, elem| acc + elem.to_f } }
+      @data = @data.sort_by { |a| -a.points.sum(&:to_f) }
     end
 
     def sort_norm_data!
-      @norm_data = @norm_data.sort_by { |a| -a.points.reduce(0) { |acc, elem| acc + elem.to_f } }
+      @norm_data = @norm_data.sort_by { |a| -a.points.sum(&:to_f) }
     end
 
     def reverse!

data/lib/gruff/store/xy_data.rb

@@ -2,12 +2,11 @@
 
 module Gruff
   class Store
+    # @private
     class XYData < Struct.new(:label, :y_points, :color, :x_points)
       def initialize(label, y_points, color, x_points = nil)
-        self.label = label.to_s
-        self.y_points = Array(y_points)
-        self.color = color
-        self.x_points = Array(x_points) if x_points
+        x_points = Array(x_points) if x_points
+        super(label.to_s, Array(y_points), color, x_points)
       end
 
       def x_points
@@ -18,6 +17,10 @@ module Gruff
         x_points.zip(y_points)
       end
 
+      def empty?
+        y_points.empty?
+      end
+
       def columns
         y_points.length
       end
@@ -40,12 +43,12 @@ module Gruff
         x_points.compact.max
       end
 
-      def normalize(args = {})
+      def normalize(minimum_x:, minimum_y:, spread_x:, spread_y:)
         norm_x_points = x_points.map do |x|
-          x.nil? ? nil : (x.to_f - args[:minimum_x].to_f) / args[:spread_x]
+          x.nil? ? nil : (x.to_f - minimum_x.to_f) / spread_x
         end
         norm_y_points = y_points.map do |y|
-          y.nil? ? nil : (y.to_f - args[:minimum_y].to_f) / args[:spread_y]
+          y.nil? ? nil : (y.to_f - minimum_y.to_f) / spread_y
         end
 
         self.class.new(label, norm_y_points, color, norm_x_points)

data/lib/gruff/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.13.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-31 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: parallel
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -67,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: simplecov
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -99,13 +127,12 @@ files:
 - Gemfile
 - MIT-LICENSE
 - README.md
-- Rakefile
+- assets/fonts/LICENSE.txt
+- assets/fonts/Roboto-Bold.ttf
+- assets/fonts/Roboto-Regular.ttf
 - assets/plastik/blue.png
 - assets/plastik/green.png
 - assets/plastik/red.png
-- docker/Dockerfile
-- docker/build.sh
-- docker/launch.sh
 - gruff.gemspec
 - init.rb
 - lib/gruff.rb
@@ -117,7 +144,7 @@ files:
 - lib/gruff/bullet.rb
 - lib/gruff/dot.rb
 - lib/gruff/helper/bar_conversion.rb
-- lib/gruff/helper/bar_value_label_mixin.rb
+- lib/gruff/helper/bar_value_label.rb
 - lib/gruff/helper/stacked_mixin.rb
 - lib/gruff/histogram.rb
 - lib/gruff/line.rb
@@ -148,7 +175,7 @@ files:
 - lib/gruff/spider.rb
 - lib/gruff/stacked_area.rb
 - lib/gruff/stacked_bar.rb
-- lib/gruff/store/base_data.rb
+- lib/gruff/store/basic_data.rb
 - lib/gruff/store/custom_data.rb
 - lib/gruff/store/store.rb
 - lib/gruff/store/xy_data.rb
@@ -169,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Rakefile

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require 'rake/clean'
-
-CLEAN.concat %w[pkg test/output/*]
-
-desc 'Run tests'
-task default: :test
-
-task gem: :build
-
-Rake::TestTask.new
-
-namespace :test do
-  desc 'Run mini tests'
-  task mini: :clean do
-    Dir['test/test_mini*'].each do |file|
-      system "ruby #{file}"
-    end
-  end
-end

data/docker/Dockerfile

@@ -1,14 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt update && apt install -y gcc libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev \
-    libmagickwand-dev wget git pkg-config && \
-    wget https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.1.tar.gz && \
-    tar xvzf ruby-2.7.1.tar.gz && \
-    cd ruby-2.7.1 && \
-    ./configure --prefix=/usr --disable-install-rdoc && \
-    make -j install && \
-    cd .. && rm -rf ruby-2.7.1 && \
-    gem install bundler -v 1.17.3 && \
-    /usr/bin/bundle config set --local path 'vendor/bundle'
-
-WORKDIR /opt/gruff

data/docker/build.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-script_dir=$(cd $(dirname ${BASH_SOURCE:-$0}); pwd)
-docker build -t gruff ${script_dir}

data/docker/launch.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-prject_dir="$(cd $(dirname ${BASH_SOURCE:-$0}); pwd)/.."
-docker run -v $prject_dir:/opt/gruff --rm -it gruff bash

data/lib/gruff/helper/bar_value_label_mixin.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-# @private
-module Gruff::Base::BarValueLabelMixin
-  class BarValueLabel
-    attr_accessor :coordinates, :values
-
-    def initialize(size, bar_width)
-      @coordinates = Array.new(size)
-      @values = Hash.new(0)
-      @bar_width = bar_width
-    end
-
-    def prepare_rendering(format)
-      @coordinates.each_with_index do |(left_x, left_y, right_x, _right_y), index|
-        value = @values[index]
-        val = (format || '%.2f') % value
-        y = value >= 0 ? left_y - 30 : left_y + 12
-        yield left_x + (right_x - left_x) / 2, y, val.commify
-      end
-    end
-
-    def prepare_sidebar_rendering(format)
-      @coordinates.each_with_index do |(_left_x, _left_y, right_x, right_y), index|
-        val = (format || '%.2f') % @values[index]
-        yield right_x + 40, right_y - @bar_width / 2, val.commify
-      end
-    end
-  end
-end