ruport 0.5.2 → 0.5.3

data/CHANGELOG

@@ -1,4 +1,22 @@
-Tnghe current version of Ruby Reports is 0.5.2
+Tnghe current version of Ruby Reports is 0.5.3
+
+changes since 0.5.2
+
+- Fixed a bug in Format Engine which required a data attribute to be specified.
+  (will still provide an accessor for this, but no more do you *need* it)
+
+- Fixed a bug in rope's build.rb that prevented generation of multiple reports.
+
+- Fixed a bug in the way reorder() was working that was causing many
+  unneccessary copies of column_names to be made
+
+- Fixed a bug in TextPlugin that caused it to throw an error when trying to
+  print an empty table. (Now returns empty string)
+
+- Since Plugin#rendering_options and Plugin#options serve a different purpose
+  and when combined, cause problems, they have been split out into two different
+  instance variables.  This does not effect their intended use from the
+  interface side.
 
 changes since 0.5.1
 

data/Rakefile

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

data/TODO

@@ -1,5 +1,4 @@
 = TODO
 
 Any future plans are available on Ruports Trac website
-  
-  http://stonecode.svnrepository.com/ruport/trac.cgi
+=   http://stonecode.svnrepository.com/ruport/trac.cgi

data/bin/rope

@@ -48,7 +48,7 @@ class_name = format_class_name(ARGV[1])
 exit if File.exist? "app/reports/#{ARGV[1]}.rb"
 if ARGV[0].eql? "report"
   File.open("app/reports.rb", "a") { |f| 
-    f << "require \"app/reports/#{ARGV[1]}\""
+    f.puts("require \"app/reports/#{ARGV[1]}\"")
   }
 REP = <<EOR
 begin; require "rubygems"; rescue LoadError; end

data/lib/ruport/data/record.rb

@@ -139,12 +139,7 @@ module Ruport::Data
     
     # Same as Record#reorder but is destructive
     def reorder!(*indices)
-      indices = indices[0] if indices[0].kind_of?(Array) 
-      indices.each do |i| 
-        self[i] rescue raise ArgumentError, 
-                "you may have specified an invalid column" 
-      end
-      @data = indices.map { |i| self[i] }
+      indices = reorder_data!(*indices)
       if @attributes
         if indices.all? { |e| e.kind_of? Integer }
           @attributes = indices.map { |i| @attributes[i] }
@@ -153,6 +148,17 @@ module Ruport::Data
         end
       end; self
     end
+
+    def reorder_data!(*indices)
+      indices = indices[0] if indices[0].kind_of?(Array) 
+      indices.each do |i| 
+        self[i] rescue raise ArgumentError, 
+                "you may have specified an invalid column" 
+      end
+      @data = indices.map { |i| self[i] }
+      return indices;
+    end
+
     
     # Makes a fresh copy of the Record
     def dup

data/lib/ruport/data/table.rb

@@ -107,13 +107,17 @@ module Ruport::Data
     def reorder!(*indices)
       indices = indices[0] if indices[0].kind_of? Array
       if @column_names
-        @column_names = if indices.all? { |i| i.kind_of? Integer }
+        x = if indices.all? { |i| i.kind_of? Integer }
           indices.map { |i| @column_names[i] }
         else
           indices 
         end
+        @column_names = x
       end
-      @data.each { |r| r.reorder! *indices }; self
+      @data.each { |r| 
+        r.reorder_data! *indices
+        r.attributes = @column_names
+      }; self
     end
 
     # Returns a copy of the table with its columns in the requested order.

data/lib/ruport/format/engine/invoice.rb

@@ -1,6 +1,6 @@
 module Ruport
   class Format::Engine
-    class Format::Engine::Invoice < Ruport::Format::Engine
+    class Invoice < Ruport::Format::Engine
 
       # order meta data
       attributes [ :customer_info, :company_info, 

data/lib/ruport/format/engine.rb

@@ -64,7 +64,7 @@ module Ruport
  
       def render
         raise "No plugin specified" unless plugin
-        active_plugin.data = data.dup
+        active_plugin.data = data.dup if data 
         if active_plugin.respond_to? :init_plugin_helper
            active_plugin.init_plugin_helper(self)
         end

data/lib/ruport/format/plugin/html_plugin.rb

@@ -2,8 +2,9 @@ module Ruport
   class Format::Plugin
     class HTMLPlugin < Format::Plugin
    
-      rendering_options :red_cloth_enabled => true, :erb_enabled => true
-      
+      rendering_options :red_cloth_enabled => true, 
+                        :erb_enabled => true
+     
       renderer :document 
       
       renderer :table do

data/lib/ruport/format/plugin/text_plugin.rb

@@ -8,6 +8,7 @@ module Ruport
       renderer :table do 
         require "ruport/system_extensions" 
         
+        return "" if data.length == 0; 
         th = "#{rendered_field_names}#{hr}"
        
         data.each { |r|
@@ -28,6 +29,7 @@ module Ruport
       end
       
       format_field_names do
+        return "" if data.length == 0;
         data.column_names.each_with_index { |f,i| 
           data.column_names[i] = f.to_s.center(max_col_width(i))
         }
@@ -50,9 +52,8 @@ module Ruport
       action :table_width do
         f = data.column_names if data.respond_to? :column_names
         d = Data::Table.new:column_names => f, :data => data 
-
+        
         f = d[0].attributes || (0...d[0].length)
-
         f.inject(0) { |s,e| s + max_col_width(e) }
       end
 

data/lib/ruport/format/plugin.rb

@@ -60,9 +60,9 @@ module Ruport
       end
       
       def rendering_options(hash={})
-        @options ||= {}
-        @options.merge!(hash)
-        @options.dup
+        @rendering_options ||= {}
+        @rendering_options.merge!(hash)
+        @rendering_options.dup
       end
      
       attr_accessor :rendered_field_names

data/lib/ruport.rb

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

data/test/test_format_engine.rb

@@ -1,7 +1,13 @@
 require 'ruport'
-require 'rubygems' rescue LoadError nil
+begin; require 'rubygems'; rescue LoadError; nil; end
 require 'test/unit'
 
+class Naked < Ruport::Format::Engine
+  alias_engine Naked, :naked_engine 
+  Ruport::Format.build_interface_for Naked, :naked
+end
+
+
 class MockPlugin < Ruport::Format::Plugin
   
   renderer(:table) { "#{rendered_field_names}#{data}" }
@@ -24,9 +30,39 @@ class MockPlugin < Ruport::Format::Plugin
     eng.rewrite_column(0) { "a" } if apple 
   }
 
+  helper(:init_plugin) { |eng|
+    eng.options ||= {}
+    eng.options = options.merge!(:init_ran => true)
+  }
+
   plugin_name :mock
   register_on :table_engine
   register_on :document_engine
+  register_on :naked_engine
+
+end
+
+class TestFormatEngine < Test::Unit::TestCase
+
+  def test_no_data_required
+    assert_nothing_raised { 
+      Ruport::Format.naked_object(:plugin => :mock).render 
+    }
+  end
+  
+  def test_init_plugin_helper
+    a = Ruport::Format.naked_object(:plugin => :mock)
+    a.render
+    assert a.options[:init_ran]
+  end
+
+  def test_options_hash 
+    a = Ruport::Format.naked_object(:plugin => :mock, :data => [1,2,3])
+    assert(a.respond_to?(:options))
+    assert(a.active_plugin.respond_to?(:options))
+    a.render
+    assert_equal a.options, a.active_plugin.options
+  end
 
 end
 

data/test/test_plugin.rb

@@ -1,6 +1,6 @@
 require "test/unit"
 require "ruport"
-require "rubygems" rescue LoadError nil
+begin; require "rubygems"; rescue LoadError; nil; end
 
 include Ruport
 
@@ -29,6 +29,8 @@ class TSVPlugin < Format::Plugin
   register_on :invoice_engine
   register_on :document_engine
   
+  rendering_options :boring => :true
+  
 end
 
 class TestPlugin < Test::Unit::TestCase
@@ -44,8 +46,18 @@ class TestPlugin < Test::Unit::TestCase
     assert_nothing_raised { d.baz }
     assert_raise(NoMethodError) { i.foo }
     assert_raise(NoMethodError) { d.foo }
-    assert_raise(NoMethodError) { d.bar }
+    assert_raise(NoMethodError) { d.bar } 
+  end
+
+  def test_rendering_options
+    t = Ruport::Format.table_object(:data => [[1,2]], :plugin => :tsv)
+    assert t.active_plugin.respond_to?(:options)
+    assert t.active_plugin.respond_to?(:rendering_options)
+    assert t.active_plugin.rendering_options[:boring]
+    assert_nil t.active_plugin.options
+    assert_nil t.options
   end
+
 end
 
 class CSVPluginTest < Test::Unit::TestCase
@@ -224,6 +236,12 @@ class TextPluginTest < Test::Unit::TestCase
     a = Format.table_object :plugin => :text, :data => [[1,2],[300,4]]
     assert_equal(nil,a.active_plugin.right_margin)
   end
+
+  def test_graceful_failure_on_empty_table
+    assert_nothing_raised { [].to_table.to_text }
+    assert_nothing_raised { [].to_table(%w[a b c]).to_text }
+  end
+
   
 end
 

data/test/test_table.rb

@@ -53,8 +53,12 @@ class TestTable < Test::Unit::TestCase
 
     b = [[1,2,3],[4,5,6]].to_table(%w[a b c]).reorder(%w[a c])
     rows = [[1,3],[4,6]]
-    b.each { |r| assert_equal rows.shift, r.data
-                 assert_equal %w[a c], r.attributes }
+    b.each { |r| 
+      assert_equal rows.shift, r.data
+      assert_equal %w[a c], r.attributes 
+      assert_equal b.column_names.object_id,
+                   r.instance_eval{@attributes}.object_id
+    }
   end
 
   def test_append_column

data/test/unit.log

@@ -5,3 +5,108 @@ F, [2006-09-02T18:29:02.139771 #3218] FATAL -- : no block given!
 F, [2006-09-03T11:57:39.721854 #4421] FATAL -- : Missing host for mailer bar
 F, [2006-09-03T11:57:39.723273 #4421] FATAL -- : Missing DSN for source foo!
 F, [2006-09-03T11:57:41.224266 #4421] FATAL -- : no block given!
+F, [2006-09-06T02:05:31.162211 #2279] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:05:31.186639 #2279] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:05:32.685959 #2279] FATAL -- : no block given!
+F, [2006-09-06T02:07:29.461513 #2299] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:07:29.462790 #2299] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:07:30.834786 #2299] FATAL -- : no block given!
+F, [2006-09-06T02:07:39.501562 #2307] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:07:39.502847 #2307] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:07:40.867553 #2307] FATAL -- : no block given!
+F, [2006-09-06T02:08:15.951719 #2324] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:08:15.953031 #2324] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:08:17.327679 #2324] FATAL -- : no block given!
+F, [2006-09-06T02:09:55.207829 #2346] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:09:55.209021 #2346] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:09:56.579415 #2346] FATAL -- : no block given!
+F, [2006-09-06T02:10:57.371514 #2363] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:10:57.372702 #2363] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:10:58.735178 #2363] FATAL -- : no block given!
+F, [2006-09-06T02:12:20.106302 #2387] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:12:20.107504 #2387] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:12:21.541101 #2387] FATAL -- : no block given!
+F, [2006-09-06T02:23:19.798195 #2411] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:23:19.799518 #2411] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:23:21.551952 #2411] FATAL -- : no block given!
+F, [2006-09-06T02:24:24.486511 #2432] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:24:24.487828 #2432] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:24:26.351275 #2432] FATAL -- : no block given!
+F, [2006-09-06T02:25:49.579542 #2466] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:25:49.580731 #2466] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:25:50.946354 #2466] FATAL -- : no block given!
+F, [2006-09-06T02:26:40.801772 #2478] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:26:40.803067 #2478] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:26:42.178881 #2478] FATAL -- : no block given!
+F, [2006-09-06T02:34:37.820463 #2543] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:34:37.821736 #2543] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:34:39.186743 #2543] FATAL -- : no block given!
+F, [2006-09-06T02:34:59.951157 #2562] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:34:59.952376 #2562] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:35:01.336348 #2562] FATAL -- : no block given!
+F, [2006-09-06T02:36:26.308317 #2578] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:36:26.310977 #2578] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:36:27.710023 #2578] FATAL -- : no block given!
+F, [2006-09-06T02:37:03.381886 #2590] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:37:03.383193 #2590] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:37:04.752215 #2590] FATAL -- : no block given!
+F, [2006-09-06T02:38:01.261965 #2623] FATAL -- : Missing host for mailer bar
+F, [2006-09-06T02:38:01.263340 #2623] FATAL -- : Missing DSN for source foo!
+F, [2006-09-06T02:38:02.775252 #2623] FATAL -- : no block given!
+F, [2006-09-09T15:12:29.044943 #4092] FATAL -- : Missing host for mailer bar
+F, [2006-09-09T15:12:29.077832 #4092] FATAL -- : Missing DSN for source foo!
+F, [2006-09-09T15:12:30.640727 #4092] FATAL -- : no block given!
+F, [2006-09-10T23:45:58.521016 #3114] FATAL -- : Missing host for mailer bar
+F, [2006-09-10T23:45:58.553802 #3114] FATAL -- : Missing DSN for source foo!
+F, [2006-09-10T23:46:00.003750 #3114] FATAL -- : no block given!
+F, [2006-09-10T23:47:10.565187 #3129] FATAL -- : Missing host for mailer bar
+F, [2006-09-10T23:47:10.566720 #3129] FATAL -- : Missing DSN for source foo!
+F, [2006-09-10T23:47:12.022613 #3129] FATAL -- : no block given!
+F, [2006-09-13T20:46:21.960919 #2337] FATAL -- : Missing host for mailer bar
+F, [2006-09-13T20:46:21.982106 #2337] FATAL -- : Missing DSN for source foo!
+F, [2006-09-13T20:46:23.480527 #2337] FATAL -- : no block given!
+F, [2006-09-13T20:48:24.836142 #2382] FATAL -- : Missing host for mailer bar
+F, [2006-09-13T20:48:24.837660 #2382] FATAL -- : Missing DSN for source foo!
+F, [2006-09-13T20:48:26.328458 #2382] FATAL -- : no block given!
+F, [2006-09-13T20:49:11.334379 #2397] FATAL -- : Missing host for mailer bar
+F, [2006-09-13T20:49:11.335947 #2397] FATAL -- : Missing DSN for source foo!
+F, [2006-09-13T20:49:12.840600 #2397] FATAL -- : no block given!
+F, [2006-09-14T14:55:40.003769 #2286] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T14:55:40.034439 #2286] FATAL -- : Missing DSN for source foo!
+F, [2006-09-14T14:55:41.420531 #2286] FATAL -- : no block given!
+F, [2006-09-14T14:57:33.765321 #2314] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T14:57:33.766633 #2314] FATAL -- : Missing DSN for source foo!
+F, [2006-09-14T14:57:35.134511 #2314] FATAL -- : no block given!
+F, [2006-09-14T15:09:44.869755 #2389] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T15:09:44.870964 #2389] FATAL -- : Missing DSN for source foo!
+F, [2006-09-14T15:09:46.241647 #2389] FATAL -- : no block given!
+F, [2006-09-14T15:10:39.003512 #2406] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T15:10:39.004723 #2406] FATAL -- : Missing DSN for source foo!
+F, [2006-09-14T15:10:40.390227 #2406] FATAL -- : no block given!
+F, [2006-09-14T15:13:47.931038 #2474] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T15:13:47.932247 #2474] FATAL -- : Missing DSN for source foo!
+F, [2006-09-14T15:13:49.301237 #2474] FATAL -- : no block given!
+F, [2006-09-14T15:15:33.282728 #2504] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T15:15:33.283937 #2504] FATAL -- : Missing DSN for source foo!
+F, [2006-09-14T15:15:34.671120 #2504] FATAL -- : no block given!
+F, [2006-09-14T15:19:23.897944 #2541] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T15:19:23.899149 #2541] FATAL -- : Missing DSN for source foo!
+F, [2006-09-14T15:19:25.270930 #2541] FATAL -- : no block given!
+F, [2006-09-14T15:21:45.369960 #2569] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T15:21:45.371195 #2569] FATAL -- : Missing DSN for source foo!
+F, [2006-09-14T15:21:46.732855 #2569] FATAL -- : no block given!
+F, [2006-09-14T15:29:00.285359 #2626] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T15:29:00.286595 #2626] FATAL -- : Missing DSN for source foo!
+F, [2006-09-14T15:29:01.667713 #2626] FATAL -- : no block given!
+F, [2006-09-14T15:36:10.757949 #2664] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T15:36:10.759201 #2664] FATAL -- : Missing DSN for source foo!
+F, [2006-09-14T15:36:12.184753 #2664] FATAL -- : no block given!
+F, [2006-09-14T15:38:50.563309 #2686] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T15:38:50.564546 #2686] FATAL -- : Missing DSN for source foo!
+F, [2006-09-14T15:38:51.987976 #2686] FATAL -- : no block given!
+F, [2006-09-14T15:43:01.826129 #2747] FATAL -- : Missing host for mailer bar
+F, [2006-09-14T15:43:01.827337 #2747] FATAL -- : Missing DSN for source foo!
+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!

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruport
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
-date: 2006-09-03 00:00:00 -04:00
+  version: 0.5.3
+date: 2006-09-15 00:00:00 -04:00
 summary: A generalized Ruby report generation and templating engine.
 require_paths: 
 - lib