Wiki2Go 1.17.5 → 1.22.0

data/test/TestFormatter.rb

@@ -11,19 +11,17 @@ require "Wiki2Go/WhiteList"
 require "Wiki2GoConfigForTest"
 require "UnitTestFiles"
 
-class MockStorage
-  attr_accessor :find_it
+module TestFormatter_local
+  class MockStorage
+    attr_accessor :find_it
 
-  def exists?(path)
-    return @find_it
-  end
-
-  def load_whitelist
-    return Wiki2Go::WhiteList.new(Array.new)
-  end
+    def exists?(path)
+      return @find_it
+    end
 
-  def initialize
-    @find_it = false
+    def initialize
+      @find_it = false
+    end
   end
 end
 
@@ -139,8 +137,8 @@ END_OF_EXPECTED
 
   def test_view_link_with_parameters
     formatter = makeFormatter
-    formatted = formatter.view_version_link("Xpday", "aPage", "aLabel", { 'version' => '2' , 'user' => 'firstuser', 'firstparam' => 'value' })
-    assert_equal('<a href="/view/Xpday/aPage?firstparam=value&user=firstuser&version=2">aLabel</a>',formatted)
+    formatted = formatter.view_version_link("Xpday", "aPage", "aLabel",2)
+    assert_equal('<a href="/view/Xpday/aPage?version=2">aLabel</a>',formatted)
     
   end
 
@@ -453,7 +451,7 @@ END_OF_LOADSATAGS
   end
   
   def makeFormatter
-    storage = MockStorage.new
+    storage = TestFormatter_local::MockStorage.new
     storage.find_it = true  
     config = TestWiki2GoConfig.new
     web = Wiki2Go::Web.from_page_url("http://webserver:8081/view/Xpday/Page",'view',config)
@@ -461,7 +459,7 @@ END_OF_LOADSATAGS
   end
 
   def makePublicFormatter
-    storage = MockStorage.new
+    storage = TestFormatter_local::MockStorage.new
     storage.find_it = true  
     config = PublicTestWiki2GoConfig.new
     web = Wiki2Go::Web.from_page_url("http://webserver:8081/view/Xpday/Page",'view',config)
@@ -469,7 +467,7 @@ END_OF_LOADSATAGS
   end
 
   def make_single_wiki_Formatter
-    storage = MockStorage.new
+    storage = TestFormatter_local::MockStorage.new
     storage.find_it = true  
     config = PublicTestWiki2GoConfig.new
     config.multi_wiki = false

data/test/TestHTMLFormatter.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
+
+require 'test/unit'
+require 'Wiki2Go/HTMLFormatter'
+require "Wiki2Go/Web"
+require "Wiki2Go/FileStorage"
+require "Wiki2GoConfigForTest"
+require "UnitTestFiles"
+
+class TestHTMLFormatter <  Test::Unit::TestCase
+
+  include UnitTestFiles
+
+  def test_formatter_doesnt_touch_wikiwords
+    config = PublicTestWiki2GoConfig.new
+    config.multi_wiki = false
+    web = Wiki2Go::Web.from_page_url("http://webserver:8081/view/Page",'view',config)
+
+    formatter = Wiki2Go::HTMLFormatter.new(web,nil,config,true,false)
+
+    output = formatter.format_page("Don't *touch* the WikiWord !")
+    assert_equal "Don't <STRONG>touch</STRONG> the WikiWord !",output
+  end
+
+  def test_formatter_doesnt_touch_forced_internal_links
+    config = PublicTestWiki2GoConfig.new
+    config.multi_wiki = false
+    web = Wiki2Go::Web.from_page_url("http://webserver:8081/view/Page",'view',config)
+
+    formatter = Wiki2Go::HTMLFormatter.new(web,nil,config,true,false)
+
+    output = formatter.format_page("Don't *touch* the {forced link@Somepage} !")
+    assert_equal "Don't <STRONG>touch</STRONG> the {forced link@Somepage} !",output
+  end
+
+end

data/test/TestInstall.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/ruby
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
-
+$: << File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
 
 require 'test/unit'
+require 'rubygems'
 
 require "Wiki2Go/Install/make_site"
 require "Wiki2Go/Install/make_repository"
@@ -11,6 +11,49 @@ require 'UnitTestFiles'
 
 include FileUtils
 
+class UpdatedFiles
+  def initialize(directory)
+    @directory = directory
+    @files = {}
+  end
+
+  # Returns an array of all filenames that have been updated since the last call
+  def updated_files
+    changed = []
+    sources = all_files_with_mtime
+
+    # Changed == a file did not exist before or its timestamp has changed
+    sources.each do |filename,mtime|
+      existing = @files[filename]
+      if existing.nil? || existing < mtime then
+        changed << filename
+      end
+    end
+
+    # Changed == a file existed before, but no longer
+    @files.each do |filename,mtime|
+      changed << filename unless sources.has_key?(filename)
+    end
+
+    @files = sources
+
+    changed
+  end
+
+  private
+
+  def all_files_with_mtime
+    path = File.join(@directory,'**','*')
+    found = Dir.glob(path)
+    files = {}
+    found.each do |filename|
+      files[filename] = File.mtime(filename) if File.file?(filename)
+    end
+
+    files
+  end
+end
+
 class TestInstall <  Test::Unit::TestCase
 
   def test_public_make_site
@@ -64,37 +107,30 @@ class TestInstall <  Test::Unit::TestCase
     assert_wiki_structure_exists(wiki_dir,'Wiki2Go')
     assert_wiki_structure_exists(wiki_dir,'Admin')
   end
-
-  def test_update_wiki
-    wiki_dir = scratch_dir('updatewiki')
+  
+  def test_update_doesnt_change_install
+    wiki_dir = scratch_dir('formathtml')
     args = ['-s', 'wiki2go.nayima.be' , '-w' , 'Wiki2Go' , '-t' , 'private', '-d' , wiki_dir]
     Wiki2Go::Install.make_site(args)
-    args = ['-t' , 'private', '-d' , wiki_dir]
-    Wiki2Go::Install.update_site(args)
-    assert_wiki_structure_exists(wiki_dir,'Wiki2Go')
-  end
 
-  def test_make_repository
-    scratch = scratch_dir('testcvs')
-    repository_dir = File.join(scratch,'repository')
-    wiki_dir       = File.join(scratch,'readwrite')
-    user = ENV['USER'] || ENV['USERNAME']
-    args = ['-d', repository_dir , '-u' ,user, '-g' , user, '-m' , 'readwrite']
-    Wiki2Go::RepositoryMaker.create(args)
-    assert File.exists?(repository_dir)
+    files = UpdatedFiles.new(wiki_dir)
+    changed = files.updated_files
+    
+    args = [ '-d' , wiki_dir]
+    Wiki2Go::Install.update_site(args)
 
-    args = ['-s', 'http://wiki2go.nayima.be/blog' , '-w' , 'Wiki2Go' , '-t' , 'readwrite', '-d' , wiki_dir]
-    Wiki2Go::Install.make_site(args)
+    # An update should not change existing files, except...
+    # CGI .rb scripts may be updated
+    # Except CgiOptions.rb, put a new version in CgiOptions.rb.new so that the user can merge new functionalities
+    changed = files.updated_files
+    really_changed = changed.reject {|name| name =~ /\.new$/  || name =~/\.rb$/ }
+    assert_equal 0,really_changed.length,"Update should NOT change files but updated : #{really_changed.join(' and ')}"
+    assert !changed.find {|name| name =~ /CgiOptions\.rb$/ }
+    assert changed.find {|name| name =~ /CgiOptions\.rb\.new$/ }
 
-    args = ['-d', repository_dir , '-w' ,wiki_dir, '-m' , 'readwrite']
-    added = Wiki2Go::RepositoryMaker.addwiki(args)
-    added = Wiki2Go::RepositoryMaker.addwiki(args)
-    assert_equal 0,added.length
-    args = ['-d', repository_dir , '-w' ,wiki_dir]
-    Wiki2Go::RepositoryMaker.updatewiki(args)
+    assert_wiki_structure_exists(wiki_dir,'Wiki2Go')
   end
 
-
   private
 
   def scratch_dir(type)
@@ -107,8 +143,10 @@ class TestInstall <  Test::Unit::TestCase
   end
 
   def assert_wiki_structure_exists(wiki_dir,wiki_name)
-    assert(File.exists?(File.join(wiki_dir,'site','scripts')))
+    assert_exists(wiki_dir,'site','scripts')
     assert(File.exists?(File.join(wiki_dir,'site','scripts','secure')))
+    assert(File.exists?(File.join(wiki_dir,'site','html',wiki_name)))
+    assert(!File.exists?(File.join(wiki_dir,'site','fckeditor')))
     assert(File.exists?(File.join(wiki_dir,'texts')))
     assert(File.exists?(File.join(wiki_dir,'templates')))
     assert(File.exists?(File.join(wiki_dir,'config')))
@@ -116,5 +154,10 @@ class TestInstall <  Test::Unit::TestCase
     assert(File.exists?(File.join(wiki_dir,'texts',wiki_name)))
     assert(File.exists?(File.join(wiki_dir,'templates',wiki_name)))    
   end
+  
+  def assert_exists(wiki_dir,*dirs)
+      dir  = File.join(wiki_dir,dirs)
+      assert("#{dir} must exist",File.exists?(dir))
+  end
 end
 

data/test/TestLineFormatter.rb

@@ -18,10 +18,6 @@ class LineMockStorage
     return @find_it
   end
 
-  def load_whitelist
-    return Wiki2Go::WhiteList.new(Array.new)
-  end
-
   def initialize
     @find_it = false
   end
@@ -62,14 +58,39 @@ class TestLineFormatter <  Test::Unit::TestCase
   def test_accept_tags_with_attributes
     formatter = makeFormatter
 
-    formatted = formatter.format_line("<a href=\"hello\"/>")
-    assert_equal("<a href=\"hello\"/>",formatted) 
+    formatted = formatter.format_line("<img src=\"http://www.xp.be\"/>")
+    assert_equal("<img src=\"http://www.xp.be\"/>",formatted) 
 
-    formatted = formatter.format_line("<a href=\"hello&gt;\"/>")
-    assert_equal("<a href=\"hello&gt;\"/>",formatted) 
+    formatted = formatter.format_line("<div name=\"hello&gt;\"/>")
+    assert_equal("<div name=\"hello&gt;\"/>",formatted) 
   end
+  
+  def test_handle_anchor_links
+    formatter = makePublicFormatter
+    
+    formatted = formatter.format_line("<a href=\"http://www.xp.be\" />")
+    assert_equal("<a href=\"http://www.xp.be\" target=\"_blank\" />",formatted) 
+
+    formatted = formatter.format_line("<a href=\"http://www.xp.be\" target=\"_blank\" />")
+    assert_equal("<a href=\"http://www.xp.be\" target=\"_blank\" />",formatted) 
+  end
+
+  def test_accept_technorati_links
+    formatter = makePublicFormatter
 
-  def test_FormatterEntities
+    formatted = formatter.format_line("<a href=\"http://hello\" rel=\"tag\"/>")
+    assert_equal("<a href=\"http://hello\" target=\"_blank\" rel=\"tag\"/>",formatted) 
+
+    formatted = formatter.format_line("<a href=\"hello&gt;\" rel=\"tag\"/>")
+    assert_equal("<a href=\"hello&gt;\" rel=\"tag\"/>",formatted) 
+
+    formatted = formatter.format_line("{technorati:agileopen}")
+    assert_equal("<a href=\"http://technorati.com/tag/agileopen\" target=\"_blank\" rel=\"tag\">agileopen</a>",formatted) 
+    formatted = formatter.format_line("{Agile Open@technorati:agileopen}")
+    assert_equal("<a href=\"http://technorati.com/tag/agileopen\" target=\"_blank\" rel=\"tag\">Agile Open</a>",formatted) 
+  end
+
+  def test_formatter_entities
     formatter = makeFormatter
 
     formatted = formatter.format_line(" &lt; & &gt; ")
@@ -145,7 +166,21 @@ class TestLineFormatter <  Test::Unit::TestCase
     formatted = formatter.format_line(" a link http://www.xp.be/logo.GIF works ")
     assert_equal(" a link <img src=\"http://www.xp.be/logo.GIF\" alt=\"logo\"> works ",formatted)
   end
-
+  
+  # Bug on XP Day 2006 sessions wiki
+  def test_bug_link_not_formatted
+    formatter = makePublicFormatter
+    
+    formatted = formatter.format_line("I hope to play the {Leadership game@http://www.xpday.org/wiki/index.php/The_Leadership_Game%2C_a_pair_coaching_experiment} ")
+    assert_equal('I hope to play the <a href="http://www.xpday.org/wiki/index.php/The_Leadership_Game%2C_a_pair_coaching_experiment" target="_blank">Leadership game</a> ',formatted)
+  end
+  
+  def test_bug_save_may_not_redirect_to_static_page_of_rbl_page
+    formatter = makePublicFormatter
+    formatted = formatter.view_url('Xpday','Registration.rbl')
+    assert_equal '/view/Xpday/Registration.rbl',formatted
+  end
+  
   def test_links_with_redirect    
     formatter = makeFormatter
 
@@ -157,7 +192,7 @@ class TestLineFormatter <  Test::Unit::TestCase
 
 
     formatted = formatter.format_line(" a mail link mailto:pvc@nayima.be works ")
-    assert_equal(" a mail link <a href=\"/view/Xpday/MailFormattingRules\" onmouseover=\"this.href='mai' + 'lto:' + 'pvc' + '&#64;' + 'nayima.be'\">pvc</a> works ",formatted)
+    assert_equal(" a mail link <a href=\"/view/Xpday/MailFormattingRules\" rel=\"nofollow\" onmouseover=\"this.href='mai' + 'lto:' + 'pvc' + '&#64;' + 'nayima.be'\">pvc</a> works ",formatted)
 
     formatted = formatter.format_line(" a link %test@http://SomePage% works ")
     assert_equal(" a link <a href=\"/redirect/Xpday?url=http%3A%2F%2FSomePage\" rel=\"nofollow\" target=\"_blank\">test</a> works ",formatted)
@@ -189,7 +224,7 @@ class TestLineFormatter <  Test::Unit::TestCase
     assert_equal(" a link <img src=\"http://www.xp.be/logo.gif\" alt=\"logo\"> works ",formatted)
 
     formatted = formatter.format_line(" a mail link mailto:pvc@nayima.be works ")
-    assert_equal(" a mail link <a href=\"/Xpday/MailFormattingRules.html\" onmouseover=\"this.href='mai' + 'lto:' + 'pvc' + '&#64;' + 'nayima.be'\">pvc</a> works ",formatted)
+    assert_equal(" a mail link <a href=\"/Xpday/MailFormattingRules.html\" rel=\"nofollow\" onmouseover=\"this.href='mai' + 'lto:' + 'pvc' + '&#64;' + 'nayima.be'\">pvc</a> works ",formatted)
 
     formatted = formatter.format_line(" a link %test@http://SomePage% works ")
     assert_equal(" a link <a href=\"http://SomePage\" target=\"_blank\">test</a> works ",formatted)
@@ -216,6 +251,12 @@ class TestLineFormatter <  Test::Unit::TestCase
     assert_equal(" a link http:// does not generate a link ",formatted)
   end
 
+  def test_bug_labeled_link_to_named_wiki
+    formatter = makePublicFormatter
+    formatted = formatter.format_line(" a link {Previous year@Xpday2007:FrontPage} works ")
+    assert_equal(" a link <a href=\"/Xpday2007/FrontPage.html\">Previous year</a> works ",formatted)
+  end
+  
   def perform_test_sister_wikis(formatter)
     formatted = formatter.format_line(" a link {xpnl:BesprokenOnderwerpen} works ")
     assert_equal(" a link <a href=\"http://www.xpnl.org/Wiki/BesprokenOnderwerpen\" target=\"_blank\">xpnl:BesprokenOnderwerpen</a> works ",formatted)
@@ -266,6 +307,9 @@ class TestLineFormatter <  Test::Unit::TestCase
     formatted = formatter.format_line("{microsoft.gif}")
     assert_equal("<img src=\"/html/Xpday/microsoft.gif\" border=0 alt=\"microsoft\" >",formatted)
 
+    formatted = formatter.format_line("{Wicked Witch.gif}")
+    assert_equal("<img src=\"/html/Xpday/Wicked%20Witch.gif\" border=0 alt=\"Wicked Witch\" >",formatted)
+
     formatted = formatter.format_line("{paper.pdf}")
     assert_equal("<a href=\"/html/Xpday/paper.pdf\" target=\"_blank\">paper.pdf</a>",formatted)
 
@@ -297,13 +341,19 @@ class TestLineFormatter <  Test::Unit::TestCase
 
   end
 
+  def test_no_target_for_img_tags
+    formatter = makePublicFormatter
+    formatted = formatter.format_line("Dont add a target to <img src=\"http://blog.nayima.be/html/logo2005small.gif\" align=left border=0 alt=\"XP Day Benelux 2005 logo\"> tags")
+    assert_equal("Dont add a target to <img src=\"http://blog.nayima.be/html/logo2005small.gif\" align=left border=0 alt=\"XP Day Benelux 2005 logo\"> tags",formatted)
+  end
+  
   def test_tilde_in_url
     formatter = makePublicFormatter
     formatted = formatter.format_line("Read about %weblog@http://www.xs4all.nl/~mmmevers/blog% or %homepage@http://www.xs4all.nl/~mmmevers% in Dutch")
     assert_equal("Read about <a href=\"http://www.xs4all.nl/~mmmevers/blog\" target=\"_blank\">weblog</a> or <a href=\"http://www.xs4all.nl/~mmmevers\" target=\"_blank\">homepage</a> in Dutch",formatted)
   end
 
-    def test_underscore_in_url
+  def test_underscore_in_url
     formatter = makeFormatter
     formatted = formatter.format_line("<p align=center>{http://www.agileopen.com@agileopen_logo.jpg}</p>")
     assert_equal('<p align=center><a href="/redirect/Xpday?url=http%3A%2F%2Fwww.agileopen.com" rel="nofollow" target="_blank"><img src="/html/Xpday/agileopen_logo.jpg" border=0 alt="agileopen_logo" ></a></p>',formatted)
@@ -365,7 +415,7 @@ class TestLineFormatter <  Test::Unit::TestCase
 
     storage.find_it = false
     formatted = formatter.format_line(" a SomeLink ")
-    assert_equal(" a SomeLink<a href=\"/edit/Xpday/SomeLink\">?</a> ",formatted)
+    assert_equal(" a SomeLink<a href=\"/wikiedit/Xpday/SomeLink\" rel=\"nofollow\">?</a> ",formatted)
 
   end
 
@@ -510,7 +560,13 @@ class TestLineFormatter <  Test::Unit::TestCase
     assert_equal('<a href="/view/Xpday/FrontPage.rbl">The dynamic page</a>',formatted)
   end
   
-  
+  def test_stack_too_deep_bug
+    
+    too_long = "<a href=\"  \"> </a>" * 5000
+    formatter = makeFormatter
+    formatted = formatter.format_line(too_long)
+    assert_equal too_long,formatted
+  end
 
 
   

data/test/TestRSS.rb

@@ -3,10 +3,10 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
 
 require 'test/unit'
 
+require "Wiki2Go/Wiki2Go"
 require "Wiki2Go/WikiFormatter"
 require "Wiki2Go/Web"
 require "Wiki2Go/FileStorage"
-require "Wiki2Go/Wiki2Go"
 require "Wiki2GoConfigForTest"
 require "UnitTestFiles"
 
@@ -66,7 +66,7 @@ class TestRSS <  Test::Unit::TestCase
     wiki = Wiki2Go::Wiki.new(config)
     web = Wiki2Go::Web.from_page_url("http://agilesystems.nayima.be/view/Xpday/Page","view",config)
     rss = wiki.generate_rss(web,changes)
-#    puts rss
+    # puts rss
     assert_same_markup_strings(expected_rss_with_absolute_urls,rss,{ '$DATE$' => Time.new.gmtime.strftime("%d %B %Y %H:%M GMT") })  
   end
 
@@ -117,15 +117,16 @@ END_OF_BEFORE_ITEMS_XML
         <author>author1</author> 
         <pubDate>13 September 2004 22:19 GMT</pubDate> 
         <link>http://agilesystems.nayima.be/view/Xpday/title1</link> 
-        <guid isPermaLink="true">Xpday/title1</guid> 
-        <description><![CDATA[content1<img src="http://agilesystems.nayima.be/html/Xpday/image.gif" border=0 alt="image" >]]></description> 
+        <guid isPermaLink="true">http://agilesystems.nayima.be/view/Xpday/title1</guid> 
+        <description><![CDATA[content1
+<img src="http://agilesystems.nayima.be/html/Xpday/image.gif" border=0 alt="image" >]]></description> 
         </item> 
         <item> 
         <title>title2</title> 
         <author>author2</author> 
         <pubDate>12 September 2004 20:26 GMT</pubDate> 
         <link>http://agilesystems.nayima.be/view/Xpday/title2</link> 
-        <guid isPermaLink="true">Xpday/title2</guid> 
+        <guid isPermaLink="true">http://agilesystems.nayima.be/view/Xpday/title2</guid> 
         <description><![CDATA[content2]]></description> 
         </item> 
       </channel> 
@@ -136,7 +137,7 @@ end
 def errorlog
   return <<-END_OF_LOG
 I, [2005-08-13 18:19:54#1567]  INFO -- : >> save.rb {"Wiki2Go_user"=>["Pascal"]}
-E, [2005-08-13 18:19:54#1567] ERROR -- : Blacklisted user 192.168.0.30 because of the following urls: http://blog.nayima.be
+E, [2005-08-13 18:19:54#1567] ERROR -- : <Error:> Blacklisted user 192.168.0.30 because of the following urls: http://blog.nayima.be
 I, [2005-08-13 18:20:54#1567]  INFO -- : << save {"Wiki2Go_user"=>["Pascal"]}
 I, [2005-08-13 18:20:54#1567]  INFO -- : Response cookies = {"Wiki2Go_user"=>["Pascal"]}
 I, [2005-08-13 18:26:41#1592]  INFO -- : Request cookies = {"Wiki2Go_user"=>["Pascal"]}
@@ -167,7 +168,7 @@ return <<-END_OF_EXPECTED
         <link>http://agilesystems.nayima.be/scripts/secure/admin/show_log</link> 
         <author>Wiki2Go</author> 
         <pubDate>13 August 2005 18:19 GMT</pubDate> 
-        <description><![CDATA[Blacklisted user 192.168.0.30 because of the following urls: http://blog.nayima.be]]></description> 
+        <description><![CDATA[&lt;Error:&gt; Blacklisted user 192.168.0.30 because of the following urls: http://blog.nayima.be]]></description> 
         </item> 
         <item> 
         <title>errormessage</title>