gruff 0.11.0-java → 0.14.0-java

data/lib/gruff/spider.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 # Experimental!!! See also the Net graph.
 #
 # Here's how to set up a Gruff::Spider.
@@ -15,14 +13,14 @@ require 'gruff/base'
 #   g.data :Wisdom, [10]
 #   g.data 'Charisma', [16]
 #   g.write("spider.png")
-
+#
 class Gruff::Spider < Gruff::Base
   # Hide all text.
   attr_writer :hide_axes
   attr_writer :rotation
 
   def transparent_background=(value)
-    Gruff::Renderer.setup_transparent_background(@columns, @rows) if value
+    renderer.transparent_background(@columns, @rows) if value
   end
 
   def hide_text=(value)
@@ -34,22 +32,21 @@ class Gruff::Spider < Gruff::Base
     @max_value = max_value
   end
 
-  def initialize_ivars
+private
+
+  def initialize_attributes
     super
     @hide_legend = true
     @hide_axes = false
     @hide_text = false
     @rotation = 0
-  end
-  private :initialize_ivars
+    @marker_font.bold = true
 
-  def draw
     @hide_line_markers = true
+    @hide_line_markers.freeze
+  end
 
-    super
-
-    return unless data_given?
-
+  def draw_graph
     # Setup basic positioning
     radius = @graph_height / 2.0
     center_x = @graph_left + (@graph_width / 2.0)
@@ -64,12 +61,8 @@ class Gruff::Spider < Gruff::Base
 
     # Draw polygon
     draw_polygon(center_x, center_y, additive_angle)
-
-    Gruff::Renderer.finish
   end
 
-private
-
   def normalize_points(value)
     value * @unit_length
   end
@@ -81,9 +74,7 @@ private
     x = x_offset + ((radius + r_offset) * Math.cos(angle))
     y = y_offset + ((radius + r_offset) * Math.sin(angle))
 
-    # Draw label
-    text_renderer = Gruff::Renderer::Text.new(amount, font: @font, size: @legend_font_size, 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
 
   def draw_axes(center_x, center_y, radius, additive_angle, line_color = nil)
@@ -95,7 +86,7 @@ private
       x_offset = radius * Math.cos(current_angle)
       y_offset = radius * Math.sin(current_angle)
 
-      Gruff::Renderer::Line.new(color: line_color || data_row.color, width: 5.0)
+      Gruff::Renderer::Line.new(renderer, color: line_color || data_row.color, width: 5.0)
                            .render(center_x, center_y, center_x + x_offset, center_y + y_offset)
 
       draw_label(center_x, center_y, current_angle, radius, data_row.label.to_s) unless @hide_text
@@ -114,10 +105,10 @@ private
       current_angle += additive_angle
     end
 
-    Gruff::Renderer::Polygon.new(color: color || @marker_color, opacity: 0.4).render(points)
+    Gruff::Renderer::Polygon.new(renderer, color: color || @marker_color, opacity: 0.4).render(points)
   end
 
   def sums_for_spider
-    store.data.reduce(0.0) { |sum, data_row| sum + data_row.points.first }
+    store.data.sum { |data_row| data_row.points.first }
   end
 end

data/lib/gruff/stacked_area.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-require 'gruff/helper/stacked_mixin'
-
 #
 # Here's how to set up a Gruff::StackedArea.
 #
@@ -15,27 +12,26 @@ require 'gruff/helper/stacked_mixin'
 #
 class Gruff::StackedArea < Gruff::Base
   include StackedMixin
-  attr_writer :last_series_goes_on_bottom
 
-  def initialize_ivars
-    super
-    @last_series_goes_on_bottom = false
+  # @deprecated
+  def last_series_goes_on_bottom=(_value)
+    warn '#last_series_goes_on_bottom is deprecated. It is no longer effective.'
   end
-  private :initialize_ivars
 
-  def draw
+private
+
+  def setup_data
     calculate_maximum_by_stack
     super
+  end
 
-    return unless data_given?
-
+  def draw_graph
     x_increment = @graph_width / (column_count - 1).to_f
 
     height = Array.new(column_count, 0)
 
     data_points = nil
-    iterator = @last_series_goes_on_bottom ? :reverse_each : :each
-    store.norm_data.public_send(iterator) do |data_row|
+    store.norm_data.each do |data_row|
       prev_data_points = data_points
       data_points = []
 
@@ -67,9 +63,7 @@ class Gruff::StackedArea < Gruff::Base
       poly_points << data_points[0]
       poly_points << data_points[1]
 
-      Gruff::Renderer::Polygon.new(color: data_row.color).render(poly_points)
+      Gruff::Renderer::Polygon.new(renderer, color: data_row.color).render(poly_points)
     end
-
-    Gruff::Renderer.finish
   end
 end

data/lib/gruff/stacked_bar.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-require 'gruff/helper/stacked_mixin'
-require 'gruff/helper/bar_value_label_mixin'
-
 #
 # Here's how to set up a Gruff::StackedBar.
 #
@@ -16,7 +12,6 @@ require 'gruff/helper/bar_value_label_mixin'
 #
 class Gruff::StackedBar < Gruff::Base
   include StackedMixin
-  include BarValueLabelMixin
 
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
@@ -24,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
 
@@ -32,21 +27,27 @@ class Gruff::StackedBar < Gruff::Base
   # Default is +false+.
   attr_writer :show_labels_for_bar_values
 
-  def initialize_ivars
+  # Prevent drawing of column labels below a stacked bar graph.  Default is +false+.
+  attr_writer :hide_labels
+
+private
+
+  def initialize_attributes
     super
     @bar_spacing = 0.9
     @segment_spacing = 2
     @label_formatting = nil
     @show_labels_for_bar_values = false
+    @hide_labels = false
   end
-  private :initialize_ivars
 
-  # Draws a bar graph, but multiple sets are stacked on top of each other.
-  def draw
+  def setup_data
     calculate_maximum_by_stack
     super
-    return unless data_given?
+  end
 
+  # Draws a bar graph, but multiple sets are stacked on top of each other.
+  def draw_graph
     # Setup spacing.
     #
     # Columns sit stacked.
@@ -54,7 +55,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|
@@ -71,24 +72,34 @@ class Gruff::StackedBar < Gruff::Base
         # update the total height of the current stacked bar
         height[point_index] += (data_point * @graph_height)
 
-        rect_renderer = Gruff::Renderer::Rectangle.new(color: data_row.color)
+        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: data_row.color)
         rect_renderer.render(left_x, left_y, right_x, right_y)
 
         # Calculate center based on bar_width and current row
         label_center = left_x + bar_width * @bar_spacing / 2.0
         draw_label(label_center, point_index)
 
-        bar_value_label.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|
-        draw_value_label(x, y, text, true)
+      stack_bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
+        draw_value_label(x, y, text)
       end
     end
+  end
+
+  def hide_labels?
+    @hide_labels
+  end
+
+  def hide_left_label_area?
+    @hide_line_markers
+  end
 
-    Gruff::Renderer.finish
+  def hide_bottom_label_area?
+    hide_labels?
   end
 end

data/lib/gruff/store/{base_data.rb → basic_data.rb}

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 module Gruff
-  # @private
   class Store
-    class BaseData < Struct.new(:label, :points, :color)
+    # @private
+    class BasicData < Struct.new(:label, :points, :color)
       def initialize(label, points, color)
-        self.label = label.to_s
-        self.points = Array(points)
-        self.color = color
+        super(label.to_s, Array(points), color)
       end
 
       def empty?
@@ -26,9 +24,9 @@ module Gruff
         points.compact.max
       end
 
-      def normalize(args = {})
+      def normalize(minimum:, spread:)
         norm_points = points.map do |point|
-          point.nil? ? nil : (point.to_f - args[:minimum].to_f) / args[:spread]
+          point.nil? ? nil : (point.to_f - minimum.to_f) / spread
         end
 
         self.class.new(label, norm_points, color)

data/lib/gruff/store/custom_data.rb

@@ -2,12 +2,10 @@
 
 module Gruff
   class Store
+    # @private
     class CustomData < Struct.new(:label, :points, :color, :custom)
       def initialize(label, points, color, custom = nil)
-        self.label = label.to_s
-        self.points = Array(points)
-        self.color = color
-        self.custom = custom
+        super(label.to_s, Array(points), color, custom)
       end
 
       def empty?
@@ -26,9 +24,9 @@ module Gruff
         points.compact.max
       end
 
-      def normalize(args = {})
+      def normalize(minimum:, spread:)
         norm_points = points.map do |point|
-          point.nil? ? nil : (point.to_f - args[:minimum].to_f) / args[:spread]
+          point.nil? ? nil : (point.to_f - minimum.to_f) / spread
         end
 
         self.class.new(label, norm_points, color, custom)

data/lib/gruff/store/store.rb

@@ -1,28 +1,25 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Store
-    attr_reader :data, :norm_data
+    attr_reader :data
 
     def initialize(data_class)
       @data_class = data_class
       @data = []
-      @norm_data = []
-      @normalized = false
     end
 
     def add(*args)
       @data << @data_class.new(*args)
     end
 
-    def normalize(args = {})
-      unless @normalized
-        @data.each do |data_row|
-          @norm_data << data_row.normalize(args)
-        end
+    def norm_data
+      @norm_data || []
+    end
 
-        @normalized = true
-      end
+    def normalize(**keywords)
+      @norm_data = @data.map { |data_row| data_row.normalize(**keywords) }
     end
 
     def empty?
@@ -56,11 +53,11 @@ module Gruff
     end
 
     def sort_data!
-      @data = @data.sort_by { |a| -a.points.reduce(0) { |acc, elem| acc + elem.to_f } }
+      @data = @data.sort_by { |a| -a.points.sum(&:to_f) }
     end
 
     def sort_norm_data!
-      @norm_data = @norm_data.sort_by { |a| -a.points.reduce(0) { |acc, elem| acc + elem.to_f } }
+      @norm_data = @norm_data.sort_by { |a| -a.points.sum(&:to_f) }
     end
 
     def reverse!

data/lib/gruff/store/xy_data.rb

@@ -2,12 +2,11 @@
 
 module Gruff
   class Store
+    # @private
     class XYData < Struct.new(:label, :y_points, :color, :x_points)
       def initialize(label, y_points, color, x_points = nil)
-        self.label = label.to_s
-        self.y_points = Array(y_points)
-        self.color = color
-        self.x_points = Array(x_points) if x_points
+        x_points = Array(x_points) if x_points
+        super(label.to_s, Array(y_points), color, x_points)
       end
 
       def x_points
@@ -44,12 +43,12 @@ module Gruff
         x_points.compact.max
       end
 
-      def normalize(args = {})
+      def normalize(minimum_x:, minimum_y:, spread_x:, spread_y:)
         norm_x_points = x_points.map do |x|
-          x.nil? ? nil : (x.to_f - args[:minimum_x].to_f) / args[:spread_x]
+          x.nil? ? nil : (x.to_f - minimum_x.to_f) / spread_x
         end
         norm_y_points = y_points.map do |y|
-          y.nil? ? nil : (y.to_f - args[:minimum_y].to_f) / args[:spread_y]
+          y.nil? ? nil : (y.to_f - minimum_y.to_f) / spread_y
         end
 
         self.class.new(label, norm_y_points, color, norm_x_points)

data/lib/gruff/themes.rb

@@ -16,7 +16,7 @@ module Gruff
       marker_color: 'white',
       font_color: 'white',
       background_colors: %w[black #4a465a]
-    }
+    }.freeze
 
     # A color scheme plucked from the colors on the popular usability blog.
     THIRTYSEVEN_SIGNALS = {
@@ -32,7 +32,7 @@ module Gruff
       marker_color: 'black',
       font_color: 'black',
       background_colors: %w[#d1edf5 white]
-    }
+    }.freeze
 
     # A color scheme from the colors used on the 2005 Rails keynote
     # presentation at RubyConf.
@@ -49,7 +49,7 @@ module Gruff
       marker_color: 'white',
       font_color: 'white',
       background_colors: %w[#0083a3 #0083a3]
-    }
+    }.freeze
 
     # A color scheme similar to that used on the popular podcast site.
     ODEO = {
@@ -65,7 +65,7 @@ module Gruff
       marker_color: 'white',
       font_color: 'white',
       background_colors: %w[#ff47a4 #ff1f81]
-    }
+    }.freeze
 
     # A pastel theme
     PASTEL = {
@@ -81,7 +81,7 @@ module Gruff
       marker_color: '#aea9a9', # Grey
       font_color: 'black',
       background_colors: 'white'
-    }
+    }.freeze
 
     # A greyscale theme
     GREYSCALE = {
@@ -96,6 +96,6 @@ module Gruff
       marker_color: '#aea9a9', # Grey
       font_color: 'black',
       background_colors: 'white'
-    }
+    }.freeze
   end
 end