reportbuilder 1.1.1 → 1.2.0

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.2.0 / 2010-03-28
+*ReporBuilder::Table 
+  * Colspans works as expected on Html and Text. On Rtf the cells doesn't merge, because ruby-rtf doesn't support it.
+  * Better tests for Html and Text.
+* Classes related to Generator renamed to Builder, because these correspond to Builder pattern
+* Flexible codes for formats. You could use :text or :txt as :format for ReportBuilder#generate. See ReportBuilder::Builder.code for more information
+
 === 1.1.1 / 2010-03-24
 * Test suite replaces Test::Unit for Test::MiniUnit and Hpricot for Nokogiri
 * Bug fix: rtf generator doesn't accept a ReportBuilder::Image object

data/Manifest.txt

@@ -12,16 +12,16 @@ examples/images.rb
 examples/test.rtf
 examples/using_a_block.rb
 lib/reportbuilder.rb
-lib/reportbuilder/generator.rb
-lib/reportbuilder/generator/html.rb
-lib/reportbuilder/generator/rtf.rb
-lib/reportbuilder/generator/text.rb
+lib/reportbuilder/builder.rb
+lib/reportbuilder/builder/html.rb
+lib/reportbuilder/builder/rtf.rb
+lib/reportbuilder/builder/text.rb
 lib/reportbuilder/image.rb
 lib/reportbuilder/section.rb
 lib/reportbuilder/table.rb
-lib/reportbuilder/table/htmlgenerator.rb
-lib/reportbuilder/table/rtfgenerator.rb
-lib/reportbuilder/table/textgenerator.rb
+lib/reportbuilder/table/htmlbuilder.rb
+lib/reportbuilder/table/rtfbuilder.rb
+lib/reportbuilder/table/textbuilder.rb
 test/test_html.rb
 test/test_image.rb
 test/test_reportbuilder.rb

data/Rakefile

@@ -12,8 +12,15 @@ Hoe.spec 'reportbuilder' do
   self.rubyforge_name = 'ruby-statsample'
   self.developer('Claudio Bustos', 'clbustos_at_gmail.com')
   self.url = "http://ruby-statsample.rubyforge.org/reportbuilder/"
-  self.extra_deps << ["clbustos-rtf","~>0.2.1"]
-  self.extra_dev_deps << ["hpricot", "~>0.8"] 
+  self.extra_deps << ["clbustos-rtf","~>0.2.1"] << ['text-table', "~>1.2"]
+  self.extra_dev_deps << ["nokogiri", "~>1.4"] 
+end
+
+task :release => [:tag] do 
+end
+
+task :tag do	
+	sh %(svn cp https://ruby-statsample.googlecode.com/svn/reportbuilder/trunk https://ruby-statsample.googlecode.com/svn/reportbuilder/tags/v#{ReportBuilder::VERSION} -m "ReportBuilder #{ReportBuilder::VERSION} tagged")
 end
 
 # vim: syntax=ruby

data/lib/reportbuilder.rb

@@ -1,9 +1,11 @@
+require 'reportbuilder/builder'
 require 'reportbuilder/table'
 require 'reportbuilder/section'
-require 'reportbuilder/generator'
 require 'reportbuilder/image'
+
 # = Report Abstract Interface.
-# Creates text and html output, based on a common framework.
+# Creates text, html and rtf output, based on a common framework.
+#
 # == Use
 # 
 # 
@@ -26,7 +28,7 @@ require 'reportbuilder/image'
 #  rb.name="Html output"
 #  puts rb.to_html
 # 
-# * Using a block, you can control directly the generator
+# * Using a block, you can control directly the builder
 # 
 #  require "reportbuilder"    
 #  rb=ReportBuilder.new do
@@ -50,7 +52,15 @@ class ReportBuilder
   attr_accessor :name
   # Doesn't print a title if set to true
   attr_accessor :no_title
-  VERSION = '1.1.1'
+  # ReportBuilder version
+  VERSION = '1.2.0'
+  
+  FormatNotFound=Class.new(Exception)
+  # Available formats
+  def self.builder_for(format)
+    format=format.to_s.downcase
+    Builder.inherited_classes.find {|m| m.code.include? format} 
+  end
   # Generates and optionally save the report on one function
   def self.generate(options=Hash.new, &block)
     options[:filename]||=nil
@@ -58,18 +68,18 @@ class ReportBuilder
     
     if options[:filename] and options[:filename]=~/\.(\w+?)$/
       options[:format]=$1
-      options[:format]="text" if options[:format]=="txt"
     end
     file=options.delete(:filename)
-    format=options.delete(:format).to_s
-    format[0]=format[0,1].upcase
+    format=options.delete(:format)
     rb=ReportBuilder.new(options)
-    
     rb.add(block)
-    
-    generator=Generator.const_get(format.to_sym).new(rb, options)
-    generator.parse
-    out=generator.out
+    begin
+      builder=builder_for(format).new(rb, options)
+    rescue NameError  => e
+      raise FormatNotFound.new(e)
+    end
+    builder.parse
+    out=builder.out
     unless file.nil?
       File.open(file,"wb") do |fp|
         fp.write out
@@ -96,19 +106,19 @@ class ReportBuilder
   end
   # Returns an Html output
   def to_html()
-    gen = Generator::Html.new(self,@options)
+    gen = Builder::Html.new(self,@options)
     gen.parse
     gen.out
   end
   # Returns a RTF output
   def to_rtf()
-    gen = Generator::Rtf.new(self, @options)
+    gen = Builder::Rtf.new(self, @options)
     gen.parse
     gen.out
   end  
   # Save a rtf file
   def save_rtf(filename)
-    gen = Generator::Rtf.new(self,@options)
+    gen = Builder::Rtf.new(self,@options)
     gen.parse
     gen.save(filename)
   end
@@ -116,13 +126,13 @@ class ReportBuilder
   def save_html(file)
     options=@options.dup
     options[:directory]=File.dirname(file)
-    gen=Generator::Html.new(self, options)
+    gen=Builder::Html.new(self, options)
     gen.parse
     gen.save(file)
   end
   # Returns a Text output
   def to_text()
-    gen=Generator::Text.new(self, @options)
+    gen=Builder::Text.new(self, @options)
     gen.parse 
     gen.out
   end

data/lib/reportbuilder/{generator.rb → builder.rb}

@@ -1,15 +1,27 @@
 class ReportBuilder
-  # Abstract class for generators.
-  # A generator is a class which control the output for a ReportBuilder object
+  # Abstract Builder.
+  # A builder is a class which control the output for a ReportBuilder object
   # Every object which have a #report_building() method could be
   # parsed with #parse_element method.
-  class Generator
+  class Builder
     # Level of heading. See ReportBuilder::Section for using it.
     attr_reader :parse_level
-    # Options for Generator. Passed by ReportBuilder class on creation
+    # Options for Builder. Passed by ReportBuilder class on creation
     attr_reader :options
     # Entries for Table of Contents
     attr_reader :toc
+    # Array of string with format names for the Builder.
+    # For example, Html builder returns %w{html htm} and 
+    # Text builde returns %w{text txt}
+    def self.code
+#      raise "Implement this"
+    end
+    def self.inherited_classes
+      @@inherited_classes||=Array.new
+    end
+    def self.inherited(subclass)
+      inherited_classes << subclass
+    end
     def initialize(builder, options)
       @builder=builder
       @parse_level=0
@@ -24,7 +36,7 @@ class ReportBuilder
     def parse
       parse_cycle(@builder)
     end
-    # Save the output of generator to a file
+    # Save the output of builder to a file
     def save(filename)
       File.open(filename, "wb") do |fp|
         fp.write(out)
@@ -35,7 +47,7 @@ class ReportBuilder
       Hash.new
     end
     
-    # Parse each element of the container
+    # Parse each #elements of the container
     def parse_cycle(container)
       @parse_level+=1
       container.elements.each do |element|
@@ -46,14 +58,15 @@ class ReportBuilder
     
     # Parse one object, using this workflow
     # * If is a block, evaluate it
-    # * Use #report_building_FORMAT
+    # * Use #report_building_CODE, where CODE is one of the codes defined by #code
     # * Use #report_building
     # * Use #to_s
     def parse_element(element)
-      method=("report_building_" + self.class::PREFIX).intern
+      methods=self.class.code.map {|m| ("report_building_"+m).intern}
+      
       if element.is_a? Proc
         element.arity<1 ? instance_eval(&element) : element.call(self)
-      elsif element.respond_to? method
+      elsif method=methods.find {|m| element.respond_to? m}
         element.send(method, self)
       elsif element.respond_to? :report_building
         element.send(:report_building, self)
@@ -78,7 +91,7 @@ class ReportBuilder
     def text(t)
       raise "Implement this"
     end
-    # Add html code. Only parsed with generator which understand html 
+    # Add html code. Only parsed with builder which understand html 
     def html(t)
       raise "Implement this"
     end
@@ -105,15 +118,15 @@ class ReportBuilder
     end
   end
   
-  class ElementGenerator
-    def initialize(generator,element)
+  class ElementBuilder
+    def initialize(builder,element)
       @element=element
-      @generator=generator
+      @builder=builder
     end
   end
 end
 
-require 'reportbuilder/generator/text'
-require 'reportbuilder/generator/html'
-require 'reportbuilder/generator/rtf'
+require 'reportbuilder/builder/text'
+require 'reportbuilder/builder/html'
+require 'reportbuilder/builder/rtf'
 

data/lib/reportbuilder/{generator → builder}/html.rb

@@ -1,8 +1,7 @@
 require 'fileutils'
 class ReportBuilder
-  class Generator
-    class Html < Generator
-      PREFIX="html"
+  class Builder
+    class Html < Builder
       attr_reader :directory
       def initialize(builder, options)
         super
@@ -11,6 +10,11 @@ class ReportBuilder
         @headers=[]
         @footers=[]
       end
+      
+      def self.code
+        %w{html htm}
+      end
+      
       def default_options
         {:directory => Dir.pwd}
       end

data/lib/reportbuilder/{generator → builder}/rtf.rb

@@ -1,13 +1,11 @@
-gem 'clbustos-rtf'
 require 'rtf'
-
+require 'pp'
 class ReportBuilder
-  class Generator
-    # Rtf Generator.
+  class Builder
+    # Rtf Builder.
     # Based on ruby-rtf (http://ruby-rtf.rubyforge.org/)
     # 
-    class Rtf < Generator
-      PREFIX="rtf"
+    class Rtf < Builder
       # RTF::Document object.
       # See http://ruby-rtf.rubyforge.org/ for documentation
       attr_accessor :rtf
@@ -34,6 +32,12 @@ class ReportBuilder
           h[k]={:cs=>cs, :ps=>ps}
         }        
       end
+      
+      def self.code
+        %w{rtf}
+      end
+
+      
       def default_options
         
         {

data/lib/reportbuilder/{generator → builder}/text.rb

@@ -1,13 +1,17 @@
 class ReportBuilder
-  class Generator
-    class Text < Generator
-      PREFIX="text"
+  class Builder
+    class Text < Builder
       attr_reader :toc
       attr_reader :out
       def initialize(builder, options)
         super
         @out=""
       end
+      
+      def self.code
+        %w{text txt}
+      end
+      
       def parse
         @out="#{@builder.name}\n" unless @builder.no_title
         parse_cycle(@builder)

data/lib/reportbuilder/image.rb

@@ -21,7 +21,7 @@ class ReportBuilder::Image
     @filename=filename
   end
   # Based on http://rubyquiz.com/quiz50.html
-  def report_building_text(generator)
+  def report_building_text(builder)
     require 'RMagick'
 
 
@@ -69,14 +69,14 @@ class ReportBuilder::Image
       end
     end
     out+= border
-    generator.preformatted(out)
+    builder.preformatted(out)
   end
-  def report_building_rtf(generator)
-    raise "Not implemented on RTF::Document. Use gem install thecrisoshow-ruby-rtf for support" unless generator.rtf.respond_to? :image
-    generator.rtf.image(@filename)
+  def report_building_rtf(builder)
+    raise "Not implemented on RTF::Document. Use gem install thecrisoshow-ruby-rtf for support" unless builder.rtf.respond_to? :image
+    builder.rtf.image(@filename)
   end
-  def report_building_html(generator)
-    basedir=generator.directory+"/images"
+  def report_building_html(builder)
+    basedir=builder.directory+"/images"
     out=basedir+"/"+File.basename(@filename)
     if(File.exists? @filename)
       if !File.exists? out
@@ -84,6 +84,6 @@ class ReportBuilder::Image
         FileUtils.cp @filename, out
       end
     end
-    generator.html("<img src='images/#{File.basename(@filename)}' alt='#{@options[:alt]}' />")
+    builder.html("<img src='images/#{File.basename(@filename)}' alt='#{@options[:alt]}' />")
   end
 end

data/lib/reportbuilder/section.rb

@@ -26,9 +26,9 @@ class ReportBuilder::Section
     end
   end
 
-  def report_building_text(generator)
-    generator.text(("="*generator.parse_level)+" "+name)
-    generator.parse_cycle(self)
+  def report_building_text(builder)
+    builder.text(("="*builder.parse_level)+" "+name)
+    builder.parse_cycle(self)
   end
 
   def report_building_html(g)

data/lib/reportbuilder/table.rb

@@ -1,3 +1,4 @@
+
 class ReportBuilder
   # Creates a table.
   # Use:
@@ -52,6 +53,7 @@ class ReportBuilder
       end
     end
     # Adds a row
+    # <b>Usage:</b>
     #   table.add_row(%w{1 2})
     def row(row)
       @rows.push(row)
@@ -105,20 +107,20 @@ class ReportBuilder
       }
       @max_cols
     end
-    def report_building_text(generator)
-      require 'reportbuilder/table/textgenerator'
-      table_generator=ReportBuilder::Table::TextGenerator.new( generator, self)
-      table_generator.generate
+    def report_building_text(builder)
+      require 'reportbuilder/table/textbuilder'
+      table_builder=ReportBuilder::Table::TextBuilder.new( builder, self)
+      table_builder.generate
     end
-    def report_building_html(generator)
-      require 'reportbuilder/table/htmlgenerator'
-      table_generator=ReportBuilder::Table::HtmlGenerator.new(generator, self)
-      table_generator.generate
+    def report_building_html(builder)
+      require 'reportbuilder/table/htmlbuilder'
+      table_builder=ReportBuilder::Table::HtmlBuilder.new(builder, self)
+      table_builder.generate
     end
-    def report_building_rtf(generator)
-      require 'reportbuilder/table/rtfgenerator'
-      table_generator=ReportBuilder::Table::RtfGenerator.new(generator, self)
-      table_generator.generate
+    def report_building_rtf(builder)
+      require 'reportbuilder/table/rtfbuilder'
+      table_builder=ReportBuilder::Table::RtfBuilder.new(builder, self)
+      table_builder.generate
     end
     def total_width # :nodoc:
       if @max_cols.size>0
@@ -127,6 +129,9 @@ class ReportBuilder
         0
       end
     end
+    
+
+
     ######################
     #  INTERNAL CLASSES  #
     ######################
@@ -154,4 +159,7 @@ class ReportBuilder
     end
   end
 end
+require 'reportbuilder/table/htmlbuilder'
+require 'reportbuilder/table/textbuilder'
+require 'reportbuilder/table/rtfbuilder'
 

data/lib/reportbuilder/table/{htmlgenerator.rb → htmlbuilder.rb}

@@ -1,9 +1,9 @@
 class ReportBuilder
   class Table
-    class HtmlGenerator < ElementGenerator
+    class HtmlBuilder < ElementBuilder
       def generate()
         t=@element
-        anchor=@generator.table_entry(t.name)
+        anchor=@builder.table_entry(t.name)
         out="<a name='#{anchor}'></a><table><caption>#{t.name}</caption>"
         @rowspans=[]
         if t.header.size>0
@@ -21,27 +21,31 @@ class ReportBuilder
           end
         }
         out+="</tbody>\n</table>\n"
-        @generator.html(out)
+        @builder.html(out)
       end
       def parse_row(t,row,tag="td")
         row_ary=[]
-        colspan_i=0
+        real_i=0
         row.each_index do |i|
-          if !@rowspans[i].nil? and @rowspans[i]>0
-            @rowspans[i]-=1
-          elsif colspan_i>0
-            colspan_i-=1
-          elsif row[i].is_a? Table::Colspan
+          extra=1 
+          while !@rowspans[real_i].nil? and @rowspans[real_i]>0
+            @rowspans[real_i]-=1
+            row_ary << ""
+            real_i+=1
+          end
+          
+          if row[i].is_a? Table::Colspan
             row_ary.push(sprintf("<%s colspan=\"%d\">%s</%s>",tag, row[i].cols, row[i].data,tag))
-            colspan_i=row[i].cols-1
           elsif row[i].nil?
             row_ary.push("<#{tag}></#{tag}>")
           elsif row[i].is_a? Table::Rowspan
             row_ary.push(sprintf("<%s rowspan=\"%d\">%s</%s>", tag, row[i].rows, row[i].data, tag))
-            @rowspans[i]=row[i].rows-1
+            @rowspans[real_i]=row[i].rows-1
           else
             row_ary.push("<#{tag}>#{row[i]}</#{tag}>")
           end
+          real_i+=extra
+          
         end
         row_ary.join("")
       end

data/lib/reportbuilder/table/{rtfgenerator.rb → rtfbuilder.rb}

@@ -1,20 +1,20 @@
 class ReportBuilder
   class Table
-    class RtfGenerator < ElementGenerator
+    class RtfBuilder < ElementBuilder
       include RTF
       def generate()
         @t=@element
-        @rtf=@generator.rtf
+        @rtf=@builder.rtf
         
         # Title
         
-        @generator.header(6,@t.name)
+        @builder.header(6,@t.name)
         
         max_cols=@t.calculate_widths
         n_rows=@t.n_rows_no_hr+(@t.header.size>0 ? 1: 0)
-        args=[n_rows, @t.n_columns]+max_cols.map{|m| m*@generator.options[:font_size]*10}
+        args=[n_rows, @t.n_columns]+max_cols.map{|m| m*@builder.options[:font_size]*10}
         @table=@rtf.table(*args)
-        @table.border_width=@generator.options[:table_border_width]
+        @table.border_width=@builder.options[:table_border_width]
         @rowspans=[]
         if @t.header.size>0
           @t.header.each_with_index do |th,i|
@@ -40,30 +40,34 @@ class ReportBuilder
       end
       def create_hr(row_i)
         (0...@t.n_columns).each {|i|
-          @table[row_i][i].top_border_width=@generator.options[:table_hr_width]
+          @table[row_i][i].top_border_width=@builder.options[:table_hr_width]
         }
       end
       
       def parse_row(row,row_i)
         t=@element
         row_ary=[]
+        real_i=0
         colspan_i=0
         row.each_index do |i|
-          if !@rowspans[i].nil? and @rowspans[i]>0
-            @rowspans[i]-=1
-          elsif colspan_i>0
-            colspan_i-=1
-          elsif row[i].is_a? Table::Colspan
-            @table[row_i][i] << row[i].data            
+          extra=1 
+          while !@rowspans[real_i].nil? and @rowspans[real_i]>0
+            @rowspans[real_i]-=1
+            real_i+=1
+          end
+          if row[i].is_a? Table::Colspan
+            @table[row_i][real_i] << row[i].data            
             colspan_i=row[i].cols-1
+            extra=row[i].cols
           elsif row[i].nil?
             @table[row_i][i] << ""
           elsif row[i].is_a? Table::Rowspan
-            @table[row_i][i] << row[i].data
-            @rowspans[i]=row[i].rows-1
+            @table[row_i][real_i] << row[i].data
+            @rowspans[real_i]=row[i].rows-1
           else
-            @table[row_i][i] << row[i].to_s
+            @table[row_i][real_i] << row[i].to_s
           end
+          real_i+=extra
         end
       end
     end

data/lib/reportbuilder/table/textbuilder.rb

@@ -0,0 +1,52 @@
+require 'text-table'
+class ReportBuilder
+  class Table
+    class TextBuilder < ElementBuilder
+      def generate()
+        
+        t=@element
+        @rowspans=[]
+        @builder.text(t.name)
+        return if t.header.size+t.rows.size==0
+        table = Text::Table.new do |tt|
+          tt.head=t.header if t.header.size>0
+          tt.rows=t.rows.map {|row| parse_row(row)}
+        end
+        #pp table.rows
+        @builder.text(table.to_s)
+      end
+      # Parse a row
+      def parse_row(row)
+        return :separator if row==:hr
+        t=@element
+        row_ary=[]
+        real_i=0
+        row.each_index do |i|
+          extra=1
+          
+          while !@rowspans[real_i].nil? and @rowspans[real_i]>0
+            @rowspans[real_i]-=1
+            row_ary << ""
+            real_i+=1
+          end
+          
+          if row[i].is_a? ReportBuilder::Table::Rowspan
+            @rowspans[real_i]=row[i].rows-1
+            row_ary << row[i].to_s
+          elsif row[i].is_a? ReportBuilder::Table::Colspan
+            row_ary.push({:value=>row[i].to_s, :colspan=>row[i].cols})
+            extra=row[i].cols
+          elsif row[i].nil?
+            row_ary.push("")
+          else
+            #size=row[i].to_s.size
+            #puts sprintf("%i : %s (%d-%d)",i,row[i].to_s,@max_cols[i], size)
+            row_ary.push(row[i].to_s)
+          end
+          real_i+=extra
+        end
+        row_ary
+      end
+    end
+  end
+end

data/test/test_image.rb

@@ -41,6 +41,6 @@ Test
     assert_match(/img src='images\/sheep.jpg'/, @rp.to_html)
   end
   def test_image_rtf
-    assert_match(/\\pict\\picw128\\pich112\\bliptag2403101\\jpegblip/, @rp.to_rtf)
+    assert_match(/\\pict\\picw128\\pich112\\bliptag\d+\\jpegblip/, @rp.to_rtf)
   end
 end

data/test/test_reportbuilder.rb

@@ -64,6 +64,8 @@ class TestReportbuilder < MiniTest::Unit::TestCase
     ["para","pre","th1","th2"].each do |t|
       assert_match(/#{t}/,out)
     end
+    
+    
   end
   def test_empty
     rp=ReportBuilder.new
@@ -73,11 +75,32 @@ class TestReportbuilder < MiniTest::Unit::TestCase
     rp.add("hola")
     assert_equal("hola\n",rp.to_s)
   end
+  def test_incorrect_format
+    assert_raises ReportBuilder::FormatNotFound do 
+    ReportBuilder::generate(:format=>:fish) do 
+        text "This is silly"
+      end
+    end
+  end
+  def test_formats
+    require 'pp'
+    assert_equal(ReportBuilder.builder_for(:txt), ReportBuilder::Builder::Text)
+    assert_equal(ReportBuilder.builder_for("txt"), ReportBuilder::Builder::Text)
+    assert_equal(ReportBuilder.builder_for("html"), ReportBuilder::Builder::Html)
+    
+  end
+  
   def test_generate
-    res=ReportBuilder.generate(:format=>:text,:name=>"Test") do 
+    txt_file=Tempfile.new("test.txt")
+    ReportBuilder.generate(:name=>"Test", :filename=>txt_file.path) do
+      text("hola")
+    end
+    
+    text=ReportBuilder.generate(:format=>:text,:name=>"Test") do 
       text("hola")
     end
-    assert_match(/^Test\nhola$/,res)
+    assert_match(/^Test\nhola$/,text)
+    assert_equal(text, File.read(txt_file.path))
     html_file=Tempfile.new("test.html")
     html=ReportBuilder.generate(:name=>"Test", :format=>:html) do
       text("hola")

data/test/test_table.rb

@@ -1,8 +1,6 @@
 require "minitest/unit"
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require "reportbuilder"
-require 'reportbuilder/table/htmlgenerator'
-require 'reportbuilder/table/textgenerator'
 require 'nokogiri'
 
 MiniTest::Unit.autorun
@@ -11,13 +9,13 @@ class TestReportbuilderTable < MiniTest::Unit::TestCase
     super
     @name="Table Test"
     @header=%w{a bb ccc dddd eeee fff gggg hh i}
-    table=ReportBuilder::Table.new(:name=>"Table Test", :header=>@header) do
+    table=ReportBuilder::Table.new(:name=>@name, :header=>@header) do
       row(["a","b","c","d","e","f","g","h","i"])
-      row([colspan("a",2),nil,"c",rowspan("d",2),"e","f","g","h","i"])
-      row([colspan("a",3),nil,nil,nil,"e","f","g","h","i"])
-      row([colspan("a",4),nil,nil,nil,"e","f","g","h","i"])
-      row([colspan("a",5),nil,nil,nil,nil,colspan("f",3),nil,nil,"i"])
-      row([colspan("a",6),nil,nil,nil,nil,nil,"g","h","i"])
+      row([colspan("a",2),"c",'d',rowspan("e",2),rowspan("f",2),"g",rowspan("h",3),"i"])
+      row([colspan("a",3),'d', "g","i"])
+      row([colspan("a",4),"e","f","g","i"])
+      row([colspan("a",5),colspan("f",3),"i"])
+      row([colspan("a",6),"g","h","i"])
     end
     
     @table=table
@@ -25,16 +23,25 @@ class TestReportbuilderTable < MiniTest::Unit::TestCase
     @mock_generator = ""
     class << @mock_generator
       def preformatted(t)
-        replace(t)
+        @first_pre||=true
+        self << "\n" unless @first_pre
+        self << t
+        @first=false
       end
       def text(t)
-        replace(t)
+        @first_text||=:true
+        self << "\n" unless @first_text==:true
+        self << t
+        @first_text=:false
       end
       def table_entry(t)
         "MOCK"
       end
       def html(t)
-        replace(t)
+        @first_html||=true
+        self << "\n" unless @first_html
+        self << t
+        @first=false
       end
     end
 
@@ -45,75 +52,69 @@ class TestReportbuilderTable < MiniTest::Unit::TestCase
     end
     assert_match(/^Table\s+$/ , text)
   end
+  
+  def test_rtf
+    rb=ReportBuilder.new
+    rb.add(@table)
+    rb.save_rtf("test.rtf")
+    
+    
+  end
   def test_table_text
-
-    tg=ReportBuilder::Table::TextGenerator.new(@mock_generator,@table)
+    tg=ReportBuilder::Table::TextBuilder.new(@mock_generator, @table)
     tg.generate
-        expected= <<-HEREDOC
+    expected= <<-HEREDOC
 Table Test
-----------------------------------------------------
++---+----+-----+------+------+-----+------+----+---+
 | a | bb | ccc | dddd | eeee | fff | gggg | hh | i |
-----------------------------------------------------
++---+----+-----+------+------+-----+------+----+---+
 | a | b  | c   | d    | e    | f   | g    | h  | i |
 | a      | c   | d    | e    | f   | g    | h  | i |
-| a            |      | e    | f   | g    | h  | i |
-| a                   | e    | f   | g    | h  | i |
+| a            | d    |      |     | g    |    | i |
+| a                   | e    | f   | g    |    | i |
 | a                          | f               | i |
 | a                                | g    | h  | i |
-----------------------------------------------------
++---+----+-----+------+------+-----+------+----+---+
 HEREDOC
-
-    assert_equal(expected,@mock_generator)
-
+#puts expected
+#puts @mock_generator
+    assert_equal(expected, @mock_generator)
   end
   def test_table_html
 
-    tg=ReportBuilder::Table::HtmlGenerator.new(@mock_generator,@table)
+    tg=ReportBuilder::Table::HtmlBuilder.new(@mock_generator,@table)
     tg.generate
-    
-    expected= <<HEREDOC
-<a name='MOCK'> </a>
-<table>
-    <thead>
-    <th>a</th><th>bb</th><th>ccc</th>
-    <th>dddd</th><th>eeee</th>
-    <th>fff</th><th>gggg</th><th>hh</th><th>i</th>
-    </thead>
-    <tbody>
-    <tr><td>a</td><td>b</td><td>c</td><td>d</td><td>e</td>
-    <td>f</td><td>g</td><td>h</td><td>i</td></tr>
-    
-    <tr><td colspan="2">a</td><td>c</td><td rowspan="2">d</td><td>e</td>
-    <td>f</td><td>g</td><td>h</td><td>i</td></tr>
-    
-    <tr><td colspan="3">a</td><td>e</td>
-    <td>f</td><td>g</td><td>h</td><td>i</td></tr>
-    
-    <tr><td colspan="4">a</td><td>e</td>
-    <td>f</td><td>g</td><td>h</td><td>i</td></tr>
-    
-    <tr><td colspan="5">a</td><td colspan="3">f</td><td>i</td></tr>
-    
-    <tr><td colspan="6">a</td><td>g</td><td>h</td><td>i</td></tr>
-    </tbody>
-    </table>
-HEREDOC
-
     doc=Nokogiri::HTML(@mock_generator).at_xpath("/html")
     
     assert(doc.at_xpath("a[@name='MOCK']")!="")
     assert(doc.at_xpath("table")!="")
     
     assert_equal(@header, doc.xpath("//table/thead/th").map {|m| m.content} )
-    [[2,%w{a}],
-    [3,%w{a f}],
-    [4,%w{a}],
-    [5,%w{a}],
-    [6,%w{a}],
+    expected_contents=[
+    %w{a b c d e f g h i},
+    %w{a c d e f g h i},
+    %w{a d g i},
+    %w{a e f g i},
+    %w{a f i},
+    %w{a g h i}
+    ]
+    real_contents=doc.xpath("//table/tbody/tr").map do |tr|
+      tds=tr.xpath("td").map {|m| m.content}
+      
+    end
+    assert_equal(expected_contents, real_contents) 
     
-    ].each do |m,exp|
-      real=doc.xpath("//table/tbody/tr/td[@colspan='#{m}']").map {|x| x.inner_html}
-      assert_equal(exp, real, "On table/tbody/tr/td[@colspan='#{m}']"
+    [
+    ['colspan',2,%w{a}],
+    ['colspan',3,%w{a f}],
+    ['colspan',4,%w{a}],
+    ['colspan',5,%w{a}],
+    ['colspan',6,%w{a}],
+    ['rowspan',2,%w{e f}],
+    ['rowspan',3,%w{h}],    
+    ].each do |attr,m,exp|
+      real=doc.xpath("//table/tbody/tr/td[@#{attr}='#{m}']").map {|x| x.content}.sort
+      assert_equal(exp, real, "On table/tbody/tr/td[@#{attr}='#{m}']"
         )
     end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: reportbuilder
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -9,59 +14,91 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 -03:00
+date: 2010-03-28 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clbustos-rtf
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 1
         version: 0.2.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: text-table
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 4
         version: 2.0.4
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: gemcutter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hpricot
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.8"
-    version: 
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 1
         version: 2.5.1
-    version: 
+  type: :development
+  version_requirements: *id006
 description: Report Abstract Interface. Creates text, html and rtf output, based on a common framework.
 email: 
 - clbustos_at_gmail.com
@@ -88,16 +125,16 @@ files:
 - examples/test.rtf
 - examples/using_a_block.rb
 - lib/reportbuilder.rb
-- lib/reportbuilder/generator.rb
-- lib/reportbuilder/generator/html.rb
-- lib/reportbuilder/generator/rtf.rb
-- lib/reportbuilder/generator/text.rb
+- lib/reportbuilder/builder.rb
+- lib/reportbuilder/builder/html.rb
+- lib/reportbuilder/builder/rtf.rb
+- lib/reportbuilder/builder/text.rb
 - lib/reportbuilder/image.rb
 - lib/reportbuilder/section.rb
 - lib/reportbuilder/table.rb
-- lib/reportbuilder/table/htmlgenerator.rb
-- lib/reportbuilder/table/rtfgenerator.rb
-- lib/reportbuilder/table/textgenerator.rb
+- lib/reportbuilder/table/htmlbuilder.rb
+- lib/reportbuilder/table/rtfbuilder.rb
+- lib/reportbuilder/table/textbuilder.rb
 - test/test_html.rb
 - test/test_image.rb
 - test/test_reportbuilder.rb
@@ -117,18 +154,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-statsample
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Report Abstract Interface

data/lib/reportbuilder/table/textgenerator.rb

@@ -1,55 +0,0 @@
-class ReportBuilder
-  class Table
-    class TextGenerator < ElementGenerator
-
-      def generate()
-        t=@element
-        t.calculate_widths
-        total_width=t.total_width
-        out="#{t.name}\n"
-        if total_width>0
-          if t.header.size>0
-            out+=parse_hr(total_width)+"\n"
-            out+=parse_row(t,t.header)+"\n"
-            out+=parse_hr(total_width)+"\n"
-          end
-          t.rows.each do |row|
-            if row==:hr
-              out+=parse_hr(total_width)+"\n"
-            else
-              out+=parse_row(t,row)+"\n"
-            end
-          end
-          out+=parse_hr(total_width)+"\n"
-        end
-        @generator.text(out)
-      end
-      # Parse a row
-      def parse_row(t,row)
-        row_ary=[]
-        colspan_i=0
-        row.each_index do |i|
-          if colspan_i>0
-            colspan_i-=1
-          elsif row[i].is_a? ReportBuilder::Table::Colspan
-            size = (i...(i+row[i].cols)).inject(0) {|a,v| a+t.max_cols[v]+3}
-            size-=3
-            row_ary.push(row[i].data.to_s+" "*(size - row[i].data.size))
-            colspan_i=row[i].cols-1
-          elsif row[i].nil?
-            row_ary.push(" "*t.max_cols[i])
-          else
-            size=row[i].to_s.size
-            #puts sprintf("%i : %s (%d-%d)",i,row[i].to_s,@max_cols[i], size)
-            row_ary.push(row[i].to_s+" "*(t.max_cols[i] - size))
-          end
-        end
-        "| "+row_ary.join(" | ")+" |"
-      end
-      # Parse a horizontal rule
-      def parse_hr(l)
-        "-"*l
-      end
-    end
-  end
-end