gruff 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b01a0cdd72f20c5aad3a39aed50fefd42a006b3dba14656df9356ef29ce1b43d
-  data.tar.gz: 15800ffcd4c4f06dc9e4569ebfa18ec8f551164bfc78e66aadb9b37d2e8cd312
+  metadata.gz: f025be5cc258c8ad9add6f626281d04d190566df8435df847bd4d4ff82cae7d0
+  data.tar.gz: ac74357d127a7a88fa5a824672b9ad40056b122f7f1a134fadc1b6fdd4880980
 SHA512:
-  metadata.gz: 92cfceb4d4b45f896352b6a1c06015bb468c8e2fa641271bbd8608431b455cb2b8d5730c344545f2067c90cc4e7ac4c48fbb68f950b569cf06e949490e48f299
-  data.tar.gz: 64b3436e681a3b8904e1c17729d51f1eb4693759afce386b81fed1a1d2d82ba3a1351597b7454a28cedc9dc3cac4eb740ee6c49e2e36938b732ef8d4509d65e3
+  metadata.gz: 5ded193e69c08a79ea90f45110c0331616e1ab14654d09adbf6fd81905b3b64ba2deb09eb1cb5b3c7831e8567f75a332d6b40f2ca70a4542a20eacf34a1ec976
+  data.tar.gz: d74024f08954283d3da0ff761576a1c94e0f41a1dc2df86e8ee2c8a8848672208c09780d3bcf22254da0a9e04b35c7cac04d9eaf62ff6d2b02130675915e967a

data/.github/workflows/ci.yml

@@ -0,0 +1,66 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  lint:
+    runs-on: ubuntu-18.04
+    timeout-minutes: 20
+    name: Lint
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+    - name: Set up Ruby 2.4
+      uses: ruby/setup-ruby@master
+      with:
+        ruby-version: '2.4'
+        bundler-cache: true
+    - 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
+    - name: Run tests
+      run: bundle exec rubocop
+
+  test-ruby:
+    runs-on: ubuntu-18.04
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        ruby-version: ['2.4', '2.5', '2.6', '2.7', '3.0']
+    name: Ruby ${{ matrix.ruby-version }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@master
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Install dependencies
+      run: bundle install --path=vendor/bundle --jobs 4 --retry 3
+    - name: Run tests
+      run: bundle exec rake
+
+  test-jruby:
+    runs-on: ubuntu-18.04
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        ruby-version: ['9.2.19.0']
+    name: JRuby ${{ matrix.ruby-version }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@master
+      with:
+        ruby-version: jruby-${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Install dependencies
+      run: bundle install --path=vendor/bundle --jobs 4 --retry 3
+    - name: Run tests
+      run: bundle exec rake

data/.rubocop.yml

@@ -1,5 +1,7 @@
 inherit_from: .rubocop_todo.yml
-require: rubocop-performance
+require:
+  - rubocop-performance
+  - rubocop-rake
 
 AllCops:
     EnabledByDefault: true
@@ -23,9 +25,6 @@ Layout/ClassStructure:
 Layout/FirstMethodArgumentLineBreak:
   Enabled: false
 
-Layout/LeadingCommentSpace:
-  Enabled: false
-
 Layout/LineLength:
   Max: 150
 
@@ -44,6 +43,9 @@ Lint/ConstantResolution:
 Lint/NumberConversion:
   Enabled: false
 
+Naming/MethodParameterName:
+  Enabled: false
+
 Style/AccessorGrouping:
   Enabled: false
 
@@ -62,9 +64,6 @@ Style/Copyright:
 Style/Documentation:
   Enabled: true
 
-Style/Encoding:
-  Enabled: false
-
 Style/FormatString:
   EnforcedStyle: sprintf
 
@@ -92,9 +91,6 @@ Style/MethodCallWithArgsParentheses:
 Style/MissingElse:
   Enabled: false
 
-Style/MutableConstant:
-  Enabled: false
-
 Style/Next:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,30 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-05-07 13:38:24 UTC using RuboCop version 1.12.1.
+# on 2021-07-11 06:52:14 UTC using RuboCop version 1.12.1.
 # 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
-# Cop supports --auto-correct.
-# Configuration parameters: Include.
-# Include: **/*.gemspec
-Gemspec/DateAssignment:
-  Exclude:
-    - 'gruff.gemspec'
-
-# Offense count: 1
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
-Lint/DuplicateBranch:
-  Exclude:
-    - 'test/gruff_test_case.rb'
-
-# Offense count: 1
-Lint/DuplicateMethods:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-
 # Offense count: 13
 Lint/FloatComparison:
   Exclude:
@@ -33,44 +14,34 @@ Lint/FloatComparison:
     - 'lib/gruff/renderer/renderer.rb'
     - 'lib/gruff/scatter.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: 56
+# Offense count: 57
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 75
+  Max: 66
 
-# Offense count: 1
+# Offense count: 3
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:
-  Max: 29
+  Max: 32
 
 # Offense count: 14
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 669
+  Max: 683
 
 # Offense count: 8
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 21
+  Max: 17
 
-# Offense count: 126
+# Offense count: 134
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
   Max: 81
@@ -80,10 +51,10 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 7
 
-# Offense count: 7
+# Offense count: 6
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 22
+  Max: 19
 
 # Offense count: 1
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
@@ -92,16 +63,6 @@ Naming/MemoizedInstanceVariableName:
   Exclude:
     - 'lib/gruff/scene.rb'
 
-# Offense count: 9
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
-Naming/MethodParameterName:
-  Exclude:
-    - 'lib/gruff/base.rb'
-    - 'lib/gruff/patch/rmagick.rb'
-    - 'lib/gruff/pie.rb'
-    - 'lib/gruff/renderer/text.rb'
-
 # Offense count: 6
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers.
 # SupportedStyles: snake_case, normalcase, non_integer
@@ -112,31 +73,18 @@ Naming/VariableNumber:
     - 'test/test_bezier.rb'
     - 'test/test_line.rb'
 
-# Offense count: 1
-# Configuration parameters: MinSize.
-Performance/CollectionLiteralInLoop:
-  Exclude:
-    - 'test/test_legend.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/RedundantMatch:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/RegexpMatch:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Performance/StringReplacement:
   Exclude:
     - 'lib/gruff/scene.rb'
 
-# Offense count: 2
+# Offense count: 1
+Rake/Desc:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 1
 Security/Eval:
   Exclude:
     - 'test/gruff_test_case.rb'
@@ -146,37 +94,23 @@ Style/CombinableLoops:
   Exclude:
     - 'test/test_line.rb'
 
-# Offense count: 3
+# Offense count: 2
 Style/DocumentDynamicEvalDefinition:
   Exclude:
     - 'test/gruff_test_case.rb'
 
-# Offense count: 137
+# Offense count: 97
 # Configuration parameters: RequireForNonPublicMethods.
 Style/DocumentationMethod:
   Enabled: false
 
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/EvalWithLocation:
-  Exclude:
-    - 'test/gruff_test_case.rb'
-
 # Offense count: 1
 Style/MissingRespondToMissing:
   Exclude:
     - 'lib/gruff/scene.rb'
 
-# Offense count: 1
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: respond_to_missing?
-Style/OptionalBooleanParameter:
-  Exclude:
-    - 'lib/gruff/base.rb'
-
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/StringConcatenation:
   Exclude:
-    - 'lib/gruff/photo_bar.rb'
     - 'test/gruff_test_case.rb'

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 0.14.0
+- Update rails template (#547)
+- Remove singleton in order to support multi-thread processing (#546)
+- Fix bug in Gruff::Scatter that X coordinate value is wrong if set value in x_axis_increment (#534)
+- Add marker_x_count attribute in Gruff::Line (#532)
+- Add label_formatting attribute in Gruff::Pie (#531)
+- Removed the ability to inject custom PieSlice classes from the outside (#530)
+- Remove Gruff::PhotoBar (#513)
+- Deprecate last_series_goes_on_bottom attribute in Gruff::StackedArea (#512)
+
 ## 0.13.0
 - Allow to customize label value with lambda (#510)
 - Rename enable_vertical_line_markers attribute to show_vertical_markers (#509)

data/README.md

@@ -133,30 +133,29 @@ http://www.rubydoc.info/github/topfunky/gruff/frames
 
 ## Supported Ruby Versions
 
-We aim to support all Ruby implementations supporting Ruby language level 1.9.3
-or later.  Currently we are running CI for MRI, JRuby, and Rubinius.
+- Ruby 2.4 or later
+- JRuby 9.2.x or later
 
 ## Development
 1. Build docker image
 ```sh
-$ ./docker/build.sh
+$ ./docker-build.sh
 ```
 
 2. Launch docker image
 ```sh
-$ ./docker/launch.sh
+$ ./docker-launch.sh
 ```
 
 3. Run tests
 ```sh
-$ bundle install
-$ bundle exec rake
+$ rake
 ```
 
 If you have made changes that involve updating the expected image, you need to update the image with the following command after running tests.
 
 ```sh
-$ bundle exec rake test:image:update
+$ rake test:image:update
 ```
 
 ## Contributing

data/gruff.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
 lib = File.expand_path('lib')
@@ -10,11 +9,10 @@ Gem::Specification.new do |s|
   s.name = 'gruff'
   s.version = Gruff::VERSION
   s.authors = ['Geoffrey Grosenbach', 'Uwe Kubosch']
-  s.date = Date.today.to_s
   s.description = 'Beautiful graphs for one or multiple datasets. Can be used on websites or in documents.'
   s.email = 'boss@topfunky.com'
   s.files = `git ls-files`.split.reject do |f|
-    f =~ /^test|^docker|^Rakefile/
+    f =~ /^test|^docker|^Rakefile/i
   end
   s.homepage = 'https://github.com/topfunky/gruff'
   s.require_paths = %w[lib]
@@ -31,12 +29,12 @@ Gem::Specification.new do |s|
     s.add_dependency 'rmagick'
     s.add_development_dependency 'rubocop', '~> 1.12.1'
     s.add_development_dependency 'rubocop-performance', '~> 1.10.2'
+    s.add_development_dependency 'rubocop-rake', '~> 0.5.1'
   end
   s.add_dependency 'histogram'
   s.required_ruby_version = '>= 2.4.0'
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'parallel'
   s.add_development_dependency 'minitest-reporters'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard', '~> 0.9.25'

data/lib/gruff.rb

@@ -9,6 +9,7 @@ require 'gruff/version'
   patch/rmagick
   patch/string
 
+  font
   base
 
   helper/bar_conversion.rb

data/lib/gruff/accumulator_bar.rb

@@ -14,7 +14,9 @@
 #   g.write('accumulator_bar.png')
 #
 class Gruff::AccumulatorBar < Gruff::StackedBar
-  def draw
+private
+
+  def setup_data
     raise(Gruff::IncorrectNumberOfDatasetsException) unless store.length == 1
 
     accum_array = store.data.first.points[0..-2].reduce([0]) { |a, v| a << a.last + v }

data/lib/gruff/area.rb

@@ -20,19 +20,16 @@ class Gruff::Area < Gruff::Base
   # Specifies the stroke width in line around area graph. Default is +2.0+.
   attr_writer :stroke_width
 
-  def initialize_ivars
+private
+
+  def initialize_attributes
     super
     @sorted_drawing = true
     @fill_opacity = 0.85
     @stroke_width = 2.0
   end
-  private :initialize_ivars
-
-  def draw
-    super
-
-    return unless data_given?
 
+  def draw_graph
     x_increment = @graph_width / (column_count - 1).to_f
 
     store.norm_data.each do |data_row|
@@ -55,7 +52,7 @@ class Gruff::Area < Gruff::Base
       poly_points << @graph_left
       poly_points << @graph_bottom - 1
 
-      Gruff::Renderer::Polygon.new(color: data_row.color, width: @stroke_width, opacity: @fill_opacity).render(poly_points)
+      Gruff::Renderer::Polygon.new(renderer, color: data_row.color, width: @stroke_width, opacity: @fill_opacity).render(poly_points)
     end
   end
 end