gruff 0.13.0-java → 0.16.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46eb3259410a2c7b797d4482f37db956ee9f7b69ab00770d9980522666e58f38
-  data.tar.gz: 3ddd8e3ecf26ecf8315173e1c6afc18b37cb6d0d9d487b3ff24a3a4623184e05
+  metadata.gz: 03a1c8455536dad68e5d325a51416807d32595aee6e4be75ef214c1b00e0df06
+  data.tar.gz: fa90b50b714c8464f6b82260f3ec9598edb57cf4b03ffcb8b451083e9bd1a307
 SHA512:
-  metadata.gz: 4792f0f6dc06df61238e6312988bb0ac41994cca4b30feffbda7253fb51d26c7cbbecb8152760a7eef1881e089b83a1976a333e9f1f80e8a1f5377f0155dfe3c
-  data.tar.gz: 24f43e7dd7f304fe2a3e44afe56d1f235ba205495de69f7b25fba74280b730619f60af3d51ee854b89ad00a73e9509a3052c514dd4adce56e00bff16c4233a1e
+  metadata.gz: 180bb66623c99daf3b89febea4059ed0d1f655b5fdee1da046e78174d0ea2efdf26e3fbc1de8bc18765cf9ab5cbe8bc52cb22fd01deeb25c377210340506bcfb
+  data.tar.gz: 05e9d6c86ee5ccee8bafc37fe1843f041f2a91f82aa7bbfb77c11fd05c9d64b2192d4b56dfaff0bc3f5d5db925e13ba057179843e0265873d2e1c7659582235d

data/.github/workflows/ci.yml

@@ -0,0 +1,79 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  lint:
+    runs-on: ubuntu-20.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-20.04
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1']
+        imagemagick-version:
+          - { full: 7.1.0-31, major-minor: '7.0' }
+    name: Ruby ${{ matrix.ruby-version }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Cache ImageMagick
+      uses: actions/cache@v3
+      with:
+        path: ./build-ImageMagick
+        key: v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
+        restore-keys: |
+          v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
+    - name: Install ImageMagick ${{ matrix.imagemagick-version.full }}
+      run: |
+        export IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }}
+        ./before_install_linux.sh
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@master
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: false
+    - 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-20.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/.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
 
@@ -17,15 +21,9 @@ Gemspec/RequiredRubyVersion:
 Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
-Layout/ClassStructure:
-  Enabled: false
-
 Layout/FirstMethodArgumentLineBreak:
   Enabled: false
 
-Layout/LeadingCommentSpace:
-  Enabled: false
-
 Layout/LineLength:
   Max: 150
 
@@ -35,22 +33,34 @@ Layout/MultilineMethodArgumentLineBreaks:
 Layout/MultilineAssignmentLayout:
   EnforcedStyle: same_line
 
-Lint/AssignmentInCondition:
+Layout/RedundantLineBreak:
+  Enabled: false
+
+Layout/SingleLineBlockChain:
   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 +72,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,15 +102,9 @@ Style/MethodCallWithArgsParentheses:
 Style/MissingElse:
   Enabled: false
 
-Style/MutableConstant:
-  Enabled: false
-
 Style/Next:
   Enabled: false
 
-Style/NumericLiterals:
-  Enabled: false
-
 Style/NumericPredicate:
   Enabled: false
 
@@ -113,17 +117,11 @@ Style/RedundantBegin:
 Style/SingleLineBlockParams:
   Enabled: false
 
-Style/SpecialGlobalVars:
-  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,48 @@
 # Change Log
 
+## 0.16.0
+- Add Candlestick (#575)
+- Add BoxPlot (#574)
+- Raise exception if less data set was given in Gruff::Spider (#573)
+- Adjust default label offset value in Gruff::Pie
+- Remove has_left_labels from attribute (#571)
+- Remove center_labels_over_point from attribute (#570)
+- Adjust legend label / box position
+- Fix right margin when truncate the label
+- Adjust axis label position
+- Adjust left label margin
+- Fix axis label position with hide_line_markers
+- Fix margin of value label in Bar/StackedBar (#568)
+- Fix label position in Gruff::Spider (#567)
+- Fix axis label position with legend_at_bottom
+- Fix axis label position with hide_line_markers
+- Refactor: Remove instance variable usage
+- Remove Gruff::Scene (#566)
+- Fix exception with zero value in StackBar (#565)
+- Fix segment spacing in SideStackedBar (#564)
+- Fix margin of value label in SideBar/SideStackedBar (#563)
+- Raise exception if negative values were given in stacked graph (#562)
+- Fix centering in value label position (#561)
+- Fix duck typing support in Gruff::Histogram (#560)
+- Fix start drawing position to top in Pie and enabled sort option by default (#559)
+
+## 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)

data/README.md

@@ -126,6 +126,13 @@ In progress!
 
 ![Histogram chart](https://raw.github.com/topfunky/gruff/master/test/expected/histogram.png)
 
+### Box plot
+
+![Box plot](https://raw.github.com/topfunky/gruff/master/test/expected/box_plot.png)
+
+### Candlestick
+
+![Candlestick](https://raw.github.com/topfunky/gruff/master/test/expected/candlestick.png)
 
 ## Documentation
 
@@ -133,23 +140,22 @@ 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.5 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
 ```
 

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|^before_install_linux.sh|^Rakefile/i)
   s.homepage = 'https://github.com/topfunky/gruff'
   s.require_paths = %w[lib]
   s.summary = 'Beautiful graphs for one or multiple datasets.'
@@ -28,16 +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.12.1'
-    s.add_development_dependency 'rubocop-performance', '~> 1.10.2'
+    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,10 +14,12 @@
 #   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 }
+    accum_array = store.data.first.points[0..-2].reduce([0]) { |a, v| a << (a.last + v) }
     data 'Accumulator', accum_array
     set_colors
     store.reverse!

data/lib/gruff/area.rb

@@ -20,20 +20,17 @@ 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?
 
-    x_increment = @graph_width / (column_count - 1).to_f
+  def draw_graph
+    x_increment = @graph_width / (column_count - 1)
 
     store.norm_data.each do |data_row|
       poly_points = []
@@ -41,7 +38,7 @@ class Gruff::Area < Gruff::Base
       data_row.points.each_with_index do |data_point, index|
         # Use incremented x and scaled y
         new_x = @graph_left + (x_increment * index)
-        new_y = @graph_top + (@graph_height - data_point * @graph_height)
+        new_y = @graph_top + (@graph_height - (data_point * @graph_height))
 
         poly_points << new_x
         poly_points << new_y
@@ -51,11 +48,11 @@ class Gruff::Area < Gruff::Base
 
       # Add closing points, draw polygon
       poly_points << @graph_right
-      poly_points << @graph_bottom - 1
+      poly_points << (@graph_bottom - 1)
       poly_points << @graph_left
-      poly_points << @graph_bottom - 1
+      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

data/lib/gruff/bar.rb

@@ -33,7 +33,25 @@ class Gruff::Bar < Gruff::Base
   # Prevent drawing of column labels below a bar graph.  Default is +false+.
   attr_writer :hide_labels
 
-  def initialize_ivars
+  # Value to avoid completely overwriting the coordinate axis
+  AXIS_MARGIN = 0.5
+  private_constant :AXIS_MARGIN
+
+  # Can be used to adjust the spaces between the bars.
+  # Accepts values between 0.00 and 1.00 where 0.00 means no spacing at all
+  # and 1 means that each bars' width is nearly 0 (so each bar is a simple
+  # line with no x dimension).
+  #
+  # Default value is +0.9+.
+  def spacing_factor=(space_percent)
+    raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' unless (space_percent >= 0) && (space_percent <= 1)
+
+    @spacing_factor = (1 - space_percent)
+  end
+
+private
+
+  def initialize_attributes
     super
     @spacing_factor = 0.9
     @group_spacing = 10
@@ -41,57 +59,52 @@ class Gruff::Bar < Gruff::Base
     @show_labels_for_bar_values = false
     @hide_labels = false
   end
-  private :initialize_ivars
 
-  def draw
+  def setup_drawing
     # Labels will be centered over the left of the bar if
     # there are more labels than columns. This is basically the same
     # as where it would be for a line graph.
     @center_labels_over_point = (@labels.keys.length > column_count)
 
     super
-    return unless data_given?
-
-    draw_bars
-  end
-
-  # Can be used to adjust the spaces between the bars.
-  # Accepts values between 0.00 and 1.00 where 0.00 means no spacing at all
-  # and 1 means that each bars' width is nearly 0 (so each bar is a simple
-  # line with no x dimension).
-  #
-  # Default value is +0.9+.
-  def spacing_factor=(space_percent)
-    raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' unless (space_percent >= 0) && (space_percent <= 1)
-
-    @spacing_factor = (1 - space_percent)
   end
 
-protected
-
   def hide_labels?
     @hide_labels
   end
 
   def hide_left_label_area?
-    @hide_line_markers
+    @hide_line_markers && @y_axis_label.nil?
   end
 
   def hide_bottom_label_area?
-    hide_labels?
+    hide_labels? && @x_axis_label.nil? && @legend_at_bottom == false
   end
 
-  # Value to avoid completely overwriting the coordinate axis
-  AXIS_MARGIN = 0.5
+  def setup_graph_measurements
+    super
+    return if @hide_line_markers
+
+    if @show_labels_for_bar_values
+      proc_text_metrics = ->(text) { text_metrics(@marker_font, text) }
+
+      if maximum_value >= 0
+        _, metrics = Gruff::BarValueLabel.metrics(maximum_value, @label_formatting, proc_text_metrics)
+        @graph_top += metrics.height
+      end
 
-  def draw_bars
+      @graph_height = @graph_bottom - @graph_top
+    end
+  end
+
+  def draw_graph
     # Setup spacing.
     #
     # Columns sit side-by-side.
     @bar_spacing ||= @spacing_factor # space between the bars
 
-    bar_width = (@graph_width - calculate_spacing) / (column_count * store.length).to_f
-    padding = (bar_width * (1 - @bar_spacing)) / 2
+    bar_width = (@graph_width - calculate_spacing) / (column_count * store.length)
+    padding = (bar_width * (1 - @bar_spacing)) / 2.0
 
     # Setup the BarConversion Object
     conversion = Gruff::BarConversion.new(
@@ -99,6 +112,8 @@ protected
       minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
     )
 
+    proc_text_metrics = ->(text) { text_metrics(@marker_font, text) }
+
     # iterate over all normalised data
     store.norm_data.each_with_index do |data_row, row_index|
       data_row.points.each_with_index do |data_point, point_index|
@@ -107,12 +122,12 @@ protected
         # Use incremented x and scaled y
         # x
         left_x = @graph_left + (bar_width * (row_index + point_index + ((store.length - 1) * point_index))) + padding + group_spacing
-        right_x = left_x + bar_width * @bar_spacing
+        right_x = left_x + (bar_width * @bar_spacing)
         # y
         left_y, right_y = conversion.get_top_bottom_scaled(data_point)
 
         # create new bar
-        rect_renderer = Gruff::Renderer::Rectangle.new(color: data_row.color)
+        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: data_row.color)
         rect_renderer.render(left_x, left_y - AXIS_MARGIN, right_x, right_y - AXIS_MARGIN)
 
         # Calculate center based on bar_width and current row
@@ -122,8 +137,8 @@ protected
         draw_label(label_center, point_index)
         if @show_labels_for_bar_values
           bar_value_label = Gruff::BarValueLabel::Bar.new([left_x, left_y, right_x, right_y], store.data[row_index].points[point_index])
-          bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
-            draw_value_label(x, y, text, true)
+          bar_value_label.prepare_rendering(@label_formatting, proc_text_metrics) do |x, y, text, _text_width, text_height|
+            draw_value_label(bar_width * @bar_spacing, text_height, x, y, text)
           end
         end
       end