reportbuilder 1.1.0 → 1.1.1

data/History.txt

@@ -1,6 +1,12 @@
-=== 1.1.0 / 2009-03-23
+=== 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
+* Improved output for rtf on tables and headers of sections
+* More documentation
+
+=== 1.1.0 / 2010-03-23
 * Added rtf support
-=== 1.0.0 / 2009-03-22
+=== 1.0.0 / 2010-03-22
 Change of API:
  * Deleted "add_" before methods
  * Massive use of block after functions, to allow easy creation of reports

data/Manifest.txt

@@ -6,9 +6,9 @@ bin/reportbuilder
 data/reportbuilder.css
 data/reportbuilder.js
 data/sheep.jpg
+examples/create_rtf.rb
 examples/generic_interface.rb
 examples/images.rb
-examples/rtf.rb
 examples/test.rtf
 examples/using_a_block.rb
 lib/reportbuilder.rb

data/README.txt

@@ -16,7 +16,10 @@ Report Abstract Interface. Creates text, html and rtf output, based on a common
 == SYNOPSIS:
 
 * Using generic ReportBuilder#add, every object will be parsed 
-  using #report_building_FORMAT, #report_building or #to_s
+  using methods
+  * report_building_FORMAT
+  * report_building or
+  * to_s
 
     require "reportbuilder"    
     rb=ReportBuilder.new

data/Rakefile

@@ -1,6 +1,7 @@
 #!/usr/bin/ruby
 # -*- ruby -*-
 $:.unshift(File.dirname(__FILE__)+"/lib")
+
 require 'rubygems'
 require 'hoe'
 require 'reportbuilder'
@@ -10,8 +11,8 @@ Hoe.spec 'reportbuilder' do
   self.version=ReportBuilder::VERSION
   self.rubyforge_name = 'ruby-statsample'
   self.developer('Claudio Bustos', 'clbustos_at_gmail.com')
-  self.url = "http://rubyforge.org/projects/ruby-statsample/"
-  self.extra_deps << ["rtf","~>0.1"]
+  self.url = "http://ruby-statsample.rubyforge.org/reportbuilder/"
+  self.extra_deps << ["clbustos-rtf","~>0.2.1"]
   self.extra_dev_deps << ["hpricot", "~>0.8"] 
 end
 

data/examples/{rtf.rb → create_rtf.rb}

@@ -1,5 +1,7 @@
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require "reportbuilder"    
+
+
 rb=ReportBuilder.new do
   text("First Paragraph")
   section(:name=>"Section 1") do

data/examples/generic_interface.rb

@@ -1,5 +1,5 @@
 $:.unshift(File.dirname(__FILE__)+"/../lib")
-require "reportbuilder"    
+require "reportbuilder"
 rb=ReportBuilder.new
 rb.add(2) # Int#to_s used
 section=ReportBuilder::Section.new(:name=>"Section 1")
@@ -11,6 +11,7 @@ table.row([2,"Peter"])
 section.add(table) # Section is a container for other methods
 rb.add(section) # table have a #report_building method
 rb.add("Another text") # used directly
+
 rb.name="Text output"
 puts rb.to_text
 rb.name="Html output"

data/examples/images.rb

@@ -5,4 +5,4 @@ rb=ReportBuilder.new do
 end
 rb.name="Text output"
 puts rb.to_text
-
+puts rb.to_rtf

data/examples/test.rtf

@@ -1,103 +1,86 @@
 {\rtf1\ansi\deff0\deflang2057\plain\fs24\fet1
 {\fonttbl
 {\f0\froman Times New Roman;}
-{\f1\fmodern Courier;}
 }
 {\info
-{\createim\yr2010\mo3\dy23\hr13\min11}
+{\createim\yr2010\mo3\dy23\hr17\min51}
 }
 \paperw11907\paperh16840\margl1800\margr1800\margt1440\margb1440
-{\pard
-First Paragraph
-\par}
-{\pard\qc
-{\b\f0\fs34
-Section 1
+{\*\shppict{\pict\picw128\pich112\bliptag2303101\jpegblip
+ffd8ffe000104a46494600010102001200120000ffdb004300050304040403050404040505050607
+0c08070707070f0b0b090c110f1212110f111113161c1713141a1511111821181a1d1d1f1f1f1317
+2224221e241c1e1f1effdb0043010505050706070e08080e1e1411141e1e1e1e1e1e1e1e1e1e1e1e
+1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1effc0
+0011080070008003012200021101031101ffc4001c00000105010101000000000000000000000002
+03040506070801ffc4003b1000020103020403070204030900000000010203000411051206213151
+134161071422718191a108b1233242521572c11633627382a2d1e1f0ffc4001a0100020301010000
+00000000000000000003040001050206ffc400211100020201040301010000000000000000000102
+1103041221311341512291ffda000c03010002110311003f00f65d1506f758d3ace7305cdc849000
+4a852d8f9e0541838a34b91cabf8f08c6773a641f4f849aadc822c391ab48bca2a2da6a56177b45b
+ddc4ecf9da9bb0c71ff09e7e552aace1a69d319bcbab7b3b769ee6558e3504927a9e59c01d49e5d0
+73ac06adabde6a1339791d216e421563b401d33dcfad4be33b8925d69e163f040a1507cc024fcf9f
+e055250272b746ae97028c54df6c53b339cbb16380324e7901803ed49a28a18d85145150b27e9bab
+5f69e9e1db4a047bf79428082797d7cbbd6cf87f564d52d98edd93c7812ae3973e841ec707e5f93c
+f6af3843528ac6ee64b860914a992e4742b923f19fae2bb849a7429a9c11941c92e4dcd15473f146
+971b854f1e618cee44c01e9f111441c51a5c8e55fc784633b9d320fa7c24d1b72fa67783255ed2f2
+8a66d2eed6ed37db4f1ca3009dad9233d323cbeb4f57409a6b866727d02c37ed31b291e6ac467d68
+8f43d357ac05bfcce6afe78848bd70c3a1a88e8c870c3eb5c6d430b3cdaeca6bcd02ca543e08303f
+910491f506a2a6b1abe8e5e0bc5f79054f84ce73cfbe7a91cfa1f4e95a1a8da85a457b6cd0ca3af3
+53e6a7bd538fc091cb7c64e51998a0bed68dc5d4b29925450173c81f41e43cfea6ab1d591ca3a956
+53820f506b67a0db1b5d3523618724b37cf3ff008c57cd4349b4bc6323a94908fe7538cfceb8d96a
+c616a5464d3e8c5d1563368ba8a4bb041bc67932918348ff0009d47c5f0fdd5f39ebcb1f7e95c531
+af243e9068ab16d175112ecf77cf3fe60c314e49a06a2ae15511c7f70718fcd4dacaf2c3e95556fa
+468b25dac73cadb20604f2ea79f4ab6b0d0ad22850dca09651cd8e4e3ed5637332da5a349b3f8680
+6428e83d2bb8c3db16c9a9bfcc0660d32c215c25ac67d5c6e3f9a71acacd976b5ac047fcb14ab5ba
+b7ba19b79924f4079fda9ea22484dca57cb33dab6886222eb4edcac8776c04e411e6a6a4f0cebf34
+b711d85f10c48db1ca4e0e7b367ae7a77cf7cd5bd46b9d1a1bb97c5f0da199482255ca907bfa9aad
+b4ed04f2c651db93fa5dd040230464514d5e4deef6935c6ddde146cfb738ce067144134ad99ed4b5
+fb4b7bf7b78e091d63255dc1c7c40f3001eddea35cf1242233eef0485fcb7e001f6359b766776776
+2ccc72493924f7a4d2ee6cd88e971a4ace81067c08f7733b467ed4ceaf7f6fa569379a9de315b6b3
+81e79881921114b37e01a9119cc6a479814d5cc56d770cf6570a92c724656589b9ee4604608ec798
+fbd18cd6783b5ffd60fb48b8e247bcd1acf47b2d2964fe0d94b6e652c99e4247dc0938ebb76d7b1b
+d8cf1d5b7b46f66da5717c36dee66ed184f016c88a54628e01f3195241ec4579df5efd16594fc48f
+3e8dc6cf65a34921616f35978b342b9fe40fbc06f4240f2ce6bd2dc11c19a270870159f05e911cab
+a65adbb400bbe64937125dd88fea66662718193cb02ace15fb382f16feb238474ae26974dd1f86af
+f59d3e094c6f7eb72b10930705a3420ee5ec495cd77ff67dc5da2f1d708d871470fced3585ea164d
+ebb5d1812191c79302083e5cb912306bc25c59fa51f6ada77134d61a1e996dace986522defd2f228
+86ccf22eaec195b1d400467a135ecafd3d7b3d97d997b2ed3f85eeaee3bbbd577b8bb962cf866573
+92173cf68181938ce33819c54226ef93a15337cbbeca74ef1b0fc531677f15dea17b6b082459b247
+23f978854395fa2b21ff00abd2a4dc1c41213e4a7f6aa3b5d980ad3f0c6bae655b0bf669448d88e4
+6e6413e47b8f5f2f974cbd14ba6d335f2638e48d33aa8000c0000f4a2a3697742f34e82e72a4c880
+b60100374239fae6a4d346134d3a614d5ec3ef16735beedbe2c6c9bb19c646334ed15089d3b3963a
+b23b23a956538208c107b5269fbf956e2fae274042c92b3807a804934c5287a05d726eb4a944da6d
+bc80e731807e6391aa6e2799b4de20d0b53524473dc9d3ae467915941284fa891140ff003b77a7f8
+46e77dac96cc7e28cee5f91ffdfef50bdabab0e00d52ea3ff7b64897b11ecf0baca3f294c45da323
+2c76cda3534525183a06539046452aac1857c665552cc40503249f215f6a8bda15cbd9f01ebf751b
+6d78b4db8643d9bc36c7e7150846f6645a7e10b7d4a407c5d4e596fd89ea44b233a7d90a8f901577
+ac4be0e9770f9c7c040f99e5feb48d02d92cb42d3ece35da905ac7128ec15401fb557f17dc85822b
+5079b9dedf21d3f3fb5549d209863ba69199a28a297360e8fc3f6ed6ba35b42f9dc1371057041639
+c63d338a9d51b4a667d2ed1dd8b334084927249da39d49a697479f9b6e4db0a28a2ace4e69aac22d
+f52b9816331aa4ac154e792e7975f4c545ad3f1ec1124f6b3a2059240c1d87f5636e33f7acc52b25
+4e8ddc33df05224e9976d657893af303930ee3ceaf38ec25efb3ed796321966d2ee0291eb1362b35
+561a7dd936b3699382f6d748d111fdbb86323ef5d4255c02d4e1dead766bac94a594087aac6a3f14
+f53375736f6b1892e654863ce37b9c28f99e83eb4f518cd0acf7b4a84dc7b3ee2080757d3a61ff00
+61ab2bad5ad20bf4d3d4bcf78c037810aee655fee6f251eac467ca9cd6238a6d26ee19d82452c2f1
+b13e41811feb509563f3491dbc0d2c842c68326b0fa8dd3de5dc93bf2dc7e11d8790a99adeaaf7cf
+e1c794814f207ab1ee6aae833959a5a7c3b15bec28a2b49c35a0dd1bbb6bfb811a5baff1154b659b
+902a463a0c9cf33e58c73c8e526c364c9182b66a74d8de1d3ada1906d748515867a100035228a29a
+309bb76145145428cf71cda9974e8ee5412607c1e63015b967ee17ef58baea73469342f0c83723a9
+5619c641e46b05af68b3e9b33322bcb6a79ac98fe5f46ec7f7fc507247d9a5a2ccab632a69703049
+e373d1581fcd228a10f9d0884923c10ae8c3983cc106b3f2ddff00b32b729725e4d3cab496407365
+6039db8ef9ea83e63c8655c2b7f2484d94ad90ab98c9eb8ed5737bb8420adafbd1560de1e4039072
+08cf2c838ed4c276acc7c90709532b7846c2e6c348f13512a751ba76b9bc6073f1b73db9eca30a3d
+16a4f11305d1e7c9ea001f714ca0d4afee54dddbad8d94477786640f24cc3a6ec72551d700927974
+1906935cd4defa531af28118ed03fabd4d54dd209a7c6e7355e8aca28a2806a8b86379a648635dce
+ec154671927a574eb6856deda281092b1a045cf5c018acef0968822116a7724f8846e850372008c6
+4e3ae41e9e5f3e9a6a3e38d2b664eb3329c9463e828a28a20985145150814514542183e26d266b2b
+d9678a03ee8e772b28c84cf507039733cbd31eb54d5d51d55d191d432b0c329190476aa4bee18d3a
+e1de488c96ecc0e0211b41e7cf07f60474f2a0cb1fc3470eb525533156f3496f3a4d136d743906b4
+f6bc4368f18f1d5e27f300647d2a1eabc3375690096de4377cf0cab1e187a81939aa27564764752a
+ca70411820f6ae2e50196b1e7568bbd635cf7889a0b456446e4ce79123b0aa2a5c31493482386379
+1cf4551927e956adc35ab88d18408c5b395122e57e7cf1cfd3353997274bc78555d14f52f49b1935
+1be4b58cedddcd9b190a0753ff00de78ab2b1e17d466908b9d96c83fa890c4f5e801fdc8eb5acd2b
+4db5d360315b29cb1cb3b1cb376cfcaae306fb059b55182a8bb64b45545088a155460003000afb45
+14c190145145421fffd9
+}}
 }
-\par}
-{\pard\qc
-{\b\f0\fs32
-Section 1.1
-}
-\par}
-{\pard
-Paragraph inside section 1.1
-\par}
-\trowd\tgraph100
-\clbrdrt\brdrw3\brdrs\clbrdrl\brdrw3\brdrs\clbrdrb\brdrw3\brdrs\clbrdrr\brdrw3\brdrs\cellx400
-\clbrdrt\brdrw3\brdrs\clbrdrl\brdrw3\brdrs\clbrdrb\brdrw3\brdrs\clbrdrr\brdrw3\brdrs\cellx1400
-\pard\intbl
-id
-\cell
-\pard\intbl
-name
-\cell
-\row
-\trowd\tgraph100
-\clbrdrt\brdrw3\brdrs\clbrdrl\brdrw3\brdrs\clbrdrb\brdrw3\brdrs\clbrdrr\brdrw3\brdrs\cellx400
-\clbrdrt\brdrw3\brdrs\clbrdrl\brdrw3\brdrs\clbrdrb\brdrw3\brdrs\clbrdrr\brdrw3\brdrs\cellx1400
-\pard\intbl
-1
-\cell
-\pard\intbl
-John
-\cell
-\row
-\trowd\tgraph100
-\clbrdrt\brdrw3\brdrs\clbrdrl\brdrw3\brdrs\clbrdrb\brdrw3\brdrs\clbrdrr\brdrw3\brdrs\cellx400
-\clbrdrt\brdrw3\brdrs\clbrdrl\brdrw3\brdrs\clbrdrb\brdrw3\brdrs\clbrdrr\brdrw3\brdrs\cellx1400
-\pard\intbl
-2
-\cell
-\pard\intbl
-Peter
-\cell
-\row
-\trowd\tgraph100
-\clbrdrt\brdrw25\brdrs\clbrdrl\brdrw3\brdrs\clbrdrb\brdrw3\brdrs\clbrdrr\brdrw3\brdrs\cellx400
-\clbrdrt\brdrw25\brdrs\clbrdrl\brdrw3\brdrs\clbrdrb\brdrw3\brdrs\clbrdrr\brdrw3\brdrs\cellx1400
-\pard\intbl
-3
-\cell
-\pard\intbl
-John
-\cell
-\row
-\trowd\tgraph100
-\clbrdrt\brdrw3\brdrs\clbrdrl\brdrw3\brdrs\clbrdrb\brdrw3\brdrs\clbrdrr\brdrw3\brdrs\cellx400
-\clbrdrt\brdrw3\brdrs\clbrdrl\brdrw3\brdrs\clbrdrb\brdrw3\brdrs\clbrdrr\brdrw3\brdrs\cellx1400
-\pard\intbl
-4
-\cell
-\pard\intbl
-Peter
-\cell
-\row
-{\pard\ql
-{\f1\fs20
-def test_generate
-{\line}
-  html=ReportBuilder.generate(:format=>:html, :name=>@title, :directory=>@tmpdir) do 
-{\line}
-    text("hola")
-{\line}
-  end
-{\line}
-  doc=Hpricot(html)
-{\line}
-  assert_equal(@title, doc.search("head/title").inner_html)
-{\line}
-  assert_equal(@title, doc.search("body/h1").inner_html)
-{\line}
-  assert_equal("hola", doc.search("body/p").inner_html)
-{\line}
-  
-{\line}
-end  
-{\line}
-}
-\par}
-{\pard
-Last paragraph
-\par}
-}

data/lib/reportbuilder.rb

@@ -50,8 +50,7 @@ class ReportBuilder
   attr_accessor :name
   # Doesn't print a title if set to true
   attr_accessor :no_title
-  
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
   # Generates and optionally save the report on one function
   def self.generate(options=Hash.new, &block)
     options[:filename]||=nil
@@ -64,10 +63,10 @@ class ReportBuilder
     file=options.delete(:filename)
     format=options.delete(:format).to_s
     format[0]=format[0,1].upcase
-    
-    
     rb=ReportBuilder.new(options)
+    
     rb.add(block)
+    
     generator=Generator.const_get(format.to_sym).new(rb, options)
     generator.parse
     out=generator.out
@@ -103,7 +102,7 @@ class ReportBuilder
   end
   # Returns a RTF output
   def to_rtf()
-    gen = Generator::Rtf.new(self,@options)
+    gen = Generator::Rtf.new(self, @options)
     gen.parse
     gen.out
   end  

data/lib/reportbuilder/generator.rb

@@ -1,7 +1,8 @@
 class ReportBuilder
   # Abstract class for generators.
   # A generator 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
     # Level of heading. See ReportBuilder::Section for using it.
     attr_reader :parse_level
@@ -51,7 +52,7 @@ class ReportBuilder
     def parse_element(element)
       method=("report_building_" + self.class::PREFIX).intern
       if element.is_a? Proc
-        element.arity==0 ? instance_eval(&element) : element.call(self)
+        element.arity<1 ? instance_eval(&element) : element.call(self)
       elsif element.respond_to? method
         element.send(method, self)
       elsif element.respond_to? :report_building

data/lib/reportbuilder/generator/rtf.rb

@@ -1,10 +1,16 @@
+gem 'clbustos-rtf'
 require 'rtf'
+
 class ReportBuilder
   class Generator
+    # Rtf Generator.
+    # Based on ruby-rtf (http://ruby-rtf.rubyforge.org/)
+    # 
     class Rtf < Generator
       PREFIX="rtf"
+      # RTF::Document object.
+      # See http://ruby-rtf.rubyforge.org/ for documentation
       attr_accessor :rtf
-      attr_reader :options
       include RTF
       def initialize(builder, options)
         super
@@ -26,8 +32,7 @@ class ReportBuilder
           ps=ParagraphStyle.new
           ps.justification = ParagraphStyle::CENTER_JUSTIFY
           h[k]={:cs=>cs, :ps=>ps}
-        }
-        
+        }        
       end
       def default_options
         
@@ -48,7 +53,9 @@ class ReportBuilder
       def header(level,t)
         @rtf.paragraph(@header_styles[level][:ps]) do |n1|
           n1.apply(@header_styles[level][:cs]) do |n2|
+            n2.line_break
             n2 << t
+            n2.line_break
           end
         end
       end
@@ -63,6 +70,7 @@ class ReportBuilder
         end
         
       end
+     
       def out
         @rtf.to_rtf
       end
@@ -70,6 +78,9 @@ class ReportBuilder
         File.open(filename,'wb')  {|file| file.write(@rtf.to_rtf)
         }
       end
+      def html(t)
+        # Nothing
+      end
     end
   end
 end

data/lib/reportbuilder/image.rb

@@ -71,7 +71,10 @@ class ReportBuilder::Image
     out+= border
     generator.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)
+  end
   def report_building_html(generator)
     basedir=generator.directory+"/images"
     out=basedir+"/"+File.basename(@filename)

data/lib/reportbuilder/section.rb

@@ -34,7 +34,7 @@ class ReportBuilder::Section
   def report_building_html(g)
     htag="h#{g.parse_level+1}"
     anchor=g.toc_entry(name)
-    generator.html "<div class='section'><#{htag}>#{name}</#{htag}><a name='#{anchor}'></a>"
+    g.html "<div class='section'><#{htag}>#{name}</#{htag}><a name='#{anchor}'></a>"
     g.parse_cycle(self)
     g.html "</div>"
   end

data/lib/reportbuilder/table/rtfgenerator.rb

@@ -5,6 +5,11 @@ class ReportBuilder
       def generate()
         @t=@element
         @rtf=@generator.rtf
+        
+        # Title
+        
+        @generator.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}

data/test/test_html.rb

@@ -1,11 +1,12 @@
-require "test/unit"
+require "minitest/unit"
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require "reportbuilder"
 require 'fileutils'
 require 'tmpdir'
-require 'hpricot'
+require 'nokogiri'
 require 'tempfile'
-class TestReportbuilderHtml < Test::Unit::TestCase
+MiniTest::Unit.autorun
+class TestReportbuilderHtml < MiniTest::Unit::TestCase
   def setup
     @tmpdir=Dir::mktmpdir
     @title="Test #{rand(100)}"
@@ -16,20 +17,20 @@ class TestReportbuilderHtml < Test::Unit::TestCase
     FileUtils.remove_entry_secure @tmpdir
   end
   def test_empty_document
-    doc=Hpricot(@rp.to_html)
-    assert_equal(@title, doc.search("head/title").inner_html)
-    assert_equal(@title, doc.search("body/h1").inner_html)
-    assert_match(/^\s+$/, doc.search("body").inner_html.gsub(/<h1>.+<\/h1>/,""))
+    doc=Nokogiri::HTML(@rp.to_html)
+    assert_equal(@title, doc.at_xpath("/html/head/title").content)
+    assert_equal(@title, doc.at_xpath("/html/body/h1").content)
+    assert_match("", doc.at_xpath("/html/body").to_s.gsub(/<h1>.+<\/h1>|<\/?body>/,""))
     
   end
   def test_generate
     html=ReportBuilder.generate(:format=>:html, :name=>@title, :directory=>@tmpdir) do 
       text("hola")
     end
-    doc=Hpricot(html)
-    assert_equal(@title, doc.search("head/title").inner_html)
-    assert_equal(@title, doc.search("body/h1").inner_html)
-    assert_equal("hola", doc.search("body/p").inner_html)
+    doc=Nokogiri::HTML(html)
+    assert_equal(@title, doc.at_xpath("/html/head/title").inner_html)
+    assert_equal(@title, doc.at_xpath("/html/body/h1").inner_html)
+    assert_equal("hola", doc.at_xpath("/html/body/p").inner_html)
     
   end
   def test_include_js

data/test/test_image.rb

@@ -1,8 +1,9 @@
 $:.unshift(File.dirname(__FILE__)+"/../lib")
-require 'test/unit'
+require 'minitest/unit'
 require 'tmpdir'
 require "reportbuilder"
-class TestReportbuilderImage < Test::Unit::TestCase
+MiniTest::Unit.autorun
+class TestReportbuilderImage < MiniTest::Unit::TestCase
   def setup
     @tmpdir=Dir::mktmpdir
     @rp=ReportBuilder.new(:no_name=>true, :directory=>@tmpdir)
@@ -39,5 +40,7 @@ Test
   def test_image_html
     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)
+  end
 end

data/test/test_reportbuilder.rb

@@ -1,13 +1,24 @@
-require "test/unit"
+require "minitest/unit"
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require "reportbuilder"
-require 'hpricot'
 require 'tempfile'
-class TestReportbuilder < Test::Unit::TestCase
+MiniTest::Unit.autorun
+class TestReportbuilder < MiniTest::Unit::TestCase
   def setup
     @datadir=File.dirname(__FILE__)+"/../data"
     @image=@datadir+"/sheep.jpg"
   end
+  def assert_nothing_raised(msg=nil)
+    msg||="Nothing should be raised, but raised %s"
+    begin
+      yield
+      not_raised=true
+    rescue Exception => e
+      not_raised=false
+      msg=sprintf(msg,e)
+    end
+    assert(not_raised,msg)
+  end
   # adding basic object
   def test_basic_generators
     # basic_classes = Array,String,Integer, Float,Time,Hash
@@ -63,7 +74,7 @@ class TestReportbuilder < Test::Unit::TestCase
     assert_equal("hola\n",rp.to_s)
   end
   def test_generate
-    res=ReportBuilder.generate(:format=>:text,:name=>"Test") do
+    res=ReportBuilder.generate(:format=>:text,:name=>"Test") do 
       text("hola")
     end
     assert_match(/^Test\nhola$/,res)
@@ -71,7 +82,7 @@ class TestReportbuilder < Test::Unit::TestCase
     html=ReportBuilder.generate(:name=>"Test", :format=>:html) do
       text("hola")
     end
-    ReportBuilder.generate(:name=>"Test", :filename=>html_file,:format=>:html) do
+    ReportBuilder.generate(:name=>"Test", :filename=>html_file.path,:format=>:html) do
       text("hola")
     end
     

data/test/test_section.rb

@@ -1,9 +1,9 @@
-require "test/unit"
+require "minitest/unit"
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require "reportbuilder"
-require 'hpricot'
-
-class TestReportbuilderSection < Test::Unit::TestCase
+require 'nokogiri'
+MiniTest::Unit.autorun
+class TestReportbuilderSection < MiniTest::Unit::TestCase
   def setup
     @name="Test Section"
     @rp=ReportBuilder.new(:name=>"Test Section")
@@ -50,20 +50,21 @@ Test Section
   def test_section_html
     real=@rp.to_html
     #puts real
-    doc = Hpricot(real)
+    base = Nokogiri::HTML(real)
     # Sanity
-    assert_equal("Test Section", doc.search("head/title").inner_html)
+    doc=base.at_xpath("/html")
+    assert_equal("Test Section", doc.at_xpath("head/title").content)
     # Test toc
-    base_ul=doc.search("/html/body/div[@id='toc']")
-    assert(base_ul!="")
-    #puts base_ul
+    base_ul=doc.at_xpath("/html/body/div[@id='toc']/ul")
+    assert(base_ul,"Toc have something")
     [
     ["li/a[@href='#toc_1']","Section 1"],
-    ["li/a[@href='#toc_2']","Section 1.1"],
-    ["li/a[@href='#toc_3']","Section 1.1.1"],
+    ["ul/li/a[@href='#toc_2']","Section 1.1"],
+    ["ul/ul/li/a[@href='#toc_3']","Section 1.1.1"],
     ["li/a[@href='#toc_4']","Section 2"]].each do |path, expected|
-      inner=base_ul.search(path).inner_html
-      assert_equal(expected, inner, "On #{path}")
+      assert(inner=base_ul.at_xpath(path),"#{path} should return something")
+      content=inner.content
+      assert_equal(expected, content, "On #{path}")
     end
     
     [
@@ -71,8 +72,8 @@ Test Section
     ["div[class='section']/h3",["Section 1.1"]],
     ["div[class='section']/h4",["Section 1.1.1"]]
     ].each do |path, expected|
-    base_ul.search(path).each do |el|
-      assert_equal(expected, el.inner_html, "On #{path} #{el}")
+    base_ul.xpath(path).each do |el|
+      assert_equal(expected, el.content, "On #{path} #{el}")
     end
     end
   end

data/test/test_table.rb

@@ -1,11 +1,12 @@
-require "test/unit"
+require "minitest/unit"
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require "reportbuilder"
 require 'reportbuilder/table/htmlgenerator'
 require 'reportbuilder/table/textgenerator'
-require 'hpricot'
+require 'nokogiri'
 
-class TestReportbuilderTable < Test::Unit::TestCase
+MiniTest::Unit.autorun
+class TestReportbuilderTable < MiniTest::Unit::TestCase
   def setup
     super
     @name="Table Test"
@@ -98,11 +99,12 @@ HEREDOC
     </table>
 HEREDOC
 
-    doc=Hpricot(@mock_generator)
+    doc=Nokogiri::HTML(@mock_generator).at_xpath("/html")
     
-    assert(doc.search("a[@name='MOCK']")!="")
-    assert(doc.search("table"!=""))
-    assert_equal(@header, doc.search("table/thead/th").map {|m| m.inner_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}],
@@ -110,7 +112,7 @@ HEREDOC
     [6,%w{a}],
     
     ].each do |m,exp|
-      real=doc.search("table/tbody/tr/td[@colspan='#{m}']").map {|x| x.inner_html}
+      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}']"
         )
     end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reportbuilder
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -14,77 +9,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -03:00
+date: 2010-03-24 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rtf
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: clbustos-rtf
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
-  type: :runtime
-  version_requirements: *id001
+        version: 0.2.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 4
         version: 2.0.4
-  type: :development
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: gemcutter
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 0
         version: 0.5.0
-  type: :development
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
         version: "0.8"
-  type: :development
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 1
         version: 2.5.1
-  type: :development
-  version_requirements: *id005
+    version: 
 description: Report Abstract Interface. Creates text, html and rtf output, based on a common framework.
 email: 
 - clbustos_at_gmail.com
@@ -105,9 +82,9 @@ files:
 - data/reportbuilder.css
 - data/reportbuilder.js
 - data/sheep.jpg
+- examples/create_rtf.rb
 - examples/generic_interface.rb
 - examples/images.rb
-- examples/rtf.rb
 - examples/test.rtf
 - examples/using_a_block.rb
 - lib/reportbuilder.rb
@@ -127,7 +104,7 @@ files:
 - test/test_section.rb
 - test/test_table.rb
 has_rdoc: true
-homepage: http://rubyforge.org/projects/ruby-statsample/
+homepage: http://ruby-statsample.rubyforge.org/reportbuilder/
 licenses: []
 
 post_install_message: 
@@ -140,20 +117,18 @@ 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.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Report Abstract Interface