ruport 0.5.3 → 0.5.4

data/CHANGELOG

@@ -1,4 +1,20 @@
-Tnghe current version of Ruby Reports is 0.5.3
+Tnghe current version of Ruby Reports is 0.5.4
+
+changes since 0.5.3
+
+- Fixed a bug where Table#<< would fail silently if an object could not be
+  converted to a Record
+
+- Fixed a bug where setting column names after a table was initialized without
+  them caused Table to break.
+
+- Example added for basic grouping functionality
+
+- Table#column_names= reworked to address a performance concern.
+
+- Collection#[] moved to Table#[], since Set#[] is not implemented.
+
+- Quieted some warnings discovered by pat eyler
 
 changes since 0.5.2
 

data/Rakefile

@@ -23,7 +23,7 @@ end
 
 spec = Gem::Specification.new do |spec|
 	spec.name = LEAN ? "lean-ruport" : "ruport"
-	spec.version = "0.5.3"
+	spec.version = "0.5.4"
 	spec.platform = Gem::Platform::RUBY
 	spec.summary = "A generalized Ruby report generation and templating engine."
 	spec.files =  Dir.glob("{examples,lib,test,bin}/**/**/**/*") +

data/examples/basic_grouping.rb

@@ -0,0 +1,9 @@
+require "ruport"
+a = [ ['a',7],['b',5],['c',11],
+      ['d',9],['a',3],['b',2] ].to_table(%w[letter num])
+puts "Initial Data:\n#{a}"
+b = a.split(:group => "letter")
+totals = [].to_table(%w[group sum])
+b.attributes.each { |x| totals << [x,b[x].inject(0) { |s,r| s + r['num'] }] }
+puts "After grouping:\n#{totals}"
+

data/lib/ruport.rb

@@ -12,7 +12,7 @@
 
 module Ruport
   
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
   
   # Ruports logging and error interface.
   # Can generate warnings or raise fatal errors

data/lib/ruport/data/collection.rb

@@ -40,12 +40,12 @@ module Ruport::Data
     # Provides a shortcut for the as() method by converting as(:format_name)
     # into to_format_name
     def method_missing(id,*args)
-     return as($1.to_sym) if id.to_s =~ /^to_(.*)/ 
-     super
+      return as($1.to_sym) if id.to_s =~ /^to_(.*)/ 
+      super
     end
     
     attr_reader :data
-    def_delegators :@data, :each, :length, :size, :[], :empty?
+    def_delegators :@data, :each, :length, :size, :empty?
   end
 end
 

data/lib/ruport/data/record.rb

@@ -124,7 +124,7 @@ module Ruport::Data
     # Sets the attribute list for this Record
     #
     #   my_record.attributes = %w[foo bar baz]
-    def attributes=(a); @attributes=a; end
+    attr_writer :attributes
 
     # Allows you to change the order of or reduce the number of columns in a
     # Record.  Example:
@@ -134,7 +134,7 @@ module Ruport::Data
     #   b.attributes #=> ["a","d","b"]
     #   b.data #=> [1,4,2]
     def reorder(*indices)
-      dup.reorder! *indices
+      dup.reorder!(*indices)
     end
     
     # Same as Record#reorder but is destructive

data/lib/ruport/data/table.rb

@@ -47,14 +47,20 @@ module Ruport::Data
 
     attr_reader :column_names
 
+    def_delegator :@data, :[]
+
     # Sets the column names for this table. The single parameter should be 
     # an array listing the names of the columns.
     #
     #   tbl = Table.new({:data => [1,2,3], [3,4,5], :column_names => %w[a b c]})
     #   tbl.column_names = %w[e f g]
     def column_names=(other)
-      @column_names = other.dup
-      map { |r| r.attributes = @column_names }
+      #FIXME: when column_names changes, we'll need to remove this
+      unless @column_names 
+        @column_names = other.dup
+        each { |r| r.attributes = @column_names }
+      end
+      @column_names.replace(other.dup)
     end
 
     # Compares this table to another table and returns true if
@@ -88,13 +94,15 @@ module Ruport::Data
       when Array
         @data << Record.new(other, :attributes => @column_names)
       when Hash
-        raise unless @column_names
+        raise ArgumentError unless @column_names
         arr = @column_names.map { |k| other[k] }
         @data << Record.new(arr, :attributes => @column_names)
       when Record
         raise ArgumentError unless column_names.eql? other.attributes
         @data << Record.new(other.data, :attributes => @column_names)
         @data.last.tags = other.tags.dup
+      else
+        raise ArgumentError
       end
       self
     end
@@ -104,6 +112,7 @@ module Ruport::Data
     #
     #   data = Table.new({:data => [1,2], [3,4], :column_names => %w[a b]})
     #   data.reorder!([1,0])  
+    #
     def reorder!(*indices)
       indices = indices[0] if indices[0].kind_of? Array
       if @column_names
@@ -112,10 +121,12 @@ module Ruport::Data
         else
           indices 
         end
+        #   FIXME: @column_names.replace should and allow us to avoid the
+        #   r.attributes hack below.  This means this might be buggy.
         @column_names = x
       end
       @data.each { |r| 
-        r.reorder_data! *indices
+        r.reorder_data!(*indices)
         r.attributes = @column_names
       }; self
     end
@@ -125,7 +136,7 @@ module Ruport::Data
     #   one = Table.new({:data => [1,2], [3,4], :column_names => %w[a b]})
     #   two = one.reorder!([1,0])  
     def reorder(*indices)
-      dup.reorder! *indices
+      dup.reorder!(*indices)
     end
 
     # Adds an extra column to the table. Accepts an options Hash as its

data/lib/ruport/query.rb

@@ -103,7 +103,7 @@ module Ruport
         "no block given!", :status => :fatal,
         :level => :log_only, :exception => LocalJumpError 
       ) unless action
-      fetch &action
+      fetch(&action)
     end
     
     # Grabs the result set as a Data::Table or if in raw_data mode, an array of

data/test/test_table.rb

@@ -15,6 +15,7 @@ class TestTable < Test::Unit::TestCase
     end
     
     a = Ruport::Data::Record.new [1,2,3]
+    assert a.respond_to?(:[])   
     b = a.dup
     b.attributes = %w[col1 col2 col3]
     tables.zip([[],[],[a],[b]]).each { |t,n| assert_equal n, t.data }
@@ -28,6 +29,8 @@ class TestTable < Test::Unit::TestCase
     rec = table[0].dup
     rec.attributes = %w[a b c d]
     assert_raise(ArgumentError) { table << rec }
+    assert_raise(ArgumentError) { table << Object.new }
+    assert_raise(ArgumentError) { table << [].to_table }
   end
 
   def test_csv_load

data/test/unit.log

@@ -110,3 +110,45 @@ F, [2006-09-14T15:43:03.220988 #2747] FATAL -- : no block given!
 F, [2006-09-14T15:44:57.026175 #2795] FATAL -- : Missing host for mailer bar
 F, [2006-09-14T15:44:57.027386 #2795] FATAL -- : Missing DSN for source foo!
 F, [2006-09-14T15:44:58.401789 #2795] FATAL -- : no block given!
+F, [2006-09-15T22:15:33.543076 #2687] FATAL -- : Missing host for mailer bar
+F, [2006-09-15T22:15:33.544463 #2687] FATAL -- : Missing DSN for source foo!
+F, [2006-09-15T22:15:34.930062 #2687] FATAL -- : no block given!
+F, [2006-09-15T22:38:15.020965 #2749] FATAL -- : Missing host for mailer bar
+F, [2006-09-15T22:38:15.022562 #2749] FATAL -- : Missing DSN for source foo!
+F, [2006-09-15T22:38:16.392428 #2749] FATAL -- : no block given!
+F, [2006-09-16T12:16:28.334123 #3531] FATAL -- : Missing host for mailer bar
+F, [2006-09-16T12:16:28.335300 #3531] FATAL -- : Missing DSN for source foo!
+F, [2006-09-16T12:16:31.349294 #3531] FATAL -- : no block given!
+F, [2006-09-22T10:57:48.979238 #2296] FATAL -- : Missing host for mailer bar
+F, [2006-09-22T10:57:48.980766 #2296] FATAL -- : Missing DSN for source foo!
+F, [2006-09-22T10:57:50.420679 #2296] FATAL -- : no block given!
+F, [2006-09-22T11:28:10.025473 #2436] FATAL -- : Missing host for mailer bar
+F, [2006-09-22T11:28:10.026722 #2436] FATAL -- : Missing DSN for source foo!
+F, [2006-09-22T11:28:11.452947 #2436] FATAL -- : no block given!
+F, [2006-09-22T11:29:34.369510 #2455] FATAL -- : Missing host for mailer bar
+F, [2006-09-22T11:29:34.370692 #2455] FATAL -- : Missing DSN for source foo!
+F, [2006-09-22T11:29:35.789372 #2455] FATAL -- : no block given!
+F, [2006-09-22T12:22:11.125513 #2685] FATAL -- : Missing host for mailer bar
+F, [2006-09-22T12:22:11.127121 #2685] FATAL -- : Missing DSN for source foo!
+F, [2006-09-22T12:22:12.542014 #2685] FATAL -- : no block given!
+F, [2006-09-22T12:24:39.561416 #2706] FATAL -- : Missing host for mailer bar
+F, [2006-09-22T12:24:39.562607 #2706] FATAL -- : Missing DSN for source foo!
+F, [2006-09-22T12:24:40.955523 #2706] FATAL -- : no block given!
+F, [2006-09-22T12:25:58.299119 #2728] FATAL -- : Missing host for mailer bar
+F, [2006-09-22T12:25:58.300290 #2728] FATAL -- : Missing DSN for source foo!
+F, [2006-09-22T12:25:59.700961 #2728] FATAL -- : no block given!
+F, [2006-09-22T12:26:20.389344 #2746] FATAL -- : Missing host for mailer bar
+F, [2006-09-22T12:26:20.390526 #2746] FATAL -- : Missing DSN for source foo!
+F, [2006-09-22T12:26:21.775565 #2746] FATAL -- : no block given!
+F, [2006-09-22T12:28:27.008090 #2763] FATAL -- : Missing host for mailer bar
+F, [2006-09-22T12:28:27.009264 #2763] FATAL -- : Missing DSN for source foo!
+F, [2006-09-22T12:28:28.432881 #2763] FATAL -- : no block given!
+F, [2006-09-23T20:49:21.609220 #3403] FATAL -- : Missing host for mailer bar
+F, [2006-09-23T20:49:21.610861 #3403] FATAL -- : Missing DSN for source foo!
+F, [2006-09-23T20:49:23.197684 #3403] FATAL -- : no block given!
+F, [2006-09-23T20:50:04.754598 #3412] FATAL -- : Missing host for mailer bar
+F, [2006-09-23T20:50:04.756157 #3412] FATAL -- : Missing DSN for source foo!
+F, [2006-09-23T20:50:06.211906 #3412] FATAL -- : no block given!
+F, [2006-09-23T20:50:29.074940 #3421] FATAL -- : Missing host for mailer bar
+F, [2006-09-23T20:50:29.076482 #3421] FATAL -- : Missing DSN for source foo!
+F, [2006-09-23T20:50:30.553625 #3421] FATAL -- : no block given!

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruport
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
-date: 2006-09-15 00:00:00 -04:00
+  version: 0.5.4
+date: 2006-09-24 00:00:00 -04:00
 summary: A generalized Ruby report generation and templating engine.
 require_paths: 
 - lib
@@ -37,6 +37,7 @@ files:
 - examples/line_graph.rb
 - examples/report.rb
 - examples/long.txt
+- examples/basic_grouping.rb
 - examples/simple_mail.rb
 - examples/template.rb
 - lib/ruport