gruff 0.20.0-java → 0.22.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0470a845dea66723f512a991696cefcec76110bc625720c9de2e06b248968dfb
-  data.tar.gz: d6d93d5ac547d1b588e8b936b8faf1bdbdd86b1f6b05859c62569dcc2096ddf0
+  metadata.gz: bdab668d761fffac9e5f5b128ac5b82bd10ade4a5ec36fc6b0e480308287c082
+  data.tar.gz: b0ee5cafca3513c965f66d3658e8e6be4d2e5a244b338414cd19144930a0afc0
 SHA512:
-  metadata.gz: d57209f9c7dc7d3739feea9d1d1cfb41afd85db57d3723a768c17f37413f689becaabba7a119f33a97ed7e4fab7a4906c8a334a8d230cee537fa164d62cd3f01
-  data.tar.gz: 697e7f71c16e5c8d5351144b5cd9fff0bef80a7d9f2dee100dd5e6f90daf712ca041cf8acd581830de8763b697a9c8b66b7b3ddd51df7cd40ece16fac0bc37f7
+  metadata.gz: c166a38bb26c5bdd480194ef23b429890123b68fe80a9aea1b5fc18d9a7fe85b6a45e520ccecc55f840458da4d303470030ee0d9cbc724018adf2da98899c435
+  data.tar.gz: a3a1144ec44156e47d07b1b34849898eb17a0945163cdb699918553d0adc25830a119b09da0e6daae06a8cfaf958bcbab4b3882612b20640b07ff54d3987cf90

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Change Log
 
+## 0.22.0
+Fix Gruff::Bar and Gruff::SideBar in order to draw positive and negative mixed graph (#620)
+Allow to override label margin value (#618)
+Accept image format in Base#to_image in order to fix `no decode delegate for this image format` error (#619)
+
+## 0.21.0
+- Fix legend color with empty label (#615)
+
 ## 0.20.0
 - Fix legend position when blank labels present (#614)
-- Fixed NoMethodError (undefined method `format=' for Gruff::Line (#612)
+- Fixed NoMethodError (undefined method `format=` for Gruff::Line (#612)
 - Drop Ruby 2.5 support (#611)
 - Fix deprecation warning for Base#to_blob (#610)
 

data/README.md

@@ -144,8 +144,8 @@ http://www.rubydoc.info/github/topfunky/gruff/frames
 
 ## Supported Ruby Versions
 
-- Ruby 2.5 or later
-- JRuby 9.2.x or later
+- Ruby 2.6 or later
+- JRuby 9.3.x or later
 
 ## Development
 1. Build docker image

data/lib/gruff/bar.rb

@@ -123,7 +123,7 @@ private
         right_x = left_x + (bar_width * @bar_spacing)
 
         top_y, bottom_y = conversion.get_top_bottom_scaled(bar.point)
-        if bar.point != 0
+        if top_y != bottom_y
           rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: bar.color)
           rect_renderer.render(left_x, bottom_y - AXIS_MARGIN, right_x, top_y)
         end

data/lib/gruff/base.rb

@@ -27,6 +27,9 @@ module Gruff
 
     DEFAULT_TARGET_WIDTH = 800.0
 
+    # Blank space between graph and labels. Default is +15+.
+    attr_writer :label_margin
+
     # Blank space above the graph. Default is +20+.
     attr_writer :top_margin
 
@@ -180,6 +183,7 @@ module Gruff
       @marker_font = Gruff::Font.new(size: 21.0)
       @legend_font = Gruff::Font.new(size: 20.0)
 
+      @label_margin = LABEL_MARGIN
       @top_margin = @bottom_margin = @left_margin = @right_margin = DEFAULT_MARGIN
       @legend_margin = LEGEND_MARGIN
       @title_margin = TITLE_MARGIN
@@ -497,6 +501,8 @@ module Gruff
     # Return a rendered graph image.
     # This can use RMagick's methods to adjust the image before saving.
     #
+    # @param format [String] The output image format.
+    #
     # @return [Magick::Image] The rendered image.
     #
     # @example
@@ -507,22 +513,24 @@ module Gruff
     #   image = image.resize(400, 300).quantize(128, Magick::RGBColorspace)
     #   image.write('test.png')
     #
-    def to_image
+    def to_image(format = 'PNG')
       @to_image ||= begin
         draw
         renderer.finish
-        renderer.image
+        image = renderer.image
+        image.format = format
+        image
       end
     end
 
     # Return the graph as a rendered binary blob.
     #
-    # @param image_format [String] The image format of binary blob.
+    # @param format [String] The image format of binary blob.
     #
     # @deprecated Please use +to_image.to_blob+ instead.
-    def to_blob(image_format = 'PNG')
+    def to_blob(format = 'PNG')
       warn '#to_blob is deprecated. Please use `to_image.to_blob` instead'
-      to_image.format = image_format
+      to_image.format = format
       to_image.to_blob
     end
 
@@ -646,7 +654,7 @@ module Gruff
         # X Axis
         # Centered vertically and horizontally by setting the
         # height to 1.0 and the width to the width of the graph.
-        x_axis_label_y_coordinate = @graph_bottom + (LABEL_MARGIN * 2) + labels_caps_height
+        x_axis_label_y_coordinate = @graph_bottom + (@label_margin * 2) + labels_caps_height
 
         text_renderer = Gruff::Renderer::Text.new(renderer, @x_axis_label, font: @marker_font)
         text_renderer.add_to_render_queue(@raw_columns, 1.0, 0.0, x_axis_label_y_coordinate)
@@ -674,7 +682,7 @@ module Gruff
           marker_label = (BigDecimal(index.to_s) * BigDecimal(@increment.to_s)) + BigDecimal(minimum_value.to_s)
           label = y_axis_label(marker_label, @increment)
           text_renderer = Gruff::Renderer::Text.new(renderer, label, font: @marker_font)
-          text_renderer.add_to_render_queue(@graph_left - LABEL_MARGIN, 1.0, 0.0, y, Magick::EastGravity)
+          text_renderer.add_to_render_queue(@graph_left - @label_margin, 1.0, 0.0, y, Magick::EastGravity)
         end
       end
     end
@@ -715,7 +723,7 @@ module Gruff
 
       current_y_offset = begin
         if @legend_at_bottom
-          @graph_bottom + @legend_margin + labels_caps_height + LABEL_MARGIN + (@x_axis_label ? (LABEL_MARGIN * 2) + marker_caps_height : 0)
+          @graph_bottom + @legend_margin + labels_caps_height + @label_margin + (@x_axis_label ? (@label_margin * 2) + marker_caps_height : 0)
         else
           hide_title? ? @top_margin + @title_margin : @top_margin + @title_margin + title_caps_height
         end
@@ -771,7 +779,7 @@ module Gruff
       draw_unique_label(index) do
         if x >= @graph_left && x <= @graph_right
           y = @graph_bottom
-          x_offset, y_offset = calculate_label_offset(@marker_font, @labels[index], LABEL_MARGIN, @label_rotation)
+          x_offset, y_offset = calculate_label_offset(@marker_font, @labels[index], @label_margin, @label_rotation)
 
           draw_label_at(1.0, 1.0, x + x_offset, y + y_offset, @labels[index], gravity: gravity, rotation: @label_rotation)
           yield if block
@@ -899,10 +907,10 @@ module Gruff
         if !@has_left_labels && (@hide_line_markers || @hide_line_numbers)
           0.0
         else
-          longest_left_label_width + LABEL_MARGIN
+          longest_left_label_width + @label_margin
         end
       end
-      y_axis_label_width = @y_axis_label.nil? ? 0.0 : marker_caps_height + (LABEL_MARGIN * 2)
+      y_axis_label_width = @y_axis_label.nil? ? 0.0 : marker_caps_height + (@label_margin * 2)
 
       bottom_label_width = extra_left_room_for_long_label
 
@@ -962,10 +970,10 @@ module Gruff
     end
 
     def setup_bottom_margin
-      graph_bottom_margin = hide_bottom_label_area? ? @bottom_margin : @bottom_margin + labels_caps_height + LABEL_MARGIN
+      graph_bottom_margin = hide_bottom_label_area? ? @bottom_margin : @bottom_margin + labels_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 * 2)
+      x_axis_label_height = @x_axis_label.nil? ? 0.0 : marker_caps_height + (@label_margin * 2)
       @raw_rows - graph_bottom_margin - x_axis_label_height
     end
 
@@ -1035,9 +1043,13 @@ module Gruff
     def calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
       label_widths = [[]]
       label_lines = [[]]
-      legend_labels.reject(&:empty?).each do |label|
-        width = calculate_width(@legend_font, label)
-        label_width = width + (legend_square_width * 2.7)
+      legend_labels.each do |label|
+        if label.empty?
+          label_width = 0.0
+        else
+          width = calculate_width(@legend_font, label)
+          label_width = width + (legend_square_width * 2.7)
+        end
         label_widths.last.push label_width
         label_lines.last.push label
 

data/lib/gruff/dot.rb

@@ -59,7 +59,7 @@ private
       unless @hide_line_numbers
         label = y_axis_label(marker_label, @increment)
         text_renderer = Gruff::Renderer::Text.new(renderer, label, font: @marker_font)
-        text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + (LABEL_MARGIN * 1.5), Magick::CenterGravity)
+        text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + (@label_margin * 1.5), Magick::CenterGravity)
       end
     end
   end
@@ -69,7 +69,7 @@ private
 
   def draw_label(y_offset, index)
     draw_unique_label(index) do
-      draw_label_at(@graph_left - LABEL_MARGIN, 1.0, 0.0, y_offset, @labels[index], gravity: Magick::EastGravity)
+      draw_label_at(@graph_left - @label_margin, 1.0, 0.0, y_offset, @labels[index], gravity: Magick::EastGravity)
     end
   end
 end

data/lib/gruff/net.rb

@@ -112,8 +112,8 @@ private
   def draw_label(center_x, center_y, angle, radius, amount)
     x_offset = center_x # + 15 # The label points need to be tweaked slightly
     y_offset = center_y # + 0  # This one doesn't though
-    x = x_offset + ((radius + LABEL_MARGIN) * Math.sin(deg2rad(angle)))
-    y = y_offset - ((radius + LABEL_MARGIN) * Math.cos(deg2rad(angle)))
+    x = x_offset + ((radius + @label_margin) * Math.sin(deg2rad(angle)))
+    y = y_offset - ((radius + @label_margin) * Math.cos(deg2rad(angle)))
 
     draw_label_at(1.0, 1.0, x, y, amount, gravity: Magick::CenterGravity)
   end

data/lib/gruff/scatter.rb

@@ -188,7 +188,7 @@ private
         label = x_axis_label(marker_label, x_increment)
         x = @graph_left + (increment_x_scaled * index)
         y = @graph_bottom
-        x_offset, y_offset = calculate_label_offset(@marker_font, label, LABEL_MARGIN, @label_rotation)
+        x_offset, y_offset = calculate_label_offset(@marker_font, label, @label_margin, @label_rotation)
 
         draw_label_at(1.0, 1.0, x + x_offset, y + y_offset, label, rotation: @label_rotation)
       end

data/lib/gruff/side_bar.rb

@@ -90,7 +90,7 @@ private
 
       if minimum_value < 0
         _, metrics = Gruff::BarValueLabel.metrics(minimum_value, @label_formatting, proc_text_metrics)
-        width = metrics.width + LABEL_MARGIN
+        width = metrics.width + @label_margin
         @graph_left += width - @graph_left if width > @graph_left
       end
 
@@ -120,7 +120,7 @@ private
         right_y = left_y + (bar_width * @bar_spacing)
 
         bottom_x, top_x = conversion.get_top_bottom_scaled(bar.point).sort
-        if bar.point != 0
+        if bottom_x != top_x
           rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: bar.color)
           rect_renderer.render(bottom_x + AXIS_MARGIN, left_y, top_x, right_y)
         end
@@ -160,7 +160,7 @@ private
         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(renderer, label, font: @marker_font)
-        text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + LABEL_MARGIN, Magick::CenterGravity)
+        text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + @label_margin, Magick::CenterGravity)
       end
     end
   end
@@ -170,7 +170,7 @@ private
 
   def draw_label(y_offset, index)
     draw_unique_label(index) do
-      draw_label_at(@graph_left - LABEL_MARGIN, 1.0, 0.0, y_offset, @labels[index], gravity: Magick::EastGravity)
+      draw_label_at(@graph_left - @label_margin, 1.0, 0.0, y_offset, @labels[index], gravity: Magick::EastGravity)
     end
   end
 

data/lib/gruff/spider.rb

@@ -54,10 +54,10 @@ private
   def setup_graph_measurements
     super
 
-    @graph_left += LABEL_MARGIN
-    @graph_top += LABEL_MARGIN
-    @graph_right -= LABEL_MARGIN
-    @graph_bottom -= LABEL_MARGIN
+    @graph_left += @label_margin
+    @graph_top += @label_margin
+    @graph_right -= @label_margin
+    @graph_bottom -= @label_margin
 
     @graph_width = @graph_right - @graph_left
     @graph_height = @graph_bottom - @graph_top
@@ -94,7 +94,7 @@ private
     degree = rad2deg(angle)
     metrics = text_metrics(@marker_font, amount)
 
-    r_offset = LABEL_MARGIN # The distance out from the center of the pie to get point
+    r_offset = @label_margin # The distance out from the center of the pie to get point
     x_offset = center_x # The label points need to be tweaked slightly
 
     x_offset -= begin

data/lib/gruff/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.22.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-04 00:00:00.000000000 Z
+date: 2023-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement