gruff 0.13.0 → 0.14.0

data/lib/gruff/scene.rb

@@ -52,7 +52,7 @@ class Gruff::Scene < Gruff::Base
     # Join all the custom paths and filter out the empty ones
     image_paths = @layers.map(&:path).reject(&:empty?)
     images = Magick::ImageList.new(*image_paths)
-    Gruff::Renderer.background_image = images.flatten_images
+    renderer.background_image = images.flatten_images
   end
 
   def layers=(ordered_list)
@@ -132,18 +132,20 @@ class Gruff::Layer
 
   # Choose the appropriate filename for this layer, based on the input
   def update(value)
-    @selected_filename =  case value.to_s
-                          when /^(true|false)$/
-                            select_boolean value
-                          when /^(\w|\s)+$/
-                            select_string value
-                          when /^-?(\d+\.)?\d+$/
-                            select_numeric value
-                          when /(\d\d):(\d\d):\d\d/
-                            select_time "#{Regexp.last_match(1)}#{Regexp.last_match(2)}"
-                          else
-                            select_default
-                          end
+    @selected_filename = begin
+      case value.to_s
+      when /^(true|false)$/
+        select_boolean value
+      when /^(\w|\s)+$/
+        select_string value
+      when /^-?(\d+\.)?\d+$/
+        select_numeric value
+      when /(\d\d):(\d\d):\d\d/
+        select_time "#{Regexp.last_match(1)}#{Regexp.last_match(2)}"
+      else
+        select_default
+      end
+    end
     # Finally, try to use 'default' if we're still blank
     @selected_filename ||= select_default
   end

data/lib/gruff/side_bar.rb

@@ -36,33 +36,24 @@ class Gruff::SideBar < Gruff::Base
   # Prevent drawing of column labels left of a side bar graph.  Default is +false+.
   attr_writer :hide_labels
 
-  def initialize_ivars
+  # With Side Bars use the data label for the marker value to the left of the bar.
+  # @deprecated
+  def use_data_label=(_value)
+    warn '#use_data_label is deprecated. It is no longer effective.'
+  end
+
+private
+
+  def initialize_attributes
     super
     @bar_spacing = 0.9
     @group_spacing = 10
     @label_formatting = nil
     @show_labels_for_bar_values = false
     @hide_labels = false
-  end
-  private :initialize_ivars
-
-  def draw
     @has_left_labels = true
-    super
-
-    return unless data_given?
-
-    draw_bars
   end
 
-  # With Side Bars use the data label for the marker value to the left of the bar.
-  # @deprecated
-  def use_data_label=(_value)
-    warn '#use_data_label is deprecated. It is no longer effective.'
-  end
-
-protected
-
   def hide_labels?
     @hide_labels
   end
@@ -75,12 +66,10 @@ protected
     @hide_line_markers
   end
 
-private
-
   # Value to avoid completely overwriting the coordinate axis
   AXIS_MARGIN = 0.5
 
-  def draw_bars
+  def draw_graph
     # Setup spacing.
     #
     bars_width = (@graph_height - calculate_spacing) / column_count.to_f
@@ -93,11 +82,6 @@ private
       minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
     )
 
-    # if we're a side stacked bar then we don't need to draw ourself at all
-    # because sometimes (due to different heights/min/max) you can actually
-    # see both graphs and it looks like crap
-    return if is_a?(Gruff::SideStackedBar)
-
     store.norm_data.each_with_index do |data_row, row_index|
       data_row.points.each_with_index do |data_point, point_index|
         group_spacing = @group_spacing * @scale * point_index
@@ -107,7 +91,7 @@ private
 
         left_x, right_x = conversion.get_top_bottom_scaled(data_point).sort
 
-        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 + AXIS_MARGIN, left_y, right_x + AXIS_MARGIN, right_y)
 
         # Calculate center based on bar_width and current row
@@ -118,7 +102,7 @@ private
         if @show_labels_for_bar_values
           bar_value_label = Gruff::BarValueLabel::SideBar.new([left_x, left_y, right_x, right_y], store.data[row_index].points[point_index])
           bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
-            draw_value_label(x, y, text, true)
+            draw_value_label(x, y, text)
           end
         end
       end
@@ -139,14 +123,14 @@ private
       line_diff = (@graph_right - @graph_left) / number_of_lines
       x = @graph_right - (line_diff * index) - 1
 
-      line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
+      line_renderer = Gruff::Renderer::Line.new(renderer, color: @marker_color, shadow_color: @marker_shadow_color)
       line_renderer.render(x, @graph_bottom, x, @graph_top)
 
       unless @hide_line_numbers
         diff = index - number_of_lines
         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(label, font: @font, size: @marker_font_size, color: @font_color)
+        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)
       end
     end

data/lib/gruff/side_stacked_bar.rb

@@ -39,24 +39,23 @@ class Gruff::SideStackedBar < Gruff::SideBar
   # Prevent drawing of column labels left of a side 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.0
     @label_formatting = nil
     @show_labels_for_bar_values = false
     @hide_labels = false
+    @has_left_labels = true
   end
-  private :initialize_ivars
 
-  def draw
-    @has_left_labels = true
+  def setup_data
     calculate_maximum_by_stack
     super
   end
 
-protected
-
   def hide_labels?
     @hide_labels
   end
@@ -69,9 +68,7 @@ protected
     @hide_line_markers
   end
 
-private
-
-  def draw_bars
+  def draw_graph
     # Setup spacing.
     #
     # Columns sit stacked.
@@ -105,7 +102,7 @@ private
         # that shouldn't even be there being drawn on top of the existing
         # bar - this is bad
         if data_point != 0
-          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
         end
@@ -118,7 +115,7 @@ private
 
     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)
+        draw_value_label(x, y, text)
       end
     end
   end

data/lib/gruff/spider.rb

@@ -20,7 +20,7 @@ class Gruff::Spider < Gruff::Base
   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)
@@ -32,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,8 +63,6 @@ class Gruff::Spider < Gruff::Base
     draw_polygon(center_x, center_y, additive_angle)
   end
 
-private
-
   def normalize_points(value)
     value * @unit_length
   end
@@ -77,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)
@@ -91,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
@@ -110,7 +105,7 @@ 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

data/lib/gruff/stacked_area.rb

@@ -12,27 +12,26 @@
 #
 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 = []
 
@@ -64,7 +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
   end
 end

data/lib/gruff/stacked_bar.rb

@@ -30,7 +30,9 @@ 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
@@ -38,14 +40,14 @@ class Gruff::StackedBar < Gruff::Base
     @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.
@@ -70,7 +72,7 @@ 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
@@ -84,13 +86,11 @@ class Gruff::StackedBar < Gruff::Base
 
     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)
+        draw_value_label(x, y, text)
       end
     end
   end
 
-protected
-
   def hide_labels?
     @hide_labels
   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/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