reportbuilder 0.2.0 → 1.0.0

data/test/test_html.rb

@@ -3,45 +3,66 @@ $:.unshift(File.dirname(__FILE__)+"/../lib")
 require "reportbuilder"
 require 'fileutils'
 require 'tmpdir'
+require 'hpricot'
+require 'tempfile'
 class TestReportbuilderHtml < Test::Unit::TestCase
   def setup
     @tmpdir=Dir::mktmpdir
-    @rp=ReportBuilder.new("Test Html", @tmpdir)
+    @title="Test #{rand(100)}"
+    @rp=ReportBuilder.new(:name=>@title, :directory=>@tmpdir)
     @datadir=File.dirname(__FILE__)+"/../data"
   end
   def teardown
-   FileUtils.remove_entry_secure @tmpdir
+    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>/,""))
+    
+  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)
+    
   end
   def test_include_js
-    mock_element = ""
-    eval(" class << mock_element 
-      def to_reportbuilder_html(generator)
-        generator.add_js('"+@datadir+"/reportbuilder.js')
+      mock = ""
+      eval(" class << mock
+        def report_building_html(generator)
+      generator.js('"+@datadir+"/reportbuilder.js')
       end
-    end ")
-    @rp.add(mock_element)
-    assert_match(/script.+js\/reportbuilder.js/, @rp.to_html)
-    assert(File.exists? @tmpdir+"/js/reportbuilder.js")
+      end ")
+      @rp.add(mock)
+      assert_match(/script.+js\/reportbuilder.js/, @rp.to_html)
+      assert(File.exists? @tmpdir+"/js/reportbuilder.js")
   end
   def test_save_html
+    tf=Tempfile.new("sdsd.html")
     exp=@rp.to_html
-    @rp.save_html("test.html")
+    @rp.save_html(tf.path)
     obt=""
-    File.open(@tmpdir+"/test.html","r") {|fp|
+    File.open(tf.path,"r") {|fp|
       obt=fp.readlines(nil)[0]
     }
     assert_equal(exp,obt)
   end
   def test_include_css
     mock_element = ""
-    eval(" class << mock_element 
-      def to_reportbuilder_html(generator)
-        generator.add_css('"+@datadir+"/reportbuilder.css')
-      end
-    end ")
-    @rp.add(mock_element)
-    assert_match(/link rel='stylesheet'.+css\/reportbuilder.css/, @rp.to_html)
-    assert(File.exists? @tmpdir+"/css/reportbuilder.css")
-  end  
-  
+    eval(" class << mock_element
+    def report_building_html(generator)
+      generator.css('"+@datadir+"/reportbuilder.css')
+    end
+  end ")
+  @rp.add(mock_element)
+  assert_match(/link rel='stylesheet'.+css\/reportbuilder.css/, @rp.to_html)
+  assert(File.exists? @tmpdir+"/css/reportbuilder.css")
+  end
+
 end

data/test/test_image.rb

@@ -1,20 +1,20 @@
-require "test/unit"
 $:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'test/unit'
+require 'tmpdir'
 require "reportbuilder"
-
 class TestReportbuilderImage < Test::Unit::TestCase
   def setup
     @tmpdir=Dir::mktmpdir
-    @rp=ReportBuilder.new("Test", @tmpdir)
+    @rp=ReportBuilder.new(:no_name=>true, :directory=>@tmpdir)
     @datadir=File.dirname(__FILE__)+"/../data"
-    @rp.add(@rp.image(@datadir+"/sheep.jpg"))
+    @rp.add(ReportBuilder::Image.new(@datadir+"/sheep.jpg"))
   end
   def teardown
-   FileUtils.remove_entry_secure @tmpdir
+    FileUtils.remove_entry_secure @tmpdir
   end
   def test_image_text
     expected= <<-HERE
-Report: Test
+Test
 +--------------------------------+
 |          *********#**          |
 |         ****#********#    *    |
@@ -31,12 +31,13 @@ Report: Test
 |        ****#**  *#*****        |
 |             **#*****           |
 +--------------------------------+
-HERE
-puts @rp.to_s
-  assert_equal(expected, @rp.to_s)
+    HERE
+  real=@rp.to_s
+  #expected=expected.gsub(/[^ ]/,'-')
+  assert_match(/[^\s]{12}$/,real)
   end
   def test_image_html
     assert_match(/img src='images\/sheep.jpg'/, @rp.to_html)
   end
-  
+
 end

data/test/test_reportbuilder.rb

@@ -1,22 +1,81 @@
 require "test/unit"
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require "reportbuilder"
-
+require 'hpricot'
+require 'tempfile'
 class TestReportbuilder < Test::Unit::TestCase
+  def setup
+    @datadir=File.dirname(__FILE__)+"/../data"
+    @image=@datadir+"/sheep.jpg"
+  end
   # adding basic object
   def test_basic_generators
     # basic_classes = Array,String,Integer, Float,Time,Hash
-    ary=[1,2,3]
-    str="1,2,3"
-    int=1
-    flt=1.0
-    rat=1.quo(2)
-    tim=Time.new
-    has={'a'=>1,'b'=>2}
+    args=[]
+    args << [1,2,3]
+    args << "1,2,3"
+    args << 1
+    args << 1.0
+    args << 1.quo(2)
+    args << Time.new
+    args << {'a'=>1,'b'=>2}
+    rb=ReportBuilder.new
+    args.each do |a|
+      assert_nothing_raised do
+        rb.add(a)
+      end
+    end
+  end
+  def test_using_block
     rb=ReportBuilder.new
-    rb.add(ary,str,int,flt,rat,tim,has)
-    assert_nothing_raised do
-      rb.to_s
+    a=lambda {|g|
+      g.text "para"
+      g.preformatted "pre"
+      g.table(:header=>%w{th1 th2}) {row([1,2]); row([1,3])}
+      g.image @image
+     
+    }
+    rb.add(a)
+    out=rb.to_text
+    ["para","pre","th1","th2"].each do |t|
+      assert_match(/#{t}/,out)
+    end
+    
+    rb=ReportBuilder.new {|g|
+      g.text "para"
+      g.preformatted "pre"
+      g.table(:header=>%w{th1 th2}) {row([1,2]); row([1,3])}
+      g.image @image
+    }
+    
+    out=rb.to_text
+
+    ["para","pre","th1","th2"].each do |t|
+      assert_match(/#{t}/,out)
+    end
+  end
+  def test_empty
+    rp=ReportBuilder.new
+    assert_match(/^Report.+\n$/,rp.to_s)
+    rp=ReportBuilder.new(:no_title=>true)
+    assert_equal("",rp.to_s)
+    rp.add("hola")
+    assert_equal("hola\n",rp.to_s)
+  end
+  def test_generate
+    res=ReportBuilder.generate(:format=>:text,:name=>"Test") do
+      text("hola")
+    end
+    assert_match(/^Test\nhola$/,res)
+    html_file=Tempfile.new("test.html")
+    html=ReportBuilder.generate(:name=>"Test", :format=>:html) do
+      text("hola")
+    end
+    ReportBuilder.generate(:name=>"Test", :filename=>html_file,:format=>:html) do
+      text("hola")
     end
+    
+    assert_equal(html,File.read(html_file.path))
+    
   end
 end

data/test/test_section.rb

@@ -1,64 +1,80 @@
 require "test/unit"
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require "reportbuilder"
+require 'hpricot'
 
 class TestReportbuilderSection < Test::Unit::TestCase
   def setup
-    @rp=ReportBuilder.new("Test Report")
-    s1=@rp.section(:name=>"Section 1")
+    @name="Test Section"
+    @rp=ReportBuilder.new(:name=>"Test Section")
+    s1=ReportBuilder::Section.new(:name=>"Section 1")
     @rp.add s1
     s1.add("Texto 1")
     s1.add(2)
-    s11=@rp.section(:name=>"Section 1.1")
+    s11=ReportBuilder::Section.new(:name=>"Section 1.1")
     s1.add s11
-    s111=@rp.section(:name=>"Section 1.1.1")
+    s111=ReportBuilder::Section.new(:name=>"Section 1.1.1")
     s11.add s111
     s1.add("Texto 1.1")
-    s2=@rp.section(:name=>"Section 2")
+    s2=ReportBuilder::Section.new(:name=>"Section 2")
     @rp.add s2
   end
+  def test_section_generate
+    text=ReportBuilder.generate(:name=>@name,:format=>:text) {
+      section(:name=>"Section 1") {
+        text("Texto 1")
+        text("2")
+        section(:name=>"Section 1.1") {
+          section(:name=>"Section 1.1.1") {
+          }
+        }
+        text("Texto 1.1")
+      }
+      section(:name=>"Section 2")
+    }
+    assert_equal(@rp.to_text,text)
+  end
   def test_section_text
     expected= <<-HERE
-Report: Test Report
-  = Section 1
-    Texto 1
-    2
-    == Section 1.1
-      === Section 1.1.1
-    Texto 1.1
-  = Section 2
-
-HERE
-  assert_equal(expected, @rp.to_s)
+Test Section
+= Section 1
+  Texto 1
+  2
+  == Section 1.1
+    === Section 1.1.1
+  Texto 1.1
+= Section 2
+    HERE
+    assert_equal(expected, @rp.to_s)
   end
   def test_section_html
-    expected= <<-HERE
-<html><head><title>Test Report</title></head><body>
-<h1>Test Report</h1><div class='toc'><div class='title'>List of contents</div></div><ul>
-<li><a href='#toc_1'>Section 1</a></li>
-<ul>
-<li><a href='#toc_2'>Section 1.1</a></li>
-<ul>
-<li><a href='#toc_3'>Section 1.1.1</a></li>
-</ul>
-</ul>
-<li><a href='#toc_4'>Section 2</a></li>
-</ul>
-</div>
-    <div class='section'><h2>Section 1</h2><a name='toc_1'></a>
-<pre>Texto 1</pre>
-<pre>2</pre>
-        <div class='section'><h3>Section 1.1</h3><a name='toc_2'></a>
-            <div class='section'><h4>Section 1.1.1</h4><a name='toc_3'></a>
-            </div>
-        </div>
-<pre>Texto 1.1</pre>
-    </div>
-    <div class='section'><h2>Section 2</h2><a name='toc_4'></a>
-    </div>
-</body></html>
-HERE
-  assert_equal(expected.gsub(/\s/,""), @rp.to_html.gsub(/\s/,""))
+    real=@rp.to_html
+    #puts real
+    doc = Hpricot(real)
+    # Sanity
+    assert_equal("Test Section", doc.search("head/title").inner_html)
+    # Test toc
+    base_ul=doc.search("/html/body/div[@id='toc']")
+    assert(base_ul!="")
+    #puts base_ul
+    [
+    ["li/a[@href='#toc_1']","Section 1"],
+    ["li/a[@href='#toc_2']","Section 1.1"],
+    ["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}")
+    end
+    
+    [
+    ["div[class='section']/h2", ["Section 1","Section 2"]],
+    ["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}")
+    end
+    end
   end
-  
+
 end

data/test/test_table.rb

@@ -1,40 +1,55 @@
 require "test/unit"
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require "reportbuilder"
-require "reportbuilder/table/htmlgenerator"
-require "reportbuilder/table/textgenerator"
+require 'reportbuilder/table/htmlgenerator'
+require 'reportbuilder/table/textgenerator'
+require 'hpricot'
 
 class TestReportbuilderTable < Test::Unit::TestCase
   def setup
     super
-    table=ReportBuilder::Table.new(:header=>%w{a bb ccc dddd eeee fff gggg hh i})
-    table.add_row(["a","b","c","d","e","f","g","h","i"])
-    table.add_row([table.colspan("a",2),nil,"c",table.rowspan("d",2),"e","f","g","h","i"])
-    table.add_row([table.colspan("a",3),nil,nil,nil,"e","f","g","h","i"])
-    table.add_row([table.colspan("a",4),nil,nil,nil,"e","f","g","h","i"])
-    table.add_row([table.colspan("a",5),nil,nil,nil,nil,table.colspan("f",3),nil,nil,"i"])
-    table.add_row([table.colspan("a",6),nil,nil,nil,nil,nil,"g","h","i"])
-    @table=table
+    @name="Table Test"
+    @header=%w{a bb ccc dddd eeee fff gggg hh i}
+    table=ReportBuilder::Table.new(:name=>"Table Test", :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"])
+    end
     
+    @table=table
+
     @mock_generator = ""
     class << @mock_generator
-      def add_raw(t)
+      def preformatted(t)
         replace(t)
       end
-      def add_text(t)
+      def text(t)
         replace(t)
       end
-      def add_table_entry(t)
+      def table_entry(t)
         "MOCK"
       end
+      def html(t)
+        replace(t)
+      end
     end
-    
+
+  end
+  def test_empty_table
+    text=ReportBuilder.generate(:no_title=>true,:format=>:text) do
+      table(:name=>"Table")
+    end
+    assert_match(/^Table\s+$/ , text)
   end
   def test_table_text
-    
+
     tg=ReportBuilder::Table::TextGenerator.new(@mock_generator,@table)
     tg.generate
-        expected= <<HEREDOC
+        expected= <<-HEREDOC
+Table Test
 ----------------------------------------------------
 | a | bb | ccc | dddd | eeee | fff | gggg | hh | i |
 ----------------------------------------------------
@@ -47,14 +62,15 @@ class TestReportbuilderTable < Test::Unit::TestCase
 ----------------------------------------------------
 HEREDOC
 
-assert_equal(expected,@mock_generator)
+    assert_equal(expected,@mock_generator)
 
   end
   def test_table_html
-        
+
     tg=ReportBuilder::Table::HtmlGenerator.new(@mock_generator,@table)
     tg.generate
-        expected= <<HEREDOC
+    
+    expected= <<HEREDOC
 <a name='MOCK'> </a>
 <table>
     <thead>
@@ -82,6 +98,22 @@ assert_equal(expected,@mock_generator)
     </table>
 HEREDOC
 
-assert_equal(expected.gsub(/\s/m,""), @mock_generator.gsub(/\s/m,""))
+    doc=Hpricot(@mock_generator)
+    
+    assert(doc.search("a[@name='MOCK']")!="")
+    assert(doc.search("table"!=""))
+    assert_equal(@header, doc.search("table/thead/th").map {|m| m.inner_html} )
+    [[2,%w{a}],
+    [3,%w{a f}],
+    [4,%w{a}],
+    [5,%w{a}],
+    [6,%w{a}],
+    
+    ].each do |m,exp|
+      real=doc.search("table/tbody/tr/td[@colspan='#{m}']").map {|x| x.inner_html}
+      assert_equal(exp, real, "On table/tbody/tr/td[@colspan='#{m}']"
+        )
+    end
+
   end
 end