gruff 0.14.0 → 0.17.0

data/lib/gruff/stacked_bar.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'helper/stacked_mixin'
+
 #
 # Here's how to set up a Gruff::StackedBar.
 #
@@ -39,6 +41,16 @@ private
     @label_formatting = nil
     @show_labels_for_bar_values = false
     @hide_labels = false
+    @minimum_value = 0.0
+  end
+
+  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
   end
 
   def setup_data
@@ -46,47 +58,61 @@ private
     super
   end
 
+  def setup_graph_measurements
+    super
+    return if @hide_line_markers
+
+    if @show_labels_for_bar_values
+      if maximum_value >= 0
+        _, metrics = Gruff::BarValueLabel.metrics(maximum_value, @label_formatting, proc_text_metrics)
+        @graph_top += metrics.height
+      end
+
+      @graph_height = @graph_bottom - @graph_top
+    end
+  end
+
   # Draws a bar graph, but multiple sets are stacked on top of each other.
   def draw_graph
     # Setup spacing.
     #
     # Columns sit stacked.
-    bar_width = @graph_width / column_count.to_f
+    bar_width = @graph_width / column_count
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
-    height = Array.new(column_count, 0)
-    stack_bar_value_label = Gruff::BarValueLabel::StackedBar.new
+    # Setup the BarConversion Object
+    conversion = Gruff::BarConversion.new(
+      top: @graph_top, bottom: @graph_bottom,
+      minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
+    )
 
-    store.norm_data.each_with_index do |data_row, row_index|
-      data_row.points.each_with_index do |data_point, point_index|
-        next if data_point == 0
+    normalized_stacked_bars.each_with_index do |stacked_bars, stacked_index|
+      total = 0
+      left_x = @graph_left + (bar_width * stacked_index) + padding
+      right_x = left_x + (bar_width * @bar_spacing)
 
-        # Use incremented x and scaled y
-        left_x = @graph_left + (bar_width * point_index) + padding
-        left_y = @graph_top + (@graph_height -
-                               data_point * @graph_height -
-                               height[point_index]) + @segment_spacing
-        right_x = left_x + bar_width * @bar_spacing
-        right_y = @graph_top + @graph_height - height[point_index]
+      top_y = 0
+      stacked_bars.each do |bar|
+        next if bar.point == 0
 
-        # update the total height of the current stacked bar
-        height[point_index] += (data_point * @graph_height)
+        bottom_y, = conversion.get_top_bottom_scaled(total)
+        bottom_y -= @segment_spacing
+        top_y, = conversion.get_top_bottom_scaled(total + bar.point)
 
-        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: data_row.color)
-        rect_renderer.render(left_x, left_y, right_x, right_y)
+        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: bar.color)
+        rect_renderer.render(left_x, bottom_y, right_x, top_y)
 
-        # Calculate center based on bar_width and current row
-        label_center = left_x + bar_width * @bar_spacing / 2.0
-        draw_label(label_center, point_index)
-
-        bar_value_label = Gruff::BarValueLabel::Bar.new([left_x, left_y, right_x, right_y], store.data[row_index].points[point_index])
-        stack_bar_value_label.add(bar_value_label, point_index)
+        total += bar.point
       end
-    end
 
-    if @show_labels_for_bar_values
-      stack_bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
-        draw_value_label(x, y, text)
+      label_center = left_x + (bar_width * @bar_spacing / 2.0)
+      draw_label(label_center, stacked_index)
+
+      if @show_labels_for_bar_values
+        bar_value_label = Gruff::BarValueLabel::Bar.new([left_x, top_y, right_x, @graph_bottom], stacked_bars.sum(&:value))
+        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
   end
@@ -96,10 +122,14 @@ private
   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
+
+  def proc_text_metrics
+    ->(text) { text_metrics(@marker_font, text) }
   end
 end

data/lib/gruff/store/xy_data.rb

@@ -9,6 +9,8 @@ module Gruff
         super(label.to_s, Array(y_points), color, x_points)
       end
 
+      alias points y_points
+
       def x_points
         self[:x_points] || Array.new(y_points.length)
       end

data/lib/gruff/version.rb

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

data/lib/gruff.rb

@@ -1,62 +1,71 @@
 # frozen_string_literal: true
 
 require 'rmagick'
-require 'gruff/version'
-
-# Extra full path added to fix loading errors on some installations.
-
-%w[
-  patch/rmagick
-  patch/string
-
-  font
-  base
-
-  helper/bar_conversion.rb
-  helper/stacked_mixin
-  helper/bar_value_label
-
-  themes
-  area
-  bar
-  bezier
-  bullet
-  dot
-  histogram
-  line
-  net
-  pie
-  scatter
-  spider
-  side_bar
-  stacked_area
-  stacked_bar
-  side_stacked_bar
-  accumulator_bar
-
-  scene
-
-  renderer/renderer
-  renderer/rectangle
-  renderer/circle
-  renderer/dash_line
-  renderer/line
-  renderer/polyline
-  renderer/polygon
-  renderer/bezier
-  renderer/ellipse
-  renderer/dot
-  renderer/text
-
-  store/store
-  store/basic_data
-  store/custom_data
-  store/xy_data
-
-  mini/legend
-  mini/bar
-  mini/pie
-  mini/side_bar
-].each do |filename|
-  require "gruff/#{filename}"
+
+require_relative 'gruff/patch/rmagick'
+require_relative 'gruff/patch/string'
+require_relative 'gruff/renderer/renderer'
+require_relative 'gruff/store/store'
+require_relative 'gruff/font'
+require_relative 'gruff/base'
+require_relative 'gruff/version'
+
+##
+# = Gruff. Graphs.
+#
+module Gruff
+  # @private
+  def self.libpath(path)
+    File.join(__dir__, 'gruff', path)
+  end
+
+  autoload :BarConversion, Gruff.libpath('helper/bar_conversion')
+  autoload :BarValueLabel, Gruff.libpath('helper/bar_value_label')
+
+  autoload :AccumulatorBar, Gruff.libpath('accumulator_bar')
+  autoload :Area, Gruff.libpath('area')
+  autoload :Bar, Gruff.libpath('bar')
+  autoload :Bezier, Gruff.libpath('bezier')
+  autoload :BoxPlot, Gruff.libpath('box_plot')
+  autoload :Bullet, Gruff.libpath('bullet')
+  autoload :Candlestick, Gruff.libpath('candlestick')
+  autoload :Dot, Gruff.libpath('dot')
+  autoload :Histogram, Gruff.libpath('histogram')
+  autoload :Line, Gruff.libpath('line')
+  autoload :Net, Gruff.libpath('net')
+  autoload :Pie, Gruff.libpath('pie')
+  autoload :Scatter, Gruff.libpath('scatter')
+  autoload :SideBar, Gruff.libpath('side_bar')
+  autoload :SideStackedBar, Gruff.libpath('side_stacked_bar')
+  autoload :Spider, Gruff.libpath('spider')
+  autoload :StackedArea, Gruff.libpath('stacked_area')
+  autoload :StackedBar, Gruff.libpath('stacked_bar')
+
+  autoload :Layer, Gruff.libpath('scene')
+  autoload :Themes, Gruff.libpath('themes')
+
+  class Renderer
+    autoload :Bezier, Gruff.libpath('renderer/bezier')
+    autoload :Circle, Gruff.libpath('renderer/circle')
+    autoload :DashLine, Gruff.libpath('renderer/dash_line')
+    autoload :Dot, Gruff.libpath('renderer/dot')
+    autoload :Ellipse, Gruff.libpath('renderer/ellipse')
+    autoload :Line, Gruff.libpath('renderer/line')
+    autoload :Polygon, Gruff.libpath('renderer/polygon')
+    autoload :Polyline, Gruff.libpath('renderer/polyline')
+    autoload :Rectangle, Gruff.libpath('renderer/rectangle')
+    autoload :Text, Gruff.libpath('renderer/text')
+  end
+
+  class Store
+    autoload :BasicData, Gruff.libpath('store/basic_data')
+    autoload :XYData, Gruff.libpath('store/xy_data')
+  end
+
+  module Mini
+    autoload :Bar, Gruff.libpath('mini/bar')
+    autoload :Legend, Gruff.libpath('mini/legend')
+    autoload :Pie, Gruff.libpath('mini/pie')
+    autoload :SideBar, Gruff.libpath('mini/side_bar')
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Geoffrey Grosenbach
 - Uwe Kubosch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -17,56 +17,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.28.2
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.13.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.13.3
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: histogram
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.25
+        version: 0.9.28
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.25
+        version: 0.9.28
 description: Beautiful graphs for one or multiple datasets. Can be used on websites
   or in documents.
 email: boss@topfunky.com
@@ -149,7 +149,6 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -166,10 +165,13 @@ files:
 - lib/gruff/bar.rb
 - lib/gruff/base.rb
 - lib/gruff/bezier.rb
+- lib/gruff/box_plot.rb
 - lib/gruff/bullet.rb
+- lib/gruff/candlestick.rb
 - lib/gruff/dot.rb
 - lib/gruff/font.rb
 - lib/gruff/helper/bar_conversion.rb
+- lib/gruff/helper/bar_mixin.rb
 - lib/gruff/helper/bar_value_label.rb
 - lib/gruff/helper/stacked_mixin.rb
 - lib/gruff/histogram.rb
@@ -194,14 +196,12 @@ files:
 - lib/gruff/renderer/renderer.rb
 - lib/gruff/renderer/text.rb
 - lib/gruff/scatter.rb
-- lib/gruff/scene.rb
 - lib/gruff/side_bar.rb
 - lib/gruff/side_stacked_bar.rb
 - lib/gruff/spider.rb
 - lib/gruff/stacked_area.rb
 - lib/gruff/stacked_bar.rb
 - lib/gruff/store/basic_data.rb
-- lib/gruff/store/custom_data.rb
 - lib/gruff/store/store.rb
 - lib/gruff/store/xy_data.rb
 - lib/gruff/themes.rb
@@ -212,8 +212,9 @@ files:
 homepage: https://github.com/topfunky/gruff
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -221,15 +222,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.
 test_files: []

data/.rubocop_todo.yml

@@ -1,116 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# 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: 13
-Lint/FloatComparison:
-  Exclude:
-    - 'Rakefile'
-    - 'lib/gruff/base.rb'
-    - 'lib/gruff/renderer/renderer.rb'
-    - 'lib/gruff/scatter.rb'
-
-# Offense count: 1
-# Configuration parameters: CheckForMethodsWithNoSideEffects.
-Lint/Void:
-  Exclude:
-    - 'lib/gruff/patch/rmagick.rb'
-
-# Offense count: 57
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
-Metrics/AbcSize:
-  Max: 66
-
-# Offense count: 3
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
-Metrics/BlockLength:
-  Max: 32
-
-# Offense count: 14
-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ClassLength:
-  Max: 683
-
-# Offense count: 8
-# Configuration parameters: IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 17
-
-# Offense count: 134
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-Metrics/MethodLength:
-  Max: 81
-
-# Offense count: 3
-# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
-Metrics/ParameterLists:
-  Max: 7
-
-# Offense count: 6
-# Configuration parameters: IgnoredMethods.
-Metrics/PerceivedComplexity:
-  Max: 19
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyleForLeadingUnderscores.
-# SupportedStylesForLeadingUnderscores: disallowed, required, optional
-Naming/MemoizedInstanceVariableName:
-  Exclude:
-    - 'lib/gruff/scene.rb'
-
-# Offense count: 6
-# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers.
-# SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339
-Naming/VariableNumber:
-  Exclude:
-    - 'test/test_bar.rb'
-    - 'test/test_bezier.rb'
-    - 'test/test_line.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Performance/StringReplacement:
-  Exclude:
-    - 'lib/gruff/scene.rb'
-
-# Offense count: 1
-Rake/Desc:
-  Exclude:
-    - 'Rakefile'
-
-# Offense count: 1
-Security/Eval:
-  Exclude:
-    - 'test/gruff_test_case.rb'
-
-# Offense count: 1
-Style/CombinableLoops:
-  Exclude:
-    - 'test/test_line.rb'
-
-# Offense count: 2
-Style/DocumentDynamicEvalDefinition:
-  Exclude:
-    - 'test/gruff_test_case.rb'
-
-# Offense count: 97
-# Configuration parameters: RequireForNonPublicMethods.
-Style/DocumentationMethod:
-  Enabled: false
-
-# Offense count: 1
-Style/MissingRespondToMissing:
-  Exclude:
-    - 'lib/gruff/scene.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/StringConcatenation:
-  Exclude:
-    - 'test/gruff_test_case.rb'