gruff 0.11.0-java → 0.12.0-java

data/lib/gruff/store/custom_data.rb

@@ -2,12 +2,10 @@
 
 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?
@@ -26,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
@@ -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
@@ -44,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.11.0'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-12 00:00:00.000000000 Z
+date: 2020-10-31 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:
@@ -88,24 +102,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".github/ISSUE_TEMPLATE.md"
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
-- Rakefile
 - 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
@@ -148,7 +151,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 +172,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/.editorconfig

@@ -1,14 +0,0 @@
-# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
-# @see http://editorconfig.org
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = spaces
-tab_width = 2
-
-[{*.{rb,yml,md}]
-indent_size = 2

data/.github/ISSUE_TEMPLATE.md

@@ -1,18 +0,0 @@
-### Description
-<!-- A description of the bug or feature -->
-
-### Steps to Reproduce
-<!-- 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 -->
-
-### System Configuration
-<!-- Tell us about the environment where you are experiencing the bug -->
-
-- ImageMagick version:
-- RMagick version:
-- Gruff version:
-- Ruby version:
-- Environment (Operating system, version and so on):
-- Additional information:
-
-<!-- Thanks for reporting the issue to Gruff! -->

data/.gitignore

@@ -1,10 +0,0 @@
-*~
-/.idea/
-/pkg/
-/vendor/
-/test/output/
-/test/output_java/
-.DS_Store
-.bundle
-.yardoc
-Gemfile.lock

data/.rubocop.yml

@@ -1,109 +0,0 @@
-inherit_from: .rubocop_todo.yml
-
-AllCops:
-    EnabledByDefault: true
-    Exclude:
-        - 'vendor/bundle/**/*'
-        - 'rails_generators/gruff/**/*'
-
-Gemspec/OrderedDependencies:
-  Enabled: false
-
-Gemspec/RequiredRubyVersion:
-  Enabled: false
-
-Layout/AccessModifierIndentation:
-  EnforcedStyle: outdent
-
-Layout/ClassStructure:
-  Enabled: false
-
-Layout/FirstMethodArgumentLineBreak:
-  Enabled: false
-
-Layout/LeadingCommentSpace:
-  Enabled: false
-
-Layout/MultilineMethodArgumentLineBreaks:
-  Enabled: false
-
-Layout/MultilineAssignmentLayout:
-  EnforcedStyle: same_line
-
-Lint/AssignmentInCondition:
-  Enabled: false
-
-Lint/NumberConversion:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/ConditionalAssignment:
-  Enabled: false
-
-Style/ConstantVisibility:
-  Enabled: false
-
-Style/Copyright:
-  Enabled: false
-
-Style/Encoding:
-  Enabled: false
-
-Style/FormatString:
-  EnforcedStyle: sprintf
-
-Style/FormatStringToken:
-  Enabled: false
-
-Style/GuardClause:
-  Enabled: false
-
-Style/HashSyntax:
-  EnforcedStyle: ruby19_no_mixed_keys
-
-Style/IfUnlessModifier:
-  Enabled: false
-
-Style/InlineComment:
-  Enabled: false
-
-Style/ImplicitRuntimeError:
-  Enabled: false
-
-Style/MethodCallWithArgsParentheses:
-  Enabled: false
-
-Style/MissingElse:
-  Enabled: false
-
-Style/MutableConstant:
-  Enabled: false
-
-Style/Next:
-  Enabled: false
-
-Style/NumericLiterals:
-  Enabled: false
-
-Style/NumericPredicate:
-  Enabled: false
-
-Style/OptionHash:
-  Enabled: false
-
-Style/SingleLineBlockParams:
-  Enabled: false
-
-Style/SpecialGlobalVars:
-  Enabled: false
-
-Style/StructInheritance:
-  Enabled: false
-
-Style/SymbolArray:
-  Enabled: false
-
-Style/TernaryParentheses:
-  Enabled: false

data/.rubocop_todo.yml

@@ -1,112 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2020-05-24 08:35:04 +0000 using RuboCop version 0.81.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-Lint/DuplicateMethods:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-
-# Offense count: 1
-Lint/UnreachableCode:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-
-# Offense count: 1
-# Configuration parameters: CheckForMethodsWithNoSideEffects.
-Lint/Void:
-  Exclude:
-    - 'lib/gruff/patch/rmagick.rb'
-
-# Offense count: 49
-# Configuration parameters: IgnoredMethods.
-Metrics/AbcSize:
-  Max: 78
-
-# Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
-  Max: 29
-
-# Offense count: 12
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 637
-
-# Offense count: 12
-# Configuration parameters: IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 17
-
-# Offense count: 126
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 81
-
-# Offense count: 2
-# Configuration parameters: CountKeywordArgs.
-Metrics/ParameterLists:
-  Max: 7
-
-# Offense count: 9
-# Configuration parameters: IgnoredMethods.
-Metrics/PerceivedComplexity:
-  Max: 20
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyleForLeadingUnderscores.
-# SupportedStylesForLeadingUnderscores: disallowed, required, optional
-Naming/MemoizedInstanceVariableName:
-  Exclude:
-    - 'lib/gruff/scene.rb'
-
-# Offense count: 7
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db, os, pp
-Naming/MethodParameterName:
-  Exclude:
-    - 'lib/gruff/base.rb'
-    - 'lib/gruff/patch/rmagick.rb'
-    - 'lib/gruff/pie.rb'
-    - 'lib/gruff/renderer/text.rb'
-
-# Offense count: 2
-Security/Eval:
-  Exclude:
-    - 'test/gruff_test_case.rb'
-
-# Offense count: 39
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 134
-# Configuration parameters: RequireForNonPublicMethods.
-Style/DocumentationMethod:
-  Enabled: false
-
-# Offense count: 3
-Style/EvalWithLocation:
-  Exclude:
-    - 'test/gruff_test_case.rb'
-
-# Offense count: 1
-Style/MissingRespondToMissing:
-  Exclude:
-    - 'lib/gruff/scene.rb'
-
-# Offense count: 406
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 164