gruff 0.5.1-java → 0.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e5490ec337a0c19428786a0f662a98624db34c
-  data.tar.gz: 412f712794923a9d1cdc8dd1c8ceee6a002e2ce1
+  metadata.gz: 3dcf399d4935b793e35aa2e4a23fb653e149f2da
+  data.tar.gz: 9165805bf7719fb68924645d694cc189095b39b7
 SHA512:
-  metadata.gz: 9b2f2724535484731cb95001a44113c78c9ea0ef269b10b5f6d112abab256f4f88945e3c03d7c7766a5e3545d50fac3dfbd819a3fe8889d81fb536f9fff732d2
-  data.tar.gz: eb802f0b301c81cde6362ac09827e972ee10997da4f260719184f623ba57a21b3f7b9b9ec2846ab5341a8ca4bb9a2c04fea15c0ce4562da8b9c78dc8fbb73bb2
+  metadata.gz: ebc6235ed48788da4152060d8a5cf54c75a7eab654628af66a0c63743fb3951a6038dd89e15802008a0fc574c284d2386f9bb3ad446eaa965f4794cff9c9f559
+  data.tar.gz: af643a3a4fad7a7ab8e6fd25c186eb002d3e3b62760db781be5168417768d7973a5e365f214d87ffbc4933d9d5e1caa9eb5885686e33c915eb9b73dd6d5d2ac9

data/.travis.yml

@@ -1,14 +1,17 @@
 language: ruby
-notifications:
-  email:
-    - uwe@kubosch.no
+sudo: false
 rvm:
   - "1.8.7"
   - "1.9.3"
   - "2.0.0"
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - jruby-20mode # JRuby in 2.0 mode
-  - rbx-18mode
-  - rbx-19mode
-  - rbx-20mode
+  - "2.1"
+  - "2.2"
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-20mode
+  - jruby-head
+  - rbx
+  - rbx-2
+notifications:
+  email:
+    - uwe@kubosch.no

data/Gemfile

@@ -4,7 +4,7 @@ source 'http://rubygems.org'
 gemspec
 
 group :test do
-  if RUBY_VERSION =~ /^1\.9\./ || RUBY_VERSION =~ /^2\.0\./
-    gem 'minitest-reporters'
+  if RUBY_VERSION =~ /^1\.9\./ || RUBY_VERSION =~ /^2\./
+    gem 'minitest-reporters', '<1.0.0'
   end
 end

data/gruff.gemspec

@@ -11,23 +11,20 @@ Gem::Specification.new do |s|
   s.date = Date.today.to_s
   s.description = %q{Beautiful graphs for one or multiple datasets. Can be used on websites or in documents.}
   s.email = %q{boss@topfunky.com}
-  # s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
   s.files = `git ls-files`.split($/).reject{|f| f =~ /^test#{File::ALT_SEPARATOR || File::SEPARATOR}output/}
-  # s.has_rdoc = true
   s.homepage = %q{https://github.com/topfunky/gruff}
-  # s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = %w(lib)
-  # s.rubyforge_project = %q{gruff}
   s.summary = %q{Beautiful graphs for one or multiple datasets.}
   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
   if defined? JRUBY_VERSION
     s.platform = 'java'
-    s.add_dependency 'rmagick4j'
+    s.add_dependency 'rmagick4j', '>= 0.3.9'
   else
-    s.add_dependency 'rmagick'
+    s.add_dependency 'rmagick', '>= 2.13.4'
   end
   s.add_development_dependency('rake')
+  s.add_development_dependency('test-unit')
   s.license = 'MIT'
 end

data/lib/gruff/base.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'RMagick'
+require 'rmagick'
 require 'bigdecimal'
 
 require File.dirname(__FILE__) + '/deprecated'
@@ -117,6 +117,12 @@ module Gruff
     # a reader here.
     attr_reader :font
 
+    # Same as font but for the title.
+    attr_reader :title_font
+    
+    # Specifies whether to draw the title bolded or not.
+    attr_accessor :bold_title
+
     attr_accessor :font_color
 
     # Prevent drawing of line markers
@@ -249,6 +255,7 @@ module Gruff
 
       vera_font_path = File.expand_path('Vera.ttf', ENV['MAGICK_FONT_PATH'])
       @font = File.exists?(vera_font_path) ? vera_font_path : nil
+      @bold_title = true
 
       @marker_font_size = 21.0
       @legend_font_size = 20.0
@@ -290,6 +297,11 @@ 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:
@@ -799,10 +811,10 @@ module Gruff
       return if (@hide_title || @title.nil?)
 
       @d.fill = @font_color
-      @d.font = @font if @font
+      @d.font = @title_font || @font if @title_font || @font
       @d.stroke('transparent')
       @d.pointsize = scale_fontsize(@title_font_size)
-      @d.font_weight = BoldWeight
+      @d.font_weight = if @bold_title then BoldWeight else NormalWeight end
       @d.gravity = NorthGravity
       @d = @d.annotate_scaled(@base_image,
                               @raw_columns, 1.0,
@@ -1123,6 +1135,11 @@ module Gruff
       @d.get_type_metrics(@base_image, text.to_s).width
     end
 
+    # Used for degree => radian conversions
+    def deg2rad(angle)
+      angle * (Math::PI/180.0)
+    end
+
   end # Gruff::Base
 
   class IncorrectNumberOfDatasetsException < StandardError;

data/lib/gruff/bezier.rb

@@ -18,8 +18,8 @@ class Gruff::Bezier < Gruff::Base
         new_y = @graph_top + (@graph_height - data_point * @graph_height)
 
         if index == 0 && RUBY_PLATFORM != 'java'
-          poly_points << @graph_left
-          poly_points << @graph_bottom - 1
+          poly_points << new_x
+          poly_points << new_y
         end
 
         poly_points << new_x

data/lib/gruff/line.rb

@@ -18,6 +18,9 @@ class Gruff::Line < Gruff::Base
   attr_accessor :reference_line_default_color
   attr_accessor :reference_line_default_width
 
+  # Allow for vertical marker lines
+  attr_accessor :show_vertical_markers
+
   # Dimensions of lines and dots; calculated based on dataset size if left unspecified
   attr_accessor :line_width
   attr_accessor :dot_radius
@@ -167,7 +170,7 @@ class Gruff::Line < Gruff::Base
 
   def draw_vertical_reference_line(reference_line)
     index = @graph_left + (@x_increment * reference_line[:index])
-    draw_reference_line(reference_line, index, index, @graph_top, @graph_top + graph_height)
+    draw_reference_line(reference_line, index, index, @graph_top, @graph_top + @graph_height)
   end
 
   def draw
@@ -183,16 +186,34 @@ class Gruff::Line < Gruff::Base
       draw_vertical_reference_line(curr_reference_line) if curr_reference_line.key?(:index)
     end
 
+    if (@show_vertical_markers)
+      (0..@column_count).each do |column|
+        x = @graph_left + @graph_width - column.to_f * @x_increment
+
+        @d = @d.fill(@marker_color)
+
+        # FIXME(uwe): Workaround for Issue #66
+        #             https://github.com/topfunky/gruff/issues/66
+        #             https://github.com/rmagick/rmagick/issues/82
+        #             Remove if the issue gets fixed.
+        x += 0.001 unless defined?(JRUBY_VERSION)
+        # EMXIF
+
+        @d = @d.line(x, @graph_bottom, x, @graph_top)
+        #If the user specified a marker shadow color, draw a shadow just below it
+        unless @marker_shadow_color.nil?
+          @d = @d.fill(@marker_shadow_color)
+          @d = @d.line(x + 1, @graph_bottom, x + 1, @graph_top)
+        end
+      end
+    end
+
     @norm_data.each do |data_row|
       prev_x = prev_y = nil
 
       @one_point = contains_one_point_only?(data_row)
 
       data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
-        unless data_point
-          prev_x = prev_y = nil
-          next
-        end
         x_data = data_row[DATA_VALUES_X_INDEX]
         if x_data == nil
           #use the old method: equally spaced points along the x-axis
@@ -204,6 +225,10 @@ class Gruff::Line < Gruff::Base
             draw_label(@graph_left + ((label_pos - @minimum_x_value) * @graph_width) / (@maximum_x_value - @minimum_x_value), label_pos)
           end
         end
+        unless data_point # we can't draw a line for a null data point, we can still label the axis though
+          prev_x = prev_y = nil
+          next
+        end
 
         new_y = @graph_top + (@graph_height - data_point * @graph_height)
 

data/lib/gruff/net.rb

@@ -111,8 +111,8 @@ class Gruff::Net < Gruff::Base
     r_offset = 1.1
     x_offset = center_x # + 15 # The label points need to be tweaked slightly
     y_offset = center_y # + 0  # This one doesn't though
-    x = x_offset + (radius * r_offset * Math.sin(angle.deg2rad))
-    y = y_offset - (radius * r_offset * Math.cos(angle.deg2rad))
+    x = x_offset + (radius * r_offset * Math.sin(deg2rad(angle)))
+    y = y_offset - (radius * r_offset * Math.cos(deg2rad(angle)))
 
     # Draw label
     @d.fill = @marker_color
@@ -125,14 +125,3 @@ class Gruff::Net < Gruff::Base
   end
 
 end
-
-# # This method is already in Float
-# class Float
-#   # Used for degree => radian conversions
-#   def deg2rad
-#     self * (Math::PI/180.0)
-#   end
-# end
-
-
-

data/lib/gruff/pie.rb

@@ -13,7 +13,7 @@ require File.dirname(__FILE__) + '/base'
 
 class Gruff::Pie < Gruff::Base
 
-  TEXT_OFFSET_PERCENTAGE = 0.15
+  DEFAULT_TEXT_OFFSET_PERCENTAGE = 0.15
 
   # 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.
@@ -21,11 +21,18 @@ class Gruff::Pie < Gruff::Base
   # 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
+  # Affect the distance between the percentages and the pie chart
+  # Defaults to 0.15
+  attr_accessor :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 draw
@@ -64,9 +71,9 @@ class Gruff::Pie < Gruff::Base
         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 = label_val.to_s + '%'
+          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),
+                          radius + (radius * @text_offset_percentage),
                           label_string)
         end
 
@@ -87,12 +94,12 @@ private
   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
+    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(angle.deg2rad))
-    y = y_offset + (radius_offset * Math.sin(angle.deg2rad))
+    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
@@ -114,11 +121,3 @@ private
   end
 
 end
-
-class Float
-  # Used for degree => radian conversions
-  def deg2rad
-    self * (Math::PI/180.0)
-  end
-end
-

data/lib/gruff/stacked_bar.rb

@@ -7,6 +7,9 @@ class Gruff::StackedBar < Gruff::Base
 
     # Spacing factor applied between bars
     attr_accessor :bar_spacing
+
+    # Number of pixels between bar segments
+    attr_accessor :segment_spacing
     
     # Draws a bar graph, but multiple sets are stacked on top of each other.
     def draw
@@ -18,6 +21,7 @@ class Gruff::StackedBar < Gruff::Base
       #
       # Columns sit stacked.
       @bar_spacing ||= 0.9
+      @segment_spacing ||= 1
       @bar_width = @graph_width / @column_count.to_f
       padding = (@bar_width * (1 - @bar_spacing)) / 2
     
@@ -38,9 +42,9 @@ class Gruff::StackedBar < Gruff::Base
           left_x = @graph_left + (@bar_width * point_index) + padding
           left_y = @graph_top + (@graph_height -
                                  data_point * @graph_height - 
-                                 height[point_index]) + 1
+                                 height[point_index]) + @segment_spacing
           right_x = left_x + @bar_width * @bar_spacing
-          right_y = @graph_top + @graph_height - height[point_index] - 1
+          right_y = @graph_top + @graph_height - height[point_index] - @segment_spacing
           
           # update the total height of the current stacked bar
           height[point_index] += (data_point * @graph_height ) 

data/lib/gruff/version.rb

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

data/test/test_labels_for_null_data.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + "/gruff_test_case"
+
+class TestLabelsForNullData < GruffTestCase
+
+  def setup
+    @dataset = [nil, 1, 2, 1, nil]
+
+    @labels = {
+        0 => '1',
+        1 => '2',
+        2 => '3',
+        3 => '4',
+        4 => '5'
+    }
+  end
+
+  def test_labels
+    g = Gruff::Line.new
+    g.title = 'Labels For Null Data'
+    g.labels = @labels
+    g.data('data', @dataset)
+    g.minimum_value = 0
+    
+    g.write("test/output/TestLabelsForNullData.png")
+  end
+
+end

data/test/test_pie.rb

@@ -139,7 +139,14 @@ class TestGruffPie < GruffTestCase
     
     write_test_file g, "pie_simple.png"
   end
-  
+
+   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
+
 protected
 
   def setup_basic_graph(size=800)

data/test/test_scatter.rb

@@ -25,7 +25,7 @@ class TestGruffScatter < Test::Unit::TestCase
     g.title = 'Many Datapoint Graph Test'
     y_values = (0..50).map { rand(100) }
     x_values = (0..50).map { rand(100) }
-    g.data('many points', y_values, x_values)
+    g.data('many points', x_values, y_values)
 
     # Default theme
     g.write('test/output/scatter_many.png')

data/test/test_stacked_bar.rb

@@ -48,5 +48,21 @@ class TestGruffStackedBar < GruffTestCase
     end
     g.write "test/output/stacked_bar_keynote_small.png"
   end
+
+  def test_bar_graph_segment_spacing
+    g = Gruff::StackedBar.new
+    g.title = "Visual Stacked Bar Graph Test"
+    g.segment_spacing = 0
+    g.labels = {
+      0 => '5/6',
+      1 => '5/15',
+      2 => '5/24',
+      3 => '5/30',
+    }
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+    g.write "test/output/stacked_bar_keynote_no_space.png"
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,36 +9,50 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.9
   name: rmagick4j
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.9
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
   name: rake
+  prerelease: false
+  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
   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.
 email: boss@topfunky.com
 executables: []
@@ -123,6 +137,7 @@ files:
 - 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
@@ -158,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.5
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: Beautiful graphs for one or multiple datasets.
@@ -172,6 +187,7 @@ test_files:
 - 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