gruff 0.11.0-java → 0.12.0-java

data/lib/gruff/dot.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 #
 # Graph with dots and labels along a vertical access.
 # see: 'Creating More Effective Graphs' by Robbins
@@ -44,8 +42,6 @@ class Gruff::Dot < Gruff::Base
         draw_label(y_pos, point_index)
       end
     end
-
-    Gruff::Renderer.finish
   end
 
 protected
@@ -54,7 +50,7 @@ protected
   def draw_line_markers
     return if @hide_line_markers
 
-    (0..@marker_count).each do |index|
+    (0..marker_count).each do |index|
       marker_label = minimum_value + index * @increment
       x = @graph_left + (marker_label - minimum_value) * @graph_width / @spread
 

data/lib/gruff/helper/bar_conversion.rb

@@ -3,7 +3,7 @@
 ##
 # Original Author: David Stokar
 #
-#   This class perfoms the y coordinats conversion for the bar class.
+#   This class performs the y coordinates conversion for the bar class.
 #
 #   There are three cases:
 #

data/lib/gruff/helper/bar_value_label_mixin.rb

@@ -2,6 +2,9 @@
 
 # @private
 module Gruff::Base::BarValueLabelMixin
+  using String::GruffCommify
+
+  # @private
   class BarValueLabel
     attr_accessor :coordinates, :values
 

data/lib/gruff/histogram.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'histogram'
-require 'gruff/base'
 
 #
 # Here's how to set up a Gruff::Histogram.

data/lib/gruff/line.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 #
 # Here's how to make a Gruff::Line.
 #
@@ -30,7 +28,7 @@ class Gruff::Line < Gruff::Base
   # default is +'circle'+, other options include square.
   attr_writer :dot_style
 
-  # Hide parts of the graph to fit more datapoints, or for a different appearance.
+  # Hide parts of the graph to fit more data points, or for a different appearance.
   attr_writer :hide_dots, :hide_lines
 
   # accessors for support of xy data.
@@ -134,7 +132,7 @@ class Gruff::Line < Gruff::Base
   #   g.data("Capples", [1, 1, 2, 2, 3, 3])
   #
   #   # labels will be drawn at the x locations of the keys passed in.
-  #   In this example the lables are drawn at x positions 2, 4, and 6:
+  #   In this example the labels are drawn at x positions 2, 4, and 6:
   #   g.labels = {0 => '2003', 2 => '2004', 4 => '2005', 6 => '2006'}
   #   # The 0 => '2003' label will be ignored since it is outside the chart range.
   def dataxy(name, x_data_points = [], y_data_points = [], color = nil)
@@ -155,11 +153,9 @@ class Gruff::Line < Gruff::Base
   end
 
   def draw_reference_line(reference_line, left, right, top, bottom)
-    config = {
-      color: reference_line[:color] || @reference_line_default_color,
-      width: reference_line[:width] || @reference_line_default_width
-    }
-    Gruff::Renderer::DashLine.new(config).render(left, top, right, bottom)
+    color = reference_line[:color] || @reference_line_default_color
+    width = reference_line[:width] || @reference_line_default_width
+    Gruff::Renderer::DashLine.new(color: color, width: width).render(left, top, right, bottom)
   end
 
   def draw_horizontal_reference_line(reference_line)
@@ -237,8 +233,6 @@ class Gruff::Line < Gruff::Base
         prev_y = new_y
       end
     end
-
-    Gruff::Renderer.finish
   end
 
 private

data/lib/gruff/mini/bar.rb

@@ -14,6 +14,7 @@
 #
 module Gruff
   module Mini
+    # A class for drawing a small bar graph.
     class Bar < Gruff::Bar
       include Gruff::Mini::Legend
 
@@ -37,7 +38,6 @@ module Gruff
         super
 
         draw_vertical_legend
-        Gruff::Renderer.finish
       end
     end
   end

data/lib/gruff/mini/legend.rb

@@ -2,6 +2,7 @@
 
 module Gruff
   module Mini
+    # A module to handle the small legend.
     module Legend
       attr_accessor :hide_mini_legend, :legend_position
 
@@ -25,7 +26,7 @@ module Gruff
         @original_columns = @raw_columns
 
         case @legend_position
-        when :right then
+        when :right
           @rows = [@rows, legend_height].max
           @columns += calculate_legend_width + @left_margin
         else
@@ -55,7 +56,7 @@ module Gruff
         legend_top_margin = 40.0
 
         case @legend_position
-        when :right then
+        when :right
           current_x_offset = @original_columns + @left_margin
           current_y_offset = @top_margin + legend_top_margin
         else
@@ -67,7 +68,8 @@ module Gruff
           # Draw label
           label = truncate_legend_label(legend_label)
           text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @legend_font_size, color: @font_color)
-          text_renderer.add_to_render_queue(@raw_columns, 1.0, current_x_offset + (legend_square_width * 1.7), current_y_offset, Magick::WestGravity)
+          x_offset = current_x_offset + (legend_square_width * 1.7)
+          text_renderer.add_to_render_queue(@raw_columns, 1.0, x_offset, current_y_offset, Magick::WestGravity)
 
           # Now draw box with color of this dataset
           rect_renderer = Gruff::Renderer::Rectangle.new(color: store.data[index].color)
@@ -87,7 +89,10 @@ module Gruff
 
       def truncate_legend_label(label)
         truncated_label = label.to_s
-        while calculate_width(scale_fontsize(@legend_font_size), truncated_label) > (@columns - @legend_left_margin - @right_margin) && (truncated_label.length > 1)
+
+        font_size = scale_fontsize(@legend_font_size)
+        max_width = @columns - @legend_left_margin - @right_margin
+        while calculate_width(font_size, truncated_label) > max_width && truncated_label.length > 1
           truncated_label = truncated_label[0..truncated_label.length - 2]
         end
         truncated_label + (truncated_label.length < label.to_s.length ? '...' : '')

data/lib/gruff/mini/pie.rb

@@ -13,6 +13,7 @@
 #
 module Gruff
   module Mini
+    # A class for drawing a small pie graph.
     class Pie < Gruff::Pie
       include Gruff::Mini::Legend
 
@@ -34,8 +35,6 @@ module Gruff
         super
 
         draw_vertical_legend
-
-        Gruff::Renderer.finish
       end
     end
   end

data/lib/gruff/mini/side_bar.rb

@@ -21,6 +21,7 @@
 #
 module Gruff
   module Mini
+    # A class for drawing a small side bar graph.
     class SideBar < Gruff::SideBar
       include Gruff::Mini::Legend
 
@@ -41,8 +42,6 @@ module Gruff
         super
 
         draw_vertical_legend
-
-        Gruff::Renderer.finish
       end
     end
   end

data/lib/gruff/net.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 # See also the Spider graph.
 #
 # Here's how to make a Gruff::Net.
@@ -25,7 +23,7 @@ require 'gruff/base'
 #   g.write("net.png")
 #
 class Gruff::Net < Gruff::Base
-  # Hide parts of the graph to fit more datapoints, or for a different appearance.
+  # Hide parts of the graph to fit more data points, or for a different appearance.
   attr_writer :hide_dots
 
   # Dimensions of lines and dots; calculated based on dataset size if left unspecified.
@@ -66,11 +64,12 @@ class Gruff::Net < Gruff::Base
 
         Gruff::Renderer::Line.new(color: data_row.color, width: @stroke_width).render(start_x, start_y, end_x, end_y)
 
-        Gruff::Renderer::Circle.new(color: data_row.color, width: @stroke_width).render(start_x, start_y, start_x - @circle_radius, start_y) unless @hide_dots
+        unless @hide_dots
+          circle_renderer = Gruff::Renderer::Circle.new(color: data_row.color, width: @stroke_width)
+          circle_renderer.render(start_x, start_y, start_x - @circle_radius, start_y)
+        end
       end
     end
-
-    Gruff::Renderer.finish
   end
 
 private

data/lib/gruff/patch/rmagick.rb

@@ -1,33 +1,31 @@
 # frozen_string_literal: true
 
+# @private
 module Magick
-  class Draw
-    # Additional method to scale annotation text since Draw.scale doesn't.
-    def annotate_scaled(img, width, height, x, y, text, scale)
-      scaled_width = (width * scale) >= 1 ? (width * scale) : 1
-      scaled_height = (height * scale) >= 1 ? (height * scale) : 1
+  # @private
+  module GruffAnnotate
+    refine Draw do
+      # Additional method to scale annotation text since Draw.scale doesn't.
+      def annotate_scaled(img, width, height, x, y, text, scale)
+        scaled_width = (width * scale) >= 1 ? (width * scale) : 1
+        scaled_height = (height * scale) >= 1 ? (height * scale) : 1
 
-      annotate(img,
-               scaled_width, scaled_height,
-               x * scale, y * scale,
-               text.gsub('%', '%%'))
-    end
-
-    remove_method :stroke_opacity
-    def stroke_opacity(_opacity)
-      raise '#stroke_opacity method has different behavior between RMagick and RMagick4J. Should not use this method.'
-    end
+        annotate(img,
+                 scaled_width, scaled_height,
+                 x * scale, y * scale,
+                 text.gsub('%', '%%'))
+      end
 
-    if defined? JRUBY_VERSION
-      # FIXME(uwe):  We should NOT need to implement this method.
-      #              Remove this method as soon as RMagick4J Issue #16 is fixed.
-      #              https://github.com/Serabe/RMagick4J/issues/16
-      def fill=(fill)
-        fill = { white: '#FFFFFF' }[fill.to_sym] || fill
-        @draw.fill = Magick4J.ColorDatabase.query_default(fill)
-        self
+      if defined? JRUBY_VERSION
+        # FIXME(uwe):  We should NOT need to implement this method.
+        #              Remove this method as soon as RMagick4J Issue #16 is fixed.
+        #              https://github.com/Serabe/RMagick4J/issues/16
+        def fill=(fill)
+          fill = { white: '#FFFFFF' }[fill.to_sym] || fill
+          @draw.fill = Magick4J.ColorDatabase.query_default(fill)
+          self
+        end
       end
-      # EMXIF
     end
   end
 end

data/lib/gruff/patch/string.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
-class String
+# @private
+module String::GruffCommify
   THOUSAND_SEPARATOR = ','
 
-  #Taken from http://codesnippets.joyent.com/posts/show/330
-  def commify(delimiter = THOUSAND_SEPARATOR)
-    gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
+  refine String do
+    #Taken from http://codesnippets.joyent.com/posts/show/330
+    def commify(delimiter = THOUSAND_SEPARATOR)
+      gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
+    end
   end
 end

data/lib/gruff/photo_bar.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 # EXPERIMENTAL!
 #
 # Doesn't work yet.
@@ -70,8 +68,6 @@ class Gruff::PhotoBar < Gruff::Base
         draw_label(label_center, point_index)
       end
     end
-
-    Gruff::Renderer.finish
   end
 
   # Return the chosen theme or the default

data/lib/gruff/pie.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 #
 # Here's how to make a Gruff::Pie.
 #
@@ -69,8 +67,6 @@ class Gruff::Pie < Gruff::Base
         update_chart_degrees_with slice.degrees
       end
     end
-
-    Gruff::Renderer.finish
   end
 
 private
@@ -81,7 +77,7 @@ private
 
       slices.sort_by(&:value) if @sort
 
-      total = slices.map(&:value).inject(:+).to_f
+      total = slices.map(&:value).sum.to_f
       slices.each { |slice| slice.total = total }
     end
   end

data/lib/gruff/renderer/bezier.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Bezier
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width] || 1.0
+    def initialize(color:, width: 1.0)
+      @color = color
+      @width = width
     end
 
     def render(points)

data/lib/gruff/renderer/circle.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Circle
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width] || 1.0
+    def initialize(color:, width: 1.0)
+      @color = color
+      @width = width
     end
 
     def render(origin_x, origin_y, perim_x, perim_y)

data/lib/gruff/renderer/dash_line.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::DashLine
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width]
+    def initialize(color:, width:)
+      @color = color
+      @width = width
     end
 
     def render(start_x, start_y, end_x, end_y)

data/lib/gruff/renderer/dot.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Dot
-    def initialize(style, config)
+    def initialize(style, color:, width: 1.0)
       @style = style
-      @color = config[:color]
-      @width = config[:width] || 1.0
+      @color = color
+      @width = width
     end
 
     def render(new_x, new_y, circle_radius)

data/lib/gruff/renderer/ellipse.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Ellipse
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width] || 1.0
+    def initialize(color:, width: 1.0)
+      @color = color
+      @width = width
     end
 
     def render(origin_x, origin_y, width, height, arc_start, arc_end)

data/lib/gruff/renderer/line.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Line
     EPSILON = 0.001
 
-    def initialize(args = {})
-      @color = args[:color]
-      @shadow_color = args[:shadow_color]
-      @width = args[:width]
+    def initialize(color:, width: nil, shadow_color: nil)
+      @color = color
+      @width = width
+      @shadow_color = shadow_color
     end
 
     def render(start_x, start_y, end_x, end_y)