gruff 0.13.0-java → 0.14.0-java

data/lib/gruff/mini/pie.rb

@@ -15,25 +15,28 @@ module Gruff
   module Mini
     # A class for drawing a small pie graph.
     class Pie < Gruff::Pie
+    private
+
       include Gruff::Mini::Legend
 
-      def initialize_ivars
+      def initialize_attributes
         super
 
         @hide_legend = true
         @hide_title = true
         @hide_line_numbers = true
 
-        @marker_font_size = 60.0
-        @legend_font_size = 60.0
+        @marker_font.size = 60.0
+        @legend_font.size = 60.0
       end
-      private :initialize_ivars
 
-      def draw
+      def setup_data
         expand_canvas_for_vertical_legend
-
         super
+      end
 
+      def draw_graph
+        super
         draw_vertical_legend
       end
     end

data/lib/gruff/mini/side_bar.rb

@@ -23,24 +23,27 @@ module Gruff
   module Mini
     # A class for drawing a small side bar graph.
     class SideBar < Gruff::SideBar
+    private
+
       include Gruff::Mini::Legend
 
-      def initialize_ivars
+      def initialize_attributes
         super
         @hide_legend = true
         @hide_title = true
         @hide_line_numbers = true
 
-        @marker_font_size = 50.0
-        @legend_font_size = 50.0
+        @marker_font.size = 50.0
+        @legend_font.size = 50.0
       end
-      private :initialize_ivars
 
-      def draw
+      def setup_data
         expand_canvas_for_vertical_legend
-
         super
+      end
 
+      def draw_graph
+        super
         draw_vertical_legend
       end
     end

data/lib/gruff/net.rb

@@ -30,7 +30,9 @@ class Gruff::Net < Gruff::Base
   attr_writer :line_width
   attr_writer :dot_radius
 
-  def initialize_ivars
+private
+
+  def initialize_attributes
     super
 
     @hide_dots = false
@@ -38,14 +40,10 @@ class Gruff::Net < Gruff::Base
     @dot_radius = nil
     @hide_line_numbers = true
     @sorted_drawing = true
+    @marker_font.bold = true
   end
-  private :initialize_ivars
-
-  def draw
-    super
-
-    return unless data_given?
 
+  def draw_graph
     store.norm_data.each do |data_row|
       data_row.points.each_with_index do |data_point, index|
         next if data_point.nil?
@@ -62,18 +60,16 @@ class Gruff::Net < Gruff::Base
         end_x = @center_x + Math.sin(next_rad_pos) * next_point_distance
         end_y = @center_y - Math.cos(next_rad_pos) * next_point_distance
 
-        Gruff::Renderer::Line.new(color: data_row.color, width: @stroke_width).render(start_x, start_y, end_x, end_y)
+        Gruff::Renderer::Line.new(renderer, color: data_row.color, width: @stroke_width).render(start_x, start_y, end_x, end_y)
 
         unless @hide_dots
-          circle_renderer = Gruff::Renderer::Circle.new(color: data_row.color, width: @stroke_width)
+          circle_renderer = Gruff::Renderer::Circle.new(renderer, color: data_row.color, width: @stroke_width)
           circle_renderer.render(start_x, start_y, start_x - @circle_radius, start_y)
         end
       end
     end
   end
 
-private
-
   def setup_drawing
     super
 
@@ -92,7 +88,7 @@ private
     (0..column_count - 1).each do |index|
       rad_pos = index * Math::PI * 2 / column_count
 
-      Gruff::Renderer::Line.new(color: @marker_color)
+      Gruff::Renderer::Line.new(renderer, 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'
@@ -106,8 +102,6 @@ private
     x = x_offset + (radius + LABEL_MARGIN) * Math.sin(deg2rad(angle))
     y = y_offset - (radius + LABEL_MARGIN) * Math.cos(deg2rad(angle))
 
-    # Draw label
-    text_renderer = Gruff::Renderer::Text.new(amount, font: @font, size: 20, 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
 end

data/lib/gruff/patch/string.rb

@@ -5,7 +5,7 @@ module String::GruffCommify
   THOUSAND_SEPARATOR = ','
 
   refine String do
-    #Taken from http://codesnippets.joyent.com/posts/show/330
+    # Taken from http://codesnippets.joyent.com/posts/show/330
     def commify(delimiter = THOUSAND_SEPARATOR)
       gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
     end

data/lib/gruff/pie.rb

@@ -18,6 +18,9 @@ class Gruff::Pie < Gruff::Base
   # or at another angle. Default is +0.0+, which starts at 3 o'clock.
   attr_writer :zero_degree
 
+  # Set the number output format lambda.
+  attr_writer :label_formatting
+
   # Do not show labels for slices that are less than this percent. Use 0 to always show all labels.
   # Defaults to +0+.
   attr_writer :hide_labels_less_than
@@ -29,39 +32,30 @@ class Gruff::Pie < Gruff::Base
   ## Use values instead of percentages.
   attr_writer :show_values_as_labels
 
+private
+
   def initialize_store
     @store = Gruff::Store.new(Gruff::Store::CustomData)
   end
-  private :initialize_store
 
-  def initialize_ivars
+  def initialize_attributes
     super
     @zero_degree = 0.0
     @hide_labels_less_than = 0.0
     @text_offset_percentage = DEFAULT_TEXT_OFFSET_PERCENTAGE
     @show_values_as_labels = false
-  end
-  private :initialize_ivars
+    @marker_font.bold = true
 
-  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
-    }
-  end
-
-  def draw
-    hide_line_markers
-
-    super
+    @hide_line_markers = true
+    @hide_line_markers.freeze
 
-    return unless data_given?
+    @label_formatting = ->(value, percentage) { @show_values_as_labels ? value.to_s : "#{percentage}%" }
+  end
 
+  def draw_graph
     slices.each do |slice|
       if slice.value > 0
-        Gruff::Renderer::Ellipse.new(color: slice.color, width: radius)
+        Gruff::Renderer::Ellipse.new(renderer, 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
@@ -69,11 +63,9 @@ class Gruff::Pie < Gruff::Base
     end
   end
 
-private
-
   def slices
     @slices ||= begin
-      slices = store.data.map { |data| slice_class.new(data, options) }
+      slices = store.data.map { |data| Gruff::Pie::PieSlice.new(data.label, data.points.first, data.color) }
 
       slices.sort_by(&:value) if @sort
 
@@ -84,18 +76,10 @@ private
 
   # General Helper Methods
 
-  def hide_line_markers
-    @hide_line_markers = true
-  end
-
   def update_chart_degrees_with(degrees)
     @chart_degrees = chart_degrees + degrees
   end
 
-  def slice_class
-    PieSlice
-  end
-
   # Spatial Value-Related Methods
 
   def chart_degrees
@@ -103,13 +87,8 @@ private
   end
 
   attr_reader :graph_height
-
   attr_reader :graph_width
 
-  def diameter
-    graph_height
-  end
-
   def half_width
     graph_width / 2.0
   end
@@ -147,8 +126,8 @@ private
   def process_label_for(slice)
     if slice.percentage >= @hide_labels_less_than
       x, y = label_coordinates_for slice
-
-      draw_label(x, y, slice.label)
+      label = @label_formatting.call(slice.value, slice.percentage)
+      draw_label_at(1.0, 1.0, x, y, label, Magick::CenterGravity)
     end
   end
 
@@ -166,45 +145,24 @@ private
     center_y + (radius_offset * Math.sin(deg2rad(angle)))
   end
 
-  # Drawing-Related Methods
-
-  def draw_label(x, y, value)
-    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)
+  class PieSlice < Struct.new(:label, :value, :color)
     attr_accessor :total
 
-    def name
-      data_array[0]
-    end
-
-    def value
-      data_array[1].first
-    end
-
-    def color
-      data_array[2]
-    end
-
-    def size
-      @size ||= value / total
-    end
-
     def percentage
-      @percentage ||= (size * 100.0).round
+      (size * 100.0).round
     end
 
     def degrees
-      @degrees ||= size * 360.0
+      size * 360.0
     end
 
-    def label
-      options[:show_values_as_labels] ? value.to_s : "#{percentage}%"
+  private
+
+    def size
+      value / total
     end
   end
 end

data/lib/gruff/renderer/bezier.rb

@@ -3,20 +3,19 @@
 module Gruff
   # @private
   class Renderer::Bezier
-    def initialize(color:, width: 1.0)
+    def initialize(renderer, color:, width: 1.0)
+      @renderer = renderer
       @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
+      @renderer.draw.push
+      @renderer.draw.stroke(@color)
+      @renderer.draw.stroke_width(@width)
+      @renderer.draw.fill_opacity(0.0)
+      @renderer.draw.bezier(*points)
+      @renderer.draw.pop
     end
   end
 end

data/lib/gruff/renderer/circle.rb

@@ -3,20 +3,19 @@
 module Gruff
   # @private
   class Renderer::Circle
-    def initialize(color:, width: 1.0)
+    def initialize(renderer, color:, width: 1.0)
+      @renderer = renderer
       @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
+      @renderer.draw.push
+      @renderer.draw.fill(@color)
+      @renderer.draw.stroke(@color)
+      @renderer.draw.stroke_width(@width)
+      @renderer.draw.circle(origin_x, origin_y, perim_x, perim_y)
+      @renderer.draw.pop
     end
   end
 end

data/lib/gruff/renderer/dash_line.rb

@@ -3,21 +3,20 @@
 module Gruff
   # @private
   class Renderer::DashLine
-    def initialize(color:, width:)
+    def initialize(renderer, color:, width:)
+      @renderer = renderer
       @color = color
       @width = width
     end
 
     def render(start_x, start_y, end_x, end_y)
-      draw = Renderer.instance.draw
-
-      draw.push
-      draw.stroke_color(@color)
-      draw.fill_opacity(0.0)
-      draw.stroke_dasharray(10, 20)
-      draw.stroke_width(@width)
-      draw.line(start_x, start_y, end_x, end_y)
-      draw.pop
+      @renderer.draw.push
+      @renderer.draw.stroke_color(@color)
+      @renderer.draw.fill_opacity(0.0)
+      @renderer.draw.stroke_dasharray(10, 20)
+      @renderer.draw.stroke_width(@width)
+      @renderer.draw.line(start_x, start_y, end_x, end_y)
+      @renderer.draw.pop
     end
   end
 end

data/lib/gruff/renderer/dot.rb

@@ -3,38 +3,37 @@
 module Gruff
   # @private
   class Renderer::Dot
-    def initialize(style, color:, width: 1.0)
+    def initialize(renderer, style, color:, width: 1.0)
+      @renderer = renderer
       @style = style
       @color = color
       @width = width
     end
 
     def render(new_x, new_y, circle_radius)
-      draw = Renderer.instance.draw
-
-      # draw.push # TODO
-      draw.stroke_width(@width)
-      draw.stroke(@color)
-      draw.fill(@color)
+      # @renderer.draw.push # TODO
+      @renderer.draw.stroke_width(@width)
+      @renderer.draw.stroke(@color)
+      @renderer.draw.fill(@color)
       if @style.to_s == 'square'
-        square(draw, new_x, new_y, circle_radius)
+        square(new_x, new_y, circle_radius)
       else
-        circle(draw, new_x, new_y, circle_radius)
+        circle(new_x, new_y, circle_radius)
       end
-      # draw.pop # TODO
+      # @renderer.draw.pop # TODO
     end
 
-    def circle(draw, new_x, new_y, circle_radius)
-      draw.circle(new_x, new_y, new_x - circle_radius, new_y)
+    def circle(new_x, new_y, circle_radius)
+      @renderer.draw.circle(new_x, new_y, new_x - circle_radius, new_y)
     end
 
-    def square(draw, new_x, new_y, circle_radius)
+    def square(new_x, new_y, circle_radius)
       offset = (circle_radius * 0.8).to_i
       corner1 = new_x - offset
       corner2 = new_y - offset
       corner3 = new_x + offset
       corner4 = new_y + offset
-      draw.rectangle(corner1, corner2, corner3, corner4)
+      @renderer.draw.rectangle(corner1, corner2, corner3, corner4)
     end
   end
 end