gruff 0.13.0 → 0.16.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -17,64 +17,64 @@ 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.12.1
+        version: 1.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.27.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.13.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.13.3
 - !ruby/object:Gem::Dependency
-  name: histogram
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 0.6.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: histogram
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -146,10 +146,9 @@ 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
@@ -158,9 +157,6 @@ files:
 - assets/fonts/LICENSE.txt
 - assets/fonts/Roboto-Bold.ttf
 - assets/fonts/Roboto-Regular.ttf
-- assets/plastik/blue.png
-- assets/plastik/green.png
-- assets/plastik/red.png
 - gruff.gemspec
 - init.rb
 - lib/gruff.rb
@@ -169,8 +165,11 @@ files:
 - lib/gruff/bar.rb
 - lib/gruff/base.rb
 - lib/gruff/bezier.rb
+- lib/gruff/box_plot.rb
 - lib/gruff/bullet.rb
+- lib/gruff/candlestick.rb
 - lib/gruff/dot.rb
+- lib/gruff/font.rb
 - lib/gruff/helper/bar_conversion.rb
 - lib/gruff/helper/bar_value_label.rb
 - lib/gruff/helper/stacked_mixin.rb
@@ -183,7 +182,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
@@ -197,14 +195,12 @@ files:
 - lib/gruff/renderer/renderer.rb
 - lib/gruff/renderer/text.rb
 - lib/gruff/scatter.rb
-- lib/gruff/scene.rb
 - lib/gruff/side_bar.rb
 - lib/gruff/side_stacked_bar.rb
 - lib/gruff/spider.rb
 - lib/gruff/stacked_area.rb
 - lib/gruff/stacked_bar.rb
 - lib/gruff/store/basic_data.rb
-- lib/gruff/store/custom_data.rb
 - lib/gruff/store/store.rb
 - lib/gruff/store/xy_data.rb
 - lib/gruff/themes.rb
@@ -215,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:
@@ -224,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.

data/.rubocop_todo.yml

@@ -1,182 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2021-05-07 13:38:24 UTC using RuboCop version 1.12.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: Include.
-# Include: **/*.gemspec
-Gemspec/DateAssignment:
-  Exclude:
-    - 'gruff.gemspec'
-
-# Offense count: 1
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
-Lint/DuplicateBranch:
-  Exclude:
-    - 'test/gruff_test_case.rb'
-
-# Offense count: 1
-Lint/DuplicateMethods:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-
-# Offense count: 13
-Lint/FloatComparison:
-  Exclude:
-    - 'Rakefile'
-    - 'lib/gruff/base.rb'
-    - 'lib/gruff/renderer/renderer.rb'
-    - 'lib/gruff/scatter.rb'
-
-# Offense count: 1
-Lint/UnreachableCode:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-
-# Offense count: 1
-# Configuration parameters: CheckForMethodsWithNoSideEffects.
-Lint/Void:
-  Exclude:
-    - 'lib/gruff/patch/rmagick.rb'
-
-# Offense count: 56
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
-Metrics/AbcSize:
-  Max: 75
-
-# Offense count: 1
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
-Metrics/BlockLength:
-  Max: 29
-
-# Offense count: 14
-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ClassLength:
-  Max: 669
-
-# Offense count: 8
-# Configuration parameters: IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 21
-
-# Offense count: 126
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-Metrics/MethodLength:
-  Max: 81
-
-# Offense count: 3
-# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
-Metrics/ParameterLists:
-  Max: 7
-
-# Offense count: 7
-# Configuration parameters: IgnoredMethods.
-Metrics/PerceivedComplexity:
-  Max: 22
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyleForLeadingUnderscores.
-# SupportedStylesForLeadingUnderscores: disallowed, required, optional
-Naming/MemoizedInstanceVariableName:
-  Exclude:
-    - 'lib/gruff/scene.rb'
-
-# Offense count: 9
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
-Naming/MethodParameterName:
-  Exclude:
-    - 'lib/gruff/base.rb'
-    - 'lib/gruff/patch/rmagick.rb'
-    - 'lib/gruff/pie.rb'
-    - 'lib/gruff/renderer/text.rb'
-
-# Offense count: 6
-# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers.
-# SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339
-Naming/VariableNumber:
-  Exclude:
-    - 'test/test_bar.rb'
-    - 'test/test_bezier.rb'
-    - 'test/test_line.rb'
-
-# Offense count: 1
-# Configuration parameters: MinSize.
-Performance/CollectionLiteralInLoop:
-  Exclude:
-    - 'test/test_legend.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/RedundantMatch:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/RegexpMatch:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Performance/StringReplacement:
-  Exclude:
-    - 'lib/gruff/scene.rb'
-
-# Offense count: 2
-Security/Eval:
-  Exclude:
-    - 'test/gruff_test_case.rb'
-
-# Offense count: 1
-Style/CombinableLoops:
-  Exclude:
-    - 'test/test_line.rb'
-
-# Offense count: 3
-Style/DocumentDynamicEvalDefinition:
-  Exclude:
-    - 'test/gruff_test_case.rb'
-
-# Offense count: 137
-# Configuration parameters: RequireForNonPublicMethods.
-Style/DocumentationMethod:
-  Enabled: false
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/EvalWithLocation:
-  Exclude:
-    - 'test/gruff_test_case.rb'
-
-# Offense count: 1
-Style/MissingRespondToMissing:
-  Exclude:
-    - 'lib/gruff/scene.rb'
-
-# Offense count: 1
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: respond_to_missing?
-Style/OptionalBooleanParameter:
-  Exclude:
-    - 'lib/gruff/base.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/StringConcatenation:
-  Exclude:
-    - 'lib/gruff/photo_bar.rb'
-    - 'test/gruff_test_case.rb'

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-dist: bionic
-cache: bundler
-
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-  - jruby-9.2.14.0
-
-jobs:
-  include:
-    - name: 'Lint'
-      rvm: 2.4
-      script: bundle exec rubocop
-
-addons:
-  apt:
-    packages:
-      - gsfonts
-      - ghostscript

data/lib/gruff/photo_bar.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-# EXPERIMENTAL!
-#
-# Doesn't work yet.
-#
-class Gruff::PhotoBar < Gruff::Base
-  # TODO
-  #
-  # define base and cap in yml
-  # allow for image directory to be located elsewhere
-  # more exact measurements for bar heights (go all the way to the bottom of the graph)
-  # option to tile images instead of use a single image
-  # drop base label a few px lower so photo bar graphs can have a base dropping over the lower marker line
-  #
-
-  # The name of a pre-packaged photo-based theme.
-  attr_reader :theme
-
-  # def initialize(target_width=800)
-  #   super
-  #   init_photo_bar_graphics()
-  # end
-
-  def draw
-    super
-    return unless data_given?
-
-    return # TODO: Remove for further development
-
-    init_photo_bar_graphics
-
-    #Draw#define_clip_path()
-    #Draw#clip_path(pathname)
-    #Draw#composite....with bar graph image OverCompositeOp
-    #
-    # See also
-    #
-    # Draw.pattern # define an image to tile as the filling of a draw object
-    #
-
-    # Setup spacing.
-    #
-    # Columns sit side-by-side.
-    spacing_factor = 0.9
-    bar_width = store.norm_data[0].color.columns
-
-    store.norm_data.each_with_index do |data_row, row_index|
-      data_row.points.each_with_index do |data_point, point_index|
-        data_point = 0 if data_point.nil?
-        # Use incremented x and scaled y
-        left_x = @graph_left + (bar_width * (row_index + point_index + ((store.length - 1) * point_index)))
-        left_y = @graph_top + (@graph_height - data_point * @graph_height) + 1
-        right_x = left_x + bar_width * spacing_factor
-        right_y = @graph_top + @graph_height - 1
-
-        bar_image_width = data_row.color.columns
-        bar_image_height = right_y.to_f - left_y.to_f
-
-        # Crop to scale for data
-        bar_image = data_row.color.crop(0, 0, bar_image_width, bar_image_height)
-
-        @d.gravity = Magick::NorthWestGravity
-        @d.composite(left_x, left_y, bar_image_width, bar_image_height, bar_image)
-
-        # Calculate center based on bar_width and current row
-        label_center = @graph_left + (store.length * bar_width * point_index) + (store.length * bar_width / 2.0)
-        draw_label(label_center, point_index)
-      end
-    end
-  end
-
-  # Return the chosen theme or the default
-  def theme
-    @theme || 'plastik'
-  end
-
-protected
-
-  # Sets up colors with a list of images that will be used.
-  # Images should be 340px tall
-  def init_photo_bar_graphics
-    color_list = []
-    theme_dir = File.dirname(__FILE__) + '/../../assets/' + theme
-
-    Dir.open(theme_dir).each do |file|
-      next unless /\.png$/.match(file)
-
-      color_list << Magick::Image.read("#{theme_dir}/#{file}").first
-    end
-    @colors = color_list
-  end
-end

data/lib/gruff/scene.rb

@@ -1,198 +0,0 @@
-# frozen_string_literal: true
-
-require 'observer'
-
-# 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
-# layers and control them together or just set their values individually.
-#
-# Examples:
-#
-# * A city scene that changes with the time of day and the weather conditions.
-# * A traffic map that shows red lines on streets that are crowded and green on free-flowing ones.
-#
-#  g = Gruff::Scene.new("500x100", "path/to/city_scene_directory")
-#
-#  # Define order of layers, back to front
-#  g.layers = %w(background haze sky clouds)
-#
-#  # Define groups that will be controlled by the same input
-#  g.weather_group = %w(clouds)
-#  g.time_group = %w(background sky)
-#
-#  # Set values for the layers or groups
-#  g.weather = "cloudy"
-#  g.time = Time.now
-#  g.haze = true
-#
-#  # Write the final graph to disk
-#  g.write "hazy_daytime_city_scene.png"
-#
-# There are several rules that will magically select a layer when possible.
-#
-# * Numbered files will be selected according to the closest value that is less than the input value.
-# * +'true.png'+ and +'false.png'+ will be used as booleans.
-# * Other named files will be used if the input matches the filename (without the filetype extension).
-# * If there is a file named +'default.png'+, it will be used unless other input values are set for the corresponding layer.
-class Gruff::Scene < Gruff::Base
-  # An array listing the folder names that will be rendered, from back to front.
-  #
-  # @example
-  #   g.layers = %w(sky clouds buildings street people)
-  attr_reader :layers
-
-  def initialize(target_width, base_dir)
-    @base_dir = base_dir
-    @groups = {}
-    @layers = []
-    super target_width
-  end
-
-  def draw
-    # Join all the custom paths and filter out the empty ones
-    image_paths = @layers.map(&:path).reject(&:empty?)
-    images = Magick::ImageList.new(*image_paths)
-    Gruff::Renderer.background_image = images.flatten_images
-  end
-
-  def layers=(ordered_list)
-    ordered_list.each do |layer_name|
-      @layers << Gruff::Layer.new(@base_dir, layer_name)
-    end
-  end
-
-  # Group layers to input values
-  #
-  #  g.weather_group = ["sky", "sea", "clouds"]
-  #
-  # Set input values
-  #
-  #  g.weather = "cloudy"
-  #
-  def method_missing(method_name, *args)
-    case method_name.to_s
-    when /^(\w+)_group=$/
-      add_group Regexp.last_match(1), *args
-      return
-    when /^(\w+)=$/
-      set_input Regexp.last_match(1), args.first
-      return
-    end
-    super
-  end
-
-private
-
-  def add_group(input_name, layer_names)
-    @groups[input_name] = Gruff::Group.new(input_name, @layers.select { |layer| layer_names.include?(layer.name) })
-  end
-
-  def set_input(input_name, input_value)
-    if !@groups[input_name].nil?
-      @groups[input_name].send_updates(input_value)
-    elsif chosen_layer = @layers.find { |layer| layer.name == input_name }
-      chosen_layer.update input_value
-    end
-  end
-end
-
-# @private
-class Gruff::Group
-  include Observable
-  attr_reader :name
-
-  def initialize(folder_name, layers)
-    @name = folder_name
-    layers.each do |layer|
-      layer.observe self
-    end
-  end
-
-  def send_updates(value)
-    changed
-    notify_observers value
-  end
-end
-
-# @private
-class Gruff::Layer
-  attr_reader :name
-
-  def initialize(base_dir, folder_name)
-    @base_dir = base_dir.to_s
-    @name = folder_name.to_s
-    @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }.sort
-    @selected_filename = select_default
-  end
-
-  # Register this layer so it receives updates from the group
-  def observe(obj)
-    obj.add_observer self
-  end
-
-  # Choose the appropriate filename for this layer, based on the input
-  def update(value)
-    @selected_filename =  case value.to_s
-                          when /^(true|false)$/
-                            select_boolean value
-                          when /^(\w|\s)+$/
-                            select_string value
-                          when /^-?(\d+\.)?\d+$/
-                            select_numeric value
-                          when /(\d\d):(\d\d):\d\d/
-                            select_time "#{Regexp.last_match(1)}#{Regexp.last_match(2)}"
-                          else
-                            select_default
-                          end
-    # Finally, try to use 'default' if we're still blank
-    @selected_filename ||= select_default
-  end
-
-  # Returns the full path to the selected image, or a blank string
-  def path
-    unless @selected_filename.nil? || @selected_filename.empty?
-      return File.join(@base_dir, @name, @selected_filename)
-    end
-
-    ''
-  end
-
-private
-
-  # Match "true.png" or "false.png"
-  def select_boolean(value)
-    file_exists_or_blank value.to_s
-  end
-
-  # Match -5 to _5.png
-  def select_numeric(value)
-    file_exists_or_blank value.to_s.gsub('-', '_')
-  end
-
-  def select_time(value)
-    times = @filenames.map { |filename| filename.gsub('.png', '') }
-    times.each_with_index do |time, index|
-      if (time > value) && (index > 0)
-        return "#{times[index - 1]}.png"
-      end
-    end
-
-    "#{times.last}.png"
-  end
-
-  # Match "partly cloudy" to "partly_cloudy.png"
-  def select_string(value)
-    file_exists_or_blank value.to_s.gsub(' ', '_')
-  end
-
-  def select_default
-    @filenames.include?('default.png') ? 'default.png' : ''
-  end
-
-  # Returns the string "#{filename}.png", if it exists.
-  #
-  # Failing that, it returns default.png, or '' if that doesn't exist.
-  def file_exists_or_blank(filename)
-    @filenames.include?("#{filename}.png") ? "#{filename}.png" : select_default
-  end
-end