gruff 0.12.2-java → 0.13.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48aea7b38e287c7020e9c5accef465de355ea7604e88234cc3eeacb97a76247d
-  data.tar.gz: 52f15904875b6ebfa35b98da41a919ad400fdb7faf50ea6c61f1b43dc3011380
+  metadata.gz: 46eb3259410a2c7b797d4482f37db956ee9f7b69ab00770d9980522666e58f38
+  data.tar.gz: 3ddd8e3ecf26ecf8315173e1c6afc18b37cb6d0d9d487b3ff24a3a4623184e05
 SHA512:
-  metadata.gz: 76395c1016e0af0df78eb4960381c955be484b3448f19d46f08aa12613a3e0a6b2ef8b3449e4a881cded7600fb3178ecd6e23eb89fc016a83fae36912361963b
-  data.tar.gz: f5c52f1b2270cbe9907d4ef0eea38582f5babcf9b81dcac4548ce6a17f6fc79d0067a9f11aadcb1c9c6deca4b9e9edf161b9d439db9af3e6c01d1422e229f978
+  metadata.gz: 4792f0f6dc06df61238e6312988bb0ac41994cca4b30feffbda7253fb51d26c7cbbecb8152760a7eef1881e089b83a1976a333e9f1f80e8a1f5377f0155dfe3c
+  data.tar.gz: 24f43e7dd7f304fe2a3e44afe56d1f235ba205495de69f7b25fba74280b730619f60af3d51ee854b89ad00a73e9509a3052c514dd4adce56e00bff16c4233a1e

data/.gitignore

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

data/.rubocop.yml

@@ -107,6 +107,9 @@ Style/NumericPredicate:
 Style/OptionHash:
   Enabled: false
 
+Style/RedundantBegin:
+  Enabled: false
+
 Style/SingleLineBlockParams:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-03-07 06:12:58 UTC using RuboCop version 1.11.0.
+# on 2021-05-07 13:38:24 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
@@ -49,10 +49,10 @@ Lint/Void:
   Exclude:
     - 'lib/gruff/patch/rmagick.rb'
 
-# Offense count: 54
+# Offense count: 56
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 82
+  Max: 75
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
@@ -60,17 +60,17 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 29
 
-# Offense count: 13
+# Offense count: 14
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 637
+  Max: 669
 
-# Offense count: 9
+# Offense count: 8
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 21
 
-# Offense count: 121
+# Offense count: 126
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
   Max: 81
@@ -80,7 +80,7 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 7
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 22
@@ -151,7 +151,7 @@ Style/DocumentDynamicEvalDefinition:
   Exclude:
     - 'test/gruff_test_case.rb'
 
-# Offense count: 132
+# Offense count: 137
 # Configuration parameters: RequireForNonPublicMethods.
 Style/DocumentationMethod:
   Enabled: false
@@ -180,11 +180,3 @@ Style/StringConcatenation:
   Exclude:
     - 'lib/gruff/photo_bar.rb'
     - 'test/gruff_test_case.rb'
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: forbid_mixed_logical_operators, forbid_logical_operators
-Style/UnlessLogicalOperators:
-  Exclude:
-    - 'lib/gruff/bar.rb'
-    - 'lib/gruff/scatter.rb'

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 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
@@ -133,7 +136,7 @@ http://www.rubydoc.info/github/topfunky/gruff/frames
 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.
 
-## Development Setup
+## Development
 1. Build docker image
 ```sh
 $ ./docker/build.sh
@@ -150,6 +153,12 @@ $ bundle install
 $ bundle exec 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
+```
+
 ## Contributing
 
 ### Source

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

@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
     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_development_dependency 'rubocop', '~> 1.12.1'
+    s.add_development_dependency 'rubocop-performance', '~> 1.10.2'
   end
   s.add_dependency 'histogram'
   s.required_ruby_version = '>= 2.4.0'
@@ -38,5 +38,6 @@ Gem::Specification.new do |s|
   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'
 end

data/lib/gruff.rb

@@ -13,7 +13,7 @@ require 'gruff/version'
 
   helper/bar_conversion.rb
   helper/stacked_mixin
-  helper/bar_value_label_mixin
+  helper/bar_value_label
 
   themes
   area

data/lib/gruff/bar.rb

@@ -16,15 +16,13 @@
 #   g.write('bar.png')
 #
 class Gruff::Bar < Gruff::Base
-  using String::GruffCommify
-
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
 
   # Spacing factor applied between a group of bars belonging to the same label.
   attr_writer :group_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
   attr_writer :label_formatting
 
@@ -83,6 +81,9 @@ protected
     hide_labels?
   end
 
+  # Value to avoid completely overwriting the coordinate axis
+  AXIS_MARGIN = 0.5
+
   def draw_bars
     # Setup spacing.
     #
@@ -93,24 +94,10 @@ protected
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
     # Setup the BarConversion Object
-    conversion = Gruff::BarConversion.new
-    conversion.graph_height = @graph_height
-    conversion.graph_top = @graph_top
-
-    # Set up the right mode [1,2,3] see BarConversion for further explanation
-    if minimum_value >= 0
-      # all bars go from zero to positive
-      conversion.mode = 1
-    elsif maximum_value <= 0
-      # all bars go from 0 to negative
-      conversion.mode = 2
-    else
-      # bars either go from zero to negative or to positive
-      conversion.mode = 3
-      conversion.spread = @spread
-      conversion.minimum_value = minimum_value
-      conversion.zero = -minimum_value / @spread
-    end
+    conversion = Gruff::BarConversion.new(
+      top: @graph_top, bottom: @graph_bottom,
+      minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
+    )
 
     # iterate over all normalised data
     store.norm_data.each_with_index do |data_row, row_index|
@@ -122,11 +109,11 @@ protected
         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
         # y
-        left_y, right_y = conversion.get_left_y_right_y_scaled(data_point)
+        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.render(left_x, left_y, right_x, right_y)
+        rect_renderer.render(left_x, left_y - AXIS_MARGIN, right_x, right_y - AXIS_MARGIN)
 
         # Calculate center based on bar_width and current row
         label_center = @graph_left + group_spacing + (store.length * bar_width * point_index) + (store.length * bar_width / 2.0)
@@ -134,10 +121,10 @@ protected
         # Subtract half a bar width to center left if requested
         draw_label(label_center, point_index)
         if @show_labels_for_bar_values
-          raw_value = store.data[row_index].points[point_index]
-          val = (@label_formatting || '%.2f') % raw_value
-          y = raw_value >= 0 ? left_y - 30 : left_y + 12
-          draw_value_label(left_x + (right_x - left_x) / 2, y, val.commify, true)
+          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)
+          end
         end
       end
     end

data/lib/gruff/base.rb

@@ -156,9 +156,11 @@ module Gruff
     # Will be scaled down if graph is smaller than 800px wide.
     attr_writer :legend_box_size
 
-    # With Side Bars use the data label for the marker value to the left of the bar.
-    # Default is +false+.
-    attr_writer :use_data_label
+    # Allow passing lambdas to format labels for x axis.
+    attr_writer :x_axis_label_format
+
+    # Allow passing lambdas to format labels for y axis.
+    attr_writer :y_axis_label_format
 
     # If one numerical argument is given, the graph is drawn at 4/3 ratio
     # according to the given width (+800+ results in 800x600, +400+ gives 400x300,
@@ -214,8 +216,8 @@ module Gruff
       @sort = false
       @sorted_drawing = false
       @title = nil
-      @title_font = nil
 
+      @title_font = nil
       @font = nil
       @bold_title = true
 
@@ -238,10 +240,12 @@ module Gruff
       @label_max_size = 0
       @label_truncation_style = :absolute
 
-      @use_data_label = false
       @x_axis_increment = nil
       @x_axis_label = @y_axis_label = nil
       @y_axis_increment = nil
+
+      @x_axis_label_format = nil
+      @y_axis_label_format = nil
     end
     protected :initialize_ivars
 
@@ -603,7 +607,7 @@ module Gruff
 
         unless @hide_line_numbers
           marker_label = BigDecimal(index.to_s) * BigDecimal(@increment.to_s) + BigDecimal(minimum_value.to_s)
-          label = label(marker_label, @increment)
+          label = y_axis_label(marker_label, @increment)
           text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @marker_font_size, color: @font_color)
           text_renderer.add_to_render_queue(@graph_left - LABEL_MARGIN, 1.0, 0.0, y, Magick::EastGravity)
         end
@@ -627,7 +631,7 @@ module Gruff
       current_x_offset = center(label_widths.first.sum)
       current_y_offset = begin
         if @legend_at_bottom
-          @graph_height + @title_margin
+          @graph_bottom + @legend_margin + @legend_caps_height + LABEL_MARGIN
         else
           hide_title? ? @top_margin + @title_margin : @top_margin + @title_margin + @title_caps_height
         end
@@ -659,8 +663,6 @@ module Gruff
           unless label_widths.empty?
             # Wrap to next line and shrink available graph dimensions
             current_y_offset += line_height
-            @graph_top += line_height
-            @graph_height = @graph_bottom - @graph_top
           end
         end
       end
@@ -674,7 +676,7 @@ module Gruff
       font_weight = @bold_title ? Magick::BoldWeight : Magick::NormalWeight
       font_size = @title_font_size
 
-      metrics = Renderer::Text.metrics(@title, font_size, font_weight)
+      metrics = Renderer::Text.metrics(@title, font, font_size, font_weight)
       if metrics.width > @raw_columns
         font_size = font_size * (@raw_columns / metrics.width) * 0.95
       end
@@ -694,11 +696,8 @@ module Gruff
         # TODO: See if index.odd? is the best stragegy
         y_offset += @label_stagger_height if index.odd?
 
-        label_text = truncate_label_text(@labels[index].to_s)
-
         if x_offset >= @graph_left && x_offset <= @graph_right
-          text_renderer = Gruff::Renderer::Text.new(label_text, font: @font, size: @marker_font_size, color: @font_color)
-          text_renderer.add_to_render_queue(1.0, 1.0, x_offset, y_offset, gravity)
+          draw_label_at(1.0, 1.0, x_offset, y_offset, @labels[index], gravity)
         end
       end
     end
@@ -713,6 +712,12 @@ module Gruff
       end
     end
 
+    def draw_label_at(width, height, x, y, text, gravity = Magick::NorthGravity)
+      label_text = truncate_label_text(text)
+      text_renderer = Gruff::Renderer::Text.new(label_text, font: @font, size: @marker_font_size, color: @font_color)
+      text_renderer.add_to_render_queue(width, height, x, y, gravity)
+    end
+
     # Draws the data value over the data point in bar graphs
     def draw_value_label(x_offset, y_offset, data_point, bar_value = false)
       return if @hide_line_markers && !bar_value
@@ -818,10 +823,10 @@ module Gruff
         if @has_left_labels
           @labels.values.reduce('') { |value, memo| (value.to_s.length > memo.to_s.length) ? value : memo }
         else
-          label(maximum_value.to_f, @increment)
+          y_axis_label(maximum_value.to_f, @increment)
         end
       end
-      longest_left_label_width = calculate_width(@marker_font_size, text)
+      longest_left_label_width = calculate_width(@marker_font_size, truncate_label_text(text))
       longest_left_label_width *= 1.25 if @has_left_labels
 
       # Shift graph if left line numbers are hidden
@@ -831,17 +836,16 @@ module Gruff
     end
 
     def setup_top_margin
-      return @top_margin if @legend_at_bottom
-
       # When @hide title, leave a title_margin space for aesthetics.
       # Same with @hide_legend
       @top_margin +
         (hide_title? ? @title_margin : @title_caps_height + @title_margin) +
-        (@hide_legend ? @legend_margin : @legend_caps_height + @legend_margin)
+        ((@hide_legend || @legend_at_bottom) ? @legend_margin : calculate_legend_height + @legend_margin)
     end
 
     def setup_bottom_margin
       graph_bottom_margin = hide_bottom_label_area? ? @bottom_margin : @bottom_margin + @marker_caps_height + LABEL_MARGIN
+      graph_bottom_margin += (calculate_legend_height + @legend_margin) if @legend_at_bottom
 
       x_axis_label_height = @x_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN
       # FIXME: Consider chart types other than bar
@@ -849,6 +853,7 @@ module Gruff
     end
 
     def truncate_label_text(text)
+      text = text.to_s
       return text if text.size <= @label_max_size
 
       if @label_truncation_style == :trailing_dots
@@ -892,6 +897,22 @@ module Gruff
       parts.join('.')
     end
 
+    def x_axis_label(value, increment)
+      if @x_axis_label_format
+        @x_axis_label_format.call(value)
+      else
+        label(value, increment)
+      end
+    end
+
+    def y_axis_label(value, increment)
+      if @y_axis_label_format
+        @y_axis_label_format.call(value)
+      else
+        label(value, increment)
+      end
+    end
+
     def calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
       # May fix legend drawing problem at small sizes
       label_widths = [[]] # Used to calculate line wrap
@@ -908,13 +929,38 @@ module Gruff
       label_widths
     end
 
+    def calculate_legend_height
+      return 0.0 if @hide_legend
+
+      legend_labels = store.data.map(&:label)
+      legend_square_width = @legend_box_size
+      label_widths = calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
+      legend_height = 0.0
+
+      legend_labels.each_with_index do |legend_label, _index|
+        next if legend_label.empty?
+
+        label_widths.first.shift
+        if label_widths.first.empty?
+          label_widths.shift
+          line_height = [@legend_caps_height, legend_square_width].max + @legend_margin
+          unless label_widths.empty?
+            # Wrap to next line and shrink available graph dimensions
+            legend_height += line_height
+          end
+        end
+      end
+
+      legend_height + @legend_caps_height
+    end
+
     # Returns the height of the capital letter 'X' for the current font and
     # size.
     #
     # Not scaled since it deals with dimensions that the regular scaling will
     # handle.
     def calculate_caps_height(font_size)
-      metrics = Renderer::Text.metrics('X', font_size)
+      metrics = Renderer::Text.metrics('X', @font, font_size)
       metrics.height
     end
 
@@ -926,7 +972,7 @@ module Gruff
       text = text.to_s
       return 0 if text.empty?
 
-      metrics = Renderer::Text.metrics(text, font_size)
+      metrics = Renderer::Text.metrics(text, @font, font_size)
       metrics.width
     end
 

data/lib/gruff/dot.rb

@@ -51,14 +51,14 @@ protected
     return if @hide_line_markers
 
     (0..marker_count).each do |index|
-      marker_label = minimum_value + index * @increment
+      marker_label = BigDecimal(index.to_s) * BigDecimal(@increment.to_s) + BigDecimal(minimum_value.to_s)
       x = @graph_left + (marker_label - minimum_value) * @graph_width / @spread
 
       line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
       line_renderer.render(x, @graph_bottom, x, @graph_bottom + 5)
 
       unless @hide_line_numbers
-        label = label(marker_label, @increment)
+        label = y_axis_label(marker_label, @increment)
         text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @marker_font_size, color: @font_color)
         text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + (LABEL_MARGIN * 1.5), Magick::CenterGravity)
       end
@@ -70,8 +70,7 @@ protected
 
   def draw_label(y_offset, index)
     draw_unique_label(index) do
-      text_renderer = Gruff::Renderer::Text.new(@labels[index], font: @font, size: @marker_font_size, color: @font_color)
-      text_renderer.add_to_render_queue(@graph_left - LABEL_MARGIN, 1.0, 0.0, y_offset, Magick::EastGravity)
+      draw_label_at(@graph_left - LABEL_MARGIN, 1.0, 0.0, y_offset, @labels[index], Magick::EastGravity)
     end
   end
 end

data/lib/gruff/helper/bar_conversion.rb

@@ -14,29 +14,44 @@
 # @private
 class Gruff::BarConversion
   attr_writer :mode
-  attr_writer :zero
-  attr_writer :graph_top
-  attr_writer :graph_height
-  attr_writer :minimum_value
-  attr_writer :spread
 
-  def get_left_y_right_y_scaled(data_point)
+  def initialize(top:, bottom:, minimum_value:, maximum_value:, spread:)
+    @graph_top = top
+    @graph_height = bottom - top
+    @spread = spread
+    @minimum_value = minimum_value
+    @maximum_value = maximum_value
+
+    if minimum_value >= 0
+      # all bars go from zero to positive
+      @mode = 1
+    elsif maximum_value <= 0
+      # all bars go from 0 to negative
+      @mode = 2
+    else
+      # bars either go from zero to negative or to positive
+      @mode = 3
+      @zero = -minimum_value / @spread
+    end
+  end
+
+  def get_top_bottom_scaled(data_point)
     result = []
 
     case @mode
     when 1
       # minimum value >= 0 ( only positive values )
-      result[0] = @graph_top + @graph_height * (1 - data_point) + 1
-      result[1] = @graph_top + @graph_height - 1
+      result[0] = @graph_top + @graph_height * (1 - data_point)
+      result[1] = @graph_top + @graph_height
     when 2
       # only negative values
-      result[0] = @graph_top + 1
-      result[1] = @graph_top + @graph_height * (1 - data_point) - 1
+      result[0] = @graph_top
+      result[1] = @graph_top + @graph_height * (1 - data_point)
     when 3
       # positive and negative values
       val = data_point - @minimum_value / @spread
-      result[0] = @graph_top + @graph_height * (1 - (val - @zero)) + 1
-      result[1] = @graph_top + @graph_height * (1 - @zero) - 1
+      result[0] = @graph_top + @graph_height * (1 - (val - @zero))
+      result[1] = @graph_top + @graph_height * (1 - @zero)
     else
       result[0] = 0.0
       result[1] = 0.0

data/lib/gruff/helper/bar_value_label.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+# @private
+module Gruff::BarValueLabel
+  using String::GruffCommify
+
+  # @private
+  class Base
+    attr_reader :coordinate, :value
+
+    def initialize(coordinate, value)
+      @coordinate = coordinate
+      @value = value
+    end
+  end
+
+  # @private
+  class Bar < Base
+    def prepare_rendering(format, _bar_width = 0)
+      left_x, left_y, right_x, _right_y = @coordinate
+      if format.is_a?(Proc)
+        val = format.call(@value)
+      else
+        val = sprintf(format || '%.2f', @value).commify
+      end
+
+      y = @value >= 0 ? left_y - 30 : left_y + 12
+      yield left_x + (right_x - left_x) / 2, y, val
+    end
+  end
+
+  # @private
+  class SideBar < Base
+    def prepare_rendering(format, bar_width = 0)
+      left_x, _left_y, right_x, right_y = @coordinate
+      if format.is_a?(Proc)
+        val = format.call(@value)
+      else
+        val = sprintf(format || '%.2f', @value).commify
+      end
+
+      x = @value >= 0 ? right_x + 40 : left_x - 40
+      yield x, right_y - bar_width / 2, val
+    end
+  end
+
+  # @private
+  class StackedBar
+    def initialize
+      @bars = []
+    end
+
+    def add(bar, index)
+      bars = @bars[index] || []
+      bars << bar
+      @bars[index] = bars
+    end
+
+    def prepare_rendering(format, bar_width = 0, &block)
+      @bars.each do |bars|
+        value = bars.sum(&:value)
+        bar = bars.last
+        bar_value_label = bar.class.new(bar.coordinate, value)
+        bar_value_label.prepare_rendering(format, bar_width, &block)
+      end
+    end
+  end
+end

data/lib/gruff/renderer/text.rb

@@ -34,7 +34,7 @@ module Gruff
       draw.rotation = @rotation if @rotation
       draw.fill = @font_color
       draw.stroke = 'transparent'
-      draw.font = @font if @font
+      draw.font = @font || Renderer::Text.default_font(@font_weight)
       draw.font_weight = @font_weight
       draw.pointsize = @font_size * scale
       draw.gravity = gravity
@@ -45,10 +45,11 @@ module Gruff
       draw.rotation = -@rotation if @rotation
     end
 
-    def self.metrics(text, size, font_weight = Magick::NormalWeight)
+    def self.metrics(text, font, size, font_weight = Magick::NormalWeight)
       draw  = Renderer.instance.draw
       image = Renderer.instance.image
 
+      draw.font = font || Renderer::Text.default_font(font_weight)
       draw.font_weight = font_weight
       draw.pointsize = size
 
@@ -60,5 +61,12 @@ module Gruff
 
       draw.get_type_metrics(image, text)
     end
+
+    FONT_BOLD = File.expand_path(File.join(__FILE__, '../../../../assets/fonts/Roboto-Bold.ttf'))
+    FONT_REGULAR = File.expand_path(File.join(__FILE__, '../../../../assets/fonts/Roboto-Regular.ttf'))
+
+    def self.default_font(font_weight)
+      (font_weight == Magick::BoldWeight) ? FONT_BOLD : FONT_REGULAR
+    end
   end
 end

data/lib/gruff/scatter.rb

@@ -28,17 +28,13 @@ class Gruff::Scatter < Gruff::Base
   # This is useful when working with a small range of high values (for example, a date range of months, while seconds as units).
   attr_writer :disable_significant_rounding_x_axis
 
-  # Allow enabling vertical lines. When you have a lot of data, they can work great.
-  attr_writer :enable_vertical_line_markers
+  # Allow for vertical marker lines.
+  attr_writer :show_vertical_markers
 
   # Allow using vertical labels in the X axis (and setting the label margin).
   attr_writer :x_label_margin
   attr_writer :use_vertical_x_labels
 
-  # Allow passing lambdas to format labels.
-  attr_writer :y_axis_label_format
-  attr_writer :x_axis_label_format
-
   def initialize_store
     @store = Gruff::Store.new(Gruff::Store::XYData)
   end
@@ -51,17 +47,22 @@ class Gruff::Scatter < Gruff::Base
     @baseline_x_value = @baseline_y_value = nil
     @circle_radius = nil
     @disable_significant_rounding_x_axis = false
-    @enable_vertical_line_markers = false
+    @show_vertical_markers = false
     @marker_x_count = nil
     @maximum_x_value = @minimum_x_value = nil
     @stroke_width = nil
     @use_vertical_x_labels = false
-    @x_axis_label_format = nil
     @x_label_margin = nil
-    @y_axis_label_format = nil
   end
   private :initialize_ivars
 
+  # Allow enabling vertical lines. When you have a lot of data, they can work great.
+  # @deprecated Please use +show_vertical_markers+ attribute instead.
+  def enable_vertical_line_markers=(value)
+    warn '#enable_vertical_line_markers= is deprecated. Please use `show_vertical_markers` attribute instead'
+    @show_vertical_markers = value
+  end
+
   def draw
     super
     return unless data_given?
@@ -191,7 +192,7 @@ private
       calculate_spread
       normalize
 
-      self.marker_count = (@x_spread / @x_axis_increment).to_i
+      @marker_x_count = (@x_spread / @x_axis_increment).to_i
       @x_increment = @x_axis_increment
     end
     increment_x_scaled = @graph_width.to_f / (@x_spread / @x_increment)
@@ -199,7 +200,7 @@ private
     # Draw vertical line markers and annotate with numbers
     (0..@marker_x_count).each do |index|
       # TODO: Fix the vertical lines, and enable them by default. Not pretty when they don't match up with top y-axis line
-      if @enable_vertical_line_markers
+      if @show_vertical_markers
         x = @graph_left + @graph_width - index.to_f * increment_x_scaled
 
         line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
@@ -207,11 +208,11 @@ private
       end
 
       unless @hide_line_numbers
-        marker_label = index * @x_increment + @minimum_x_value.to_f
+        marker_label = BigDecimal(index.to_s) * BigDecimal(@x_increment.to_s) + BigDecimal(@minimum_x_value.to_s)
         y_offset = @graph_bottom + (@x_label_margin || LABEL_MARGIN)
         x_offset = get_x_coord(index.to_f, increment_x_scaled, @graph_left)
 
-        label = vertical_label(marker_label, @x_increment)
+        label = x_axis_label(marker_label, @x_increment)
         rotation = -90.0 if @use_vertical_x_labels
         text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @marker_font_size, color: @font_color, rotation: rotation)
         text_renderer.add_to_render_queue(1.0, 1.0, x_offset, y_offset)
@@ -219,22 +220,6 @@ private
     end
   end
 
-  def label(value, increment)
-    if @y_axis_label_format
-      @y_axis_label_format.call(value)
-    else
-      super
-    end
-  end
-
-  def vertical_label(value, increment)
-    if @x_axis_label_format
-      @x_axis_label_format.call(value)
-    else
-      label(value, increment)
-    end
-  end
-
   def get_x_coord(x_data_point, width, offset) #:nodoc:
     x_data_point * width + offset
   end

data/lib/gruff/side_bar.rb

@@ -19,15 +19,13 @@
 #   g.write('sidebar.png')
 #
 class Gruff::SideBar < Gruff::Base
-  using String::GruffCommify
-
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
 
   # Spacing factor applied between a group of bars belonging to the same label.
   attr_writer :group_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
   attr_writer :label_formatting
 
@@ -57,6 +55,12 @@ class Gruff::SideBar < Gruff::Base
     draw_bars
   end
 
+  # With Side Bars use the data label for the marker value to the left of the bar.
+  # @deprecated
+  def use_data_label=(_value)
+    warn '#use_data_label is deprecated. It is no longer effective.'
+  end
+
 protected
 
   def hide_labels?
@@ -73,15 +77,22 @@ protected
 
 private
 
+  # Value to avoid completely overwriting the coordinate axis
+  AXIS_MARGIN = 0.5
+
   def draw_bars
     # Setup spacing.
     #
     bars_width = (@graph_height - calculate_spacing) / column_count.to_f
     bar_width = bars_width / store.length
-    height = Array.new(column_count, 0)
-    length = Array.new(column_count, @graph_left)
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
+    # Setup the BarConversion Object
+    conversion = Gruff::BarConversion.new(
+      top: @graph_right, bottom: @graph_left,
+      minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
+    )
+
     # if we're a side stacked bar then we don't need to draw ourself at all
     # because sometimes (due to different heights/min/max) you can actually
     # see both graphs and it looks like crap
@@ -91,35 +102,24 @@ private
       data_row.points.each_with_index do |data_point, point_index|
         group_spacing = @group_spacing * @scale * point_index
 
-        # Using the original calculations from the stacked bar chart
-        # to get the difference between
-        # part of the bart chart we wish to stack.
-        temp1 = @graph_left + (@graph_width - data_point * @graph_width - height[point_index])
-        temp2 = @graph_left + @graph_width - height[point_index]
-        difference = temp2 - temp1
-
-        left_x = length[point_index] - 1
         left_y = @graph_top + (bars_width * point_index) + (bar_width * row_index) + padding + group_spacing
-        right_x = left_x + difference
         right_y = left_y + bar_width * @bar_spacing
 
-        height[point_index] += (data_point * @graph_width)
+        left_x, right_x = conversion.get_top_bottom_scaled(data_point).sort
 
         rect_renderer = Gruff::Renderer::Rectangle.new(color: data_row.color)
-        rect_renderer.render(left_x, left_y, right_x, right_y)
+        rect_renderer.render(left_x + AXIS_MARGIN, left_y, right_x + AXIS_MARGIN, right_y)
 
         # Calculate center based on bar_width and current row
+        label_center = left_y + bars_width / 2
 
-        if @use_data_label
-          label_center = left_y + bar_width / 2
-          draw_label(label_center, row_index, store.norm_data[row_index].label)
-        else
-          label_center = left_y + bars_width / 2
-          draw_label(label_center, point_index)
-        end
+        # Subtract half a bar width to center left if requested
+        draw_label(label_center, point_index)
         if @show_labels_for_bar_values
-          val = (@label_formatting || '%.2f') % store.data[row_index].points[point_index]
-          draw_value_label(right_x + 40, right_y - bar_width / 2, val.commify, true)
+          bar_value_label = Gruff::BarValueLabel::SideBar.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)
+          end
         end
       end
     end
@@ -142,11 +142,11 @@ private
       line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
       line_renderer.render(x, @graph_bottom, x, @graph_top)
 
-      diff = index - number_of_lines
-      marker_label = diff.abs * increment + minimum_value
-
       unless @hide_line_numbers
-        text_renderer = Gruff::Renderer::Text.new(marker_label, font: @font, size: @marker_font_size, color: @font_color)
+        diff = index - number_of_lines
+        marker_label = BigDecimal(diff.abs.to_s) * BigDecimal(increment.to_s) + BigDecimal(minimum_value.to_s)
+        label = x_axis_label(marker_label, @increment)
+        text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @marker_font_size, color: @font_color)
         text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + LABEL_MARGIN, Magick::CenterGravity)
       end
     end
@@ -155,12 +155,9 @@ private
   ##
   # Draw on the Y axis instead of the X
 
-  def draw_label(y_offset, index, label = nil)
+  def draw_label(y_offset, index)
     draw_unique_label(index) do
-      lbl = @use_data_label ? label : @labels[index]
-
-      text_renderer = Gruff::Renderer::Text.new(lbl, font: @font, size: @marker_font_size, color: @font_color)
-      text_renderer.add_to_render_queue(@graph_left - LABEL_MARGIN, 1.0, 0.0, y_offset, Magick::EastGravity)
+      draw_label_at(@graph_left - LABEL_MARGIN, 1.0, 0.0, y_offset, @labels[index], Magick::EastGravity)
     end
   end
 

data/lib/gruff/side_stacked_bar.rb

@@ -21,7 +21,6 @@
 #
 class Gruff::SideStackedBar < Gruff::SideBar
   include StackedMixin
-  include BarValueLabelMixin
 
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
@@ -29,7 +28,7 @@ class Gruff::SideStackedBar < Gruff::SideBar
   # Number of pixels between bar segments.
   attr_writer :segment_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
   attr_writer :label_formatting
 
@@ -80,7 +79,7 @@ private
     height = Array.new(column_count, 0)
     length = Array.new(column_count, @graph_left)
     padding = (bar_width * (1 - @bar_spacing)) / 2
-    bar_value_label = BarValueLabel.new(column_count, bar_width)
+    stack_bar_value_label = Gruff::BarValueLabel::StackedBar.new
 
     store.norm_data.each_with_index do |data_row, row_index|
       data_row.points.each_with_index do |data_point, point_index|
@@ -99,8 +98,8 @@ private
         length[point_index] += difference
         height[point_index] += (data_point * @graph_width - 2)
 
-        bar_value_label.coordinates[point_index] = [left_x, left_y, right_x, right_y]
-        bar_value_label.values[point_index] += store.data[row_index].points[point_index]
+        bar_value_label = Gruff::BarValueLabel::SideBar.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)
 
         # if a data point is 0 it can result in weird really thing lines
         # that shouldn't even be there being drawn on top of the existing
@@ -118,7 +117,7 @@ private
     end
 
     if @show_labels_for_bar_values
-      bar_value_label.prepare_sidebar_rendering(@label_formatting) do |x, y, text|
+      stack_bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
         draw_value_label(x, y, text, true)
       end
     end

data/lib/gruff/stacked_bar.rb

@@ -12,7 +12,6 @@
 #
 class Gruff::StackedBar < Gruff::Base
   include StackedMixin
-  include BarValueLabelMixin
 
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
@@ -20,7 +19,7 @@ class Gruff::StackedBar < Gruff::Base
   # Number of pixels between bar segments.
   attr_writer :segment_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
   attr_writer :label_formatting
 
@@ -54,7 +53,7 @@ class Gruff::StackedBar < Gruff::Base
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
     height = Array.new(column_count, 0)
-    bar_value_label = BarValueLabel.new(column_count, bar_width)
+    stack_bar_value_label = Gruff::BarValueLabel::StackedBar.new
 
     store.norm_data.each_with_index do |data_row, row_index|
       data_row.points.each_with_index do |data_point, point_index|
@@ -78,13 +77,13 @@ class Gruff::StackedBar < Gruff::Base
         label_center = left_x + bar_width * @bar_spacing / 2.0
         draw_label(label_center, point_index)
 
-        bar_value_label.coordinates[point_index] = [left_x, left_y, right_x, right_y]
-        bar_value_label.values[point_index] += store.data[row_index].points[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)
       end
     end
 
     if @show_labels_for_bar_values
-      bar_value_label.prepare_rendering(@label_formatting) do |x, y, text|
+      stack_bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
         draw_value_label(x, y, text, true)
       end
     end

data/lib/gruff/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-24 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,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: simplecov
+  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:
@@ -113,6 +127,9 @@ files:
 - Gemfile
 - MIT-LICENSE
 - README.md
+- assets/fonts/LICENSE.txt
+- assets/fonts/Roboto-Bold.ttf
+- assets/fonts/Roboto-Regular.ttf
 - assets/plastik/blue.png
 - assets/plastik/green.png
 - assets/plastik/red.png
@@ -127,7 +144,7 @@ files:
 - lib/gruff/bullet.rb
 - lib/gruff/dot.rb
 - lib/gruff/helper/bar_conversion.rb
-- lib/gruff/helper/bar_value_label_mixin.rb
+- lib/gruff/helper/bar_value_label.rb
 - lib/gruff/helper/stacked_mixin.rb
 - lib/gruff/histogram.rb
 - lib/gruff/line.rb

data/lib/gruff/helper/bar_value_label_mixin.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-# @private
-module Gruff::Base::BarValueLabelMixin
-  using String::GruffCommify
-
-  # @private
-  class BarValueLabel
-    attr_accessor :coordinates, :values
-
-    def initialize(size, bar_width)
-      @coordinates = Array.new(size)
-      @values = Hash.new(0)
-      @bar_width = bar_width
-    end
-
-    def prepare_rendering(format)
-      @coordinates.each_with_index do |(left_x, left_y, right_x, _right_y), index|
-        value = @values[index]
-        val = (format || '%.2f') % value
-        y = value >= 0 ? left_y - 30 : left_y + 12
-        yield left_x + (right_x - left_x) / 2, y, val.commify
-      end
-    end
-
-    def prepare_sidebar_rendering(format)
-      @coordinates.each_with_index do |(_left_x, _left_y, right_x, right_y), index|
-        val = (format || '%.2f') % @values[index]
-        yield right_x + 40, right_y - @bar_width / 2, val.commify
-      end
-    end
-  end
-end