gruff 0.11.0-java → 0.14.0-java

data/lib/gruff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gruff
-  VERSION = '0.11.0'
+  VERSION = '0.14.0'
 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.11.0
+  version: 0.14.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-12 00:00:00.000000000 Z
+date: 2021-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: simplecov
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -90,22 +104,18 @@ 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
-- Rakefile
-- assets/plastik/blue.png
-- assets/plastik/green.png
-- assets/plastik/red.png
-- docker/Dockerfile
-- docker/build.sh
-- docker/launch.sh
+- assets/fonts/LICENSE.txt
+- assets/fonts/Roboto-Bold.ttf
+- assets/fonts/Roboto-Regular.ttf
 - gruff.gemspec
 - init.rb
 - lib/gruff.rb
@@ -116,8 +126,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
@@ -128,7 +139,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
@@ -148,7 +158,7 @@ files:
 - lib/gruff/spider.rb
 - lib/gruff/stacked_area.rb
 - lib/gruff/stacked_bar.rb
-- lib/gruff/store/base_data.rb
+- lib/gruff/store/basic_data.rb
 - lib/gruff/store/custom_data.rb
 - lib/gruff/store/store.rb
 - lib/gruff/store/xy_data.rb
@@ -169,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,26 +0,0 @@
-language: ruby
-dist: bionic
-cache: bundler
-
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - jruby-1.7.27
-  - jruby-9.0.5.0
-  - jruby-9.1.17.0
-  - jruby-9.2.11.1
-
-jobs:
-  include:
-    - name: 'Lint'
-      rvm: 2.3
-      script: bundle exec rubocop
-
-addons:
-  apt:
-    packages:
-      - gsfonts
-      - ghostscript

data/Rakefile

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require 'rake/clean'
-
-CLEAN.concat %w[pkg test/output/*]
-
-desc 'Run tests'
-task default: :test
-
-task gem: :build
-
-Rake::TestTask.new
-
-namespace :test do
-  desc 'Run mini tests'
-  task mini: :clean do
-    Dir['test/test_mini*'].each do |file|
-      system "ruby #{file}"
-    end
-  end
-
-  desc 'Update expected image with output'
-  task :"image:update" do
-    require 'rmagick'
-    require 'fileutils'
-
-    update_expected_images = lambda do |expect_dir, output_dir|
-      Dir.glob("#{output_dir}/*.png") do |output_path|
-        file_name = File.basename(output_path)
-        expected_path = "#{expect_dir}/#{file_name}"
-
-        expected_image = Magick::Image.read(expected_path).first
-        output_image = Magick::Image.read(output_path).first
-        _, error = expected_image.compare_channel(output_image, Magick::PeakAbsoluteErrorMetric)
-
-        if error != 0.0
-          FileUtils.copy(output_path, expected_path)
-        end
-      end
-    end
-
-    update_expected_images.call('test/expected', 'test/output')
-    update_expected_images.call('test/expected_java', 'test/output_java')
-  end
-end

data/docker/Dockerfile

@@ -1,14 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt update && apt install -y gcc libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev \
-    libmagickwand-dev wget git pkg-config && \
-    wget https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.1.tar.gz && \
-    tar xvzf ruby-2.7.1.tar.gz && \
-    cd ruby-2.7.1 && \
-    ./configure --prefix=/usr --disable-install-rdoc && \
-    make -j install && \
-    cd .. && rm -rf ruby-2.7.1 && \
-    gem install bundler -v 1.17.3 && \
-    /usr/bin/bundle config set --local path 'vendor/bundle'
-
-WORKDIR /opt/gruff

data/docker/build.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-script_dir=$(cd $(dirname ${BASH_SOURCE:-$0}); pwd)
-docker build -t gruff ${script_dir}

data/docker/launch.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-prject_dir="$(cd $(dirname ${BASH_SOURCE:-$0}); pwd)/.."
-docker run -v $prject_dir:/opt/gruff --rm -it gruff bash

data/lib/gruff/helper/bar_value_label_mixin.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-# @private
-module Gruff::Base::BarValueLabelMixin
-  class BarValueLabel
-    attr_accessor :coordinates, :values
-
-    def initialize(size, bar_width)
-      @coordinates = Array.new(size)
-      @values = Hash.new(0)
-      @bar_width = bar_width
-    end
-
-    def prepare_rendering(format)
-      @coordinates.each_with_index do |(left_x, left_y, right_x, _right_y), index|
-        value = @values[index]
-        val = (format || '%.2f') % value
-        y = value >= 0 ? left_y - 30 : left_y + 12
-        yield left_x + (right_x - left_x) / 2, y, val.commify
-      end
-    end
-
-    def prepare_sidebar_rendering(format)
-      @coordinates.each_with_index do |(_left_x, _left_y, right_x, right_y), index|
-        val = (format || '%.2f') % @values[index]
-        yield right_x + 40, right_y - @bar_width / 2, val.commify
-      end
-    end
-  end
-end

data/lib/gruff/photo_bar.rb

@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-
-require 'gruff/base'
-
-# 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
-
-    Gruff::Renderer.finish
-  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