gruff 0.7.0-java → 0.12.0-java

data/lib/gruff/patch/rmagick.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# @private
+module Magick
+  # @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
+
+      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
+    end
+  end
+end

data/lib/gruff/patch/string.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# @private
+module String::GruffCommify
+  THOUSAND_SEPARATOR = ','
+
+  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/photo_bar.rb

@@ -1,36 +1,35 @@
-require File.dirname(__FILE__) + '/base'
+# frozen_string_literal: true
 
 # EXPERIMENTAL!
 #
 # Doesn't work yet.
 #
 class Gruff::PhotoBar < Gruff::Base
-
-# TODO
-#
-# define base and cap in yml
-# allow for image directory to be located elsewhere
-# more exact measurements for bar heights (go all the way to the bottom of the graph)
-# option to tile images instead of use a single image
-# drop base label a few px lower so photo bar graphs can have a base dropping over the lower marker line
-#
+  # TODO
+  #
+  # define base and cap in yml
+  # allow for image directory to be located elsewhere
+  # more exact measurements for bar heights (go all the way to the bottom of the graph)
+  # option to tile images instead of use a single image
+  # drop base label a few px lower so photo bar graphs can have a base dropping over the lower marker line
+  #
 
   # The name of a pre-packaged photo-based theme.
   attr_reader :theme
 
-#   def initialize(target_width=800)
-#     super
-#     init_photo_bar_graphics()
-#   end
+  # def initialize(target_width=800)
+  #   super
+  #   init_photo_bar_graphics()
+  # end
 
   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)
     #Draw#composite....with bar graph image OverCompositeOp
@@ -38,44 +37,39 @@ class Gruff::PhotoBar < Gruff::Base
     # See also
     #
     # Draw.pattern # define an image to tile as the filling of a draw object
-    # 
+    #
 
     # Setup spacing.
     #
     # 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)
-        
-        @d.gravity = NorthWestGravity
-        @d = @d.composite(left_x, left_y, bar_image_width, bar_image_height, bar_image)
-      
+        bar_image = data_row.color.crop(0, 0, bar_image_width, bar_image_height)
+
+        @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)    
   end
 
-
   # Return the chosen theme or the default
   def theme
     @theme || 'plastik'
@@ -85,16 +79,15 @@ 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
+  def init_photo_bar_graphics
+    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
-

data/lib/gruff/pie.rb

@@ -1,59 +1,54 @@
-require File.dirname(__FILE__) + '/base'
+# frozen_string_literal: true
 
-##
-# Here's how to make a Pie graph:
+#
+# Here's how to make a Gruff::Pie.
 #
 #   g = Gruff::Pie.new
 #   g.title = "Visual Pie Graph Test"
 #   g.data 'Fries', 20
 #   g.data 'Hamburgers', 50
-#   g.write("test/output/pie_keynote.png")
+#   g.write("pie_keynote.png")
+#
+# To control where the pie chart starts creating slices, use {#zero_degree=}.
 #
-# To control where the pie chart starts creating slices, use #zero_degree.
-
 class Gruff::Pie < Gruff::Base
-
   DEFAULT_TEXT_OFFSET_PERCENTAGE = 0.15
 
   # Can be used to make the pie start cutting slices at the top (-90.0)
-  # or at another angle. Default is 0.0, which starts at 3 o'clock.
+  # or at another angle. Default is +0.0+, which starts at 3 o'clock.
   attr_writer :zero_degree
 
   # Do not show labels for slices that are less than this percent. Use 0 to always show all labels.
-  # Defaults to 0
+  # Defaults to +0+.
   attr_writer :hide_labels_less_than
 
-  # Affect the distance between the percentages and the pie chart
-  # Defaults to 0.15
+  # Affect the distance between the percentages and the pie chart.
+  # Defaults to +0.15+.
   attr_writer :text_offset_percentage
 
-  ## Use values instead of percentages
-  attr_accessor :show_values_as_labels
+  ## Use values instead of percentages.
+  attr_writer :show_values_as_labels
+
+  def initialize_store
+    @store = Gruff::Store.new(Gruff::Store::CustomData)
+  end
+  private :initialize_store
 
   def initialize_ivars
     super
-
+    @zero_degree = 0.0
+    @hide_labels_less_than = 0.0
+    @text_offset_percentage = DEFAULT_TEXT_OFFSET_PERCENTAGE
     @show_values_as_labels = false
   end
-
-  def zero_degree
-    @zero_degree ||= 0.0
-  end
-
-  def hide_labels_less_than
-    @hide_labels_less_than ||= 0.0
-  end
-
-  def text_offset_percentage
-    @text_offset_percentage ||= DEFAULT_TEXT_OFFSET_PERCENTAGE
-  end
+  private :initialize_ivars
 
   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
+      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
 
@@ -66,27 +61,23 @@ class Gruff::Pie < Gruff::Base
 
     slices.each do |slice|
       if slice.value > 0
-        set_stroke_color slice
-        set_fill_color
-        set_stroke_width
-        set_drawing_points_for slice
+        Gruff::Renderer::Ellipse.new(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
-
-    trigger_final_draw
   end
 
-  private
+private
 
   def slices
     @slices ||= begin
-      slices = @data.map { |data| slice_class.new(data, options) }
+      slices = store.data.map { |data| slice_class.new(data, options) }
 
       slices.sort_by(&:value) if @sort
 
-      total = slices.map(&:value).inject(:+).to_f
+      total = slices.map(&:value).sum.to_f
       slices.each { |slice| slice.total = total }
     end
   end
@@ -97,10 +88,6 @@ class Gruff::Pie < Gruff::Base
     @hide_line_markers = true
   end
 
-  def data_given?
-    @has_data
-  end
-
   def update_chart_degrees_with(degrees)
     @chart_degrees = chart_degrees + degrees
   end
@@ -112,16 +99,12 @@ class Gruff::Pie < Gruff::Base
   # Spatial Value-Related Methods
 
   def chart_degrees
-    @chart_degrees ||= zero_degree
+    @chart_degrees ||= @zero_degree
   end
 
-  def graph_height
-    @graph_height
-  end
+  attr_reader :graph_height
 
-  def graph_width
-    @graph_width
-  end
+  attr_reader :graph_width
 
   def diameter
     graph_height
@@ -152,20 +135,20 @@ class Gruff::Pie < Gruff::Base
   end
 
   def radius_offset
-    radius + (radius * text_offset_percentage) + distance_from_center
+    radius + (radius * @text_offset_percentage) + distance_from_center
   end
 
   def ellipse_factor
-    radius_offset * text_offset_percentage
+    radius_offset * @text_offset_percentage
   end
 
   # Label-Related Methods
 
   def process_label_for(slice)
-    if slice.percentage >= hide_labels_less_than
-      x, y  = label_coordinates_for slice
+    if slice.percentage >= @hide_labels_less_than
+      x, y = label_coordinates_for slice
 
-      @d = draw_label(x, y, slice.label)
+      draw_label(x, y, slice.label)
     end
   end
 
@@ -185,58 +168,14 @@ class Gruff::Pie < Gruff::Base
 
   # Drawing-Related Methods
 
-  def set_stroke_width
-    @d.stroke_width(radius)
-  end
-
-  def set_stroke_color(slice)
-    @d = @d.stroke slice.color
-  end
-
-  def set_fill_color
-    @d = @d.fill 'transparent'
-  end
-
-  def set_drawing_points_for(slice)
-    @d = @d.ellipse(
-      center_x,
-      center_y,
-      radius / 2.0,
-      radius / 2.0,
-      chart_degrees,
-      chart_degrees + slice.degrees + 0.5
-    )
-  end
-
-  def trigger_final_draw
-    @d.draw(@base_image)
-  end
-
-  def configure_label_styling
-    @d.fill        = @font_color
-    @d.font        = @font if @font
-    @d.pointsize   = scale_fontsize(@marker_font_size)
-    @d.stroke      = 'transparent'
-    @d.font_weight = BoldWeight
-    @d.gravity     = CenterGravity
-  end
-
   def draw_label(x, y, value)
-    configure_label_styling
-
-    @d.annotate_scaled(
-      @base_image,
-      0,
-      0,
-      x,
-      y,
-      value,
-      @scale
-    )
+    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)
     attr_accessor :total
 

data/lib/gruff/renderer/bezier.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Gruff
+  # @private
+  class Renderer::Bezier
+    def initialize(color:, width: 1.0)
+      @color = color
+      @width = width
+    end
+
+    def render(points)
+      draw = Renderer.instance.draw
+
+      draw.push
+      draw.stroke(@color)
+      draw.stroke_width(@width)
+      draw.fill_opacity(0.0)
+      draw.bezier(*points)
+      draw.pop
+    end
+  end
+end

data/lib/gruff/renderer/circle.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Gruff
+  # @private
+  class Renderer::Circle
+    def initialize(color:, width: 1.0)
+      @color = color
+      @width = width
+    end
+
+    def render(origin_x, origin_y, perim_x, perim_y)
+      draw = Renderer.instance.draw
+
+      draw.push
+      draw.fill(@color)
+      draw.stroke(@color)
+      draw.stroke_width(@width)
+      draw.circle(origin_x, origin_y, perim_x, perim_y)
+      draw.pop
+    end
+  end
+end