gruff 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1,6 +1,13 @@
 CHANGELOG
 
+== 0.0.2
+
+* Fixed to_blob (thanks to Carlos Villela)
+* Added bar graphs (initial functionality...will be enhanced)
+* Removed rendered test output from gem
+
+
 == 0.0.1
 
-Initial release.
-Line graphs only. Other graph styles coming soon.
+* Initial release.
+* Line graphs only. Other graph styles coming soon.

data/lib/gruff.rb

@@ -1,5 +1,7 @@
 
-%w{base area bar line pie}.each do |filename|
-  #puts "Requiring #{filename}"
-  require "gruff/#{filename}"
-end
+require 'gruff/base'
+
+require 'gruff/area'
+require 'gruff/bar'
+require 'gruff/line'
+require 'gruff/pie'

data/lib/gruff/bar.rb

@@ -4,11 +4,56 @@ require 'gruff/base'
 module Gruff
   class Bar < Base
 
-    # TODO Not yet implemented.
     def draw
       super
 
-      @d.draw(@base_image)
+      # Setup spacing.
+      #
+      # Columns sit side-by-side.
+      @bar_width = @graph_width / (@column_count * @data.length).to_f
+    
+      @d = @d.stroke_opacity 0.0
+    
+      @norm_data.each_with_index do |data_row, row_index|
+        @d = @d.fill current_color
+      
+        data_row[1].each_with_index do |data_point, point_index|
+          # Use incremented x and scaled y
+          left_x = @graph_left + (@bar_width * (row_index + point_index + ((@data.length - 1) * point_index)))
+          left_y = @graph_top + (@graph_height - data_point * @graph_height)
+          right_x = left_x + @bar_width
+          right_y = @graph_top + @graph_height - 1
+          
+          @d = @d.rectangle(left_x, left_y, right_x, right_y)
+
+          # TODO Calculate center based on bar_width and current row
+          #draw_label(left_x, index)
+        end
+        
+        increment_color()
+      end
+    
+      @d.draw(@base_image)    
+    end
+
+private
+
+    # Draws column labels below graph, centered under entire block
+    def draw_label(x_offset, index)
+      # TODO
+      if !@labels[index].nil? && @labels_seen[index].nil?
+        @d.fill = @marker_color
+        @d.font = @font
+        @d.stroke = 'transparent'
+        @d.font_weight = NormalWeight
+        @d.pointsize = scale_fontsize(@marker_pointsize)
+        @d.gravity = CenterGravity
+        @d = @d.annotate_scaled(@base_image,
+                                1, 1,
+                                x_offset, @raw_rows - 80,
+                                @labels[index], @scale)
+        @labels_seen[index] = 1
+      end
     end
 
   end

data/lib/gruff/base.rb

@@ -7,12 +7,15 @@
 #
 #
 
-require 'rmagick'
-require 'yaml'
+begin
+  require 'rmagick'
+rescue LoadError
+  require 'RMagick' # capitalized on Windows
+end
 
 module Gruff
   
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
   
   class Base
   
@@ -172,10 +175,12 @@ module Gruff
       @base_image.write(filename)
     end
 
-    # TODO Return the graph as a rendered binary blob.
-    def to_blob(filename="graph.png")
+    # Return the graph as a rendered binary blob.
+    def to_blob(fileformat='PNG')
       draw()
-      @base_image = @base_image.to_blob()
+      return @base_image.to_blob do
+         self.format=fileformat
+      end
     end
 
 protected
@@ -217,7 +222,7 @@ protected
     # Draws horizontal background lines and labels
     def draw_line_markers
       @graph_left = 130.0
-      @graph_right = @raw_columns - 100.0
+      @graph_right = @raw_columns - 100.0 # TODO Make wider
       @graph_top = 150.0
       @graph_bottom = @raw_rows - 110.0
       @graph_height = @graph_bottom - @graph_top

data/rakefile

@@ -61,7 +61,7 @@ spec = Gem::Specification.new do |s|
 
   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( "test/**/*" ).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|

data/test/bar_test.rb

@@ -0,0 +1,76 @@
+#!/usr/bin/ruby
+
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+#$:.unshift File.dirname(__FILE__) + "/fixtures/helpers"
+
+require 'test/unit'
+require 'gruff'
+
+class TestGruffBar < Test::Unit::TestCase
+
+  # TODO Delete old output files once when starting tests
+
+  def setup
+    @datasets = [
+      [:Jimmy, [25, 36, 86, 39]],
+      [:Charles, [80, 54, 67, 54]],
+      [:Julie, [22, 29, 35, 38]],
+      #[:Jane, [95, 95, 95, 90, 85, 80, 88, 100]],
+      #[:Philip, [90, 34, 23, 12, 78, 89, 98, 88]],
+      #["Arthur", [5, 10, 13, 11, 6, 16, 22, 32]],
+      ]
+  end
+
+  def test_bar_graph
+    g = Gruff::Bar.new
+    g.title = "Visual Multi-Line Bar Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      2 => '5/15', 
+      4 => '5/24', 
+      6 => '5/30', 
+    }
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    g.write("test/output/bar_keynote.png")
+    
+    g.theme_37signals
+    g.write("test/output/bar_37signals.png")
+    
+    g.theme_rails_keynote
+    g.write("test/output/bar_rails_keynote.png")
+    
+    g.theme_odeo
+    g.write("test/output/bar_odeo.png")
+  end
+
+
+  def test_bar_graph_small
+    g = Gruff::Bar.new(400)
+    g.title = "Visual Multi-Line Bar Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      2 => '5/15', 
+      4 => '5/24', 
+      6 => '5/30', 
+    }
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    g.write("test/output/bar_keynote_small.png")
+    
+    g.theme_37signals
+    g.write("test/output/bar_37signals_small.png")
+    
+    g.theme_rails_keynote
+    g.write("test/output/bar_rails_keynote_small.png")
+    
+    g.theme_odeo
+    g.write("test/output/bar_odeo_small.png")
+  end
+  
+
+end

data/test/line_test.rb

@@ -6,7 +6,7 @@ $:.unshift(File.dirname(__FILE__) + "/../lib/")
 require 'test/unit'
 require 'gruff'
 
-class TestGruffLines < Test::Unit::TestCase
+class TestGruffLine < Test::Unit::TestCase
 
   # TODO Delete old output files once when starting tests
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2005-10-25 00:00:00 -07:00
+  version: 0.0.2
+date: 2005-10-26 00:00:00 -07:00
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
   - lib
@@ -40,21 +40,9 @@ files:
   - lib/gruff/base.rb
   - lib/gruff/line.rb
   - lib/gruff/pie.rb
+  - test/bar_test.rb
   - test/line_test.rb
   - test/output
-  - test/output/line_37signals.png
-  - test/output/line_37signals_small.png
-  - test/output/line_font.png
-  - test/output/line_keynote.png
-  - test/output/line_keynote_small.png
-  - test/output/line_large.png
-  - test/output/line_many.png
-  - test/output/line_odeo.png
-  - test/output/line_odeo_small.png
-  - test/output/line_rails_keynote.png
-  - test/output/line_rails_keynote_small.png
-  - test/output/line_small.png
-  - test/output/similar_high_end_values.png
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []