gruff 0.11.0-java → 0.14.0-java

data/lib/gruff/mini/bar.rb

@@ -14,30 +14,33 @@
 #
 module Gruff
   module Mini
+    # A class for drawing a small bar graph.
     class Bar < Gruff::Bar
+    private
+
       include Gruff::Mini::Legend
 
-      def initialize_ivars
+      def initialize_attributes
         super
 
         @hide_legend = true
         @hide_title = true
         @hide_line_numbers = true
 
-        @marker_font_size = 50.0
-        @legend_font_size = 60.0
+        @marker_font.size = 50.0
+        @legend_font.size = 60.0
 
         @minimum_value = 0.0
       end
-      private :initialize_ivars
 
-      def draw
+      def setup_data
         expand_canvas_for_vertical_legend
-
         super
+      end
 
+      def draw_graph
+        super
         draw_vertical_legend
-        Gruff::Renderer.finish
       end
     end
   end

data/lib/gruff/mini/legend.rb

@@ -2,6 +2,8 @@
 
 module Gruff
   module Mini
+    # A module to handle the small legend.
+    # @private
     module Legend
       attr_accessor :hide_mini_legend, :legend_position
 
@@ -25,22 +27,24 @@ 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
-          @rows += store.length * calculate_caps_height(scale_fontsize(@legend_font_size)) * 1.7
+          font = @legend_font.dup
+          font.size = scale_fontsize(font.size)
+          @rows += store.length * calculate_caps_height(font) * 1.7
         end
 
-        Gruff::Renderer.setup(@columns, @rows, @font, @scale, @theme_options)
+        @renderer = Gruff::Renderer.new(@columns, @rows, @scale, @theme_options)
       end
 
       def calculate_line_height
-        calculate_caps_height(@legend_font_size) * 1.7
+        calculate_caps_height(@legend_font) * 1.7
       end
 
       def calculate_legend_width
-        width = @legend_labels.map { |label| calculate_width(@legend_font_size, label) }.max
+        width = @legend_labels.map { |label| calculate_width(@legend_font, label) }.max
         scale_fontsize(width + 40 * 1.7)
       end
 
@@ -55,7 +59,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
@@ -66,11 +70,12 @@ module Gruff
         @legend_labels.each_with_index do |legend_label, index|
           # 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)
+          text_renderer = Gruff::Renderer::Text.new(renderer, label, font: @legend_font)
+          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)
+          rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: store.data[index].color)
           rect_renderer.render(current_x_offset,
                                current_y_offset - legend_square_width / 2.0,
                                current_x_offset + legend_square_width,
@@ -87,7 +92,11 @@ 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 = @legend_font.dup
+        font.size = scale_fontsize(font.size)
+        max_width = @columns - @legend_left_margin - @right_margin
+        while calculate_width(font, 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,29 +13,31 @@
 #
 module Gruff
   module Mini
+    # A class for drawing a small pie graph.
     class Pie < Gruff::Pie
+    private
+
       include Gruff::Mini::Legend
 
-      def initialize_ivars
+      def initialize_attributes
         super
 
         @hide_legend = true
         @hide_title = true
         @hide_line_numbers = true
 
-        @marker_font_size = 60.0
-        @legend_font_size = 60.0
+        @marker_font.size = 60.0
+        @legend_font.size = 60.0
       end
-      private :initialize_ivars
 
-      def draw
+      def setup_data
         expand_canvas_for_vertical_legend
-
         super
+      end
 
+      def draw_graph
+        super
         draw_vertical_legend
-
-        Gruff::Renderer.finish
       end
     end
   end

data/lib/gruff/mini/side_bar.rb

@@ -21,28 +21,30 @@
 #
 module Gruff
   module Mini
+    # A class for drawing a small side bar graph.
     class SideBar < Gruff::SideBar
+    private
+
       include Gruff::Mini::Legend
 
-      def initialize_ivars
+      def initialize_attributes
         super
         @hide_legend = true
         @hide_title = true
         @hide_line_numbers = true
 
-        @marker_font_size = 50.0
-        @legend_font_size = 50.0
+        @marker_font.size = 50.0
+        @legend_font.size = 50.0
       end
-      private :initialize_ivars
 
-      def draw
+      def setup_data
         expand_canvas_for_vertical_legend
-
         super
+      end
 
+      def draw_graph
+        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,14 +23,16 @@ 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.
   attr_writer :line_width
   attr_writer :dot_radius
 
-  def initialize_ivars
+private
+
+  def initialize_attributes
     super
 
     @hide_dots = false
@@ -40,14 +40,10 @@ class Gruff::Net < Gruff::Base
     @dot_radius = nil
     @hide_line_numbers = true
     @sorted_drawing = true
+    @marker_font.bold = true
   end
-  private :initialize_ivars
-
-  def draw
-    super
-
-    return unless data_given?
 
+  def draw_graph
     store.norm_data.each do |data_row|
       data_row.points.each_with_index do |data_point, index|
         next if data_point.nil?
@@ -64,17 +60,16 @@ class Gruff::Net < Gruff::Base
         end_x = @center_x + Math.sin(next_rad_pos) * next_point_distance
         end_y = @center_y - Math.cos(next_rad_pos) * next_point_distance
 
-        Gruff::Renderer::Line.new(color: data_row.color, width: @stroke_width).render(start_x, start_y, end_x, end_y)
+        Gruff::Renderer::Line.new(renderer, 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(renderer, 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
-
   def setup_drawing
     super
 
@@ -93,7 +88,7 @@ private
     (0..column_count - 1).each do |index|
       rad_pos = index * Math::PI * 2 / column_count
 
-      Gruff::Renderer::Line.new(color: @marker_color)
+      Gruff::Renderer::Line.new(renderer, color: @marker_color)
                            .render(@center_x, @center_y, @center_x + Math.sin(rad_pos) * @radius, @center_y - Math.cos(rad_pos) * @radius)
 
       marker_label = @labels[index] ? @labels[index].to_s : '000'
@@ -107,8 +102,6 @@ private
     x = x_offset + (radius + LABEL_MARGIN) * Math.sin(deg2rad(angle))
     y = y_offset - (radius + LABEL_MARGIN) * Math.cos(deg2rad(angle))
 
-    # Draw label
-    text_renderer = Gruff::Renderer::Text.new(amount, font: @font, size: 20, color: @marker_color, weight: Magick::BoldWeight)
-    text_renderer.add_to_render_queue(0, 0, x, y, Magick::CenterGravity)
+    draw_label_at(1.0, 1.0, x, y, amount, Magick::CenterGravity)
   end
 end

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/pie.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 #
 # Here's how to make a Gruff::Pie.
 #
@@ -20,6 +18,9 @@ class Gruff::Pie < Gruff::Base
   # or at another angle. Default is +0.0+, which starts at 3 o'clock.
   attr_writer :zero_degree
 
+  # Set the number output format lambda.
+  attr_writer :label_formatting
+
   # Do not show labels for slices that are less than this percent. Use 0 to always show all labels.
   # Defaults to +0+.
   attr_writer :hide_labels_less_than
@@ -31,75 +32,54 @@ class Gruff::Pie < Gruff::Base
   ## Use values instead of percentages.
   attr_writer :show_values_as_labels
 
+private
+
   def initialize_store
     @store = Gruff::Store.new(Gruff::Store::CustomData)
   end
-  private :initialize_store
 
-  def initialize_ivars
+  def initialize_attributes
     super
     @zero_degree = 0.0
     @hide_labels_less_than = 0.0
     @text_offset_percentage = DEFAULT_TEXT_OFFSET_PERCENTAGE
     @show_values_as_labels = false
-  end
-  private :initialize_ivars
+    @marker_font.bold = true
 
-  def options
-    {
-      zero_degree: @zero_degree,
-      hide_labels_less_than: @hide_labels_less_than,
-      text_offset_percentage: @text_offset_percentage,
-      show_values_as_labels: @show_values_as_labels
-    }
-  end
-
-  def draw
-    hide_line_markers
-
-    super
+    @hide_line_markers = true
+    @hide_line_markers.freeze
 
-    return unless data_given?
+    @label_formatting = ->(value, percentage) { @show_values_as_labels ? value.to_s : "#{percentage}%" }
+  end
 
+  def draw_graph
     slices.each do |slice|
       if slice.value > 0
-        Gruff::Renderer::Ellipse.new(color: slice.color, width: radius)
+        Gruff::Renderer::Ellipse.new(renderer, color: slice.color, width: radius)
                                 .render(center_x, center_y, radius / 2.0, radius / 2.0, chart_degrees, chart_degrees + slice.degrees + 0.5)
         process_label_for slice
         update_chart_degrees_with slice.degrees
       end
     end
-
-    Gruff::Renderer.finish
   end
 
-private
-
   def slices
     @slices ||= begin
-      slices = store.data.map { |data| slice_class.new(data, options) }
+      slices = store.data.map { |data| Gruff::Pie::PieSlice.new(data.label, data.points.first, data.color) }
 
       slices.sort_by(&:value) if @sort
 
-      total = slices.map(&:value).inject(:+).to_f
+      total = slices.sum(&:value).to_f
       slices.each { |slice| slice.total = total }
     end
   end
 
   # General Helper Methods
 
-  def hide_line_markers
-    @hide_line_markers = true
-  end
-
   def update_chart_degrees_with(degrees)
     @chart_degrees = chart_degrees + degrees
   end
 
-  def slice_class
-    PieSlice
-  end
-
   # Spatial Value-Related Methods
 
   def chart_degrees
@@ -107,13 +87,8 @@ private
   end
 
   attr_reader :graph_height
-
   attr_reader :graph_width
 
-  def diameter
-    graph_height
-  end
-
   def half_width
     graph_width / 2.0
   end
@@ -151,8 +126,8 @@ private
   def process_label_for(slice)
     if slice.percentage >= @hide_labels_less_than
       x, y = label_coordinates_for slice
-
-      draw_label(x, y, slice.label)
+      label = @label_formatting.call(slice.value, slice.percentage)
+      draw_label_at(1.0, 1.0, x, y, label, Magick::CenterGravity)
     end
   end
 
@@ -170,45 +145,24 @@ private
     center_y + (radius_offset * Math.sin(deg2rad(angle)))
   end
 
-  # Drawing-Related Methods
-
-  def draw_label(x, y, value)
-    text_renderer = Gruff::Renderer::Text.new(value, font: @font, size: @marker_font_size, color: @font_color, weight: Magick::BoldWeight)
-    text_renderer.add_to_render_queue(0, 0, x, y, Magick::CenterGravity)
-  end
-
   # Helper Classes
   #
   # @private
-  class PieSlice < Struct.new(:data_array, :options)
+  class PieSlice < Struct.new(:label, :value, :color)
     attr_accessor :total
 
-    def name
-      data_array[0]
-    end
-
-    def value
-      data_array[1].first
-    end
-
-    def color
-      data_array[2]
-    end
-
-    def size
-      @size ||= value / total
-    end
-
     def percentage
-      @percentage ||= (size * 100.0).round
+      (size * 100.0).round
     end
 
     def degrees
-      @degrees ||= size * 360.0
+      size * 360.0
     end
 
-    def label
-      options[:show_values_as_labels] ? value.to_s : "#{percentage}%"
+  private
+
+    def size
+      value / total
     end
   end
 end