gruff 0.2.6 → 0.2.7

data/CHANGELOG

@@ -1,5 +1,14 @@
 CHANGELOG
 
+== 0.2.7
+
+* Regenerated Manifest.txt
+* Added scene sample to package
+* Added mini side_bar (EXPERIMENTAL)
+* Added @zero_degree option to Gruff::Pie so first slice can start somewhere other than 3 o'clock
+* Increased size of numbers in Gruff::Mini::Pie
+* Added legend_box_size accessor
+
 == 0.2.6
 
 * Fixed missing side_bar.rb in Manifest.txt

data/Manifest.txt

@@ -1,9 +1,31 @@
 CHANGELOG
-README.txt
+Manifest.txt
 MIT-LICENSE
 Rakefile
-Manifest.txt
-
+README.txt
+assets/pc306715.jpg
+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
 lib/gruff.rb
 lib/gruff/area.rb
 lib/gruff/bar.rb
@@ -15,31 +37,29 @@ 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_bar.rb
-lib/gruff/side_bar.rb
-
 lib/gruff/mini/bar.rb
+lib/gruff/mini/legend.rb
 lib/gruff/mini/pie.rb
 lib/gruff/mini/side_bar.rb
-lib/gruff/mini/legend.rb
-
+test/gruff_test_case.rb
+test/output
 test/test_area.rb
 test/test_bar.rb
 test/test_base.rb
-test/gruff_test_case.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/output
 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_bar.rb
-
-test/test_mini_bar.rb
-test/test_mini_pie.rb
-test/test_mini_side_bar.rb

data/Rakefile

@@ -1,4 +1,3 @@
-
 require 'rubygems'
 require 'hoe'
 $:.unshift(File.dirname(__FILE__) + "/lib")
@@ -12,216 +11,25 @@ Hoe.new('Gruff', Gruff::VERSION) do |p|
   p.summary = "Beautiful graphs for one or multiple datasets."
   p.url = "http://nubyonrails.com/pages/gruff"
   p.clean_globs = ['test/output/*.png']
+end
 
-  # * extra_deps - An array of rubygem dependencies.
+desc "Simple test 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
 end
 
+##
+# Catch unmatched tasks and run them as a unit test.
+#
+# Makes it possible to do
+#  
+#  rake pie
+#
+# To run the +test/test_pie+ file.
 
-# require 'rake'
-# require 'rake/testtask'
-# require 'rake/rdoctask'
-# require 'rake/packagetask'
-# require 'rake/gempackagetask'
-# require 'rake/contrib/rubyforgepublisher'
-# 
-# $:.unshift(File.dirname(__FILE__) + "/lib")
-# require 'gruff'
-# 
-# PKG_NAME      = 'gruff'
-# PKG_VERSION   = Gruff::VERSION
-# PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-# 
-# RELEASE_NAME  = "REL #{PKG_VERSION}"
-# 
-# RUBY_FORGE_PROJECT = "gruff"
-# RUBY_FORGE_USER    = "topfunky"
-# 
-# desc "Default Task"
-# task :default => [ :clean, :test ]
-# 
-# desc "Clean images generated by tests"
-# task :clean do
-#   rm FileList['test/output/*.png']
-#   rm_rf 'pkg'
-#   rm_rf 'doc'
-# end
-# 
-# desc "Copy documentation to topfunky.com" 
-# task :rdoc_deploy => [:rdoc] do
-#   dirs = %w{doc}
-#   onserver = "topfunky@topfunky.com:/home/topfunky/topfunky.com/clients/rails/gruff" 
-#   dirs.each do | dir|
-#     `rsync -avz -e ssh "#{`pwd`.chomp}/#{dir}" "#{onserver}" --exclude ".svn"`
-#   end
-# end
-# 
-# # Run the unit tests
-# Rake::TestTask.new { |t|
-#   t.libs << "test"
-#   t.pattern = 'test/*_test.rb'
-#   t.verbose = true
-# }
-# 
-# # Genereate the RDoc documentation
-# Rake::RDocTask.new { |rdoc|
-#   rdoc.rdoc_dir = 'doc'
-#   rdoc.title    = "Gruff -- Beautiful graphs"
-# #  rdoc.options << '--line-numbers --inline-source --main README --accessor adv_attr_accessor=M'
-#   rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-#   rdoc.rdoc_files.include('README', 'CHANGELOG')
-#   rdoc.rdoc_files.include('lib/gruff.rb')
-#   rdoc.rdoc_files.include('lib/gruff/*.rb')
-# }
-# 
-# 
-# # Create compressed packages
-# spec = Gem::Specification.new do |s|
-#   s.platform = Gem::Platform::RUBY
-#   s.name = PKG_NAME
-#   s.summary = "Beautiful graphs for one or multiple datasets."
-#   s.description = %q{Make colorful graphs for use on websites or documents.}
-#   s.version = PKG_VERSION
-# 
-#   s.author = "Geoffrey Grosenbach"
-#   s.email = "boss@topfunky.com"
-#   s.rubyforge_project = RUBY_FORGE_PROJECT
-#   s.homepage = "http://www.topfunky.com"
-# 
-#   s.has_rdoc = true
-#   s.requirements << 'none'
-#   s.require_path = 'lib'
-#   s.autorequire = 'gruff'
-# 
-#   s.files = [ "Rakefile", "README", "CHANGELOG", "MIT-LICENSE" ]
-#   s.files = s.files + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
-#   s.files = s.files + Dir.glob( "assets/*" ).delete_if { |item| item.include?( "\.svn" ) }
-#   s.files = s.files + Dir.glob( "test/**/*" ).delete_if { |item| item.include?( "\.svn" ) || item.include?("\.png") }
-# end
-#   
-# Rake::GemPackageTask.new(spec) do |p|
-#   p.gem_spec = spec
-#   p.need_tar = true
-#   p.need_zip = true
-# end
-# 
-# desc "Publish the API documentation"
-# task :pgem => [:package] do 
-#   Rake::SshFilePublisher.new("boss@topfunky.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-# end
-# 
-# desc "Publish the release files to RubyForge."
-# task :release => [:package] do
-#   files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
-# 
-#   if RUBY_FORGE_PROJECT then
-#     require 'net/http'
-#     require 'open-uri'
-# 
-#     project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
-#     project_data = open(project_uri) { |data| data.read }
-#     group_id = project_data[/[?&]group_id=(\d+)/, 1]
-#     raise "Couldn't get group id" unless group_id
-# 
-#     # This echos password to shell which is a bit sucky
-#     if ENV["RUBY_FORGE_PASSWORD"]
-#       password = ENV["RUBY_FORGE_PASSWORD"]
-#     else
-#       print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
-#       password = STDIN.gets.chomp
-#     end
-# 
-#     login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
-#       data = [
-#         "login=1",
-#         "form_loginname=#{RUBY_FORGE_USER}",
-#         "form_pw=#{password}"
-#       ].join("&")
-#       http.post("/account/login.php", data)
-#     end
-# 
-#     cookie = login_response["set-cookie"]
-#     raise "Login failed" unless cookie
-#     headers = { "Cookie" => cookie }
-# 
-#     release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
-#     release_data = open(release_uri, headers) { |data| data.read }
-#     package_id = release_data[/[?&]package_id=(\d+)/, 1]
-#     raise "Couldn't get package id" unless package_id
-# 
-#     first_file = true
-#     release_id = ""
-# 
-#     files.each do |filename|
-#       basename  = File.basename(filename)
-#       file_ext  = File.extname(filename)
-#       file_data = File.open(filename, "rb") { |file| file.read }
-# 
-#       puts "Releasing #{basename}..."
-# 
-#       release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
-#         release_date = Time.now.strftime("%Y-%m-%d %H:%M")
-#         type_map = {
-#           ".zip"    => "3000",
-#           ".tgz"    => "3110",
-#           ".gz"     => "3110",
-#           ".gem"    => "1400"
-#         }; type_map.default = "9999"
-#         type = type_map[file_ext]
-#         boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
-# 
-#         query_hash = if first_file then
-#           {
-#             "group_id" => group_id,
-#             "package_id" => package_id,
-#             "release_name" => RELEASE_NAME,
-#             "release_date" => release_date,
-#             "type_id" => type,
-#             "processor_id" => "8000", # Any
-#             "release_notes" => "",
-#             "release_changes" => "",
-#             "preformatted" => "1",
-#             "submit" => "1"
-#           }
-#         else
-#           {
-#             "group_id" => group_id,
-#             "release_id" => release_id,
-#             "package_id" => package_id,
-#             "step2" => "1",
-#             "type_id" => type,
-#             "processor_id" => "8000", # Any
-#             "submit" => "Add This File"
-#           }
-#         end
-# 
-#         query = "?" + query_hash.map do |(name, value)|
-#           [name, URI.encode(value)].join("=")
-#         end.join("&")
-# 
-#         data = [
-#           "--" + boundary,
-#           "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
-#           "Content-Type: application/octet-stream",
-#           "Content-Transfer-Encoding: binary",
-#           "", file_data, ""
-#           ].join("\x0D\x0A")
-# 
-#         release_headers = headers.merge(
-#           "Content-Type" => "multipart/form-data; boundary=#{boundary}"
-#         )
-# 
-#         target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
-#         http.post(target + query, data, release_headers)
-#       end
-# 
-#       if first_file then
-#         release_id = release_response.body[/release_id=(\d+)/, 1]
-#         raise("Couldn't get release id") unless release_id
-#       end
-# 
-#       first_file = false
-#     end
-#   end
-# end
-# 
-# 
+rule '' do |t|
+  system "ruby test/test_#{t.name}.rb"
+end

data/lib/gruff/base.rb

@@ -20,7 +20,7 @@ require File.dirname(__FILE__) + '/deprecated'
 
 module Gruff
   
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
   
   class Base
   
@@ -124,6 +124,12 @@ module Gruff
     # Experimental
     attr_accessor :stacked
     
+    
+    # Optionally set the size of the colored box by each item in the legend. Default is 20.0
+    #
+    # Will be scaled down if graph is smaller than 800px wide.
+    attr_accessor :legend_box_size
+
 
     # If one numerical argument is given, the graph is drawn at 4/3 ratio according to the given width (800 results in 800x600, 400 gives 400x300, etc.).
     #
@@ -141,6 +147,21 @@ module Gruff
         @rows = target_width.to_f * 0.75        
       end
 
+      initialize_ivars
+
+      reset_themes
+      theme_keynote
+    end
+
+    ##
+    # Set instance variables for this object.
+    #
+    # Subclasses can override this, call super, then set values separately.
+    #
+    # This makes it possible to set defaults in a subclass but still allow
+    # developers to change this values in their program.
+    
+    def initialize_ivars
       # Internal for calculations
       @raw_columns = 800.0
       @raw_rows = 800.0 * (@rows/@columns)
@@ -162,6 +183,8 @@ module Gruff
       @marker_font_size = 21.0
       @legend_font_size = 20.0
       @title_font_size = 36.0
+      
+      @legend_box_size = 20.0
 
       @no_data_message = "No Data"
 
@@ -177,9 +200,6 @@ module Gruff
       @y_axis_increment = nil
       @stacked = nil
       @norm_data = nil
-
-      reset_themes()
-      theme_keynote()
     end
     
     def font=(font_path)
@@ -380,7 +400,7 @@ protected
     # Subclasses should start by calling super() for this method.
     def draw
       make_stacked if @stacked
-      setup_drawing()
+      setup_drawing
       
       debug {
         # Outer margin
@@ -391,10 +411,13 @@ protected
       }
     end
 
-    # Draws the decorations.
-    # - line markers
-    # - legend
-    # - title
+    ##
+    # Calculates size of drawable area and draws the decorations.
+    #
+    # * line markers
+    # * legend
+    # * title
+    
     def setup_drawing
       # Maybe should be done in one of the following functions for more granularity.
       unless @has_data
@@ -439,6 +462,9 @@ protected
       @spread = @spread > 0 ? @spread : 1
     end
 
+    ##
+    # Calculates size of drawable area, general font dimensions, etc.
+    
     def setup_graph_measurements
       @marker_caps_height = calculate_caps_height(@marker_font_size)
       @title_caps_height = calculate_caps_height(@title_font_size)
@@ -449,10 +475,19 @@ protected
          @graph_right_margin, 
          @graph_bottom_margin) = [LEFT_MARGIN, RIGHT_MARGIN, BOTTOM_MARGIN]
       else
+        longest_left_label_width = 0
+        if @has_left_labels
+          longest_left_label_width =  calculate_width(@marker_font_size,
+                                      labels.values.inject('') { |value, memo| (value.to_s.length > memo.to_s.length) ? value : memo }) * 1.25
+        else
+          longest_left_label_width = calculate_width(@marker_font_size, 
+                          label(@maximum_value.to_f))
+        end
+      
         # Shift graph if left line numbers are hidden
-        line_number_width = @hide_line_numbers ? 
+        line_number_width = @hide_line_numbers && !@has_left_labels ? 
                               0.0 : 
-                              (calculate_width(@marker_font_size, label(@maximum_value.to_f)) + LABEL_MARGIN * 2)
+                              (longest_left_label_width + LABEL_MARGIN * 2)
 
         @graph_left = LEFT_MARGIN + 
                       line_number_width + 
@@ -607,8 +642,7 @@ protected
 
       @legend_labels = @data.collect {|item| item[DATA_LABEL_INDEX] }
 
-      legend_square_width = 20 # small square with color of this item
-      legend_square_margin = 4
+      legend_square_width = @legend_box_size # small square with color of this item
 
       # May fix legend drawing problem at small sizes
       @d.font = @font if @font
@@ -886,6 +920,9 @@ private
       end
     end
 
+    ##
+    # Return a formatted string representing a number value that should be printed as a label.   
+
     def label(value)      
       if (@spread.to_f % @marker_count.to_f == 0) || !@y_axis_increment.nil?
         return value.to_i.to_s

data/lib/gruff/mini/pie.rb

@@ -9,14 +9,18 @@ module Gruff
 
       include Gruff::Mini::Legend
 
-      def draw
+      def initialize_ivars
+        super
+        
         @hide_legend = true
         @hide_title = true
         @hide_line_numbers = true
   
-        @marker_font_size = 40.0
+        @marker_font_size = 60.0
         @legend_font_size = 60.0
+      end
 
+      def draw
         expand_canvas_for_vertical_legend
         
         super

data/lib/gruff/mini/side_bar.rb

@@ -5,18 +5,17 @@
 module Gruff
   module Mini
 
-    class SideBar < Gruff::Base
+    class SideBar < Gruff::SideBar
 
-      def draw
+      def initialize_ivars
+        super
         @hide_legend = true
         @hide_title = true
         @hide_line_numbers = true
-  
+
         @marker_font_size = 40.0
-        super
-        
       end
-
+      
     end
   
   end

data/lib/gruff/pie.rb

@@ -5,6 +5,15 @@ class Gruff::Pie < Gruff::Base
 
   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.
+  attr_accessor :zero_degree
+  
+  def initialize_ivars
+    super
+    @zero_degree = 0.0
+  end
+
   def draw
     @hide_line_markers = true
     
@@ -18,7 +27,7 @@ class Gruff::Pie < Gruff::Base
     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 = 0.0
+    prev_degrees = @zero_degree
 
     # Use full data since we can easily calculate percentages
     @data.sort{ |a, b| a[DATA_VALUES_INDEX][0] <=> b[DATA_VALUES_INDEX][0] }.each do |data_row|
@@ -61,11 +70,11 @@ private
   # 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 = 5.0      # The distance out from the center of the pie to get point
+    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 * 0.10
+    ellipse_factor = radius_offset * 0.15
     x = x_offset + ((radius_offset + ellipse_factor) * Math.cos(angle.deg2rad))
     y = y_offset + (radius_offset * Math.sin(angle.deg2rad))
     

data/lib/gruff/side_bar.rb

@@ -14,6 +14,8 @@ class Gruff::SideBar < Gruff::Base
 
     return if @hide_line_markers
 
+    @d = @d.stroke_antialias false
+      
     # Draw horizontal line markers and annotate with numbers
     @d = @d.stroke(@marker_color)
     @d = @d.stroke_width 1
@@ -23,38 +25,41 @@ class Gruff::SideBar < Gruff::Base
     increment = significant(@maximum_value.to_f / number_of_lines)
     (0..number_of_lines).each do |index|
 
-      line_diff = (@graph_right - @graph_left) / number_of_lines
-      x = @graph_right - (line_diff * index) - 1
-      @d = @d.line(x, @graph_bottom, x, @graph_top)
-
-      diff = index - number_of_lines
+      line_diff    = (@graph_right - @graph_left) / number_of_lines
+      x            = @graph_right - (line_diff * index) - 1
+      @d           = @d.line(x, @graph_bottom, x, @graph_top)
+      diff         = index - number_of_lines
       marker_label = diff.abs * increment
 
-      @d.fill = @marker_color
-      @d.font = @font if @font
-      @d.stroke = 'transparent'
-      @d.pointsize = scale_fontsize(@marker_font_size)
-#        @d.gravity = NorthGravity
-      @d = @d.annotate_scaled( @base_image, 
-                        100, 20,
-                        x - (@marker_font_size/1.5), @graph_bottom + 40, 
-                        marker_label.to_s, @scale)
-
+      unless @hide_line_numbers
+        @d.fill      = @marker_color
+        @d.font      = @font if @font
+        @d.stroke    = 'transparent'
+        @d.pointsize = scale_fontsize(@marker_font_size)
+        # @d.gravity = NorthGravity
+        @d           = @d.annotate_scaled( @base_image, 
+                          100, 20,
+                          x - (@marker_font_size/1.5), @graph_bottom + 40, 
+                          marker_label.to_s, @scale)
+      end # unless
+      @d = @d.stroke_antialias true
     end
   end
 
-  # Instead of base class version, modified to enable us to draw on the Y axis instead of X
+  ##
+  # Draw on the Y axis instead of the X
+  
   def draw_label(y_offset, index)
     if !@labels[index].nil? && @labels_seen[index].nil?
-      @d.fill = @marker_color
-      @d.font = @font if @font
-      @d.stroke = 'transparent'
-      @d.font_weight = NormalWeight
-      @d.pointsize = scale_fontsize(@marker_font_size)
-      @d.gravity = CenterGravity
-      @d = @d.annotate_scaled(@base_image,
+      @d.fill             = @marker_color
+      @d.font             = @font if @font
+      @d.stroke           = 'transparent'
+      @d.font_weight      = NormalWeight
+      @d.pointsize        = scale_fontsize(@marker_font_size)
+      @d.gravity          = EastGravity
+      @d                  = @d.annotate_scaled(@base_image,
                               1, 1,
-                              @graph_left / 2, y_offset,
+                              -@graph_left + LABEL_MARGIN * 2.0, y_offset,
                               @labels[index], @scale)
       @labels_seen[index] = 1
     end
@@ -72,34 +77,35 @@ class Gruff::SideBar < Gruff::Base
     spacing_factor = 0.9
 
     @bar_width = @graph_height / @column_count.to_f
-    @d = @d.stroke_opacity 0.0
-    height = Array.new(@column_count, 0)
-    length = Array.new(@column_count, @graph_left)
+    @d         = @d.stroke_opacity 0.0
+    height     = Array.new(@column_count, 0)
+    length     = Array.new(@column_count, @graph_left)
 
     @norm_data.each_with_index do |data_row, row_index|
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
       data_row[1].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]) + 1
-    	  temp2 = @graph_left + @graph_width - height[point_index] - 1
-    	  difference = temp2 - temp1
-
-    	  left_x = length[point_index] #+ 1
-              left_y = @graph_top + (@bar_width * point_index)
-    	  right_x = left_x + difference
-              right_y = left_y + @bar_width * spacing_factor
-    	  length[point_index] += difference
+    	  # 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]) + 1
+        temp2      = @graph_left + @graph_width - height[point_index] - 1
+        difference = temp2 - temp1
+
+        left_x                = length[point_index] #+ 1
+        left_y                = @graph_top + (@bar_width * point_index)
+        right_x               = left_x + difference
+        right_y               = left_y + @bar_width * spacing_factor
+        length[point_index] += difference
         height[point_index] += (data_point * @graph_width - 2)
 
-        @d = @d.rectangle(left_x, left_y, right_x, right_y)
+        @d                    = @d.rectangle(left_x, left_y, right_x, right_y)
 
         # Calculate center based on bar_width and current row
-        label_center = @graph_top + (@bar_width * point_index) + (@bar_width * spacing_factor / 2.0)
+        label_center          = @graph_top + (@bar_width * point_index) + (@bar_width * spacing_factor / 2.0)
         draw_label(label_center, point_index)
       end
 

data/lib/gruff/side_stacked_bar.rb

@@ -1,3 +1,4 @@
+##
 # New gruff graph type added to enable sideways stacking bar charts (basically looks like a x/y
 # flip of a standard stacking bar chart)
 #

data/test/test_bar.rb

@@ -112,6 +112,18 @@ class TestGruffBar < GruffTestCase
     g.write("test/output/bar_set_marker.png")
   end
 
+  def test_set_legend_box_size
+    g = setup_basic_graph(400)
+    g.title = "Set Legend Box Size"
+    g.legend_box_size = 10.0
+    g.write("test/output/bar_set_legend_box_size_sm.png")
+    
+    g = setup_basic_graph(400)
+    g.title = "Set Legend Box Size"
+    g.legend_box_size = 50.0
+    g.write("test/output/bar_set_legend_box_size_lg.png")
+  end
+
   def test_x_y_labels
     g = setup_basic_graph(400)
     g.title = "X Y Labels"
@@ -122,7 +134,7 @@ class TestGruffBar < GruffTestCase
 
   def test_fireball
     g = Gruff::Bar.new
-    g.hide_title = true
+    g.title = "Daring Fireball-type Accumulation Graph"
     g.hide_line_numbers = true
     
     running_totals = []

data/test/test_mini_side_bar.rb

@@ -1,11 +1,37 @@
 
 require File.dirname(__FILE__) + "/gruff_test_case"
 
-class TestSimpleSideBar < GruffTestCase
+class TestMiniSideBar < GruffTestCase
     
-  def test_simple_side_bar
+  def test_one_color
+    # Use a single data set
+    @datasets = [
+        [:Jimmy, [25, 36, 86, 39]]
+      ]
+    @labels = {
+        0 => 'Auto', 
+        1 => 'Entertainment', 
+        2 => 'Food',
+        3 => 'Bus'
+      }
+
     g = setup_basic_graph(Gruff::Mini::SideBar, 200)
     write_test_file g, 'mini_side_bar.png'    
   end
 
+  def test_multi_color
+    # @datasets = [
+    #     [:Jimmy, [25, 36, 86, 39]]
+    #   ]
+    # @labels = {
+    #     0 => 'Auto', 
+    #     1 => 'Entertainment', 
+    #     2 => 'Food',
+    #     3 => 'Bus'
+    #   }
+
+    g = setup_basic_graph(Gruff::Mini::SideBar, 200)
+    write_test_file g, 'mini_side_bar_multi_color.png'    
+  end
+
 end

data/test/test_side_bar.rb

@@ -0,0 +1,12 @@
+
+require File.dirname(__FILE__) + "/gruff_test_case"
+
+class TestGruffSideBar < GruffTestCase
+
+  def test_bar_graph
+    g = setup_basic_graph(Gruff::SideBar, 800)
+    write_test_file g, 'side_bar.png'    
+  end
+
+end
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
-date: 2006-10-26 00:00:00 -07:00
+  version: 0.2.7
+date: 2006-11-03 00:00:00 -08:00
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
 - lib
@@ -31,10 +31,33 @@ authors:
 - Geoffrey Grosenbach
 files: 
 - CHANGELOG
-- README.txt
+- Manifest.txt
 - MIT-LICENSE
 - Rakefile
-- Manifest.txt
+- README.txt
+- assets/pc306715.jpg
+- 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
 - lib/gruff.rb
 - lib/gruff/area.rb
 - lib/gruff/bar.rb
@@ -46,31 +69,32 @@ files:
 - 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_bar.rb
-- lib/gruff/side_bar.rb
 - lib/gruff/mini/bar.rb
+- lib/gruff/mini/legend.rb
 - lib/gruff/mini/pie.rb
 - lib/gruff/mini/side_bar.rb
-- lib/gruff/mini/legend.rb
+- test/gruff_test_case.rb
+- test/output
 - test/test_area.rb
 - test/test_bar.rb
 - test/test_base.rb
-- test/gruff_test_case.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/output
 - 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_bar.rb
-- test/test_mini_bar.rb
-- test/test_mini_pie.rb
-- test/test_mini_side_bar.rb
 test_files: []
 
 rdoc_options: []