teejayvanslyke-gruff 0.3.6 → 0.3.8

data/.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+test/output/*

data/Rakefile

@@ -1,55 +1,13 @@
-require 'rubygems'
-require 'hoe'
-$:.unshift(File.dirname(__FILE__) + "/lib")
-require 'gruff'
-
-Hoe.new('Gruff', Gruff::VERSION) do |p|
-  p.name = "teejayvanslyke-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
-
-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
-
-task :release => :verify
-
-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}"
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "teejayvanslyke-gruff"
+    gemspec.summary = "Fork of Geoffrey Grosenbach's Gruff gem with some customizations and fixes"
+    gemspec.description = "Beautiful graphs for one or multiple datasets. Can be used on websites or in documents."
+    gemspec.email = "teejay.vanslyke@gmail.com"
+    gemspec.homepage = "http://github.com/teejayvanslyke/gruff.git"
+    gemspec.authors = ['Geoffrey Grosenbach', 'T.J. VanSlyke']
   end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end

data/VERSION

@@ -0,0 +1 @@
+0.3.8

data/lib/gruff/base.rb

@@ -31,9 +31,10 @@ module Gruff
     DEBUG = false
 
     # Used for navigating the array of data to plot
-    DATA_LABEL_INDEX = 0
-    DATA_VALUES_INDEX = 1
-    DATA_COLOR_INDEX = 2
+    DATA_LABEL_INDEX   = 0
+    DATA_VALUES_INDEX  = 1
+    DATA_COLOR_INDEX   = 2
+    DATA_OVERLAY_INDEX = 3
 
     # Space around text elements. Mostly used for vertical spacing
     LEGEND_MARGIN = TITLE_MARGIN = 20.0
@@ -251,6 +252,11 @@ module Gruff
       @top_margin = @left_margin = @right_margin = @bottom_margin = margin
     end
 
+    # Sets whether we sort the data by the largest set first.
+    def sort=(sort)
+      @sort = sort
+    end
+
     # Sets the font for graph text to the font at +font_path+.
     def font=(font_path)
       @font = font_path
@@ -454,10 +460,25 @@ module Gruff
     #
     # Example:
     #   data("Bart S.", [95, 45, 78, 89, 88, 76], '#ffcc00')
-    def data(name, data_points=[], color=nil)
-      data_points = Array(data_points) # make sure it's an array
-      @data << [name, data_points, (color || increment_color)]
-      # Set column count if this is larger than previous counts
+    #   data("Bart S.", [95, 45, 78], :overlay => ['95%', '45%', '78%'], :color => '#ffcc00')
+    def data(name, data_points=[], options_or_color=nil)
+
+      # Allow either a color argument or a hash of options in order to 
+      # support the original interface.
+      if options_or_color.is_a?(Hash)
+        options = options_or_color
+        color   = options[:color]
+      else
+        options = {}
+        color   = options_or_color
+      end
+
+      # Make sure it's an array.
+      data_points = Array(data_points) 
+
+      @data << [name, data_points, (color || increment_color), options[:overlay]]
+
+      # Set column count if this is larger than previous counts.
       @column_count = (data_points.length > @column_count) ? data_points.length : @column_count
 
       # Pre-normalize
@@ -555,7 +576,7 @@ module Gruff
               norm_data_points << ((data_point.to_f - @minimum_value.to_f ) / @spread)
             end
           end
-          @norm_data << [data_row[DATA_LABEL_INDEX], norm_data_points, data_row[DATA_COLOR_INDEX]]
+          @norm_data << [data_row[DATA_LABEL_INDEX], norm_data_points, data_row[DATA_COLOR_INDEX], data_row[DATA_OVERLAY_INDEX]]
         end
       end
     end
@@ -875,6 +896,24 @@ module Gruff
       end
     end
 
+    # Draw a centered text overlay atop a given rectangular 
+    # area of the graph.  This is used to superimpose text
+    # atop each chart region.
+    def draw_overlay(left_x, left_y, right_x, right_y, text)
+      puts "left_x: #{left_x}; left_y: #{left_y}; right_x: #{right_x}; right_y: #{right_y}"
+      @d.fill = @font_color
+      @d.font = @font if @font
+      @d.pointsize = scale_fontsize(@marker_font_size) * 1.5
+      @d.font_weight = BoldWeight
+      @d.stroke = 'black'
+      #@d.pointsize = scale_fontsize(@marker_font_size)
+      @d.gravity = CenterGravity
+      @d = @d.annotate_scaled(@base_image,
+                              right_x - left_x, right_y - left_y,
+                              left_x, left_y,
+                              text, @scale)
+    end
+
     # Shows an error message because you have no data.
     def draw_no_data
       @d.fill = @font_color

data/lib/gruff/side_stacked_bar.rb

@@ -58,10 +58,36 @@ class Gruff::SideStackedBar < Gruff::SideBar
         label_center = @graph_top + (@bar_width * point_index) + (@bar_width * @bar_spacing / 2.0)
         draw_label(label_center, point_index)
       end
-
     end
 
-    @d.draw(@base_image)    
+    @d.draw(@base_image)
+
+    height = Array.new(@column_count, 0)
+    length = Array.new(@column_count, @graph_left)
+
+    @norm_data.each_with_index do |data_row, row_index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
+    	  ## using the original calcs from the stacked bar chart to get the difference between
+    	  ## part of the bart chart we wish to stack.
+    	  temp1 = @graph_left + (@graph_width -
+                                    data_point * @graph_width - 
+                                    height[point_index]) 
+    	  temp2 = @graph_left + @graph_width - height[point_index] 
+    	  difference = temp2 - temp1
+
+    	  left_x = length[point_index] #+ 1
+              left_y = @graph_top + (@bar_width * point_index) + padding
+    	  right_x = left_x + difference
+              right_y = left_y + @bar_width * @bar_spacing
+    	  length[point_index] += difference
+        height[point_index] += (data_point * @graph_width - 2)
+
+        p data_row
+        overlay = data_row[DATA_OVERLAY_INDEX]
+
+        draw_overlay(left_x, left_y, right_x, right_y, overlay.to_s) if overlay
+      end
+    end
   end
 
   protected

data/teejayvanslyke-gruff.gemspec

@@ -0,0 +1,144 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{teejayvanslyke-gruff}
+  s.version = "0.3.8"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Geoffrey Grosenbach", "T.J. VanSlyke"]
+  s.date = %q{2009-10-13}
+  s.description = %q{Beautiful graphs for one or multiple datasets. Can be used on websites or in documents.}
+  s.email = %q{teejay.vanslyke@gmail.com}
+  s.extra_rdoc_files = [
+    "README.txt"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "MIT-LICENSE",
+     "Manifest.txt",
+     "README.txt",
+     "Rakefile",
+     "VERSION",
+     "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",
+     "teejayvanslyke-gruff.gemspec",
+     "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_sidestacked_bar_percentile.rb",
+     "test/test_spider.rb",
+     "test/test_stacked_area.rb",
+     "test/test_stacked_bar.rb"
+  ]
+  s.homepage = %q{http://github.com/teejayvanslyke/gruff.git}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{Fork of Geoffrey Grosenbach's Gruff gem with some customizations and fixes}
+  s.test_files = [
+    "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_sidestacked_bar_percentile.rb",
+     "test/test_spider.rb",
+     "test/test_stacked_area.rb",
+     "test/test_stacked_bar.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/test/test_sidestacked_bar.rb

@@ -73,6 +73,40 @@ class TestGruffSideStackedBar < GruffTestCase
     g.write "test/output/side_stacked_bar_long_label.png"
   end
 
+  def test_unsorted_order
+    g = Gruff::SideStackedBar.new
+    g.title = "The order should be the same"
+    g.labels = {
+      0 => 'September', 
+      1 => 'Oct', 
+      2 => 'Nov', 
+      3 => 'Dec', 
+    }
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+    g.sort = false
+    g.write "test/output/side_stacked_bar_unsorted_order.png"
+    g
+  end
+
+  def test_sorted_order
+    g = Gruff::SideStackedBar.new
+    g.title = "The order should be the same"
+    g.labels = {
+      0 => 'September', 
+      1 => 'Oct', 
+      2 => 'Nov', 
+      3 => 'Dec', 
+    }
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+    g.sort = true 
+    g.write "test/output/side_stacked_bar_sorted_order.png"
+    g
+  end
+
 protected
 
   def setup_basic_graph(size=800)

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification 
 name: teejayvanslyke-gruff
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors: 
 - Geoffrey Grosenbach
+- T.J. VanSlyke
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 -07:00
+date: 2009-10-13 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+dependencies: []
+
 description: Beautiful graphs for one or multiple datasets. Can be used on websites or in documents.
-email: boss@topfunky.com
+email: teejay.vanslyke@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
 - README.txt
 files: 
+- .gitignore
 - History.txt
 - MIT-LICENSE
 - Manifest.txt
 - README.txt
 - Rakefile
+- VERSION
 - assets/bubble.png
 - assets/city_scene/background/0000.png
 - assets/city_scene/background/0600.png
@@ -93,6 +85,7 @@ files:
 - rails_generators/gruff/gruff_generator.rb
 - rails_generators/gruff/templates/controller.rb
 - rails_generators/gruff/templates/functional_test.rb
+- teejayvanslyke-gruff.gemspec
 - test/gruff_test_case.rb
 - test/test_accumulator_bar.rb
 - test/test_area.rb
@@ -111,17 +104,17 @@ files:
 - test/test_scene.rb
 - test/test_side_bar.rb
 - test/test_sidestacked_bar.rb
+- test/test_sidestacked_bar_percentile.rb
 - test/test_spider.rb
 - test/test_stacked_area.rb
 - test/test_stacked_bar.rb
 has_rdoc: true
-homepage: http://nubyonrails.com/pages/gruff
+homepage: http://github.com/teejayvanslyke/gruff.git
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -138,12 +131,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: gruff
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Beautiful graphs for one or multiple datasets.
+summary: Fork of Geoffrey Grosenbach's Gruff gem with some customizations and fixes
 test_files: 
+- test/gruff_test_case.rb
 - test/test_accumulator_bar.rb
 - test/test_area.rb
 - test/test_bar.rb