docgenerator 2.0.0 → 2.1.0

data/unittest/unittest_creole.rb

@@ -77,9 +77,10 @@ creole
     creole = Docgenerator::Creole::Creole.new(:content => source )
     assert_equal( [source], creole.source)
     
-    omit_if( RUBY_VERSION == '1.9.2', "Wrong ruby version #{RUBY_VERSION}"){
+    #ruby 1.8: symbols as key, ruby 1.9: Strings
+    #~ omit_if( RUBY_VERSION !~ /1.9/, "Wrong ruby version #{RUBY_VERSION}"){
       assert_equal_filecontent( "expected_creole/test_creole_input.normsource", creole.normsource.to_yaml)
-    }
+    #~ }
 
     creole = Docgenerator::Creole::Creole.new(:content => source )
     creole = Docgenerator::Creole::Creole.new()
@@ -193,9 +194,10 @@ creole
     $log.info('test_creole_paragraphs: uncomplete to_creole')    
     assert_equal_filecontent( "expected_creole/test_creole_paragraphs.text", creole.to_doc(:text, @opt))
 
-    omit_if( RUBY_VERSION == '1.9.2', "Wrong ruby version #{RUBY_VERSION}"){
+    #ruby 1.8: symbols as key, ruby 1.9: Strings
+    #~ omit_if( RUBY_VERSION !~ /1.9/, "Wrong ruby version #{RUBY_VERSION}"){
       assert_equal_filecontent( "expected_creole/test_creole_paragraphs.normsource", creole.normsource.to_yaml)
-    }
+    #~ }
   end
   def test_creole_paragraphs_wrap()
     creole = Docgenerator::Creole::Creole.new(:content => <<creole
@@ -447,6 +449,24 @@ creole
     #~ assert_equal_filecontent( "expected_creole/test_creole_line_break.text", creole.to_doc(:text, @opt))
   end  
 
+  def test_creole_inline_apostroph()
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
+You can add text "in apostoph".
+
+Problem may be german.sty and activated " like in "a. 
+It will be converted to an a-Umlaut.
+creole
+    )
+    assert_equal_filecontent( "expected_creole/#{__method__}.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/#{__method__}.latex", creole.to_doc(:latex, @opt))
+    $log.warn('#{__method__}: to_context')
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.context", creole.to_doc(:context))
+    $log.info('#{__method__}_bold_em: inline to wiki/creole')
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.creole", creole.to_doc(:creole, @opt))
+    $log.warn('#{__method__}_bold_em: inline text with additional spaces')
+    assert_equal_filecontent( "expected_creole/#{__method__}.text", creole.to_doc(:text, @opt))
+  end
+  
 end #Test_creole_inline
 
 
@@ -482,9 +502,10 @@ creole
     #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul.creole", creole.to_doc(:creole, @opt))    
     #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul.wiki", creole.to_doc(:wiki, @opt))
     #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul.text", creole.to_doc(:text, @opt))
-    omit_if( RUBY_VERSION == '1.9.2', "Wrong ruby version #{RUBY_VERSION}"){
+    #ruby 1.8: symbols as key, ruby 1.9: Strings
+    #~ omit_if( RUBY_VERSION !~ /1.9/, "Wrong ruby version #{RUBY_VERSION}"){
       assert_equal_filecontent( "expected_creole/test_creole_list_ul.normsource", creole.normsource.to_yaml)
-    }
+    #~ }
   end
   #It works fine here, but LaTeX will give you an error.
  def test_creole_list_ul_too_much()

data/unittest/unittest_creole_placeholders.rb

@@ -33,9 +33,7 @@ $tmplog = Log4r::Logger.new('Creole', Log4r::FATAL)
 
 <<missingtests
 erweitern:
-*tabulars 
-*Creole_creoletab
-*csv-tabs
+*todonotes
 
 placeholder mit parameter (siehe creole_rail)
 
@@ -150,123 +148,3 @@ creole
   end #test_creole_placeholders_latex
 end   #Test_creole_placeholders
 
-#http://www.wikicreole.org/wiki/Tables
-class Test_creole_tabular < Test::Unit::TestCase
-  def test_creole_tabular_creole()
-    creole = Docgenerator::Creole::Creole.new(
-                    :name => 'tabular_creole',
-                    :content => <<'creole'
-Tables are done like this:
-|=header col1|=header col2| 
-|col1|col2| 
-|you         |can         | 
-|also        |align\\ it. | 
-creole
-    )
-    $log.warn('test_creole_tabular_creole: tabular inside paragraphs/list...')
-    $log.warn('test_creole_tabular_creole: wiki syntax inside cell ')
-    assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.html", creole.to_doc(:html, OPT))
-    assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.latex", creole.to_doc(:latex, OPT))
-    $log.warn('test_creole_tabular_creole: to_context')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.context", creole.to_doc(:context))
-    $log.warn('test_creole_tabular_creole: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.creole", creole.to_doc(:creole))
-    $log.warn('test_creole_tabular_creole: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.text", creole.to_doc(:text))
-  end #test_creole_tabular_creole
-  
-  def test_creole_tabular()
-    creole = Docgenerator::Creole::Creole.new(:content => <<creole
-before
-<<<tabular
-|!columns=3
-|!columndescription=ccc
-|=1
-|=2
-|=3
-|-
-|eins
-|zwei
-|drei
-|-
-|one
-|two
-|three
->>>
-after
-creole
-    )
-    assert_equal_filecontent( "expected_creole/test_creole_tabular.html", creole.to_doc(:html, OPT))
-    assert_equal_filecontent( "expected_creole/test_creole_tabular.latex", creole.to_doc(:latex, OPT))
-    $log.warn('test_creole_tabular: to_context')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.context", creole.to_doc(:context))
-    $log.warn('test_creole_tabular: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.creole", creole.to_doc(:creole))
-    $log.warn('test_creole_tabular: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.text", creole.to_doc(:text))
-  end #test_creole_tabular
-
-  def test_creole_tabular_with_cell_option()
-#  title...    
-    creole = Docgenerator::Creole::Creole.new(:content => <<creole
-before
-<<<tabular
-|!columns=3
-|eins||css=color: red
-|css = zwei
-|||class=empty
-|-
-|normal
-|//italic//
-|//italic//||class=it
-|-
-|text with | nice! ||class = it
-|||css = 
-|
->>>
-after
-creole
-    )
-    assert_equal_filecontent( "expected_creole/test_creole_tabular_with_cell_option.html", creole.to_doc(:html, OPT))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_with_option.latex", creole.to_doc(:latex))
-    $log.warn('test_creole_tabular: to_context')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.context", creole.to_doc(:context))
-    $log.warn('test_creole_tabular: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.creole", creole.to_doc(:creole))
-    $log.warn('test_creole_tabular: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.text", creole.to_doc(:text))
-  end #test_creole_tabular
-
-  def test_creole_tabular_css()
-    creole = Docgenerator::Creole::Creole.new(:content => <<creole
-before
-<<<tabular
-|!columns=3
-|!columndescription=ccc
-|!css=border-width: 1px
-|!css=border-style: solid
-|=1
-|=2
-|=3
-|-
-|eins
-|zwei
-|drei
-|-
-|one
-|two
-|three
->>>
-after
-creole
-    )
-    assert_equal_filecontent( "expected_creole/test_creole_tabular_css.html", creole.to_doc(:html, OPT))
-    assert_equal_filecontent( "expected_creole/test_creole_tabular_css.latex", creole.to_doc(:latex, OPT))
-    $log.warn('test_creole_tabular_css: to_context')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_css.context", creole.to_doc(:context))
-    $log.warn('test_creole_tabular_css: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_css.creole", creole.to_doc(:creole))
-    $log.warn('test_creole_tabular_css: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_css.text", creole.to_doc(:text))
-  end #test_creole_tabular_css
-end   #Test_creole_tabular

data/unittest/unittest_creole_tabular.rb

@@ -0,0 +1,174 @@
+if $0 == __FILE__
+  $:.unshift("../lib")
+end
+
+=begin
+erweitern:
+*tabulars 
+*Creole_creoletab
+*csv-tabs
+
+=end
+
+
+gem 'test-unit'
+require 'test/unit'
+require 'more_unit_test/assert_equal_filecontent.rb'
+
+require 'creole/creole2doc.rb'
+
+#Avoid warnings about missing logger in to_doc
+OPT = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }  unless defined? OPT
+
+require 'log4r'
+#Warn -> report missing important test
+#Info -> report missing test
+$log = Log4r::Logger.new('Unittest creole', Log4r::ERROR)
+#~ $log = Log4r::Logger.new('Unittest creole', Log4r::WARN)
+#~ $log = Log4r::Logger.new('Unittest creole', Log4r::INFO)
+$log.outputters = Log4r::StdoutOutputter.new('log_stdout')
+
+
+#http://www.wikicreole.org/wiki/Tables
+class Test_creole_tabular < Test::Unit::TestCase
+  def test_creole_tabular_creole()
+    creole = Docgenerator::Creole::Creole.new(
+                    :name => 'tabular_creole',
+                    :content => <<'creole'
+Tables are done like this:
+|=header col1|=header col2| 
+|col1|col2| 
+|you         |can         | 
+|also        |align\\ it. | 
+creole
+    )
+    $log.warn('test_creole_tabular_creole: tabular inside paragraphs/list...')
+    $log.warn('test_creole_tabular_creole: wiki syntax inside cell ')
+    assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.html", creole.to_doc(:html, OPT))
+    assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.latex", creole.to_doc(:latex, OPT))
+    $log.warn('test_creole_tabular_creole: to_context')
+    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.context", creole.to_doc(:context))
+    tmp = OPT[:log].level
+    OPT[:log].level = Log4r::ERROR  #Suppress warning about newline
+    assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.creole", creole.to_doc(:creole, OPT))
+    OPT[:log].level = tmp
+    $log.warn('test_creole_tabular_creole: to text')
+    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.text", creole.to_doc(:text))
+  end #test_creole_tabular_creole
+  
+  def test_creole_tabular()
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
+before
+<<<tabular
+|!columns=3
+|!columndescription=ccc
+|=1
+|=2
+|=3
+|-
+|eins
+|zwei
+|drei
+|-
+|one
+|two
+|three
+>>>
+after
+creole
+    )
+    assert_equal_filecontent( "expected_creole/test_creole_tabular.html", creole.to_doc(:html, OPT))
+    assert_equal_filecontent( "expected_creole/test_creole_tabular.latex", creole.to_doc(:latex, OPT))
+    $log.warn('test_creole_tabular: to_context')
+    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.context", creole.to_doc(:context))
+    assert_equal_filecontent( "expected_creole/test_creole_tabular.creole", creole.to_doc(:creole))
+    $log.warn('test_creole_tabular: to text')
+    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.text", creole.to_doc(:text))
+  end #test_creole_tabular
+
+  def test_creole_tabular_with_cell_option()
+#  title...    
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
+before
+<<<tabular
+|!columns=3
+|eins||css=color: red
+|css = zwei
+|||class=empty
+|-
+|normal
+|//italic//
+|//italic//||class=it
+|-
+|text with | nice! ||class = it
+|||css = 
+|
+>>>
+after
+creole
+    )
+    assert_equal_filecontent( "expected_creole/test_creole_tabular_with_cell_option.html", creole.to_doc(:html, OPT))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_with_option.latex", creole.to_doc(:latex))
+    $log.warn('test_creole_tabular: to_context')
+    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_with_cell_option.context", creole.to_doc(:context))
+    assert_equal_filecontent( "expected_creole/test_creole_tabular_with_cell_option.creole", creole.to_doc(:creole))
+    $log.warn('test_creole_tabular: to text')
+    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_with_cell_option.text", creole.to_doc(:text))
+  end #test_creole_tabular
+
+  def test_creole_tabular_css()
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
+before
+<<<tabular
+|!columns=3
+|!columndescription=ccc
+|!css=border-width: 1px
+|!css=border-style: solid
+|=1
+|=2
+|=3
+|-
+|eins
+|zwei
+|drei
+|-
+|one
+|two
+|three
+>>>
+after
+creole
+    )
+    assert_equal_filecontent( "expected_creole/test_creole_tabular_css.html", creole.to_doc(:html, OPT))
+    assert_equal_filecontent( "expected_creole/test_creole_tabular_css.latex", creole.to_doc(:latex, OPT))
+    $log.warn('test_creole_tabular_css: to_context')
+    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_css.context", creole.to_doc(:context))
+    assert_equal_filecontent( "expected_creole/test_creole_tabular_css.creole", creole.to_doc(:creole))
+    $log.warn('test_creole_tabular_css: to text')
+    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_css.text", creole.to_doc(:text))
+  end #test_creole_tabular_css
+  
+  def test_creole_tabular_multicols()
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
+before
+<<<tabular
+|!columns=3
+|!columndescription=ccc
+|=Titelzeile||columns=3|pos=c
+|-
+|eins
+|zwei
+|drei
+>>>
+after
+creole
+    )
+    assert_equal_filecontent( "expected_creole/test_creole_tabular_multicols.html", creole.to_doc(:html, OPT))
+    assert_equal_filecontent( "expected_creole/test_creole_tabular_multicols.latex", creole.to_doc(:latex, OPT))
+    $log.warn('test_creole_tabular_multicols: to_context')
+    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_multicols.context", creole.to_doc(:context))
+    assert_equal_filecontent( "expected_creole/test_creole_tabular_multicols.creole", creole.to_doc(:creole))
+    $log.warn('test_creole_tabular_multicols: to text')
+    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_multicols.text", creole.to_doc(:text))
+  end #test_creole_tabular_multicols  
+end   #Test_creole_tabular

data/unittest/unittest_docgenerator.rb

@@ -11,6 +11,8 @@ require 'docgenerator'
 include Docgenerator
 #~ DOCGENERATOR_LOGGER.level = Log4r::DEBUG
 
+#~ DOCGENERATOR_DEFAULT_LOGGER.level = Log4r::ERROR
+
 #~ Element::SUPPORTED_TARGETS << :context 
 #~ Element::SUPPORTED_TARGETS << :creole
 
@@ -256,7 +258,6 @@ class Test_tabular < Test::Unit::TestCase
     @opt = { :log => DOCGENERATOR_DEFAULT_LOGGER } #unless defined? @opt
   end
   def mk_tabular( columns, lines )
-    
     tab = element(:tabular, {
             :columns => columns.size, #for HTML
             :columndescription =>	'c' * columns.size  #for LaTeX
@@ -297,8 +298,8 @@ class Test_tabular < Test::Unit::TestCase
     assert_equal_filecontent( "expected/test_tabular.latex", text.to_doc(:latex, @opt))
     $log.warn('test_tabular: to_context')
     #~ assert_equal_filecontent( "expected/test_tabular.context", text.to_doc(:context, @opt))
-    $log.warn('test_tabular: to_creole')
-    #~ assert_equal_filecontent( "expected/test_tabular.creole", text.to_doc(:creole, @opt))
+    
+    assert_equal_filecontent( "expected/test_tabular.creole", text.to_doc(:creole, @opt))
     assert_equal_filecontent( "expected/test_tabular.wiki", text.to_doc(:wiki,@opt))
     $log.warn("text-output for tables")
     #~ assert_equal_filecontent( "expected/test_tabular.text", text.to_doc(:text, @opt))