gruff 0.11.0-java → 0.12.0-java

data/lib/gruff/renderer/polygon.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Polygon
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width] || 1.0
-      @opacity = args[:opacity] || 1.0
+    def initialize(color:, width: 1.0, opacity: 1.0)
+      @color = color
+      @width = width
+      @opacity = opacity
     end
 
     def render(points)

data/lib/gruff/renderer/polyline.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Polyline
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width]
+    def initialize(color:, width:)
+      @color = color
+      @width = width
     end
 
     def render(points)

data/lib/gruff/renderer/rectangle.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Rectangle
-    def initialize(args = {})
-      @color = args[:color]
+    def initialize(color: nil)
+      @color = color
     end
 
     def render(upper_left_x, upper_left_y, lower_right_x, lower_right_y)

data/lib/gruff/renderer/renderer.rb

@@ -9,61 +9,49 @@ module Gruff
 
     attr_accessor :draw, :image, :scale, :text_renderers
 
-    class << self
-      def setup(columns, rows, font, scale, theme_options)
-        draw = Magick::Draw.new
-        draw.font = font if font
-        # Scale down from 800x600 used to calculate drawing.
-        draw.scale(scale, scale)
-
-        image = Renderer.instance.background(columns, rows, scale, theme_options)
-
-        Renderer.instance.draw  = draw
-        Renderer.instance.scale = scale
-        Renderer.instance.image = image
-        Renderer.instance.text_renderers = []
-      end
-
-      def setup_transparent_background(columns, rows)
-        image = Renderer.instance.render_transparent_background(columns, rows)
-        Renderer.instance.image = image
-      end
-
-      def background_image=(image)
-        Renderer.instance.image = image
-      end
+    def self.setup(columns, rows, font, scale, theme_options)
+      draw = Magick::Draw.new
+      draw.font = font if font
+      # Scale down from 800x600 used to calculate drawing.
+      draw.scale(scale, scale)
+
+      image = Renderer.instance.background(columns, rows, scale, theme_options)
+
+      Renderer.instance.draw  = draw
+      Renderer.instance.scale = scale
+      Renderer.instance.image = image
+      Renderer.instance.text_renderers = []
+    end
 
-      def font=(font)
-        draw = Renderer.instance.draw
-        draw.font = font if font
-      end
+    def self.setup_transparent_background(columns, rows)
+      image = Renderer.instance.render_transparent_background(columns, rows)
+      Renderer.instance.image = image
+    end
 
-      def finish
-        draw  = Renderer.instance.draw
-        image = Renderer.instance.image
+    def self.background_image=(image)
+      Renderer.instance.image = image
+    end
 
-        draw.draw(image)
+    def self.font=(font)
+      draw = Renderer.instance.draw
+      draw.font = font if font
+    end
 
-        Renderer.instance.text_renderers.each do |renderer|
-          renderer.render(renderer.width, renderer.height, renderer.x, renderer.y, renderer.gravity)
-        end
-      end
+    def self.finish
+      draw  = Renderer.instance.draw
+      image = Renderer.instance.image
 
-      def write(file_name)
-        Renderer.instance.image.write(file_name)
-      end
+      draw.draw(image)
 
-      def to_blob(file_format)
-        Renderer.instance.image.to_blob do
-          self.format = file_format
-        end
+      Renderer.instance.text_renderers.each do |renderer|
+        renderer.render(renderer.width, renderer.height, renderer.x, renderer.y, renderer.gravity)
       end
     end
 
     def background(columns, rows, scale, theme_options)
       case theme_options[:background_colors]
       when Array
-        gradated_background(columns, rows, theme_options[:background_colors][0], theme_options[:background_colors][1], theme_options[:background_direction])
+        gradated_background(columns, rows, *theme_options[:background_colors][0..1], theme_options[:background_direction])
       when String
         solid_background(columns, rows, theme_options[:background_colors])
       else

data/lib/gruff/renderer/text.rb

@@ -1,17 +1,21 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Text
-    def initialize(text, args = {})
+    using Magick::GruffAnnotate
+
+    def initialize(text, font:, size:, color:, weight: Magick::NormalWeight, rotation: nil)
       @text = text.to_s
-      @font = args[:font]
-      @font_size = args[:size]
-      @font_color = args[:color]
-      @font_weight = args[:weight] || Magick::NormalWeight
-      @rotation = args[:rotation]
+      @font = font
+      @font_size = size
+      @font_color = color
+      @font_weight = weight
+      @rotation = rotation
     end
 
     attr_reader :width, :height, :x, :y, :gravity
+
     def add_to_render_queue(width, height, x, y, gravity = Magick::NorthGravity)
       @width = width
       @height = height

data/lib/gruff/scatter.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 #
 # Here's how to set up a Gruff::Scatter.
 #
@@ -84,8 +82,6 @@ class Gruff::Scatter < Gruff::Base
         Gruff::Renderer::Circle.new(color: data_row.color, width: stroke_width).render(new_x, new_y, new_x - circle_radius, new_y)
       end
     end
-
-    Gruff::Renderer.finish
   end
 
   # The first parameter is the name of the dataset.  The next two are the
@@ -195,7 +191,7 @@ private
       calculate_spread
       normalize
 
-      @marker_count = (@x_spread / @x_axis_increment).to_i
+      self.marker_count = (@x_spread / @x_axis_increment).to_i
       @x_increment = @x_axis_increment
     end
     increment_x_scaled = @graph_width.to_f / (@x_spread / @x_increment)

data/lib/gruff/scene.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'observer'
-require 'gruff/base'
 
 # A scene is a non-linear graph that assembles layers together to tell a story.
 # Layers are folders with appropriately named files (see below). You can group

data/lib/gruff/side_bar.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 # Graph with individual horizontal bars instead of vertical bars.
 #
 # Here's how to set up a Gruff::SideBar.
@@ -21,6 +19,8 @@ require 'gruff/base'
 #   g.write('sidebar.png')
 #
 class Gruff::SideBar < Gruff::Base
+  using String::GruffCommify
+
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
 
@@ -35,12 +35,16 @@ class Gruff::SideBar < Gruff::Base
   # Default is +false+.
   attr_writer :show_labels_for_bar_values
 
+  # Prevent drawing of column labels left of a side bar graph.  Default is +false+.
+  attr_writer :hide_labels
+
   def initialize_ivars
     super
     @bar_spacing = 0.9
     @group_spacing = 10
     @label_formatting = nil
     @show_labels_for_bar_values = false
+    @hide_labels = false
   end
   private :initialize_ivars
 
@@ -53,6 +57,20 @@ class Gruff::SideBar < Gruff::Base
     draw_bars
   end
 
+protected
+
+  def hide_labels?
+    @hide_labels
+  end
+
+  def hide_left_label_area?
+    hide_labels?
+  end
+
+  def hide_bottom_label_area?
+    @hide_line_markers
+  end
+
 private
 
   def draw_bars
@@ -73,7 +91,7 @@ private
       data_row.points.each_with_index do |data_point, point_index|
         group_spacing = @group_spacing * @scale * point_index
 
-        # Using the original calcs from the stacked bar chart
+        # Using the original calculations from the stacked bar chart
         # to get the difference between
         # part of the bart chart we wish to stack.
         temp1 = @graph_left + (@graph_width - data_point * @graph_width - height[point_index])
@@ -105,8 +123,6 @@ private
         end
       end
     end
-
-    Gruff::Renderer.finish
   end
 
   # Instead of base class version, draws vertical background lines and label
@@ -114,7 +130,7 @@ private
     return if @hide_line_markers
 
     # Draw horizontal line markers and annotate with numbers
-    number_of_lines = @marker_count || 5
+    number_of_lines = marker_count
     number_of_lines = 1 if number_of_lines == 0
 
     # TODO: Round maximum marker value to a round number like 100, 0.1, 0.5, etc.

data/lib/gruff/side_stacked_bar.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/side_bar'
-require 'gruff/helper/stacked_mixin'
-
 #
 # New gruff graph type added to enable sideways stacking bar charts
 # (basically looks like a x/y flip of a standard stacking bar chart)
@@ -40,12 +37,16 @@ class Gruff::SideStackedBar < Gruff::SideBar
   # Default is +false+.
   attr_writer :show_labels_for_bar_values
 
+  # Prevent drawing of column labels left of a side stacked bar graph.  Default is +false+.
+  attr_writer :hide_labels
+
   def initialize_ivars
     super
     @bar_spacing = 0.9
     @segment_spacing = 2.0
     @label_formatting = nil
     @show_labels_for_bar_values = false
+    @hide_labels = false
   end
   private :initialize_ivars
 
@@ -55,6 +56,20 @@ class Gruff::SideStackedBar < Gruff::SideBar
     super
   end
 
+protected
+
+  def hide_labels?
+    @hide_labels
+  end
+
+  def hide_left_label_area?
+    hide_labels?
+  end
+
+  def hide_bottom_label_area?
+    @hide_line_markers
+  end
+
 private
 
   def draw_bars
@@ -69,7 +84,7 @@ private
 
     store.norm_data.each_with_index do |data_row, row_index|
       data_row.points.each_with_index do |data_point, point_index|
-        ## using the original calcs from the stacked bar chart to get the difference between
+        ## using the original calculations from the stacked bar chart to get the difference between
         ## part of the bart chart we wish to stack.
         temp1 = @graph_left + (@graph_width -
                                   data_point * @graph_width -
@@ -107,7 +122,5 @@ private
         draw_value_label(x, y, text, true)
       end
     end
-
-    Gruff::Renderer.finish
   end
 end

data/lib/gruff/spider.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 # Experimental!!! See also the Net graph.
 #
 # Here's how to set up a Gruff::Spider.
@@ -15,7 +13,7 @@ require 'gruff/base'
 #   g.data :Wisdom, [10]
 #   g.data 'Charisma', [16]
 #   g.write("spider.png")
-
+#
 class Gruff::Spider < Gruff::Base
   # Hide all text.
   attr_writer :hide_axes
@@ -64,8 +62,6 @@ class Gruff::Spider < Gruff::Base
 
     # Draw polygon
     draw_polygon(center_x, center_y, additive_angle)
-
-    Gruff::Renderer.finish
   end
 
 private
@@ -118,6 +114,6 @@ private
   end
 
   def sums_for_spider
-    store.data.reduce(0.0) { |sum, data_row| sum + data_row.points.first }
+    store.data.sum { |data_row| data_row.points.first }
   end
 end

data/lib/gruff/stacked_area.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-require 'gruff/helper/stacked_mixin'
-
 #
 # Here's how to set up a Gruff::StackedArea.
 #
@@ -69,7 +66,5 @@ class Gruff::StackedArea < Gruff::Base
 
       Gruff::Renderer::Polygon.new(color: data_row.color).render(poly_points)
     end
-
-    Gruff::Renderer.finish
   end
 end

data/lib/gruff/stacked_bar.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-require 'gruff/helper/stacked_mixin'
-require 'gruff/helper/bar_value_label_mixin'
-
 #
 # Here's how to set up a Gruff::StackedBar.
 #
@@ -32,12 +28,16 @@ class Gruff::StackedBar < Gruff::Base
   # Default is +false+.
   attr_writer :show_labels_for_bar_values
 
+  # Prevent drawing of column labels below a stacked bar graph.  Default is +false+.
+  attr_writer :hide_labels
+
   def initialize_ivars
     super
     @bar_spacing = 0.9
     @segment_spacing = 2
     @label_formatting = nil
     @show_labels_for_bar_values = false
+    @hide_labels = false
   end
   private :initialize_ivars
 
@@ -88,7 +88,19 @@ class Gruff::StackedBar < Gruff::Base
         draw_value_label(x, y, text, true)
       end
     end
+  end
+
+protected
+
+  def hide_labels?
+    @hide_labels
+  end
+
+  def hide_left_label_area?
+    @hide_line_markers
+  end
 
-    Gruff::Renderer.finish
+  def hide_bottom_label_area?
+    hide_labels?
   end
 end

data/lib/gruff/store/{base_data.rb → basic_data.rb}

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 module Gruff
-  # @private
   class Store
-    class BaseData < Struct.new(:label, :points, :color)
+    # @private
+    class BasicData < Struct.new(:label, :points, :color)
       def initialize(label, points, color)
-        self.label = label.to_s
-        self.points = Array(points)
-        self.color = color
+        super(label.to_s, Array(points), color)
       end
 
       def empty?
@@ -26,9 +24,9 @@ module Gruff
         points.compact.max
       end
 
-      def normalize(args = {})
+      def normalize(minimum:, spread:)
         norm_points = points.map do |point|
-          point.nil? ? nil : (point.to_f - args[:minimum].to_f) / args[:spread]
+          point.nil? ? nil : (point.to_f - minimum.to_f) / spread
         end
 
         self.class.new(label, norm_points, color)