gruff 0.6.0 → 0.11.0

data/lib/gruff/store/custom_data.rb

@@ -0,0 +1,38 @@
+# 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.to_s
+        self.points = Array(points)
+        self.color = color
+        self.custom = custom
+      end
+
+      def empty?
+        points.empty?
+      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.all?(&: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 change_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,59 @@
+# 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.to_s
+        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 empty?
+        y_points.empty?
+      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,9 +1,10 @@
+# frozen_string_literal: true
+
 module Gruff
   module Themes
-    
     # A color scheme similar to the popular presentation software.
     KEYNOTE = {
-      :colors => [
+      colors: [
         '#FDD84E',  # yellow
         '#6886B4',  # blue
         '#72AE6E',  # green
@@ -12,14 +13,14 @@ module Gruff
         '#EFAA43',  # orange
         'white'
       ],
-      :marker_color => 'white',
-      :font_color => 'white',
-      :background_colors => %w(black #4a465a)
+      marker_color: 'white',
+      font_color: 'white',
+      background_colors: %w[black #4a465a]
     }
 
     # A color scheme plucked from the colors on the popular usability blog.
     THIRTYSEVEN_SIGNALS = {
-      :colors => [
+      colors: [
         '#FFF804',  # yellow
         '#336699',  # blue
         '#339933',  # green
@@ -28,15 +29,15 @@ module Gruff
         '#cf5910',  # orange
         'black'
       ],
-      :marker_color => 'black',
-      :font_color => 'black',
-      :background_colors => %w(#d1edf5 white)
+      marker_color: 'black',
+      font_color: 'black',
+      background_colors: %w[#d1edf5 white]
     }
 
     # A color scheme from the colors used on the 2005 Rails keynote
     # presentation at RubyConf.
     RAILS_KEYNOTE = {
-      :colors => [
+      colors: [
         '#00ff00',  # green
         '#333333',  # grey
         '#ff5d00',  # orange
@@ -45,14 +46,14 @@ module Gruff
         '#999999',  # light grey
         'black'
       ],
-      :marker_color => 'white',
-      :font_color => 'white',
-      :background_colors => %w(#0083a3 #0083a3)
+      marker_color: 'white',
+      font_color: 'white',
+      background_colors: %w[#0083a3 #0083a3]
     }
 
     # A color scheme similar to that used on the popular podcast site.
     ODEO = {
-      :colors => [
+      colors: [
         '#202020',  # grey
         'white',
         '#3a5b87',  # dark blue
@@ -61,14 +62,14 @@ module Gruff
         '#999999',  # light grey
         'black'
       ],
-      :marker_color => 'white',
-      :font_color => 'white',
-      :background_colors => %w(#ff47a4 #ff1f81)
+      marker_color: 'white',
+      font_color: 'white',
+      background_colors: %w[#ff47a4 #ff1f81]
     }
 
     # A pastel theme
     PASTEL = {
-      :colors => [
+      colors: [
         '#a9dada', # blue
         '#aedaa9', # green
         '#daaea9', # peach
@@ -77,26 +78,24 @@ module Gruff
         '#daaeda', # purple
         '#dadada' # grey
       ],
-      :marker_color => '#aea9a9', # Grey
-      :font_color => 'black',
-      :background_colors => 'white'
+      marker_color: '#aea9a9', # Grey
+      font_color: 'black',
+      background_colors: 'white'
     }
 
     # A greyscale theme
     GREYSCALE = {
-      :colors => [
-        '#282828', #
-        '#383838', #
-        '#686868', #
-        '#989898', #
-        '#c8c8c8', #
-        '#e8e8e8', #
+      colors: [
+        '#282828',
+        '#383838',
+        '#686868',
+        '#989898',
+        '#c8c8c8',
+        '#e8e8e8'
       ],
-      :marker_color => '#aea9a9', # Grey
-      :font_color => 'black',
-      :background_colors => 'white'
+      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.6.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2020-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -17,14 +17,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.4
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.81.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.81.0
+- !ruby/object:Gem::Dependency
+  name: histogram
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,6 +81,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
@@ -60,62 +102,59 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
+- ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
+- ".yardopts"
+- CHANGELOG.md
 - Gemfile
-- History.txt
 - MIT-LICENSE
-- Manifest.txt
 - README.md
-- RELEASE.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/histogram.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
@@ -123,37 +162,15 @@ 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
 - rails_generators/gruff/templates/controller.rb
 - rails_generators/gruff/templates/functional_test.rb
-- test/gruff_test_case.rb
-- test/image_compare.rb
-- test/test_accumulator_bar.rb
-- test/test_area.rb
-- test/test_bar.rb
-- test/test_base.rb
-- test/test_bezier.rb
-- test/test_bullet.rb
-- test/test_dot.rb
-- test/test_labels_for_null_data.rb
-- test/test_legend.rb
-- test/test_line.rb
-- test/test_mini_bar.rb
-- test/test_mini_pie.rb
-- test/test_mini_side_bar.rb
-- test/test_net.rb
-- test/test_photo.rb
-- test/test_pie.rb
-- test/test_scatter.rb
-- test/test_scene.rb
-- test/test_side_bar.rb
-- test/test_sidestacked_bar.rb
-- test/test_spider.rb
-- test/test_stacked_area.rb
-- test/test_stacked_bar.rb
 homepage: https://github.com/topfunky/gruff
 licenses:
 - MIT
@@ -166,41 +183,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.
-test_files:
-- test/gruff_test_case.rb
-- test/image_compare.rb
-- test/test_accumulator_bar.rb
-- test/test_area.rb
-- test/test_bar.rb
-- test/test_base.rb
-- test/test_bezier.rb
-- test/test_bullet.rb
-- test/test_dot.rb
-- test/test_labels_for_null_data.rb
-- test/test_legend.rb
-- test/test_line.rb
-- test/test_mini_bar.rb
-- test/test_mini_pie.rb
-- test/test_mini_side_bar.rb
-- test/test_net.rb
-- test/test_photo.rb
-- test/test_pie.rb
-- test/test_scatter.rb
-- test/test_scene.rb
-- test/test_side_bar.rb
-- test/test_sidestacked_bar.rb
-- test/test_spider.rb
-- test/test_stacked_area.rb
-- test/test_stacked_bar.rb
+test_files: []