gruff 0.12.2 → 0.15.0

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,10 +105,6 @@ private
       current_angle += additive_angle
     end
 
-    Gruff::Renderer::Polygon.new(color: color || @marker_color, opacity: 0.4).render(points)
-  end
-
-  def sums_for_spider
-    store.data.sum { |data_row| data_row.points.first }
+    Gruff::Renderer::Polygon.new(renderer, color: color || @marker_color, opacity: 0.4).render(points)
   end
 end

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

@@ -12,7 +12,6 @@
 #
 class Gruff::StackedBar < Gruff::Base
   include StackedMixin
-  include BarValueLabelMixin
 
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
@@ -20,7 +19,7 @@ class Gruff::StackedBar < Gruff::Base
   # Number of pixels between bar segments.
   attr_writer :segment_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
   attr_writer :label_formatting
 
@@ -31,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
@@ -39,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.
@@ -54,7 +55,7 @@ class Gruff::StackedBar < Gruff::Base
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
     height = Array.new(column_count, 0)
-    bar_value_label = BarValueLabel.new(column_count, bar_width)
+    stack_bar_value_label = Gruff::BarValueLabel::StackedBar.new
 
     store.norm_data.each_with_index do |data_row, row_index|
       data_row.points.each_with_index do |data_point, point_index|
@@ -71,27 +72,25 @@ 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
         label_center = left_x + bar_width * @bar_spacing / 2.0
         draw_label(label_center, point_index)
 
-        bar_value_label.coordinates[point_index] = [left_x, left_y, right_x, right_y]
-        bar_value_label.values[point_index] += store.data[row_index].points[point_index]
+        bar_value_label = Gruff::BarValueLabel::Bar.new([left_x, left_y, right_x, right_y], store.data[row_index].points[point_index])
+        stack_bar_value_label.add(bar_value_label, point_index)
       end
     end
 
     if @show_labels_for_bar_values
-      bar_value_label.prepare_rendering(@label_formatting) do |x, y, text|
-        draw_value_label(x, y, text, true)
+      stack_bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
+        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/store/xy_data.rb

@@ -9,6 +9,8 @@ module Gruff
         super(label.to_s, Array(y_points), color, x_points)
       end
 
+      alias points y_points
+
       def x_points
         self[:x_points] || Array.new(y_points.length)
       end

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

data/lib/gruff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gruff
-  VERSION = '0.12.2'
+  VERSION = '0.15.0'
 end

data/lib/gruff.rb

@@ -1,61 +1,74 @@
 # frozen_string_literal: true
 
 require 'rmagick'
+
+require 'gruff/patch/rmagick'
+require 'gruff/patch/string'
+require 'gruff/renderer/renderer'
+require 'gruff/store/store'
+require 'gruff/font'
+require 'gruff/base'
 require 'gruff/version'
 
-# Extra full path added to fix loading errors on some installations.
-
-%w[
-  patch/rmagick
-  patch/string
-
-  base
-
-  helper/bar_conversion.rb
-  helper/stacked_mixin
-  helper/bar_value_label_mixin
-
-  themes
-  area
-  bar
-  bezier
-  bullet
-  dot
-  histogram
-  line
-  net
-  pie
-  scatter
-  spider
-  side_bar
-  stacked_area
-  stacked_bar
-  side_stacked_bar
-  accumulator_bar
-
-  scene
-
-  renderer/renderer
-  renderer/rectangle
-  renderer/circle
-  renderer/dash_line
-  renderer/line
-  renderer/polyline
-  renderer/polygon
-  renderer/bezier
-  renderer/ellipse
-  renderer/dot
-  renderer/text
-
-  store/store
-  store/basic_data
-  store/custom_data
-  store/xy_data
-
-  mini/legend
-  mini/bar
-  mini/pie
-  mini/side_bar
-].each do |filename|
-  require "gruff/#{filename}"
+##
+# = Gruff. Graphs.
+#
+module Gruff
+  # @private
+  def self.libpath(path)
+    File.join(__dir__, 'gruff', path)
+  end
+
+  autoload :BarConversion, Gruff.libpath('helper/bar_conversion')
+  autoload :BarValueLabel, Gruff.libpath('helper/bar_value_label')
+  class Base
+    autoload :StackedMixin, Gruff.libpath('helper/stacked_mixin')
+  end
+
+  autoload :AccumulatorBar, Gruff.libpath('accumulator_bar')
+  autoload :Area, Gruff.libpath('area')
+  autoload :Bar, Gruff.libpath('bar')
+  autoload :Bezier, Gruff.libpath('bezier')
+  autoload :Bullet, Gruff.libpath('bullet')
+  autoload :Dot, Gruff.libpath('dot')
+  autoload :Histogram, Gruff.libpath('histogram')
+  autoload :Line, Gruff.libpath('line')
+  autoload :Net, Gruff.libpath('net')
+  autoload :Pie, Gruff.libpath('pie')
+  autoload :Scatter, Gruff.libpath('scatter')
+  autoload :Scene, Gruff.libpath('scene')
+  autoload :SideBar, Gruff.libpath('side_bar')
+  autoload :SideStackedBar, Gruff.libpath('side_stacked_bar')
+  autoload :Spider, Gruff.libpath('spider')
+  autoload :StackedArea, Gruff.libpath('stacked_area')
+  autoload :StackedBar, Gruff.libpath('stacked_bar')
+
+  autoload :Layer, Gruff.libpath('scene')
+  autoload :Themes, Gruff.libpath('themes')
+
+  class Renderer
+    autoload :Bezier, Gruff.libpath('renderer/bezier')
+    autoload :Circle, Gruff.libpath('renderer/circle')
+    autoload :DashLine, Gruff.libpath('renderer/dash_line')
+    autoload :Dot, Gruff.libpath('renderer/dot')
+    autoload :Ellipse, Gruff.libpath('renderer/ellipse')
+    autoload :Line, Gruff.libpath('renderer/line')
+    autoload :Polygon, Gruff.libpath('renderer/polygon')
+    autoload :Polyline, Gruff.libpath('renderer/polyline')
+    autoload :Rectangle, Gruff.libpath('renderer/rectangle')
+    autoload :Text, Gruff.libpath('renderer/text')
+  end
+
+  class Store
+    autoload :BasicData, Gruff.libpath('store/basic_data')
+    autoload :CustomData, Gruff.libpath('store/custom_data')
+    autoload :XYData, Gruff.libpath('store/xy_data')
+  end
+
+  module Mini
+    autoload :Bar, Gruff.libpath('mini/bar')
+    autoload :Legend, Gruff.libpath('mini/legend')
+    autoload :Pie, Gruff.libpath('mini/pie')
+    autoload :SideBar, Gruff.libpath('mini/side_bar')
+  end
 end

data/rails_generators/gruff/templates/controller.rb

@@ -26,7 +26,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     g.labels = {0 => '2004', 2 => '2005', 4 => '2006'}
 
-    send_data(g.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "gruff.png")
+    send_data(g.to_image.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "gruff.png")
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-24 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -17,42 +17,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.27.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.13.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.13.3
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: histogram
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,18 +146,17 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
-- assets/plastik/blue.png
-- assets/plastik/green.png
-- assets/plastik/red.png
+- assets/fonts/LICENSE.txt
+- assets/fonts/Roboto-Bold.ttf
+- assets/fonts/Roboto-Regular.ttf
 - gruff.gemspec
 - init.rb
 - lib/gruff.rb
@@ -154,8 +167,9 @@ files:
 - lib/gruff/bezier.rb
 - lib/gruff/bullet.rb
 - lib/gruff/dot.rb
+- lib/gruff/font.rb
 - lib/gruff/helper/bar_conversion.rb
-- lib/gruff/helper/bar_value_label_mixin.rb
+- lib/gruff/helper/bar_value_label.rb
 - lib/gruff/helper/stacked_mixin.rb
 - lib/gruff/histogram.rb
 - lib/gruff/line.rb
@@ -166,7 +180,6 @@ files:
 - lib/gruff/net.rb
 - lib/gruff/patch/rmagick.rb
 - lib/gruff/patch/string.rb
-- lib/gruff/photo_bar.rb
 - lib/gruff/pie.rb
 - lib/gruff/renderer/bezier.rb
 - lib/gruff/renderer/circle.rb
@@ -198,7 +211,8 @@ files:
 homepage: https://github.com/topfunky/gruff
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -207,14 +221,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.