gruff 0.8.0 → 0.9.0

data/lib/gruff/mini/bar.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 ##
 #
 # Makes a small bar graph suitable for display at 200px or even smaller.
 #
 module Gruff
   module Mini
-
     class Bar < Gruff::Bar
-
       include Gruff::Mini::Legend
 
       def initialize_ivars
@@ -17,10 +17,11 @@ module Gruff
         @hide_line_numbers = true
 
         @marker_font_size = 50.0
-        @minimum_value = 0.0
-        @maximum_value = 0.0
         @legend_font_size = 60.0
+
+        @minimum_value = 0.0
       end
+      private :initialize_ivars
 
       def draw
         expand_canvas_for_vertical_legend
@@ -28,10 +29,8 @@ module Gruff
         super
 
         draw_vertical_legend
-        @d.draw(@base_image)
+        Gruff::Renderer.finish
       end
-
     end
-
   end
 end

data/lib/gruff/mini/legend.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Gruff
   module Mini
     module Legend
-
       attr_accessor :hide_mini_legend, :legend_position
 
       def initialize(*)
@@ -16,11 +17,9 @@ module Gruff
       def expand_canvas_for_vertical_legend
         return if @hide_mini_legend
 
-        @legend_labels = @data.collect { |item| item[Gruff::Base::DATA_LABEL_INDEX] }
+        @legend_labels = store.data.map(&:label)
 
-        legend_height = scale_fontsize(
-                                       @data.length * calculate_line_height +
-                                       @top_margin + @bottom_margin)
+        legend_height = scale_fontsize(store.length * calculate_line_height + @top_margin + @bottom_margin)
 
         @original_rows = @raw_rows
         @original_columns = @raw_columns
@@ -30,9 +29,10 @@ module Gruff
           @rows = [@rows, legend_height].max
           @columns += calculate_legend_width + @left_margin
         else
-          @rows += @data.length * calculate_caps_height(scale_fontsize(@legend_font_size)) * 1.7
+          @rows += store.length * calculate_caps_height(scale_fontsize(@legend_font_size)) * 1.7
         end
-        render_background
+
+        Gruff::Renderer.setup(@columns, @rows, @font, @scale, @theme_options)
       end
 
       def calculate_line_height
@@ -54,10 +54,6 @@ module Gruff
         @legend_left_margin = 100.0
         legend_top_margin = 40.0
 
-        # May fix legend drawing problem at small sizes
-        @d.font = @font if @font
-        @d.pointsize = @legend_font_size
-
         case @legend_position
         when :right then
           current_x_offset = @original_columns + @left_margin
@@ -67,32 +63,21 @@ module Gruff
           current_y_offset = @original_rows + legend_top_margin
         end
 
-        debug { @d.line 0.0, current_y_offset, @raw_columns, current_y_offset }
-
         @legend_labels.each_with_index do |legend_label, index|
           # Draw label
-          @d.fill = @font_color
-          @d.font = @font if @font
-          @d.pointsize = scale_fontsize(@legend_font_size)
-          @d.stroke = 'transparent'
-          @d.font_weight = Magick::NormalWeight
-          @d.gravity = Magick::WestGravity
-          @d = @d.annotate_scaled(@base_image,
-                                  @raw_columns, 1.0,
-                                  current_x_offset + (legend_square_width * 1.7), current_y_offset,
-                                  truncate_legend_label(legend_label), @scale)
+          label = truncate_legend_label(legend_label)
+          text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @legend_font_size, color: @font_color)
+          text_renderer.render(@raw_columns, 1.0, current_x_offset + (legend_square_width * 1.7), current_y_offset, Magick::WestGravity)
 
           # Now draw box with color of this dataset
-          @d = @d.stroke 'transparent'
-          @d = @d.fill @data[index][Gruff::Base::DATA_COLOR_INDEX]
-          @d = @d.rectangle(current_x_offset,
-                            current_y_offset - legend_square_width / 2.0,
-                            current_x_offset + legend_square_width,
-                            current_y_offset + legend_square_width / 2.0)
+          rect_renderer = Gruff::Renderer::Rectangle.new(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,
+                               current_y_offset + legend_square_width / 2.0)
 
           current_y_offset += calculate_line_height
         end
-        @color_index = 0
       end
 
       ##
@@ -105,9 +90,8 @@ module Gruff
         while calculate_width(scale_fontsize(@legend_font_size), truncated_label) > (@columns - @legend_left_margin - @right_margin) && (truncated_label.length > 1)
           truncated_label = truncated_label[0..truncated_label.length - 2]
         end
-        truncated_label + (truncated_label.length < label.to_s.length ? "..." : '')
+        truncated_label + (truncated_label.length < label.to_s.length ? '...' : '')
       end
-
     end
   end
 end

data/lib/gruff/mini/pie.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 ##
 #
 # Makes a small pie graph suitable for display at 200px or even smaller.
 #
 module Gruff
   module Mini
-
     class Pie < Gruff::Pie
-
       include Gruff::Mini::Legend
 
       def initialize_ivars
@@ -19,6 +19,7 @@ module Gruff
         @marker_font_size = 60.0
         @legend_font_size = 60.0
       end
+      private :initialize_ivars
 
       def draw
         expand_canvas_for_vertical_legend
@@ -27,10 +28,8 @@ module Gruff
 
         draw_vertical_legend
 
-        @d.draw(@base_image)
-      end # def draw
-
-    end # class Pie
-
+        Gruff::Renderer.finish
+      end
+    end
   end
 end

data/lib/gruff/mini/side_bar.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 ##
 #
 # Makes a small pie graph suitable for display at 200px or even smaller.
 #
 module Gruff
   module Mini
-
     class SideBar < Gruff::SideBar
-
       include Gruff::Mini::Legend
 
       def initialize_ivars
@@ -18,6 +18,7 @@ module Gruff
         @marker_font_size = 50.0
         @legend_font_size = 50.0
       end
+      private :initialize_ivars
 
       def draw
         expand_canvas_for_vertical_legend
@@ -26,10 +27,8 @@ module Gruff
 
         draw_vertical_legend
 
-        @d.draw(@base_image)
+        Gruff::Renderer.finish
       end
-
     end
-
   end
 end

data/lib/gruff/net.rb

@@ -1,106 +1,84 @@
-require File.dirname(__FILE__) + '/base'
+# frozen_string_literal: true
+
+require 'gruff/base'
 
 # Experimental!!! See also the Spider graph.
 class Gruff::Net < Gruff::Base
-
   # Hide parts of the graph to fit more datapoints, or for a different appearance.
   attr_accessor :hide_dots
 
-  # Dimensions of lines and dots; calculated based on dataset size if left unspecified
+  # Dimensions of lines and dots; calculated based on dataset size if left unspecified.
   attr_accessor :line_width
   attr_accessor :dot_radius
 
-  def initialize(*args)
+  def initialize_ivars
     super
 
     @hide_dots = false
     @hide_line_numbers = true
     @sorted_drawing = true
   end
+  private :initialize_ivars
 
   def draw
     super
 
-    return unless @has_data
-
-    @radius = @graph_height / 2.0
-    @center_x = @graph_left + (@graph_width / 2.0)
-    @center_y = @graph_top + (@graph_height / 2.0) - 10 # Move graph up a bit
-
-    @x_increment = @graph_width / (@column_count - 1).to_f
-    circle_radius = dot_radius ||
-        clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 2.5), 5.0)
-
-    @d = @d.stroke_opacity 1.0
-    @d = @d.stroke_width line_width ||
-                             clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 4), 5.0)
-
-    if defined?(@norm_baseline)
-      level = @graph_top + (@graph_height - @norm_baseline * @graph_height)
-      @d = @d.push
-      @d.stroke_color @baseline_color
-      @d.fill_opacity 0.0
-      @d.stroke_dasharray(10, 20)
-      @d.stroke_width 5
-      @d.line(@graph_left, level, @graph_left + @graph_width, level)
-      @d = @d.pop
-    end
+    return unless data_given?
 
-    @norm_data.each do |data_row|
-      @d = @d.stroke data_row[DATA_COLOR_INDEX]
-      @d = @d.fill data_row[DATA_COLOR_INDEX]
+    stroke_width = line_width  || clip_value_if_greater_than(@columns / (store.norm_data.first.points.size * 4), 5.0)
+    circle_radius = dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.points.size * 2.5), 5.0)
 
-      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
+    store.norm_data.each do |data_row|
+      data_row.points.each_with_index do |data_point, index|
         next if data_point.nil?
 
-        rad_pos = index * Math::PI * 2 / @column_count
+        rad_pos = index * Math::PI * 2 / column_count
         point_distance = data_point * @radius
-        start_x = @center_x + Math::sin(rad_pos) * point_distance
-        start_y = @center_y - Math::cos(rad_pos) * point_distance
+        start_x = @center_x + Math.sin(rad_pos) * point_distance
+        start_y = @center_y - Math.cos(rad_pos) * point_distance
 
-        next_index = index + 1 < data_row[DATA_VALUES_INDEX].length ? index + 1 : 0
+        next_index = index + 1 < data_row.points.length ? index + 1 : 0
 
-        next_rad_pos = next_index * Math::PI * 2 / @column_count
-        next_point_distance = data_row[DATA_VALUES_INDEX][next_index] * @radius
-        end_x = @center_x + Math::sin(next_rad_pos) * next_point_distance
-        end_y = @center_y - Math::cos(next_rad_pos) * next_point_distance
+        next_rad_pos = next_index * Math::PI * 2 / column_count
+        next_point_distance = data_row.points[next_index] * @radius
+        end_x = @center_x + Math.sin(next_rad_pos) * next_point_distance
+        end_y = @center_y - Math.cos(next_rad_pos) * next_point_distance
 
-        @d = @d.line(start_x, start_y, end_x, end_y)
+        Gruff::Renderer::Line.new(color: data_row.color, width: stroke_width).render(start_x, start_y, end_x, end_y)
 
-        @d = @d.circle(start_x, start_y, start_x - circle_radius, start_y) unless @hide_dots
+        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
       end
     end
 
-    @d.draw(@base_image)
+    Gruff::Renderer.finish
   end
 
-  # the lines connecting in the center, with the first line vertical
-  def draw_line_markers
-    return if @hide_line_markers
+private
+
+  def setup_drawing
+    super
 
-    # have to do this here (AGAIN)... see draw() in this class
-    # because this funtion is called before the @radius, @center_x and @center_y are set
     @radius = @graph_height / 2.0
     @center_x = @graph_left + (@graph_width / 2.0)
     @center_y = @graph_top + (@graph_height / 2.0) - 10 # Move graph up a bit
+  end
 
-    # Draw horizontal line markers and annotate with numbers
-    @d = @d.stroke(@marker_color)
-    @d = @d.stroke_width 1
+  # the lines connecting in the center, with the first line vertical
+  def draw_line_markers
+    return if @hide_line_markers
 
-    (0..@column_count - 1).each do |index|
-      rad_pos = index * Math::PI * 2 / @column_count
+    # Draw horizontal line markers and annotate with numbers
+    (0..column_count - 1).each do |index|
+      rad_pos = index * Math::PI * 2 / column_count
 
-      @d = @d.line(@center_x, @center_y, @center_x + Math::sin(rad_pos) * @radius, @center_y - Math::cos(rad_pos) * @radius)
+      Gruff::Renderer::Line.new(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'
-
       draw_label(@center_x, @center_y, rad_pos * 360 / (2 * Math::PI), @radius, marker_label)
     end
   end
 
-private
-
   def draw_label(center_x, center_y, angle, radius, amount)
     r_offset = 1.1
     x_offset = center_x # + 15 # The label points need to be tweaked slightly
@@ -109,13 +87,7 @@ private
     y = y_offset - (radius * r_offset * Math.cos(deg2rad(angle)))
 
     # Draw label
-    @d.fill = @marker_color
-    @d.font = @font if @font
-    @d.pointsize = scale_fontsize(20)
-    @d.stroke = 'transparent'
-    @d.font_weight = BoldWeight
-    @d.gravity = CenterGravity
-    @d.annotate_scaled(@base_image, 0, 0, x, y, amount, @scale)
+    text_renderer = Gruff::Renderer::Text.new(amount, font: @font, size: 20, color: @marker_color, weight: Magick::BoldWeight)
+    text_renderer.render(0, 0, x, y, Magick::CenterGravity)
   end
-
 end

data/lib/gruff/patch/rmagick.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+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
+
+      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
+
+    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
+      # EMXIF
+    end
+  end
+end

data/lib/gruff/patch/string.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class String
+  #Taken from http://codesnippets.joyent.com/posts/show/330
+  def commify(delimiter = ',')
+    gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
+  end
+end

data/lib/gruff/photo_bar.rb

@@ -1,11 +1,12 @@
-require File.dirname(__FILE__) + '/base'
+# frozen_string_literal: true
+
+require 'gruff/base'
 
 # EXPERIMENTAL!
 #
 # Doesn't work yet.
 #
 class Gruff::PhotoBar < Gruff::Base
-
 # TODO
 #
 # define base and cap in yml
@@ -25,11 +26,11 @@ class Gruff::PhotoBar < Gruff::Base
 
   def draw
     super
-    return unless @has_data
+    return unless data_given?
 
-    return # TODO Remove for further development
+    return # TODO: Remove for further development
 
-    init_photo_bar_graphics()
+    init_photo_bar_graphics
 
     #Draw#define_clip_path()
     #Draw#clip_path(pathname)
@@ -44,33 +45,33 @@ class Gruff::PhotoBar < Gruff::Base
     #
     # Columns sit side-by-side.
     spacing_factor = 0.9
-    @bar_width = @norm_data[0][DATA_COLOR_INDEX].columns
+    bar_width = store.norm_data[0].color.columns
 
-    @norm_data.each_with_index do |data_row, row_index|
-      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
+    store.norm_data.each_with_index do |data_row, row_index|
+      data_row.points.each_with_index do |data_point, point_index|
         data_point = 0 if data_point.nil?
         # Use incremented x and scaled y
-        left_x = @graph_left + (@bar_width * (row_index + point_index + ((@data.length - 1) * point_index)))
+        left_x = @graph_left + (bar_width * (row_index + point_index + ((store.length - 1) * point_index)))
         left_y = @graph_top + (@graph_height - data_point * @graph_height) + 1
-        right_x = left_x + @bar_width * spacing_factor
+        right_x = left_x + bar_width * spacing_factor
         right_y = @graph_top + @graph_height - 1
 
-        bar_image_width = data_row[DATA_COLOR_INDEX].columns
+        bar_image_width = data_row.color.columns
         bar_image_height = right_y.to_f - left_y.to_f
 
         # Crop to scale for data
-        bar_image = data_row[DATA_COLOR_INDEX].crop(0, 0, bar_image_width, bar_image_height)
+        bar_image = data_row.color.crop(0, 0, bar_image_width, bar_image_height)
 
-        @d.gravity = NorthWestGravity
-        @d = @d.composite(left_x, left_y, bar_image_width, bar_image_height, bar_image)
+        @d.gravity = Magick::NorthWestGravity
+        @d.composite(left_x, left_y, bar_image_width, bar_image_height, bar_image)
 
         # Calculate center based on bar_width and current row
-        label_center = @graph_left + (@data.length * @bar_width * point_index) + (@data.length * @bar_width / 2.0)
+        label_center = @graph_left + (store.length * bar_width * point_index) + (store.length * bar_width / 2.0)
         draw_label(label_center, point_index)
       end
     end
 
-    @d.draw(@base_image)
+    Gruff::Renderer.finish
   end
 
   # Return the chosen theme or the default
@@ -83,15 +84,14 @@ protected
   # Sets up colors with a list of images that will be used.
   # Images should be 340px tall
   def init_photo_bar_graphics
-    color_list = Array.new
+    color_list = []
     theme_dir = File.dirname(__FILE__) + '/../../assets/' + theme
 
     Dir.open(theme_dir).each do |file|
       next unless /\.png$/.match(file)
 
-      color_list << Image.read("#{theme_dir}/#{file}").first
+      color_list << Magick::Image.read("#{theme_dir}/#{file}").first
     end
     @colors = color_list
   end
-
 end