gruff 0.8.0 → 0.9.0

data/lib/gruff/stacked_area.rb

@@ -1,5 +1,7 @@
-require File.dirname(__FILE__) + '/base'
-require File.dirname(__FILE__) + '/stacked_mixin'
+# frozen_string_literal: true
+
+require 'gruff/base'
+require 'gruff/helper/stacked_mixin'
 
 class Gruff::StackedArea < Gruff::Base
   include StackedMixin
@@ -9,24 +11,21 @@ class Gruff::StackedArea < Gruff::Base
     get_maximum_by_stack
     super
 
-    return unless @has_data
+    return unless data_given?
 
-    @x_increment = @graph_width / (@column_count - 1).to_f
-    @d = @d.stroke 'transparent'
+    x_increment = @graph_width / (column_count - 1).to_f
 
-    height = Array.new(@column_count, 0)
+    height = Array.new(column_count, 0)
 
     data_points = nil
     iterator = last_series_goes_on_bottom ? :reverse_each : :each
-    @norm_data.send(iterator) do |data_row|
+    store.norm_data.public_send(iterator) do |data_row|
       prev_data_points = data_points
-      data_points = Array.new
-
-      @d = @d.fill data_row[DATA_COLOR_INDEX]
+      data_points = []
 
-      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
+      data_row.points.each_with_index do |data_point, index|
         # Use incremented x and scaled y
-        new_x = @graph_left + (@x_increment * index)
+        new_x = @graph_left + (x_increment * index)
         new_y = @graph_top + (@graph_height - data_point * @graph_height - height[index])
 
         height[index] += (data_point * @graph_height)
@@ -37,27 +36,24 @@ class Gruff::StackedArea < Gruff::Base
         draw_label(new_x, index)
       end
 
+      poly_points = data_points.dup
       if prev_data_points
-        poly_points = data_points.dup
         (prev_data_points.length / 2 - 1).downto(0) do |i|
           poly_points << prev_data_points[2 * i]
           poly_points << prev_data_points[2 * i + 1]
         end
-        poly_points << data_points[0]
-        poly_points << data_points[1]
       else
-        poly_points = data_points.dup
         poly_points << @graph_right
         poly_points << @graph_bottom - 1
         poly_points << @graph_left
         poly_points << @graph_bottom - 1
-        poly_points << data_points[0]
-        poly_points << data_points[1]
       end
-      @d = @d.polyline(*poly_points)
+      poly_points << data_points[0]
+      poly_points << data_points[1]
+
+      Gruff::Renderer::Polygon.new(color: data_row.color).render(poly_points)
     end
 
-    @d.draw(@base_image)
+    Gruff::Renderer.finish
   end
-
 end

data/lib/gruff/stacked_bar.rb

@@ -1,59 +1,85 @@
-require File.dirname(__FILE__) + '/base'
-require File.dirname(__FILE__) + '/stacked_mixin'
+# frozen_string_literal: true
+
+require 'gruff/base'
+require 'gruff/helper/stacked_mixin'
+require 'gruff/helper/bar_value_label_mixin'
 
 class Gruff::StackedBar < Gruff::Base
   include StackedMixin
+  include BarValueLabelMixin
 
-  # Spacing factor applied between bars
+  # Spacing factor applied between bars.
   attr_accessor :bar_spacing
 
-  # Number of pixels between bar segments
+  # Number of pixels between bar segments.
   attr_accessor :segment_spacing
 
+  # Set the number output format for labels using sprintf.
+  # Default is +"%.2f"+.
+  attr_accessor :label_formatting
+
+  # Output the values for the bars on a bar graph.
+  # Default is +false+.
+  attr_accessor :show_labels_for_bar_values
+
+  def initialize_ivars
+    super
+    @label_formatting = nil
+    @show_labels_for_bar_values = false
+  end
+  private :initialize_ivars
+
   # Draws a bar graph, but multiple sets are stacked on top of each other.
   def draw
     get_maximum_by_stack
     super
-    return unless @has_data
+    return unless data_given?
 
     # Setup spacing.
     #
     # Columns sit stacked.
     @bar_spacing ||= 0.9
-    @segment_spacing ||= 1
-    @bar_width = @graph_width / @column_count.to_f
-    padding = (@bar_width * (1 - @bar_spacing)) / 2
-
-    @d = @d.stroke_opacity 0.0
+    @segment_spacing ||= 2
 
-    height = Array.new(@column_count, 0)
+    bar_width = @graph_width / column_count.to_f
+    padding = (bar_width * (1 - @bar_spacing)) / 2
 
-    @norm_data.each_with_index do |data_row, row_index|
-      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
-        @d = @d.fill data_row[DATA_COLOR_INDEX]
-
-        # Calculate center based on bar_width and current row
-        label_center = @graph_left + (@bar_width * point_index) + (@bar_width * @bar_spacing / 2.0)
-        draw_label(label_center, point_index)
+    height = Array.new(column_count, 0)
+    bar_value_label = BarValueLabel.new(column_count, bar_width)
 
+    store.norm_data.each_with_index do |data_row, row_index|
+      data_row.points.each_with_index do |data_point, point_index|
         next if data_point == 0
 
         # Use incremented x and scaled y
-        left_x = @graph_left + (@bar_width * point_index) + padding
+        left_x = @graph_left + (bar_width * point_index) + padding
         left_y = @graph_top + (@graph_height -
                                data_point * @graph_height -
                                height[point_index]) + @segment_spacing
-        right_x = left_x + @bar_width * @bar_spacing
-        right_y = @graph_top + @graph_height - height[point_index] - @segment_spacing
+        right_x = left_x + bar_width * @bar_spacing
+        right_y = @graph_top + @graph_height - height[point_index]
 
         # update the total height of the current stacked bar
         height[point_index] += (data_point * @graph_height)
 
-        @d = @d.rectangle(left_x, left_y, right_x, right_y)
+        rect_renderer = Gruff::Renderer::Rectangle.new(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]
       end
     end
 
-    @d.draw(@base_image)
-  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)
+      end
+    end
 
+    Gruff::Renderer.finish
+  end
 end

data/lib/gruff/store/base_data.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Gruff
+  # @private
+  class Store
+    class BaseData < Struct.new(:label, :points, :color)
+      def initialize(label, points, color)
+        self.label = label
+        self.points = Array(points)
+        self.color = color
+      end
+
+      def columns
+        points.length
+      end
+
+      def min
+        points.compact.min
+      end
+
+      def max
+        points.compact.max
+      end
+
+      def normalize(args = {})
+        norm_points = points.map do |point|
+          point.nil? ? nil : (point.to_f - args[:minimum].to_f) / args[:spread]
+        end
+
+        self.class.new(label, norm_points, color)
+      end
+    end
+  end
+end

data/lib/gruff/store/custom_data.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Gruff
+  class Store
+    class CustomData < Struct.new(:label, :points, :color, :custom)
+      def initialize(label, points, color, custom = nil)
+        self.label = label
+        self.points = Array(points)
+        self.color = color
+        self.custom = custom
+      end
+
+      def columns
+        points.length
+      end
+
+      def min
+        points.compact.min
+      end
+
+      def max
+        points.compact.max
+      end
+
+      def normalize(args = {})
+        norm_points = points.map do |point|
+          point.nil? ? nil : (point.to_f - args[:minimum].to_f) / args[:spread]
+        end
+
+        self.class.new(label, norm_points, color, custom)
+      end
+    end
+  end
+end

data/lib/gruff/store/store.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module Gruff
+  class Store
+    attr_reader :data, :norm_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(args = {})
+      unless @normalized
+        @data.each do |data_row|
+          @norm_data << data_row.normalize(args)
+        end
+
+        @normalized = true
+      end
+    end
+
+    def empty?
+      @data.empty?
+    end
+
+    def length
+      @data.length
+    end
+
+    def columns
+      @columns ||= @data.empty? ? 0 : @data.map(&:columns).max
+    end
+
+    def min
+      @min ||= @data.map(&:min).compact.min
+    end
+    alias min_y min
+
+    def max
+      @max ||= @data.map(&:max).compact.max
+    end
+    alias max_y max
+
+    def min_x
+      @min_x ||= @data.map(&:min_x).compact.min
+    end
+
+    def max_x
+      @max_x ||= @data.map(&:max_x).compact.max
+    end
+
+    def sort_data!
+      @data = @data.sort_by { |a| -a.points.reduce(0) { |acc, elem| acc + elem.to_f } }
+    end
+
+    def sort_norm_data!
+      @norm_data = @norm_data.sort_by { |a| -a.points.reduce(0) { |acc, elem| acc + elem.to_f } }
+    end
+
+    def reverse!
+      @data.reverse!
+    end
+
+    def set_colors!(colors)
+      index = 0
+      @data.each do |data_row|
+        data_row.color ||= begin
+          index = (index + 1) % colors.length
+          colors[index - 1]
+        end
+      end
+    end
+  end
+end

data/lib/gruff/store/xy_data.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Gruff
+  class Store
+    class XYData < Struct.new(:label, :y_points, :color, :x_points)
+      def initialize(label, y_points, color, x_points = nil)
+        self.label = label
+        self.y_points = Array(y_points)
+        self.color = color
+        self.x_points = Array(x_points) if x_points
+      end
+
+      def x_points
+        self[:x_points] || Array.new(y_points.length)
+      end
+
+      def coordinates
+        x_points.zip(y_points)
+      end
+
+      def columns
+        y_points.length
+      end
+
+      def min
+        y_points.compact.min
+      end
+      alias min_y min
+
+      def max
+        y_points.compact.max
+      end
+      alias max_y max
+
+      def min_x
+        x_points.compact.min
+      end
+
+      def max_x
+        x_points.compact.max
+      end
+
+      def normalize(args = {})
+        norm_x_points = x_points.map do |x|
+          x.nil? ? nil : (x.to_f - args[:minimum_x].to_f) / args[:spread_x]
+        end
+        norm_y_points = y_points.map do |y|
+          y.nil? ? nil : (y.to_f - args[:minimum_y].to_f) / args[:spread_y]
+        end
+
+        self.class.new(label, norm_y_points, color, norm_x_points)
+      end
+    end
+  end
+end

data/lib/gruff/themes.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Gruff
   module Themes
-
     # A color scheme similar to the popular presentation software.
     KEYNOTE = {
       colors: [
@@ -90,12 +91,11 @@ module Gruff
         '#686868',
         '#989898',
         '#c8c8c8',
-        '#e8e8e8',
+        '#e8e8e8'
       ],
       marker_color: '#aea9a9', # Grey
       font_color: 'black',
       background_colors: 'white'
     }
-
   end
 end

data/lib/gruff/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gruff
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.25
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.25
 description: Beautiful graphs for one or multiple datasets. Can be used on websites
   or in documents.
 email: boss@topfunky.com
@@ -75,63 +89,57 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
-- Manifest.txt
 - README.md
 - Rakefile
-- assets/bubble.png
-- assets/city_scene/background/0000.png
-- assets/city_scene/background/0600.png
-- assets/city_scene/background/2000.png
-- assets/city_scene/clouds/cloudy.png
-- assets/city_scene/clouds/partly_cloudy.png
-- assets/city_scene/clouds/stormy.png
-- assets/city_scene/grass/default.png
-- assets/city_scene/haze/true.png
-- assets/city_scene/number_sample/1.png
-- assets/city_scene/number_sample/2.png
-- assets/city_scene/number_sample/default.png
-- assets/city_scene/sky/0000.png
-- assets/city_scene/sky/0200.png
-- assets/city_scene/sky/0400.png
-- assets/city_scene/sky/0600.png
-- assets/city_scene/sky/0800.png
-- assets/city_scene/sky/1000.png
-- assets/city_scene/sky/1200.png
-- assets/city_scene/sky/1400.png
-- assets/city_scene/sky/1500.png
-- assets/city_scene/sky/1700.png
-- assets/city_scene/sky/2000.png
-- assets/pc306715.jpg
 - assets/plastik/blue.png
 - assets/plastik/green.png
 - assets/plastik/red.png
+- docker/Dockerfile
+- docker/build.sh
+- docker/launch.sh
 - gruff.gemspec
 - init.rb
 - lib/gruff.rb
 - lib/gruff/accumulator_bar.rb
 - lib/gruff/area.rb
 - lib/gruff/bar.rb
-- lib/gruff/bar_conversion.rb
 - lib/gruff/base.rb
 - lib/gruff/bezier.rb
 - lib/gruff/bullet.rb
-- lib/gruff/deprecated.rb
 - lib/gruff/dot.rb
+- lib/gruff/helper/bar_conversion.rb
+- lib/gruff/helper/bar_value_label_mixin.rb
+- lib/gruff/helper/stacked_mixin.rb
 - lib/gruff/line.rb
 - lib/gruff/mini/bar.rb
 - lib/gruff/mini/legend.rb
 - lib/gruff/mini/pie.rb
 - lib/gruff/mini/side_bar.rb
 - 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
+- lib/gruff/renderer/dash_line.rb
+- lib/gruff/renderer/dot.rb
+- lib/gruff/renderer/ellipse.rb
+- lib/gruff/renderer/line.rb
+- lib/gruff/renderer/polygon.rb
+- lib/gruff/renderer/polyline.rb
+- lib/gruff/renderer/rectangle.rb
+- lib/gruff/renderer/renderer.rb
+- lib/gruff/renderer/text.rb
 - lib/gruff/scatter.rb
 - lib/gruff/scene.rb
 - lib/gruff/side_bar.rb
@@ -139,7 +147,10 @@ files:
 - lib/gruff/spider.rb
 - lib/gruff/stacked_area.rb
 - lib/gruff/stacked_bar.rb
-- lib/gruff/stacked_mixin.rb
+- lib/gruff/store/base_data.rb
+- lib/gruff/store/custom_data.rb
+- lib/gruff/store/store.rb
+- lib/gruff/store/xy_data.rb
 - lib/gruff/themes.rb
 - lib/gruff/version.rb
 - rails_generators/gruff/gruff_generator.rb