gruff 0.12.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea00c2968e40f335c5505b4ce5461fb9b5ec6488bfe48293829848fd2c57e2fc
-  data.tar.gz: 860569d2e37c2b14aee89671d2bd4e76b409221a8e54712008009000c054a144
+  metadata.gz: c6b8682f3d05aa7d0a91ea58fbe907aa581f9a2ed7549f28376390fc0f2101ec
+  data.tar.gz: 31dc3d1b680b887405a66d8c1d14a2baea76b549958f4cd92bf3d2a6adae8ba3
 SHA512:
-  metadata.gz: ec50aef23be4941687dc0822b02aec8daf083f1986f50054cae56562937c1788c4e6ff4f03bff6689732b3e88787fbbf42ea3bc6324d89f4b47dddfed23bbcb3
-  data.tar.gz: 87d063e7f87081ad123e47610d173dc62e4f3c6200887021af40d389b39892b20b34d73757989eae383447308e34598198e47af33a48d1a184738c4a275361b9
+  metadata.gz: 5b5e6a29b5acf50408dd03a75f7acaa8830d96cf23bc02d6ac7a5ef9d713afcc41157fc2e94be8ab1611c624bc36398ba0e6793228f9ce75be009f59a9ac9f7c
+  data.tar.gz: 15766e34990536075a856d716d75f5e6d940f7bcb5d4dc9074040c82a8d418f95c0e3780bdbe36821a1c2aca66a07eaeaa11ff10622da7e29faf6347cac303af

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@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+    - name: Set up Ruby 2.5
+      uses: ruby/setup-ruby@master
+      with:
+        ruby-version: '2.5'
+        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.5', '2.6', '2.7', '3.0', '3.1']
+    name: Ruby ${{ matrix.ruby-version }}
+    steps:
+    - uses: actions/checkout@v3
+    - 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.20.1', '9.3.4.0']
+    name: JRuby ${{ matrix.ruby-version }}
+    steps:
+    - uses: actions/checkout@v3
+    - 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/.gitignore

@@ -1,6 +1,7 @@
 *~
 /.idea/
 /pkg/
+/coverage/
 /vendor/
 /test/output/
 /test/output_java/

data/.rubocop.yml

@@ -1,13 +1,17 @@
-inherit_from: .rubocop_todo.yml
-require: rubocop-performance
+require:
+  - rubocop-performance
+  - rubocop-rake
 
 AllCops:
     EnabledByDefault: true
-    TargetRubyVersion: 2.4
+    TargetRubyVersion: 2.5
     Exclude:
         - 'vendor/bundle/**/*'
         - 'rails_generators/gruff/**/*'
 
+Metrics:
+  Enabled: false
+
 Gemspec/OrderedDependencies:
   Enabled: false
 
@@ -23,9 +27,6 @@ Layout/ClassStructure:
 Layout/FirstMethodArgumentLineBreak:
   Enabled: false
 
-Layout/LeadingCommentSpace:
-  Enabled: false
-
 Layout/LineLength:
   Max: 150
 
@@ -35,22 +36,37 @@ Layout/MultilineMethodArgumentLineBreaks:
 Layout/MultilineAssignmentLayout:
   EnforcedStyle: same_line
 
-Lint/AssignmentInCondition:
+Layout/RedundantLineBreak:
+  Enabled: false
+
+Layout/SingleLineBlockChain:
+  Enabled: false
+
+Lint/AmbiguousOperatorPrecedence:
   Enabled: false
 
 Lint/ConstantResolution:
   Enabled: false
 
+Lint/FloatComparison:
+  Enabled: false
+
 Lint/NumberConversion:
   Enabled: false
 
-Style/AccessorGrouping:
+Naming/MemoizedInstanceVariableName:
   Enabled: false
 
-Style/ClassAndModuleChildren:
+Naming/MethodParameterName:
+  Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false
+
+Style/AccessorGrouping:
   Enabled: false
 
-Style/ConditionalAssignment:
+Style/ClassAndModuleChildren:
   Enabled: false
 
 Style/ConstantVisibility:
@@ -62,15 +78,15 @@ Style/Copyright:
 Style/Documentation:
   Enabled: true
 
-Style/Encoding:
+Style/DocumentationMethod:
+  Enabled: false
+
+Style/DocumentDynamicEvalDefinition:
   Enabled: false
 
 Style/FormatString:
   EnforcedStyle: sprintf
 
-Style/FormatStringToken:
-  Enabled: false
-
 Style/GuardClause:
   Enabled: false
 
@@ -92,35 +108,26 @@ Style/MethodCallWithArgsParentheses:
 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:
+Style/RedundantBegin:
   Enabled: false
 
-Style/SpecialGlobalVars:
+Style/SingleLineBlockParams:
   Enabled: false
 
 Style/StructInheritance:
   Enabled: false
 
-Style/SymbolArray:
-  Enabled: false
-
-Style/TernaryParentheses:
+Performance/ChainArrayAllocation:
   Enabled: false
 
-Performance/ChainArrayAllocation:
+Performance/StringReplacement:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Change Log
 
+## 0.15.0
+- Fix SideStackedBar which bars overlap on the coordinate axes if data contains 0 (#558)
+- Lazy loading library to reduce memory usage (#556)
+- Drop Ruby 2.4 support (#554)
+- Fix sort drawing in Gruff::Line (#553)
+- Fix color value handling in Line#dataxy method (#552)
+
+## 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)
+- Fix error that cause ArgumentError with x_axis_increment in Gruff::Scatter (#506)
+- Fix draw_label that it should follow label_truncation_style setting (#505)
+- Deprecate use_data_label attribute from SideBar (#504)
+- Add negative values graph support in Gruff::SideBar (#499)
+- Add margin of axis in order to avoid overwriting the coordinate axes (#497)
+- Fix get_type_metrics error (#496)
+- Embed Roboto as default font (#495)
+- Fix legend rendering position when it enable legend_at_bottom (#492)
+
 ## 0.12.2
 - Avoid SEGV caused with '%S' in Draw#get_type_metrics by old ImageMagick (6.9.9 or below)  (#490)
 

data/README.md

@@ -28,6 +28,9 @@ Or install it yourself as:
 $ gem install gruff
 ```
 
+## Font
+Gruff uses [Roboto](https://fonts.google.com/specimen/Roboto) font as default font which is licensed under the Apache License, Version 2.0.
+
 ## Usage
 
 ```ruby
@@ -130,24 +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 Setup
+## 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
+$ rake test:image:update
 ```
 
 ## Contributing

data/assets/fonts/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/gruff.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
 lib = File.expand_path('lib')
@@ -10,12 +9,9 @@ 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/
-  end
+  s.files = `git ls-files`.split.grep_v(/^test|^docker|^Rakefile/i)
   s.homepage = 'https://github.com/topfunky/gruff'
   s.require_paths = %w[lib]
   s.summary = 'Beautiful graphs for one or multiple datasets.'
@@ -28,15 +24,18 @@ Gem::Specification.new do |s|
     s.platform = 'java'
     s.add_dependency 'rmagick4j'
   else
-    s.add_dependency 'rmagick'
-    s.add_development_dependency 'rubocop', '~> 1.11.0'
-    s.add_development_dependency 'rubocop-performance', '~> 1.10.1'
+    s.add_dependency 'rmagick', '>= 4.2'
+    s.add_development_dependency 'rubocop', '~> 1.27.0'
+    s.add_development_dependency 'rubocop-performance', '~> 1.13.3'
+    s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
   end
   s.add_dependency 'histogram'
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 2.5.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'
+
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

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