gruff 0.6.0-java → 0.7.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dcf399d4935b793e35aa2e4a23fb653e149f2da
-  data.tar.gz: 9165805bf7719fb68924645d694cc189095b39b7
+  metadata.gz: 23a3a98ace70f4492d644b51741d2f38bc88b3b3
+  data.tar.gz: 511bd56dafa57f4f85551d9773ef7e343f76408b
 SHA512:
-  metadata.gz: ebc6235ed48788da4152060d8a5cf54c75a7eab654628af66a0c63743fb3951a6038dd89e15802008a0fc574c284d2386f9bb3ad446eaa965f4794cff9c9f559
-  data.tar.gz: af643a3a4fad7a7ab8e6fd25c186eb002d3e3b62760db781be5168417768d7973a5e365f214d87ffbc4933d9d5e1caa9eb5885686e33c915eb9b73dd6d5d2ac9
+  metadata.gz: 9d1bf98f7cbbfe3894ffde3452c56c5ea9d8519d050d12f38a287d45bd07509bfcf0b2fa1481e56ec6fb41ad30ccef77490ff71920e7f7833ab855399bc85986
+  data.tar.gz: 466badcad6c4c7bc2aa025cb11e3dcbf571e96467571bfbdf64829f1132aab50c689d0be6ddea61d240ace60c78c85d99fdb5785147143173cc951c8f2140cf1

data/.travis.yml

@@ -1,17 +1,19 @@
 language: ruby
 sudo: false
 rvm:
-  - "1.8.7"
   - "1.9.3"
   - "2.0.0"
   - "2.1"
   - "2.2"
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-20mode
+  - "2.3.1"
+  - jruby-1.7.25
+  - jruby-9.0.5.0
+  - jruby-9.1.2.0
   - jruby-head
   - rbx
   - rbx-2
+before_install:
+  - gem query -i -n ^bundler$ > /dev/null || gem install --no-ri --no-rdoc bundler
 notifications:
   email:
     - uwe@kubosch.no

data/Gemfile

@@ -2,9 +2,3 @@ source 'http://rubygems.org'
 
 # Specify your gem's dependencies in gruff.gemspec
 gemspec
-
-group :test do
-  if RUBY_VERSION =~ /^1\.9\./ || RUBY_VERSION =~ /^2\./
-    gem 'minitest-reporters', '<1.0.0'
-  end
-end

data/README.md

@@ -1,7 +1,7 @@
 # Gruff Graphs
 
-[![Build Status](https://travis-ci.org/topfunky/gruff.png?branch=master)](https://travis-ci.org/topfunky/gruff)
-[![Gem Version](https://badge.fury.io/rb/gruff.png)](http://badge.fury.io/rb/gruff)
+[![Build Status](https://travis-ci.org/topfunky/gruff.svg?branch=master)](https://travis-ci.org/topfunky/gruff)
+[![Gem Version](https://badge.fury.io/rb/gruff.svg)](https://badge.fury.io/rb/gruff)
 
 A library for making beautiful graphs.
 
@@ -117,6 +117,10 @@ In progress!
 
 http://www.rubydoc.info/github/topfunky/gruff/frames
 
+## Supported Ruby Versions
+
+We aim to support all Ruby implementations supporting Ruby language level 1.9.3
+or later.  Currently we are running CI for MRI, JRuby, and Rubinius.
 
 ## Contributing
 

data/Rakefile

@@ -3,7 +3,7 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rake/clean'
 
-CLEAN << %w(pkg test/output/*)
+CLEAN.concat %w(pkg test/output/*)
 
 desc 'Run tests'
 task :default => :test

data/gruff.gemspec

@@ -15,16 +15,18 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://github.com/topfunky/gruff}
   s.require_paths = %w(lib)
   s.summary = %q{Beautiful graphs for one or multiple datasets.}
+  s.license = 'MIT'
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.executables = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   s.specification_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+  s.required_ruby_version = ['>= 1.9.3', '< 3']
+
   if defined? JRUBY_VERSION
     s.platform = 'java'
-    s.add_dependency 'rmagick4j', '>= 0.3.9'
+    s.add_dependency 'rmagick4j', '~> 0.3', '>= 0.3.9'
   else
-    s.add_dependency 'rmagick', '>= 2.13.4'
+    s.add_dependency 'rmagick', '~> 2.13', '>= 2.13.4'
   end
   s.add_development_dependency('rake')
-  s.add_development_dependency('test-unit')
-  s.license = 'MIT'
+  s.add_development_dependency('minitest-reporters')
 end

data/lib/gruff/base.rb

@@ -82,7 +82,8 @@ module Gruff
     # A label for the left side of the graph
     attr_accessor :y_axis_label
 
-    # attr_accessor :x_axis_increment
+    # Manually set increment of the vertical marking lines
+    attr_accessor :x_axis_increment
 
     # Manually set increment of the horizontal marking lines
     attr_accessor :y_axis_increment
@@ -118,7 +119,7 @@ module Gruff
     attr_reader :font
 
     # Same as font but for the title.
-    attr_reader :title_font
+    attr_accessor :title_font
     
     # Specifies whether to draw the title bolded or not.
     attr_accessor :bold_title
@@ -242,19 +243,23 @@ module Gruff
       @raw_columns = 800.0
       @raw_rows = 800.0 * (@rows/@columns)
       @column_count = 0
+      @data = Array.new
       @marker_count = nil
       @maximum_value = @minimum_value = nil
       @has_data = false
-      @data = Array.new
+      @increment = nil
       @labels = Hash.new
+      @label_formatting = nil
       @labels_seen = Hash.new
       @sort = false
+      @sorted_drawing = false
       @title = nil
+      @title_font = nil
 
       @scale = @columns / @raw_columns
 
       vera_font_path = File.expand_path('Vera.ttf', ENV['MAGICK_FONT_PATH'])
-      @font = File.exists?(vera_font_path) ? vera_font_path : nil
+      @font = File.exist?(vera_font_path) ? vera_font_path : nil
       @bold_title = true
 
       @marker_font_size = 21.0
@@ -280,6 +285,8 @@ module Gruff
       @additional_line_colors = []
       @theme_options = {}
 
+      @use_data_label = false
+      @x_axis_increment = nil
       @x_axis_label = @y_axis_label = nil
       @y_axis_increment = nil
       @stacked = nil
@@ -297,11 +304,6 @@ module Gruff
       @d.font = @font
     end
 
-    # Sets the title font to the font at +font_path+
-    def title_font=(font_path)
-      @title_font = font_path
-    end
-
     # Add a color to the list of available colors for lines.
     #
     # Example:
@@ -836,7 +838,7 @@ module Gruff
         # TODO: See if index.odd? is the best stragegy
         y_offset += @label_stagger_height if index.odd?
 
-        label_text = @labels[index]
+        label_text = labels[index].to_s
 
         # TESTME
         # FIXME: Consider chart types other than bar

data/lib/gruff/bullet.rb

@@ -58,7 +58,7 @@ class Gruff::Bullet < Gruff::Base
     @margin       = 30.0
     @thickness    = @raw_rows / 6.0
     @right_margin = @margin
-    @graph_left   = @title_width * 1.3 rescue @margin # HACK Need to calculate real width
+    @graph_left   = (@title && (@title_width * 1.3)) || @margin
     @graph_width  = @raw_columns - @graph_left - @right_margin
     @graph_height = @thickness * 3.0
 

data/lib/gruff/line.rb

@@ -25,6 +25,9 @@ class Gruff::Line < Gruff::Base
   attr_accessor :line_width
   attr_accessor :dot_radius
 
+  # default is a circle, other options include square
+  attr_accessor :dot_style
+
   # Hide parts of the graph to fit more datapoints, or for a different appearance.
   attr_accessor :hide_dots, :hide_lines
 
@@ -67,7 +70,7 @@ class Gruff::Line < Gruff::Base
   #  g = Gruff::Line.new(400, false) # 400px wide, no lines (for backwards compatibility)
   #
   #  g = Gruff::Line.new(false) # Defaults to 800px wide, no lines (for backwards compatibility)
-  # 
+  #
   # The preferred way is to call hide_dots or hide_lines instead.
   def initialize(*args)
     raise ArgumentError, 'Wrong number of arguments' if args.length > 2
@@ -84,6 +87,10 @@ class Gruff::Line < Gruff::Base
     @hide_dots = @hide_lines = false
     @maximum_x_value = nil
     @minimum_x_value = nil
+
+    @dot_style = 'circle'
+
+    @show_vertical_markers = false
   end
 
   # This method allows one to plot a dataset with both X and Y data.
@@ -101,7 +108,7 @@ class Gruff::Line < Gruff::Base
   #   color: hex number indicating the line color as an RGB triplet
   #
   #  Notes:
-  #   -if (x_data_points.length != y_data_points.length) an error is 
+  #   -if (x_data_points.length != y_data_points.length) an error is
   #     returned.
   #   -if the color argument is nil, the next color from the default theme will
   #     be used.
@@ -115,7 +122,7 @@ class Gruff::Line < Gruff::Base
   #   g.dataxy("Bapples", [1,3,4,5,7,9], [1, 1, 2, 2, 3, 3])
   #   g.dataxy("Capples", [[1,1],[2,3],[3,4],[4,5],[5,7],[6,9]])
   #   #you can still use the old data method too if you want:
-  #   g.data("Capples", [1, 1, 2, 2, 3, 3])  
+  #   g.data("Capples", [1, 1, 2, 2, 3, 3])
   #   #labels will be drawn at the x locations of the keys passed in.
   #   In this example the lables are drawn at x positions 2, 4, and 6:
   #   g.labels = {0 => '2003', 2 => '2004', 4 => '2005', 6 => '2006'}
@@ -178,7 +185,7 @@ class Gruff::Line < Gruff::Base
 
     return unless @has_data
 
-    # Check to see if more than one datapoint was given. NaN can result otherwise.  
+    # Check to see if more than one datapoint was given. NaN can result otherwise.
     @x_increment = (@column_count > 1) ? (@graph_width / (@column_count - 1).to_f) : @graph_width
 
     @reference_lines.each_value do |curr_reference_line|
@@ -246,9 +253,12 @@ class Gruff::Line < Gruff::Base
           @d = @d.line(prev_x, prev_y, new_x, new_y)
         elsif @one_point
           # Show a circle if there's just one_point
-          @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y)
+          @d = DotRenderers.renderer(@dot_style).render(@d, new_x, new_y, circle_radius)
+        end
+
+        unless @hide_dots
+          @d = DotRenderers.renderer(@dot_style).render(@d, new_x, new_y, circle_radius)
         end
-        @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y) unless @hide_dots
 
         prev_x, prev_y = new_x, new_y
       end
@@ -281,7 +291,7 @@ class Gruff::Line < Gruff::Base
 
     @reference_lines.each_value do |curr_reference_line|
 
-      # We only care about horizontal markers ... for normalization. 
+      # We only care about horizontal markers ... for normalization.
       # Vertical markers won't have a :value, they will have an :index
 
       curr_reference_line[:norm_value] = ((curr_reference_line[:value].to_f - @minimum_value) / @spread.to_f) if (curr_reference_line.key?(:value))
@@ -326,4 +336,30 @@ class Gruff::Line < Gruff::Base
     one_point
   end
 
+  module DotRenderers
+    class Circle
+      def render(d, new_x, new_y, circle_radius)
+        d.circle(new_x, new_y, new_x - circle_radius, new_y)
+      end
+    end
+
+    class Square
+      def render(d, new_x, new_y, circle_radius)
+        offset = (circle_radius * 0.8).to_i
+        corner_1 = new_x - offset
+        corner_2 = new_y - offset
+        corner_3 = new_x + offset
+        corner_4 = new_y + offset
+        d.rectangle(corner_1, corner_2, corner_3, corner_4)
+      end
+    end
+
+    def self.renderer(style)
+      if style.to_s == 'square'
+        Square.new
+      else
+        Circle.new
+      end
+    end
+  end
 end

data/lib/gruff/mini/legend.rb

@@ -4,6 +4,12 @@ module Gruff
 
       attr_accessor :hide_mini_legend, :legend_position
 
+      def initialize(*)
+        @hide_mini_legend = false
+        @legend_position = nil
+        super
+      end
+
       ##
       # The canvas needs to be bigger so we can put the legend beneath it.
 
@@ -45,7 +51,6 @@ module Gruff
         return if @hide_mini_legend
 
         legend_square_width = 40.0 # small square with color of this item
-        legend_square_margin = 10.0
         @legend_left_margin = 100.0
         legend_top_margin = 40.0
 

data/lib/gruff/pie.rb

@@ -17,107 +17,255 @@ class Gruff::Pie < Gruff::Base
 
   # Can be used to make the pie start cutting slices at the top (-90.0)
   # or at another angle. Default is 0.0, which starts at 3 o'clock.
-  attr_accessor :zero_degree
+  attr_writer :zero_degree
+
   # Do not show labels for slices that are less than this percent. Use 0 to always show all labels.
   # Defaults to 0
-  attr_accessor :hide_labels_less_than
+  attr_writer :hide_labels_less_than
+
   # Affect the distance between the percentages and the pie chart
   # Defaults to 0.15
-  attr_accessor :text_offset_percentage
+  attr_writer :text_offset_percentage
+
   ## Use values instead of percentages
   attr_accessor :show_values_as_labels
 
   def initialize_ivars
     super
-    @zero_degree = 0.0
-    @hide_labels_less_than = 0.0
-    @text_offset_percentage = DEFAULT_TEXT_OFFSET_PERCENTAGE
+
     @show_values_as_labels = false
   end
 
+  def zero_degree
+    @zero_degree ||= 0.0
+  end
+
+  def hide_labels_less_than
+    @hide_labels_less_than ||= 0.0
+  end
+
+  def text_offset_percentage
+    @text_offset_percentage ||= DEFAULT_TEXT_OFFSET_PERCENTAGE
+  end
+
+  def options
+    {
+      :zero_degree            => zero_degree,
+      :hide_labels_less_than  => hide_labels_less_than,
+      :text_offset_percentage => text_offset_percentage,
+      :show_values_as_labels  => show_values_as_labels
+    }
+  end
+
   def draw
-    @hide_line_markers = true
-    
+    hide_line_markers
+
     super
 
-    return unless @has_data
-
-    diameter = @graph_height
-    radius = ([@graph_width, @graph_height].min / 2.0) * 0.8
-    center_x = @graph_left + (@graph_width / 2.0)
-    center_y = @graph_top + (@graph_height / 2.0) - 10 # Move graph up a bit
-    total_sum = sums_for_pie()
-    prev_degrees = @zero_degree
-
-    # Use full data since we can easily calculate percentages
-    data = (@sort ? @data.sort{ |a, b| a[DATA_VALUES_INDEX].first <=> b[DATA_VALUES_INDEX].first } : @data)
-    data.each do |data_row|
-      if data_row[DATA_VALUES_INDEX].first > 0
-        @d = @d.stroke data_row[DATA_COLOR_INDEX]
-        @d = @d.fill 'transparent'
-        @d.stroke_width(radius) # stroke width should be equal to radius. we'll draw centered on (radius / 2)
-
-        current_degrees = (data_row[DATA_VALUES_INDEX].first / total_sum) * 360.0 
-
-        # ellipse will draw the the stroke centered on the first two parameters offset by the second two.
-        # therefore, in order to draw a circle of the proper diameter we must center the stroke at
-        # half the radius for both x and y
-        @d = @d.ellipse(center_x, center_y, 
-                  radius / 2.0, radius / 2.0,
-                  prev_degrees, prev_degrees + current_degrees + 0.5) # <= +0.5 'fudge factor' gets rid of the ugly gaps
-                  
-        half_angle = prev_degrees + ((prev_degrees + current_degrees) - prev_degrees) / 2
-        
-        label_val = ((data_row[DATA_VALUES_INDEX].first / total_sum) * 100.0).round
-        unless label_val < @hide_labels_less_than
-          # RMagick must use sprintf with the string and % has special significance.
-          label_string = @show_values_as_labels ? data_row[DATA_VALUES_INDEX].first.to_s : label_val.to_s + '%'
-          @d = draw_label(center_x,center_y, half_angle,
-                          radius + (radius * @text_offset_percentage),
-                          label_string)
-        end
-
-        prev_degrees += current_degrees
+    return unless data_given?
+
+    slices.each do |slice|
+      if slice.value > 0
+        set_stroke_color slice
+        set_fill_color
+        set_stroke_width
+        set_drawing_points_for slice
+        process_label_for slice
+        update_chart_degrees_with slice.degrees
       end
     end
 
-    # TODO debug a circle where the text is drawn...
-    
+    trigger_final_draw
+  end
+
+  private
+
+  def slices
+    @slices ||= begin
+      slices = @data.map { |data| slice_class.new(data, options) }
+
+      slices.sort_by(&:value) if @sort
+
+      total = slices.map(&:value).inject(:+).to_f
+      slices.each { |slice| slice.total = total }
+    end
+  end
+
+  # General Helper Methods
+
+  def hide_line_markers
+    @hide_line_markers = true
+  end
+
+  def data_given?
+    @has_data
+  end
+
+  def update_chart_degrees_with(degrees)
+    @chart_degrees = chart_degrees + degrees
+  end
+
+  def slice_class
+    PieSlice
+  end
+
+  # Spatial Value-Related Methods
+
+  def chart_degrees
+    @chart_degrees ||= zero_degree
+  end
+
+  def graph_height
+    @graph_height
+  end
+
+  def graph_width
+    @graph_width
+  end
+
+  def diameter
+    graph_height
+  end
+
+  def half_width
+    graph_width / 2.0
+  end
+
+  def half_height
+    graph_height / 2.0
+  end
+
+  def radius
+    @radius ||= ([graph_width, graph_height].min / 2.0) * 0.8
+  end
+
+  def center_x
+    @center_x ||= @graph_left + half_width
+  end
+
+  def center_y
+    @center_y ||= @graph_top + half_height - 10
+  end
+
+  def distance_from_center
+    20.0
+  end
+
+  def radius_offset
+    radius + (radius * text_offset_percentage) + distance_from_center
+  end
+
+  def ellipse_factor
+    radius_offset * text_offset_percentage
+  end
+
+  # Label-Related Methods
+
+  def process_label_for(slice)
+    if slice.percentage >= hide_labels_less_than
+      x, y  = label_coordinates_for slice
+
+      @d = draw_label(x, y, slice.label)
+    end
+  end
+
+  def label_coordinates_for(slice)
+    angle = chart_degrees + slice.degrees / 2
+
+    [x_label_coordinate(angle), y_label_coordinate(angle)]
+  end
+
+  def x_label_coordinate(angle)
+    center_x + ((radius_offset + ellipse_factor) * Math.cos(deg2rad(angle)))
+  end
+
+  def y_label_coordinate(angle)
+    center_y + (radius_offset * Math.sin(deg2rad(angle)))
+  end
+
+  # Drawing-Related Methods
+
+  def set_stroke_width
+    @d.stroke_width(radius)
+  end
+
+  def set_stroke_color(slice)
+    @d = @d.stroke slice.color
+  end
+
+  def set_fill_color
+    @d = @d.fill 'transparent'
+  end
+
+  def set_drawing_points_for(slice)
+    @d = @d.ellipse(
+      center_x,
+      center_y,
+      radius / 2.0,
+      radius / 2.0,
+      chart_degrees,
+      chart_degrees + slice.degrees + 0.5
+    )
+  end
+
+  def trigger_final_draw
     @d.draw(@base_image)
   end
 
-private
-
-  ##
-  # Labels are drawn around a slightly wider ellipse to give room for 
-  # labels on the left and right.
-  def draw_label(center_x, center_y, angle, radius, amount)
-    # TODO Don't use so many hard-coded numbers
-    r_offset = 20.0      # The distance out from the center of the pie to get point
-    x_offset = center_x  # + 15.0 # The label points need to be tweaked slightly
-    y_offset = center_y  # This one doesn't though
-    radius_offset = (radius + r_offset)
-    ellipse_factor = radius_offset * @text_offset_percentage
-    x = x_offset + ((radius_offset + ellipse_factor) * Math.cos(deg2rad(angle)))
-    y = y_offset + (radius_offset * Math.sin(deg2rad(angle)))
-    
-    # Draw label
-    @d.fill = @font_color
-    @d.font = @font if @font
-    @d.pointsize = scale_fontsize(@marker_font_size)
-    @d.stroke = 'transparent'
+  def configure_label_styling
+    @d.fill        = @font_color
+    @d.font        = @font if @font
+    @d.pointsize   = scale_fontsize(@marker_font_size)
+    @d.stroke      = 'transparent'
     @d.font_weight = BoldWeight
-    @d.gravity = CenterGravity
-    @d.annotate_scaled( @base_image, 
-                      0, 0,
-                      x, y, 
-                      amount, @scale)
+    @d.gravity     = CenterGravity
   end
 
-  def sums_for_pie
-    total_sum = 0.0
-    @data.collect {|data_row| total_sum += data_row[DATA_VALUES_INDEX].first }
-    total_sum
+  def draw_label(x, y, value)
+    configure_label_styling
+
+    @d.annotate_scaled(
+      @base_image,
+      0,
+      0,
+      x,
+      y,
+      value,
+      @scale
+    )
   end
 
+  # Helper Classes
+
+  class PieSlice < Struct.new(:data_array, :options)
+    attr_accessor :total
+
+    def name
+      data_array[0]
+    end
+
+    def value
+      data_array[1].first
+    end
+
+    def color
+      data_array[2]
+    end
+
+    def size
+      @size ||= value / total
+    end
+
+    def percentage
+      @percentage ||= (size * 100.0).round
+    end
+
+    def degrees
+      @degrees ||= size * 360.0
+    end
+
+    def label
+      options[:show_values_as_labels] ? value.to_s : "#{percentage}%"
+    end
+  end
 end

data/lib/gruff/scatter.rb

@@ -32,6 +32,25 @@ class Gruff::Scatter < Gruff::Base
 	
   #~ # Color of the horizontal baseline
   #~ attr_accessor :baseline_x_color
+
+  # Attributes to allow customising the size of the points
+  attr_accessor :circle_radius
+  attr_accessor :stroke_width
+
+  # Allow disabling the significant rounding when labeling the X axis
+  # This is useful when working with a small range of high values (for example, a date range of months, while seconds as units)
+  attr_accessor :disable_significant_rounding_x_axis
+
+  # Allow enabling vertical lines. When you have a lot of data, they can work great
+  attr_accessor :enable_vertical_line_markers
+
+  # Allow using vertical labels in the X axis (and setting the label margin)
+  attr_accessor :x_label_margin
+  attr_accessor :use_vertical_x_labels
+
+  # Allow passing lambdas to format labels
+  attr_accessor :y_axis_label_format
+  attr_accessor :x_axis_label_format
   
   
   # Gruff::Scatter takes the same parameters as the Gruff::Line graph
@@ -40,13 +59,21 @@ class Gruff::Scatter < Gruff::Base
   #
   # g = Gruff::Scatter.new
   #
-  def initialize(*args)
-    super(*args)
-    
-    @maximum_x_value = @minimum_x_value = nil
+  def initialize(*)
+    super
+
     @baseline_x_color = @baseline_y_color = 'red'
     @baseline_x_value = @baseline_y_value = nil
+    @circle_radius = nil
+    @disable_significant_rounding_x_axis = false
+    @enable_vertical_line_markers = false
     @marker_x_count = nil
+    @maximum_x_value = @minimum_x_value = nil
+    @stroke_width = nil
+    @use_vertical_x_labels = false
+    @x_axis_label_format = nil
+    @x_label_margin = nil
+    @y_axis_label_format = nil
   end
 
   def setup_drawing
@@ -94,9 +121,9 @@ class Gruff::Scatter < Gruff::Base
         @d = @d.stroke data_row[DATA_COLOR_INDEX]
         @d = @d.fill data_row[DATA_COLOR_INDEX]
         @d = @d.stroke_opacity 1.0
-        @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 4), 5.0)
+        @d = @d.stroke_width @stroke_width || clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 4), 5.0)
 
-        circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 2.5), 5.0)
+        circle_radius = @circle_radius || clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 2.5), 5.0)
         @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y)
       end
     end
@@ -173,7 +200,7 @@ protected
     @x_spread = @x_spread > 0 ? @x_spread : 1
   end
   
-  def normalize(force=@xy_normalize)
+  def normalize(force=nil)
     if @norm_data.nil? || force 
       @norm_data = []
       return unless @has_data
@@ -212,7 +239,10 @@ protected
         end
         @marker_x_count ||= 4
       end
-      @x_increment = (@x_spread > 0) ? significant(@x_spread / @marker_x_count) : 1
+      @x_increment = (@x_spread > 0) ? (@x_spread / @marker_x_count) : 1
+      unless @disable_significant_rounding_x_axis
+        @x_increment = significant(@x_increment)
+      end
     else
       # TODO Make this work for negative values
       @maximum_x_value = [@maximum_value.ceil, @x_axis_increment].max
@@ -228,15 +258,17 @@ protected
     # Draw vertical line markers and annotate with numbers
     (0..@marker_x_count).each do |index|
 
-      # TODO Fix the vertical lines.  Not pretty when they don't match up with top y-axis line
-      # x = @graph_left + @graph_width - index.to_f * @increment_x_scaled
-      # @d = @d.stroke(@marker_color)
-      # @d = @d.stroke_width 1
-      # @d = @d.line(x, @graph_top, x, @graph_bottom)
+      # TODO Fix the vertical lines, and enable them by default. Not pretty when they don't match up with top y-axis line
+      if @enable_vertical_line_markers
+        x = @graph_left + @graph_width - index.to_f * @increment_x_scaled
+        @d = @d.stroke(@marker_color)
+        @d = @d.stroke_width 1
+        @d = @d.line(x, @graph_top, x, @graph_bottom)
+      end
 
       unless @hide_line_numbers
         marker_label = index * @x_increment + @minimum_x_value.to_f
-        y_offset = @graph_bottom + LABEL_MARGIN 
+        y_offset = @graph_bottom + (@x_label_margin || LABEL_MARGIN)
         x_offset = get_x_coord(index.to_f, @increment_x_scaled, @graph_left)
 
         @d.fill = @font_color
@@ -244,16 +276,34 @@ protected
         @d.stroke('transparent')
         @d.pointsize = scale_fontsize(@marker_font_size)
         @d.gravity = NorthGravity
-        
+        @d.rotation = -90.0 if @use_vertical_x_labels
         @d = @d.annotate_scaled(@base_image, 
                           1.0, 1.0, 
                           x_offset, y_offset, 
-                          label(marker_label, @x_increment), @scale)
+                          vertical_label(marker_label, @x_increment), @scale)
+        @d.rotation = 90.0 if @use_vertical_x_labels
       end
     end
     
     @d = @d.stroke_antialias true
   end
+
+
+  def label(value, increment)
+    if @y_axis_label_format
+      @y_axis_label_format.call(value)
+    else
+      super
+    end
+  end
+
+  def vertical_label(value, increment)
+    if @x_axis_label_format
+      @x_axis_label_format.call(value)
+    else
+      label(value, increment)
+    end
+  end
   
 private
   

data/lib/gruff/spider.rb

@@ -24,7 +24,7 @@ class Gruff::Spider < Gruff::Base
   def initialize(max_value, target_width = 800)
     super(target_width)
     @max_value = max_value
-    @hide_legend = true;
+    @hide_legend = true
     @rotation = 0
   end
   
@@ -36,20 +36,14 @@ class Gruff::Spider < Gruff::Base
     return unless @has_data
 
     # Setup basic positioning
-    diameter = @graph_height
     radius = @graph_height / 2.0
-    top_x = @graph_left + (@graph_width - diameter) / 2.0
     center_x = @graph_left + (@graph_width / 2.0)
     center_y = @graph_top + (@graph_height / 2.0) - 25 # Move graph up a bit
 
     @unit_length = radius / @max_value
         
-    total_sum = sums_for_spider
-    prev_degrees = 0.0
     additive_angle = (2 * Math::PI)/ @data.size
     
-    current_angle = rotation * Math::PI / 180.0
-
     # Draw axes
     draw_axes(center_x, center_y, radius, additive_angle) unless hide_axes    
 
@@ -125,7 +119,7 @@ private
   end
 
   def sums_for_spider
-    @data.inject(0.0) {|sum, data_row| sum += data_row[DATA_VALUES_INDEX].first}
+    @data.inject(0.0) {|sum, data_row| sum + data_row[DATA_VALUES_INDEX].first}
   end
 
 end

data/lib/gruff/version.rb

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

data/test/gruff_test_case.rb

@@ -2,7 +2,6 @@ $:.unshift(File.dirname(__FILE__) + '/../lib/')
 
 RMAGICK_BYPASS_VERSION_TEST = true
 
-require 'test/unit'
 require 'gruff'
 require 'fileutils'
 
@@ -10,10 +9,9 @@ TEST_OUTPUT_DIR = File.dirname(__FILE__) + "/output#{'_java' if RUBY_PLATFORM ==
 FileUtils.mkdir_p(TEST_OUTPUT_DIR)
 FileUtils.rm_f Dir[TEST_OUTPUT_DIR + '/*']
 
-if ENV['RM_INFO'] && RUBY_VERSION =~ /^(1\.9|2\.0)\./
-  require 'minitest/reporters'
-  MiniTest::Reporters.use!
-end
+require 'minitest/autorun'
+require 'minitest/reporters'
+Minitest::Reporters.use!
 
 class Gruff::Base
   alias :write_org :write
@@ -23,7 +21,7 @@ class Gruff::Base
     extension = filename.slice(/\.[^\.]*$/)
     testfilename = File.join(TEST_OUTPUT_DIR, basefilename) + extension
     counter = 0
-    while File.exists?(testfilename)
+    while File.exist?(testfilename)
       counter += 1
       testfilename = File.join(TEST_OUTPUT_DIR, basefilename) + "-#{counter}#{extension}"
     end
@@ -31,7 +29,7 @@ class Gruff::Base
   end
 end
 
-class GruffTestCase < Test::Unit::TestCase
+class GruffTestCase < Minitest::Test
   def setup
     srand 42
     @datasets = [
@@ -106,7 +104,7 @@ class GruffTestCase < Test::Unit::TestCase
     basefilename = filename.split('.')[0..-2].join('.')
     extension = filename.slice(/\..*$/)
     counter = 0
-    while File.exists? testfilename
+    while File.exist? testfilename
       counter += 1
       testfilename = [TEST_OUTPUT_DIR, basefilename].join('/') + "-#{counter}#{extension}"
     end

data/test/test_accumulator_bar.rb

@@ -40,7 +40,7 @@ class TestGruffAccumulatorBar < GruffTestCase
   end
 
   def test_too_many_args
-    assert_raise(Gruff::IncorrectNumberOfDatasetsException) {
+    assert_raises(Gruff::IncorrectNumberOfDatasetsException) {
       g = Gruff::AccumulatorBar.new
       g.data 'First', [1,1,1]
       g.data 'Too Many', [1,1,1]

data/test/test_bar.rb

@@ -259,11 +259,11 @@ class TestGruffBar < GruffTestCase
   def test_spacing_factor_does_not_accept_values_lt_0_and_gt_1
     g = Gruff::Bar.new
 
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       g.spacing_factor = 1.01
     end
 
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       g.spacing_factor = -0.01
     end
   end

data/test/test_base.rb

@@ -4,5 +4,30 @@ require File.dirname(__FILE__) + "/gruff_test_case"
 
 class TestGruffBase < GruffTestCase
 
+  def setup
+    @sample_numeric_labels = {
+        0 => 6,
+        1 => 15,
+        2 => 24,
+        3 => 30,
+        4 => 4,
+        5 => 12,
+        6 => 21,
+        7 => 28,
+    }
+  end
 
-end
+  def test_labels_can_be_any_object
+    g = Gruff::Bar.new
+    g.title = 'Bar Graph With Manual Colors'
+    g.legend_margin = 50
+    g.labels = @sample_numeric_labels
+    g.data(:Art, [0, 5, 8, 15], '#990000')
+    g.data(:Philosophy, [10, 3, 2, 8], '#009900')
+    g.data(:Science, [2, 15, 8, 11], '#990099')
+
+    g.minimum_value = 0
+
+    g.write('test/output/bar_object_labels.png')
+  end
+end

data/test/test_bullet.rb

@@ -13,13 +13,13 @@ class TestGruffBullet < GruffTestCase
   def test_bullet_graph
     g = Gruff::Bullet.new
     g.title = "Monthly Revenue"
-    g.data *@data_args
+    g.data(*@data_args)
     g.write("test/output/bullet_greyscale.png")
   end
 
   def test_no_options
     g = Gruff::Bullet.new
-    g.data *@data_args
+    g.data(*@data_args)
     g.write("test/output/bullet_no_options.png")
   end
 

data/test/test_dot.rb

@@ -234,11 +234,11 @@ class TestGruffDot < GruffTestCase
     g.hide_legend = true
     g.title = 'Full speed ahead'
     g.labels = (0..10).inject({}) { |memo, i| memo.merge({ i => (i*10).to_s}) }
-    g.data(:apples, (0..9).map { rand(20)/10.0 })
+    g.data(:apples, [1.7, 0.8, 0.1, 1.9, 1.4, 0.6, 1.1, 0.7, 1.4, 0.2])
     g.y_axis_increment = 1.0
     g.x_axis_label = 'Score (%)'
     g.y_axis_label = 'Students'
-    write_test_file g, 'enhancements.png'
+    write_test_file g, 'enhancements_dot.png'
   end
 
 

data/test/test_line.rb

@@ -192,6 +192,23 @@ class TestGruffLine < GruffTestCase
   end
 
 
+  def test_dot_style_square
+    g = Gruff::Line.new
+    g.title = 'Square points'
+    g.labels = {
+        0 => 'June',
+        10 => 'July',
+        30 => 'August',
+        50 => 'September',
+    }
+    g.dot_style = :square
+    g.data('many points', (0..50).collect { |i| rand(100) })
+    g.x_axis_label = 'Months'
+
+    # Default theme
+    g.write('test/output/line_dot_style_square.png')
+  end
+
   def test_similar_high_end_values
     @dataset = %w(29.43 29.459 29.498 29.53 29.548 29.589 29.619 29.66 29.689 29.849 29.878 29.74 29.769 29.79 29.808 29.828).collect { |i| i.to_f }
 
@@ -577,7 +594,7 @@ class TestGruffLine < GruffTestCase
     g.title = 'Line Chart WEBP'
     g.write('line_webp.webp')
   rescue Magick::ImageMagickError
-    assert_match /no encode delegate for this image format .*\.webp/, $!.message
+    assert_match(/no encode delegate for this image format .*\.webp/, $!.message)
   end
 
   private

data/test/test_pie.rb

@@ -127,7 +127,8 @@ class TestGruffPie < GruffTestCase
 
   
   def test_tiny_simple_pie
-    @datasets = (1..5).map {|n| ['Auto', [rand(100)]]}
+    r = Random.new(297427)
+    @datasets = (1..5).map {|n| ['Auto', [r.rand(100)]]}
 
     g = setup_basic_graph 200
     g.hide_legend = true
@@ -140,13 +141,25 @@ class TestGruffPie < GruffTestCase
     write_test_file g, "pie_simple.png"
   end
 
-   def test_pie_with_adjusted_text_offset_percentage
+  def test_pie_with_adjusted_text_offset_percentage
     g = setup_basic_graph
     g.title = "Adjusted Text Offset Percentage"
     g.text_offset_percentage = 0.03
     g.write "test/output/pie_adjusted_text_offset_percentage.png"
   end
 
+  def test_subclassed_pie_with_custom_labels
+    CustomLabeledPie.new(800).tap do |graph|
+      graph.title = "Subclassed Pie with Custom Lables"
+
+      @datasets.map { |set| set << set.join(': ') }.each do |data|
+        graph.data(data[0], data[1], :label => data[2])
+      end
+
+      graph.write 'test/output/pie_subclass_custom_labels.png'
+    end
+  end
+
 protected
 
   def setup_basic_graph(size=800)
@@ -157,5 +170,25 @@ protected
     end
     return g
   end
-  
+
+  # Example Gruff::Pie Subclass demonstrating custom labels
+  class CustomLabeledPie < Gruff::Pie
+    def data(name, data_points = [], options = {})
+      super(name, data_points, options[:color])
+
+      @data.each { |data_array| data_array << options[:label] }
+    end
+
+    private
+
+    def slice_class
+      CustomLabeledSlice
+    end
+
+    class CustomLabeledSlice < ::Gruff::Pie::PieSlice
+      def label
+        data_array[3] || super
+      end
+    end
+  end
 end

data/test/test_scatter.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/gruff_test_case'
 
-class TestGruffScatter < Test::Unit::TestCase
+class TestGruffScatter < Minitest::Test
 
   def setup
     @datasets = [
@@ -31,6 +31,43 @@ class TestGruffScatter < Test::Unit::TestCase
     g.write('test/output/scatter_many.png')
   end
 
+  def test_custom_label_format
+    g = Gruff::Scatter.new('1000x500')
+    g.top_margin = 0
+    g.hide_legend = true
+    g.hide_title = true
+    g.marker_font_size = 10
+    g.theme = {
+      :colors => ['#12a702', '#aedaa9'],
+      :marker_color => '#dddddd',
+      :font_color => 'black',
+      :background_colors => 'white'
+    }
+
+    # Points style
+    g.circle_radius = 1
+    g.stroke_width = 0.01
+
+    # Axis labels
+    g.x_label_margin = 40
+    g.bottom_margin = 60
+    g.disable_significant_rounding_x_axis = true
+    g.use_vertical_x_labels = true
+    g.enable_vertical_line_markers = true
+    g.marker_x_count = 50 # One label every 2 days
+    g.x_axis_label_format = lambda do |value|
+      DateTime.strptime(value.to_i.to_s,'%s').strftime('%d.%m.%Y')
+    end
+    g.y_axis_increment = 1
+
+    # Fake data (100 days, random times of day between 5 and 16)
+    r = Random.new(269155)
+    y_values = (0..100).map { 5 + r.rand(12) }
+    x_values = (0..100).map { |i| Date.today.strftime('%s').to_i + i*3600*24 }
+    g.data('many points', x_values, y_values)
+    g.write('test/output/scatter_custom_label_format.png')
+  end
+
   # Done
   def test_no_data
     g = Gruff::Scatter.new(400)
@@ -65,7 +102,7 @@ class TestGruffScatter < Test::Unit::TestCase
     ]
 
     @datasets.each do |data|
-      assert_raise ArgumentError do
+      assert_raises ArgumentError do
         g.data(*data)
       end
     end
@@ -82,7 +119,7 @@ class TestGruffScatter < Test::Unit::TestCase
     ]
 
     @datasets.each do |data|
-      assert_raise ArgumentError do
+      assert_raises ArgumentError do
         g.data(*data)
       end
     end
@@ -98,7 +135,7 @@ class TestGruffScatter < Test::Unit::TestCase
     ]
 
     @datasets.each do |data|
-      assert_raise ArgumentError do
+      assert_raises ArgumentError do
         g.data(*data)
       end
     end

data/test/test_sidestacked_bar.rb

@@ -87,7 +87,7 @@ class TestGruffSideStackedBar < GruffTestCase
      end
      g.show_labels_for_bar_values = true
      g.write "test/output/side_stacked_bar_labels.png"
-   end
+  end
 
 protected
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,12 +9,15 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.9
   name: rmagick4j
@@ -22,13 +25,16 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.9
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: rake
@@ -36,21 +42,21 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: test-unit
+  name: minitest-reporters
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Beautiful graphs for one or multiple datasets. Can be used on websites or in documents.
@@ -59,8 +65,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - History.txt
 - MIT-LICENSE
@@ -163,17 +169,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      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.4.6
+rubygems_version: 2.6.4
 signing_key:
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.