gruff 0.7.0 → 0.8.0

data/lib/gruff/version.rb

@@ -1,3 +1,3 @@
 module Gruff
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Geoffrey Grosenbach
@@ -9,28 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.13'
     - - ">="
       - !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: '2.13'
-    - - ">="
+        version: 0.81.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.4
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,14 +74,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
-- History.txt
 - MIT-LICENSE
 - Manifest.txt
 - README.md
-- RELEASE.md
 - Rakefile
 - assets/bubble.png
 - assets/city_scene/background/0000.png
@@ -135,31 +145,6 @@ files:
 - 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
@@ -173,43 +158,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+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: []

data/RELEASE.md

@@ -1,30 +0,0 @@
-Subject: [ANN] Gruff 0.5.1 released!
-
-The Gruff team is pleased to announce the release of Gruff 0.5.1.
-
-New in version 0.5.1:
-
-Skip packaging the test images.  This reduces the gem from 20MB+ to
-300KB+.
-
-Bugfixes:
-
-* Issue #92 Reduce the gem size by not shipping the test images.
-    
-You can find a complete list of issues here:
-
-* https://github.com/topfunky/gruff/issues?state=closed&milestone=7
-
-
-Installation:
-
-    gem install gruff
-
-You can find an introductory tutorial at
-https://github.com/topfunky/gruff
-
-Enjoy!
-
-
---
-The Gruff Team

data/test/gruff_test_case.rb

@@ -1,152 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib/')
-
-RMAGICK_BYPASS_VERSION_TEST = true
-
-require 'gruff'
-require 'fileutils'
-
-TEST_OUTPUT_DIR = File.dirname(__FILE__) + "/output#{'_java' if RUBY_PLATFORM == 'java'}"
-FileUtils.mkdir_p(TEST_OUTPUT_DIR)
-FileUtils.rm_f Dir[TEST_OUTPUT_DIR + '/*']
-
-require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use!
-
-class Gruff::Base
-  alias :write_org :write
-
-  def write(filename='graph.png')
-    basefilename = File.basename(filename).split('.')[0..-2].join('.')
-    extension = filename.slice(/\.[^\.]*$/)
-    testfilename = File.join(TEST_OUTPUT_DIR, basefilename) + extension
-    counter = 0
-    while File.exist?(testfilename)
-      counter += 1
-      testfilename = File.join(TEST_OUTPUT_DIR, basefilename) + "-#{counter}#{extension}"
-    end
-    write_org(testfilename)
-  end
-end
-
-class GruffTestCase < Minitest::Test
-  def setup
-    srand 42
-    @datasets = [
-        [:Jimmy, [25, 36, 86, 39, 25, 31, 79, 88]],
-        [:Charles, [80, 54, 67, 54, 68, 70, 90, 95]],
-        [:Julie, [22, 29, 35, 38, 36, 40, 46, 57]],
-        [:Jane, [95, 95, 95, 90, 85, 80, 88, 100]],
-        [:Philip, [90, 34, 23, 12, 78, 89, 98, 88]],
-        [:Arthur, [5, 10, 13, 11, 6, 16, 22, 32]],
-    ]
-
-    @labels = {
-        0 => '5/6',
-        1 => '5/15',
-        2 => '5/24',
-        3 => '5/30',
-        4 => '6/4',
-        5 => '6/12',
-        6 => '6/21',
-        7 => '6/28',
-    }
-  end
-
-  def setup_single_dataset
-    @datasets = [
-        [:Jimmy, [25, 36, 86]]
-    ]
-
-    @labels = {
-        0 => 'You',
-        1 => 'Average',
-        2 => 'Lifetime'
-    }
-  end
-
-  def setup_wide_dataset
-    @datasets = [
-        ['Auto', 25],
-        ['Food', 5],
-        ['Entertainment', 15]
-    ]
-
-    @labels = {0 => 'This Month'}
-  end
-
-  def test_dummy
-    assert true
-  end
-
-  protected
-
-  # Generate graphs at several sizes.
-  #
-  # Also writes the graph to disk.
-  #
-  #   graph_sized 'bar_basic' do |g|
-  #     g.data('students', [1, 2, 3, 4])
-  #   end
-  #
-  def graph_sized(filename, sizes=['', 400])
-    class_name = self.class.name.gsub(/^TestGruff/, '')
-    Array(sizes).each do |size|
-      g = instance_eval("Gruff::#{class_name}.new #{size}")
-      g.title = "#{class_name} Graph"
-      yield g
-      write_test_file g, "#{filename}_#{size}.png"
-    end
-  end
-
-  def write_test_file(graph, filename)
-    testfilename = [TEST_OUTPUT_DIR, filename].join('/')
-    basefilename = filename.split('.')[0..-2].join('.')
-    extension = filename.slice(/\..*$/)
-    counter = 0
-    while File.exist? testfilename
-      counter += 1
-      testfilename = [TEST_OUTPUT_DIR, basefilename].join('/') + "-#{counter}#{extension}"
-    end
-    graph.write(testfilename)
-  end
-
-  ##
-  # Example:
-  #
-  #   setup_basic_graph Gruff::Pie, 400
-  #
-  def setup_basic_graph(*args)
-    klass, size = Gruff::Bar, 400
-    # Allow args to be klass, size or just klass or just size.
-    #
-    # TODO Refactor
-    case args.length
-    when 1
-      case args[0]
-      when Fixnum
-        size = args[0]
-        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}")
-      when String
-        size = args[0]
-        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}")
-      else
-        klass = args[0]
-      end
-    when 2
-      klass, size = args[0], args[1]
-    end
-
-    g = klass.new(size)
-    g.title = 'My Bar Graph'
-    g.labels = @labels
-    g.font = '/Library/Fonts/Verdana.ttf'
-
-
-    @datasets.each do |data|
-      g.data(data[0], data[1])
-    end
-    g
-  end
-
-end

data/test/image_compare.rb

@@ -1,58 +0,0 @@
-#!ruby
-
-require 'chunky_png'
-
-class ImageCompare
-  include ChunkyPNG::Color
-
-  def self.compare(file_name, old_file_name)
-    name = file_name.chomp('.png')
-    org_file_name = "#{name}_0.png~"
-    new_file_name = "#{name}_1.png~"
-
-    return nil unless File.exists? old_file_name
-    images = [
-        ChunkyPNG::Image.from_file(old_file_name),
-        ChunkyPNG::Image.from_file(file_name),
-    ]
-
-    sizes = images.map(&:width).uniq + images.map(&:height).uniq
-    if sizes.size != 2
-      logger.warn "Image size has changed for #{name}: #{sizes}"
-      return nil
-    end
-
-    diff = []
-    images.first.height.times do |y|
-      images.first.row(y).each_with_index do |pixel, x|
-        unless pixel == images.last[x, y]
-          diff << [x, y]
-        end
-      end
-    end
-
-    if diff.empty?
-      File.delete(org_file_name) if File.exists? org_file_name
-      File.delete(new_file_name) if File.exists? new_file_name
-      return false
-    end
-
-    x, y = diff.map { |xy| xy[0] }, diff.map { |xy| xy[1] }
-    (1..2).each do |i|
-      images.each do |image|
-        image.rect(x.min - i, y.min - i, x.max + i, y.max + i, ChunkyPNG::Color.rgb(255, 0, 0))
-      end
-    end
-    images.first.save(org_file_name)
-    images.last.save(new_file_name)
-    true
-  end
-end
-
-if $0 == __FILE__
-  unless ARGV.size == 2
-    puts "Usage:  #$0 <image1> <image2>"
-    exit 1
-  end
-  ImageCompare.compare(ARGV[0], ARGV[1])
-end

data/test/test_accumulator_bar.rb

@@ -1,51 +0,0 @@
-require File.dirname(__FILE__) + '/gruff_test_case'
-
-class TestGruffAccumulatorBar < GruffTestCase
-
-  # TODO Delete old output files once when starting tests
-
-  def setup
-    super
-    @datasets = [
-      (1..20).to_a.map { rand(10) }
-    ]
-  end
-
-  def test_accumulator
-    g = Gruff::AccumulatorBar.new 500
-    g.title = 'Your Savings'
-    g.hide_legend = true
-
-    # g.font = File.expand_path(File.dirname(__FILE__) + "/../assets/fonts/ATMA____.TTF")
-
-    g.marker_font_size = 18
-    
-    g.theme = {
-      :colors => ['#aedaa9', '#12a702'],
-      :marker_color => '#dddddd',
-      :font_color => 'black',      
-      :background_colors => 'white'
-      # :background_image => File.expand_path(File.dirname(__FILE__) + "/../assets/backgrounds/43things.png")
-    }
-
-    # Attempt at negative numbers
-    # g.data 'Savings', (1..20).to_a.map { rand(10) * (rand(2) > 0 ? 1 : -1) }
-    g.data 'Savings', (1..12).to_a.map { rand(100) }
-    g.labels = (0..11).to_a.inject({}) {|memo, index| {index => '12-26'}.merge(memo)}
-
-    g.maximum_value = 1000
-    g.minimum_value = 0
-
-    g.write('test/output/accum_bar.png')
-  end
-
-  def test_too_many_args
-    assert_raises(Gruff::IncorrectNumberOfDatasetsException) {
-      g = Gruff::AccumulatorBar.new
-      g.data 'First', [1,1,1]
-      g.data 'Too Many', [1,1,1]
-      g.write('test/output/_SHOULD_NOT_ACTUALLY_BE_WRITTEN.png')
-    }
-  end
-
-end