gruff 0.13.0 → 0.16.0

data/lib/gruff/spider.rb

@@ -19,35 +19,52 @@ class Gruff::Spider < Gruff::Base
   attr_writer :hide_axes
   attr_writer :rotation
 
+  def initialize(max_value, target_width = 800)
+    super(target_width)
+    @max_value = max_value
+  end
+
   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)
     @hide_title = @hide_text = value
   end
 
-  def initialize(max_value, target_width = 800)
-    super(target_width)
-    @max_value = max_value
-  end
+private
 
-  def initialize_ivars
+  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
 
+  def setup_graph_measurements
     super
 
-    return unless data_given?
+    @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
+  end
+
+  def setup_data
+    raise(Gruff::IncorrectNumberOfDatasetsException, 'Requires 3 or more data sets') if store.length < 3
+
+    super
+  end
+
+  def draw_graph
     # Setup basic positioning
     radius = @graph_height / 2.0
     center_x = @graph_left + (@graph_width / 2.0)
@@ -64,34 +81,45 @@ class Gruff::Spider < Gruff::Base
     draw_polygon(center_x, center_y, additive_angle)
   end
 
-private
-
   def normalize_points(value)
     value * @unit_length
   end
 
   def draw_label(center_x, center_y, angle, radius, amount)
-    r_offset = 50            # The distance out from the center of the pie to get point
-    x_offset = center_x      # The label points need to be tweaked slightly
-    y_offset = center_y + 0  # This one doesn't though
+    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
+    x_offset = center_x # The label points need to be tweaked slightly
+
+    x_offset -= begin
+      case degree
+      when 0..45, 315..360
+        0
+      when 135..225
+        metrics.width
+      else
+        metrics.width / 2
+      end
+    end
+
+    y_offset = center_y - (metrics.height / 2.0) # This one doesn't though
     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(metrics.width, metrics.height, x, y, amount, Magick::CenterGravity)
   end
 
   def draw_axes(center_x, center_y, radius, additive_angle, line_color = nil)
     return if @hide_axes
 
-    current_angle = @rotation * Math::PI / 180.0
+    current_angle = deg2rad(@rotation)
 
     store.data.each do |data_row|
       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
@@ -102,18 +130,14 @@ private
 
   def draw_polygon(center_x, center_y, additive_angle, color = nil)
     points = []
-    current_angle = @rotation * Math::PI / 180.0
+    current_angle = deg2rad(@rotation)
 
     store.data.each do |data_row|
-      points << center_x + normalize_points(data_row.points.first) * Math.cos(current_angle)
-      points << center_y + normalize_points(data_row.points.first) * Math.sin(current_angle)
+      points << (center_x + (normalize_points(data_row.points.first) * Math.cos(current_angle)))
+      points << (center_y + (normalize_points(data_row.points.first) * Math.sin(current_angle)))
       current_angle += additive_angle
     end
 
-    Gruff::Renderer::Polygon.new(color: color || @marker_color, opacity: 0.4).render(points)
-  end
-
-  def sums_for_spider
-    store.data.sum { |data_row| data_row.points.first }
+    Gruff::Renderer::Polygon.new(renderer, color: color || @marker_color, opacity: 0.4).render(points)
   end
 end

data/lib/gruff/stacked_area.rb

@@ -12,34 +12,38 @@
 #
 class Gruff::StackedArea < Gruff::Base
   include StackedMixin
-  attr_writer :last_series_goes_on_bottom
 
-  def initialize_ivars
+  # @deprecated
+  def last_series_goes_on_bottom=(_value)
+    warn '#last_series_goes_on_bottom is deprecated. It is no longer effective.'
+  end
+
+private
+
+  def initialize_attributes
     super
-    @last_series_goes_on_bottom = false
+    @minimum_value = 0.0
   end
-  private :initialize_ivars
 
-  def draw
+  def setup_data
     calculate_maximum_by_stack
     super
+  end
 
-    return unless data_given?
-
-    x_increment = @graph_width / (column_count - 1).to_f
+  def draw_graph
+    x_increment = @graph_width / (column_count - 1)
 
     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 = []
 
       data_row.points.each_with_index do |data_point, index|
         # Use incremented x and scaled y
         new_x = @graph_left + (x_increment * index)
-        new_y = @graph_top + (@graph_height - data_point * @graph_height - height[index])
+        new_y = @graph_top + (@graph_height - (data_point * @graph_height) - height[index])
 
         height[index] += (data_point * @graph_height)
 
@@ -51,20 +55,20 @@ class Gruff::StackedArea < Gruff::Base
 
       poly_points = data_points.dup
       if prev_data_points
-        (prev_data_points.length / 2 - 1).downto(0) do |i|
+        ((prev_data_points.length / 2) - 1).downto(0) do |i|
           poly_points << prev_data_points[2 * i]
-          poly_points << prev_data_points[2 * i + 1]
+          poly_points << prev_data_points[(2 * i) + 1]
         end
       else
         poly_points << @graph_right
-        poly_points << @graph_bottom - 1
+        poly_points << (@graph_bottom - 1)
         poly_points << @graph_left
-        poly_points << @graph_bottom - 1
+        poly_points << (@graph_bottom - 1)
       end
       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
   end
 end

data/lib/gruff/stacked_bar.rb

@@ -30,76 +30,98 @@ class Gruff::StackedBar < Gruff::Base
   # Prevent drawing of column labels below a stacked bar graph.  Default is +false+.
   attr_writer :hide_labels
 
-  def initialize_ivars
+private
+
+  def initialize_attributes
     super
     @bar_spacing = 0.9
     @segment_spacing = 2
     @label_formatting = nil
     @show_labels_for_bar_values = false
     @hide_labels = false
+    @minimum_value = 0.0
   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
+
+  def setup_graph_measurements
+    super
+    return if @hide_line_markers
+
+    if @show_labels_for_bar_values
+      proc_text_metrics = ->(text) { text_metrics(@marker_font, text) }
 
+      if maximum_value >= 0
+        _, metrics = Gruff::BarValueLabel.metrics(maximum_value, @label_formatting, proc_text_metrics)
+        @graph_top += metrics.height
+      end
+
+      @graph_height = @graph_bottom - @graph_top
+    end
+  end
+
+  # Draws a bar graph, but multiple sets are stacked on top of each other.
+  def draw_graph
     # Setup spacing.
     #
     # Columns sit stacked.
-    bar_width = @graph_width / column_count.to_f
+    bar_width = @graph_width / column_count
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
     height = Array.new(column_count, 0)
-    stack_bar_value_label = Gruff::BarValueLabel::StackedBar.new
+    length = Array.new(column_count, @graph_bottom)
+    stack_bar_value_labels = 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|
-        next if data_point == 0
+        temp1 = @graph_top + (@graph_height - (data_point * @graph_height) - height[point_index])
+        temp2 = @graph_top + @graph_height - height[point_index]
+        difference = temp2 - temp1
+        difference = 0 if difference < 0
 
         # Use incremented x and scaled y
         left_x = @graph_left + (bar_width * point_index) + padding
-        left_y = @graph_top + (@graph_height -
-                               data_point * @graph_height -
-                               height[point_index]) + @segment_spacing
-        right_x = left_x + bar_width * @bar_spacing
-        right_y = @graph_top + @graph_height - height[point_index]
+        left_y = length[point_index] - difference
+        right_x = left_x + (bar_width * @bar_spacing)
+        right_y = length[point_index]
+        right_y -= @segment_spacing if row_index != store.columns - 1
 
         # update the total height of the current stacked bar
+        length[point_index] -= difference
         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
+        label_center = left_x + (bar_width * @bar_spacing / 2.0)
         draw_label(label_center, 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)
+        stack_bar_value_labels.add(bar_value_label, point_index)
       end
     end
 
     if @show_labels_for_bar_values
-      stack_bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
-        draw_value_label(x, y, text, true)
+      proc_text_metrics = ->(text) { text_metrics(@marker_font, text) }
+      stack_bar_value_labels.prepare_rendering(@label_formatting, proc_text_metrics) do |x, y, text, _text_width, text_height|
+        draw_value_label(bar_width * @bar_spacing, text_height, x, y, text)
       end
     end
   end
 
-protected
-
   def hide_labels?
     @hide_labels
   end
 
   def hide_left_label_area?
-    @hide_line_markers
+    @hide_line_markers && @y_axis_label.nil?
   end
 
   def hide_bottom_label_area?
-    hide_labels?
+    hide_labels? && @x_axis_label.nil? && @legend_at_bottom == false
   end
 end

data/lib/gruff/store/store.rb

@@ -3,27 +3,23 @@
 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(**keywords)
-      unless @normalized
-        @data.each do |data_row|
-          @norm_data << data_row.normalize(**keywords)
-        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?

data/lib/gruff/store/xy_data.rb

@@ -9,6 +9,8 @@ module Gruff
         super(label.to_s, Array(y_points), color, x_points)
       end
 
+      alias points y_points
+
       def x_points
         self[:x_points] || Array.new(y_points.length)
       end

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

data/lib/gruff/version.rb

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

data/lib/gruff.rb

@@ -1,61 +1,74 @@
 # frozen_string_literal: true
 
 require 'rmagick'
-require 'gruff/version'
-
-# Extra full path added to fix loading errors on some installations.
-
-%w[
-  patch/rmagick
-  patch/string
-
-  base
-
-  helper/bar_conversion.rb
-  helper/stacked_mixin
-  helper/bar_value_label
-
-  themes
-  area
-  bar
-  bezier
-  bullet
-  dot
-  histogram
-  line
-  net
-  pie
-  scatter
-  spider
-  side_bar
-  stacked_area
-  stacked_bar
-  side_stacked_bar
-  accumulator_bar
-
-  scene
-
-  renderer/renderer
-  renderer/rectangle
-  renderer/circle
-  renderer/dash_line
-  renderer/line
-  renderer/polyline
-  renderer/polygon
-  renderer/bezier
-  renderer/ellipse
-  renderer/dot
-  renderer/text
-
-  store/store
-  store/basic_data
-  store/custom_data
-  store/xy_data
-
-  mini/legend
-  mini/bar
-  mini/pie
-  mini/side_bar
-].each do |filename|
-  require "gruff/#{filename}"
+
+require_relative 'gruff/patch/rmagick'
+require_relative 'gruff/patch/string'
+require_relative 'gruff/renderer/renderer'
+require_relative 'gruff/store/store'
+require_relative 'gruff/font'
+require_relative 'gruff/base'
+require_relative 'gruff/version'
+
+##
+# = Gruff. Graphs.
+#
+module Gruff
+  # @private
+  def self.libpath(path)
+    File.join(__dir__, 'gruff', path)
+  end
+
+  autoload :BarConversion, Gruff.libpath('helper/bar_conversion')
+  autoload :BarValueLabel, Gruff.libpath('helper/bar_value_label')
+  class Base
+    autoload :StackedMixin, Gruff.libpath('helper/stacked_mixin')
+  end
+
+  autoload :AccumulatorBar, Gruff.libpath('accumulator_bar')
+  autoload :Area, Gruff.libpath('area')
+  autoload :Bar, Gruff.libpath('bar')
+  autoload :Bezier, Gruff.libpath('bezier')
+  autoload :BoxPlot, Gruff.libpath('box_plot')
+  autoload :Bullet, Gruff.libpath('bullet')
+  autoload :Candlestick, Gruff.libpath('candlestick')
+  autoload :Dot, Gruff.libpath('dot')
+  autoload :Histogram, Gruff.libpath('histogram')
+  autoload :Line, Gruff.libpath('line')
+  autoload :Net, Gruff.libpath('net')
+  autoload :Pie, Gruff.libpath('pie')
+  autoload :Scatter, Gruff.libpath('scatter')
+  autoload :SideBar, Gruff.libpath('side_bar')
+  autoload :SideStackedBar, Gruff.libpath('side_stacked_bar')
+  autoload :Spider, Gruff.libpath('spider')
+  autoload :StackedArea, Gruff.libpath('stacked_area')
+  autoload :StackedBar, Gruff.libpath('stacked_bar')
+
+  autoload :Layer, Gruff.libpath('scene')
+  autoload :Themes, Gruff.libpath('themes')
+
+  class Renderer
+    autoload :Bezier, Gruff.libpath('renderer/bezier')
+    autoload :Circle, Gruff.libpath('renderer/circle')
+    autoload :DashLine, Gruff.libpath('renderer/dash_line')
+    autoload :Dot, Gruff.libpath('renderer/dot')
+    autoload :Ellipse, Gruff.libpath('renderer/ellipse')
+    autoload :Line, Gruff.libpath('renderer/line')
+    autoload :Polygon, Gruff.libpath('renderer/polygon')
+    autoload :Polyline, Gruff.libpath('renderer/polyline')
+    autoload :Rectangle, Gruff.libpath('renderer/rectangle')
+    autoload :Text, Gruff.libpath('renderer/text')
+  end
+
+  class Store
+    autoload :BasicData, Gruff.libpath('store/basic_data')
+    autoload :XYData, Gruff.libpath('store/xy_data')
+  end
+
+  module Mini
+    autoload :Bar, Gruff.libpath('mini/bar')
+    autoload :Legend, Gruff.libpath('mini/legend')
+    autoload :Pie, Gruff.libpath('mini/pie')
+    autoload :SideBar, Gruff.libpath('mini/side_bar')
+  end
 end

data/rails_generators/gruff/templates/controller.rb

@@ -26,7 +26,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     g.labels = {0 => '2004', 2 => '2005', 4 => '2006'}
 
-    send_data(g.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "gruff.png")
+    send_data(g.to_image.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "gruff.png")
   end
 
 end