gruff 0.13.0 → 0.14.0

data/lib/gruff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gruff
-  VERSION = '0.13.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.13.0
+  version: 0.14.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: 2021-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -54,27 +54,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.10.2
 - !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.5.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !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,10 @@ 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 +158,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
@@ -171,6 +168,7 @@ 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.rb
 - lib/gruff/helper/stacked_mixin.rb
@@ -183,7 +181,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

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