gruff 0.3.6 → 0.3.7

data/.gitignore

@@ -0,0 +1,6 @@
+/.idea/
+/pkg/
+.DS_Store
+/test/output
+.bundle
+.yardoc

data/.rvmrc

@@ -0,0 +1,5 @@
+if [[ -n "$rvm_environments_path" && -s "$rvm_environments_path/ree-1.8.7-2010.02@gruff" ]] ; then
+  . "$rvm_environments_path/ree-1.8.7-2010.02@gruff"
+else
+  rvm --create use  "ree-1.8.7-2010.02@gruff"
+fi

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.3"
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode

data/Gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in gruff.gemspec
+gemspec
+
+group :test do
+  gem 'rake'
+
+  platform :ruby do
+    gem 'rmagick'
+  end
+
+  platform :jruby do
+    gem 'rmagick4j'
+  end
+end

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    gruff (0.3.7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (0.9.2.2)
+    rmagick4j (0.3.7)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  gruff!
+  rake
+  rmagick
+  rmagick4j

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2012 Uwe Kubosch
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,49 @@
+# Gruff Graphs
+
+A library for making beautiful graphs.
+
+## WARNING
+
+This is beta-quality software. It works well according to our tests,
+but the API may change and other features will be added.
+We are working to make Gruff production quality software.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'gruff'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install gruff
+
+## Usage
+
+See the test suite in test/line_test.rb for examples.
+
+## Samples
+
+http://nubyonrails.com/pages/gruff
+
+## Documentation
+
+http://gruff.rubyforge.org
+
+## Contributing
+
+== Source
+
+The source for this project is now kept at GitHub:
+
+http://github.com/topfunky/gruff/tree/master
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/README.txt

@@ -1,3 +1,6 @@
+== MAIN FIX
+  Zero Division Problem
+
 == Gruff Graphs
 
 A library for making beautiful graphs.

data/Rakefile

@@ -1,55 +1,38 @@
-require 'rubygems'
-require 'hoe'
+require "rubygems"
+require "bundler/gem_tasks"
+require 'rake/testtask'
+
+require 'rake/clean'
 $:.unshift(File.dirname(__FILE__) + "/lib")
-require 'gruff'
 
-Hoe.new('Gruff', Gruff::VERSION) do |p|
-  p.name = "gruff"
-  p.author = "Geoffrey Grosenbach"
-  p.description = "Beautiful graphs for one or multiple datasets. Can be used on websites or in documents."
-  p.email = 'boss@topfunky.com'
-  p.summary = "Beautiful graphs for one or multiple datasets."
-  p.url = "http://nubyonrails.com/pages/gruff"
-  p.clean_globs = ['test/output/*.png']
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.remote_rdoc_dir = '' # Release to root
-end
+CLEAN << ['pkg', 'test/output/*']
 
-desc "Simple require on packaged files to make sure they are all there"
-task :verify => :package do
-  # An error message will be displayed if files are missing
-  if system %(ruby -e "require 'pkg/gruff-#{Gruff::VERSION}/lib/gruff'")
-    puts "\nThe library files are present"
-  end
-  raise "\n*** Gruff::Base::DEBUG must be set to false for releases ***\n\n" if Gruff::Base::DEBUG
-end
+desc "Run tests"
+task :default => :test
 
-task :release => :verify
+Rake::TestTask.new do |t|
+ t.libs << 'test'
+end
 
 namespace :test do
-
   desc "Run mini tests"
   task :mini => :clean do
     Dir['test/test_mini*'].each do |file|
       system "ruby #{file}"
     end
-
   end
-
 end
 
 ##
 # Catch unmatched tasks and run them as a unit test.
-#
 # Makes it possible to do
 #
 #  rake pie
 #
 # To run the +test/test_pie+ and +test/test_mini_pie+ files.
-
-rule '' do |t|
-  # Rake::Task["clean"].invoke
-  Dir["test/test_*#{t.name}*.rb"].each do |filename|
-    system "ruby #{filename}"
-  end
-end
+#rule '' do |t|
+#  # Rake::Task["clean"].invoke
+#  Dir["test/test_*#{t.name}*.rb"].each do |filename|
+#    system "ruby #{filename}"
+#  end
+#end

data/gruff.gemspec

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gruff/version'
+
+Gem::Specification.new do |s|
+  s.name = %q{gruff}
+  s.version = Gruff::VERSION
+
+  # s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ['Geoffrey Grosenbach', 'Uwe Kubosch']
+  # 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 = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "assets/bubble.png", "assets/city_scene/background/0000.png", "assets/city_scene/background/0600.png", "assets/city_scene/background/2000.png", "assets/city_scene/clouds/cloudy.png", "assets/city_scene/clouds/partly_cloudy.png", "assets/city_scene/clouds/stormy.png", "assets/city_scene/grass/default.png", "assets/city_scene/haze/true.png", "assets/city_scene/number_sample/1.png", "assets/city_scene/number_sample/2.png", "assets/city_scene/number_sample/default.png", "assets/city_scene/sky/0000.png", "assets/city_scene/sky/0200.png", "assets/city_scene/sky/0400.png", "assets/city_scene/sky/0600.png", "assets/city_scene/sky/0800.png", "assets/city_scene/sky/1000.png", "assets/city_scene/sky/1200.png", "assets/city_scene/sky/1400.png", "assets/city_scene/sky/1500.png", "assets/city_scene/sky/1700.png", "assets/city_scene/sky/2000.png", "assets/pc306715.jpg", "assets/plastik/blue.png", "assets/plastik/green.png", "assets/plastik/red.png", "init.rb", "lib/gruff.rb", "lib/gruff/accumulator_bar.rb", "lib/gruff/area.rb", "lib/gruff/bar.rb", "lib/gruff/bar_conversion.rb", "lib/gruff/base.rb", "lib/gruff/bullet.rb", "lib/gruff/deprecated.rb", "lib/gruff/dot.rb", "lib/gruff/line.rb", "lib/gruff/mini/bar.rb", "lib/gruff/mini/legend.rb", "lib/gruff/mini/pie.rb", "lib/gruff/mini/side_bar.rb", "lib/gruff/net.rb", "lib/gruff/photo_bar.rb", "lib/gruff/pie.rb", "lib/gruff/scene.rb", "lib/gruff/side_bar.rb", "lib/gruff/side_stacked_bar.rb", "lib/gruff/spider.rb", "lib/gruff/stacked_area.rb", "lib/gruff/stacked_bar.rb", "lib/gruff/stacked_mixin.rb", "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/test_accumulator_bar.rb", "test/test_area.rb", "test/test_bar.rb", "test/test_base.rb", "test/test_bullet.rb", "test/test_dot.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_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"]
+  s.files = `git ls-files`.split($/)
+  # s.has_rdoc = true
+  s.homepage = %q{http://nubyonrails.com/pages/gruff}
+  # s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  # s.rubyforge_project = %q{gruff}
+  # s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Beautiful graphs for one or multiple datasets.}
+  # s.test_files = ["test/test_accumulator_bar.rb", "test/test_area.rb", "test/test_bar.rb", "test/test_base.rb", "test/test_bullet.rb", "test/test_dot.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_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"]
+  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.add_development_dependency(%q<hoe>, [">= 1.8.2"])
+  # s.add_dependency(%q<rmagick>, [">= 2.12.2"])
+end

data/lib/gruff.rb

@@ -1,3 +1,5 @@
+require "gruff/version"
+
 # Extra full path added to fix loading errors on some installations.
 
 %w(
@@ -9,6 +11,7 @@
   pie
   spider
   net
+  scatter
   stacked_area
   stacked_bar
   side_stacked_bar

data/lib/gruff/base.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'RMagick'
+require 'bigdecimal'
 
 require File.dirname(__FILE__) + '/deprecated'
 
@@ -18,10 +19,6 @@ require File.dirname(__FILE__) + '/deprecated'
 # See Gruff::Base#theme= for setting themes.
 
 module Gruff
-
-  # This is the version of Gruff you are using.
-  VERSION = '0.3.6'
-
   class Base
 
     include Magick
@@ -34,6 +31,7 @@ module Gruff
     DATA_LABEL_INDEX = 0
     DATA_VALUES_INDEX = 1
     DATA_COLOR_INDEX = 2
+    DATA_VALUES_X_INDEX = 3
 
     # Space around text elements. Mostly used for vertical spacing
     LEGEND_MARGIN = TITLE_MARGIN = 20.0
@@ -41,7 +39,7 @@ module Gruff
     DEFAULT_MARGIN = 20.0
 
     DEFAULT_TARGET_WIDTH = 800
-    
+
     THOUSAND_SEPARATOR = ','
 
     # Blank space above the graph
@@ -55,10 +53,10 @@ module Gruff
 
     # Blank space to the left of the graph
     attr_accessor :left_margin
-    
+
     # Blank space below the title
     attr_accessor :title_margin
-    
+
     # Blank space below the legend
     attr_accessor :legend_margin
 
@@ -223,7 +221,7 @@ module Gruff
       @marker_font_size = 21.0
       @legend_font_size = 20.0
       @title_font_size = 36.0
-      
+
       @top_margin = @bottom_margin = @left_margin = @right_margin = DEFAULT_MARGIN
       @legend_margin = LEGEND_MARGIN
       @title_margin = TITLE_MARGIN
@@ -698,7 +696,8 @@ module Gruff
         @d = @d.fill(@marker_color)
         @d = @d.line(@graph_left, y, @graph_right, y)
 
-        marker_label = index * @increment + @minimum_value.to_f
+        marker_label = BigDecimal(index.to_s) * BigDecimal(@increment.to_s) +
+                       BigDecimal(@minimum_value.to_s)
 
         unless @hide_line_numbers
           @d.fill = @font_color
@@ -977,9 +976,10 @@ module Gruff
       data_point
     end
 
-    def significant(inc) # :nodoc:
-      return 1.0 if inc == 0 # Keep from going into infinite loop
-      factor = 1.0
+    def significant(i) # :nodoc:
+      return 1.0 if i == 0 # Keep from going into infinite loop
+      inc = BigDecimal(i.to_s)
+      factor = BigDecimal('1.0')
       while (inc < 10)
         inc *= 10
         factor /= 10
@@ -1063,7 +1063,7 @@ module Gruff
     # Return a formatted string representing a number value that should be
     # printed as a label.
     def label(value)
-      label = if (@spread.to_f % @marker_count.to_f == 0) || !@y_axis_increment.nil?
+      label = if (@spread.to_f % (@marker_count.to_f==0 ? 1 : @marker_count.to_f) == 0) || !@y_axis_increment.nil?
         value.to_i.to_s
       elsif @spread > 10.0
         sprintf("%0i", value)
@@ -1072,7 +1072,7 @@ module Gruff
       else
         value.to_s
       end
-      
+
       parts = label.split('.')
       parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{THOUSAND_SEPARATOR}")
       parts.join('.')
@@ -1085,6 +1085,7 @@ module Gruff
     # handle.
     def calculate_caps_height(font_size)
       @d.pointsize = font_size
+      @d.font = @font if @font
       @d.get_type_metrics(@base_image, 'X').height
     end
 
@@ -1093,7 +1094,9 @@ module Gruff
     # Not scaled since it deals with dimensions that the regular
     # scaling will handle.
     def calculate_width(font_size, text)
+      return 0 if text.nil?
       @d.pointsize = font_size
+      @d.font = @font if @font
       @d.get_type_metrics(@base_image, text.to_s).width
     end
 

data/lib/gruff/line.rb

@@ -16,7 +16,7 @@ class Gruff::Line < Gruff::Base
 
   # Draw a dashed line at the given value
   attr_accessor :baseline_value
-
+	
   # Color of the baseline
   attr_accessor :baseline_color
   
@@ -26,6 +26,10 @@ class Gruff::Line < Gruff::Base
 
   # Hide parts of the graph to fit more datapoints, or for a different appearance.
   attr_accessor :hide_dots, :hide_lines
+  
+  #accessors for support of xy data
+  attr_accessor :minimum_x_value
+  attr_accessor :maximum_x_value
 
   # Call with target pixel width of graph (800, 400, 300), and/or 'false' to omit lines (points only).
   #
@@ -34,7 +38,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
@@ -43,20 +47,95 @@ class Gruff::Line < Gruff::Base
     else
       super args.shift
     end
-
+    
     @hide_dots = @hide_lines = false
     @baseline_color = 'red'
     @baseline_value = nil
+    @maximum_x_value = nil
+    @minimum_x_value = nil
+  end
+  
+  # This method allows one to plot a dataset with both X and Y data.
+  #
+  # Parameters are as follows:
+  #   name: string, the title of the dataset
+  #   x_data_points: an array containing the x data points for the graph
+  #   y_data_points: an array containing the y data points for the graph
+  #   color: hex number indicating the line color as an RGB triplet
+  #
+  #  Notes: 
+  #   -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.
+  #   -if you want to use a preset theme, you must set it before calling
+  #     dataxy().
+  #
+  # Example:
+  #   g = Gruff::Line.new
+  #   g.title = "X/Y Dataset"
+  #   g.dataxy("Apples", [1,3,4,5,6,10], [1, 2, 3, 4, 4, 3])
+  #   g.dataxy("Bapples", [1,3,4,5,7,9], [1, 1, 2, 2, 3, 3])
+  #   #you can still use the old data method too if you want:
+  #   g.data("Capples", [1, 1, 2, 2, 3, 3])  
+  #   #labels will be drawn at the x locations of the 1st dataset that you 
+  #   #passed in.  In this example the lables are drawn at x locations 1,4,6
+  #   g.labels = {0 => '2003', 2 => '2004', 4 => '2005'}  #labels
+ 
+  def dataxy(name, x_data_points=[], y_data_points=[], color=nil)
+    raise ArgumentError, "x_data_points is nil!" if x_data_points.length == 0
+
+    if x_data_points.all?{|p| p.size == 2}
+      x_data_points, y_data_points = x_data_points.map{|p| p[0]}, x_data_points.map{|p| p[1]}
+    end
+
+    raise ArgumentError, "x_data_points.length != y_data_points.length!" if x_data_points.length != y_data_points.length
+
+    #call the existing data routine for the y data.
+    self.data(name, y_data_points, color)
+    
+    x_data_points = Array(x_data_points) # make sure it's an array
+    #append the x data to the last entry that was just added in the @data member
+    lastElem = @data.length()-1
+    @data[lastElem][DATA_VALUES_X_INDEX] = x_data_points
+    
+    # Update the global min/max values for the x data
+    x_data_points.each_with_index do |x_data_point, index|
+      next if x_data_point.nil?
+      
+      # Setup max/min so spread starts at the low end of the data points
+      if @maximum_x_value.nil? && @minimum_x_value.nil?
+        @maximum_x_value = @minimum_x_value = x_data_point
+      end
+      
+      @maximum_x_value = (x_data_point >  @maximum_x_value) ? 
+      x_data_point : @maximum_x_value
+      @minimum_x_value = (x_data_point < @minimum_x_value) ? 
+      x_data_point : @minimum_x_value
+    end
+    
   end
 
   def draw
     super
 
     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
 
+    #normalize the x data if it is specified
+    @data.each_with_index do |data_row, index|
+      norm_x_data_points = []
+      if (data_row[DATA_VALUES_X_INDEX] != nil)
+        data_row[DATA_VALUES_X_INDEX].each do |x_data_point|
+          norm_x_data_points << ( (x_data_point.to_f - @minimum_x_value.to_f ) /
+           (@maximum_x_value.to_f - @minimum_x_value.to_f) )
+       end
+       @norm_data[index] << norm_x_data_points
+      end
+    end
+
     if (defined?(@norm_baseline)) then
       level = @graph_top + (@graph_height - @norm_baseline * @graph_height)
       @d = @d.push
@@ -68,15 +147,22 @@ class Gruff::Line < Gruff::Base
       @d = @d.pop
     end
 
-    @norm_data.each do |data_row|
+    @norm_data.each_with_index do |data_row, dr_index|
       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|
-        new_x = @graph_left + (@x_increment * index)
         next if data_point.nil?
 
+        x_data = data_row[DATA_VALUES_X_INDEX]
+        if (x_data == nil)
+          #use the old method: equally spaced points along the x-axis
+          new_x = @graph_left + (@x_increment * index)  
+        else
+          new_x = getXCoord(x_data[index], @graph_width, @graph_left)
+        end
+        
         draw_label(new_x, index)
 
         new_y = @graph_top + (@graph_height - data_point * @graph_height)
@@ -92,7 +178,7 @@ class Gruff::Line < Gruff::Base
         circle_radius = dot_radius ||
           clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 2.5), 5.0)
 
-        if !@hide_lines and !prev_x.nil? and !prev_y.nil? then
+        if !@hide_lines and !prev_x.nil? and !prev_y.nil? then          
           @d = @d.line(prev_x, prev_y, new_x, new_y)
         elsif @one_point
           # Show a circle if there's just one_point
@@ -114,6 +200,14 @@ class Gruff::Line < Gruff::Base
     super
     @norm_baseline = (@baseline_value.to_f / @maximum_value.to_f) if @baseline_value
   end
+  
+  def sort_norm_data
+    super unless @data.any?{|d| d[DATA_VALUES_X_INDEX]}
+  end
+
+  def getXCoord(x_data_point, width, offset)
+    return(x_data_point * width + offset)
+  end
 
   def contains_one_point_only?(data_row)
     # Spin through data to determine if there is just one_value present.
@@ -123,10 +217,9 @@ class Gruff::Line < Gruff::Base
         if one_point
           # more than one point, bail
           return false
-        else
-          # there is at least one data point
-          return true
         end
+        # there is at least one data point
+        one_point = true
       end
     end
     return one_point