Wiki2Go 1.16.1 → 1.17.0

data/test/TestLineFormatter.rb

@@ -135,7 +135,7 @@ class TestLineFormatter <  Test::Unit::TestCase
     formatter = makeFormatter
 
     formatted = formatter.format_line('Interesting site:http://www.toolshed.com/blog/SoftwareDevelopment/sustainable_pace.html,v')
-    assert_equal('Interesting site:<a href="redirect/Xpday?url=http%3A%2F%2Fwww.toolshed.com%2Fblog%2FSoftwareDevelopment%2Fsustainable_pace.html%2Cv" rel="nofollow" target="_blank">http://www.toolshed.com/blog/SoftwareDevelopment/sustainable_pace.html,v</a>',formatted)
+    assert_equal('Interesting site:<a href="/redirect/Xpday?url=http%3A%2F%2Fwww.toolshed.com%2Fblog%2FSoftwareDevelopment%2Fsustainable_pace.html%2Cv" rel="nofollow" target="_blank">http://www.toolshed.com/blog/SoftwareDevelopment/sustainable_pace.html,v</a>',formatted)
   end
   
   # Bug reported by Marc Evers: upercase file extensions are not recognized
@@ -150,32 +150,32 @@ class TestLineFormatter <  Test::Unit::TestCase
     formatter = makeFormatter
 
     formatted = formatter.format_line(" a link http://wiki.xp.be works ")
-    assert_equal(" a link <a href=\"redirect/Xpday?url=http%3A%2F%2Fwiki.xp.be\" rel=\"nofollow\" target=\"_blank\">http://wiki.xp.be</a> works ",formatted)
+    assert_equal(" a link <a href=\"/redirect/Xpday?url=http%3A%2F%2Fwiki.xp.be\" rel=\"nofollow\" target=\"_blank\">http://wiki.xp.be</a> works ",formatted)
 
     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)
 
 
     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\" 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)
+    assert_equal(" a link <a href=\"/redirect/Xpday?url=http%3A%2F%2FSomePage\" rel=\"nofollow\" target=\"_blank\">test</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)
+    assert_equal(" a link <a href=\"/redirect/Xpday?url=http%3A%2F%2FSomePage\" rel=\"nofollow\" target=\"_blank\">test</a> works ",formatted)
 
     formatted = formatter.format_line(" a link <a href=\"http://SomePage?id=1\">test</a> works ")
-    assert_equal(" a link <a href=\"redirect/Xpday?url=http%3A%2F%2FSomePage%3Fid%3D1\" rel=\"nofollow\" target=\"_blank\">test</a> works ",formatted)
+    assert_equal(" a link <a href=\"/redirect/Xpday?url=http%3A%2F%2FSomePage%3Fid%3D1\" rel=\"nofollow\" target=\"_blank\">test</a> works ",formatted)
 
     formatted = formatter.format_line(" a link {test@http://www.belgium.be/eportal/application?origin=charterHome.jsp&event=bea.portal.framework.internal.refresh&pageid=charterDetailPage&navId=3647} works ")
-    assert_equal(" a link <a href=\"redirect/Xpday?url=http%3A%2F%2Fwww.belgium.be%2Feportal%2Fapplication%3Forigin%3DcharterHome.jsp%26event%3Dbea.portal.framework.internal.refresh%26pageid%3DcharterDetailPage%26navId%3D3647\" rel=\"nofollow\" target=\"_blank\">test</a> works ",formatted)
+    assert_equal(" a link <a href=\"/redirect/Xpday?url=http%3A%2F%2Fwww.belgium.be%2Feportal%2Fapplication%3Forigin%3DcharterHome.jsp%26event%3Dbea.portal.framework.internal.refresh%26pageid%3DcharterDetailPage%26navId%3D3647\" rel=\"nofollow\" target=\"_blank\">test</a> works ",formatted)
 
     formatted = formatter.format_line("http://home.scarlet.be/~ridesmet/")
-    assert_equal("<a href=\"redirect/Xpday?url=http%3A%2F%2Fhome.scarlet.be%2F%7Eridesmet%2F\" rel=\"nofollow\" target=\"_blank\">http://home.scarlet.be/~ridesmet/</a>",formatted)
+    assert_equal("<a href=\"/redirect/Xpday?url=http%3A%2F%2Fhome.scarlet.be%2F%7Eridesmet%2F\" rel=\"nofollow\" target=\"_blank\">http://home.scarlet.be/~ridesmet/</a>",formatted)
 
     formatted = formatter.format_line(" a link (http://wiki.xp.be) works ")
-    assert_equal(" a link (<a href=\"redirect/Xpday?url=http%3A%2F%2Fwiki.xp.be\" rel=\"nofollow\" target=\"_blank\">http://wiki.xp.be</a>) works ",formatted)
+    assert_equal(" a link (<a href=\"/redirect/Xpday?url=http%3A%2F%2Fwiki.xp.be\" rel=\"nofollow\" target=\"_blank\">http://wiki.xp.be</a>) works ",formatted)
 
   end
 
@@ -189,7 +189,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\" 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)
@@ -264,36 +264,36 @@ class TestLineFormatter <  Test::Unit::TestCase
   def test_local_resources
     formatter = makePublicFormatter
     formatted = formatter.format_line("{microsoft.gif}")
-    assert_equal("<img src=\"html/Xpday/microsoft.gif\" border=0 alt=\"microsoft\" >",formatted)
+    assert_equal("<img src=\"/html/Xpday/microsoft.gif\" border=0 alt=\"microsoft\" >",formatted)
 
     formatted = formatter.format_line("{paper.pdf}")
-    assert_equal("<a href=\"html/Xpday/paper.pdf\" target=\"_blank\">paper.pdf</a>",formatted)
+    assert_equal("<a href=\"/html/Xpday/paper.pdf\" target=\"_blank\">paper.pdf</a>",formatted)
 
     formatted = formatter.format_line("{The Evil Empire@microsoft.gif}")
-    assert_equal("<img src=\"html/Xpday/microsoft.gif\" border=0 alt=\"The Evil Empire\" >",formatted)
+    assert_equal("<img src=\"/html/Xpday/microsoft.gif\" border=0 alt=\"The Evil Empire\" >",formatted)
 
     formatted = formatter.format_line("{A very interesting text@paper.pdf}")
-    assert_equal("<a href=\"html/Xpday/paper.pdf\" target=\"_blank\">A very interesting text</a>",formatted)
+    assert_equal("<a href=\"/html/Xpday/paper.pdf\" target=\"_blank\">A very interesting text</a>",formatted)
 
     formatted = formatter.format_line("{http://microsoft.com@microsoft.gif}")
-    assert_equal("<a href=\"http://microsoft.com\" target=\"_blank\"><img src=\"html/Xpday/microsoft.gif\" border=0 alt=\"microsoft\" ></a>",formatted)
+    assert_equal("<a href=\"http://microsoft.com\" target=\"_blank\"><img src=\"/html/Xpday/microsoft.gif\" border=0 alt=\"microsoft\" ></a>",formatted)
 
     formatted = formatter.format_line("{WS07_XP2005.WhenTeamworkIsntWorking.pdf}")
-    assert_equal("<a href=\"html/Xpday/WS07_XP2005.WhenTeamworkIsntWorking.pdf\" target=\"_blank\">WS07_XP2005.WhenTeamworkIsntWorking.pdf</a>",formatted)
+    assert_equal("<a href=\"/html/Xpday/WS07_XP2005.WhenTeamworkIsntWorking.pdf\" target=\"_blank\">WS07_XP2005.WhenTeamworkIsntWorking.pdf</a>",formatted)
 
     formatted = formatter.resource_url("style.css")
-    assert_equal("html/Xpday/style.css",formatted)
+    assert_equal("/html/Xpday/style.css",formatted)
 
     formatter = make_single_wiki_Formatter
     
     formatted = formatter.resource_url("style.css")
-    assert_equal("html/style.css",formatted)
+    assert_equal("/html/style.css",formatted)
 
     formatted = formatter.format_line("{http://microsoft.com@microsoft.gif}")
-    assert_equal("<a href=\"http://microsoft.com\" target=\"_blank\"><img src=\"html/microsoft.gif\" border=0 alt=\"microsoft\" ></a>",formatted)
+    assert_equal("<a href=\"http://microsoft.com\" target=\"_blank\"><img src=\"/html/microsoft.gif\" border=0 alt=\"microsoft\" ></a>",formatted)
 
     formatted = formatter.format_line("{Registratie@registration.html}")
-    assert_equal('<a href="html/registration.html">Registratie</a>',formatted)
+    assert_equal('<a href="/html/registration.html">Registratie</a>',formatted)
 
   end
 
@@ -306,41 +306,41 @@ class TestLineFormatter <  Test::Unit::TestCase
     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)
+    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)
   end
 
   def test_pages
     formatter = makeFormatter
 
     formatted = formatter.format_line(" a SomeLink AnotherLink Nolink ")
-    assert_equal(" a <a href=\"view/Xpday/SomeLink\">SomeLink</a> <a href=\"view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
+    assert_equal(" a <a href=\"/view/Xpday/SomeLink\">SomeLink</a> <a href=\"/view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
 
     formatted = formatter.format_line("SomeLink or other")
-    assert_equal("<a href=\"view/Xpday/SomeLink\">SomeLink</a> or other",formatted)
+    assert_equal("<a href=\"/view/Xpday/SomeLink\">SomeLink</a> or other",formatted)
 
     formatted = formatter.format_line(" a %Xpday2004:SomeLink% AnotherLink Nolink ")
-    assert_equal(" a <a href=\"view/Xpday2004/SomeLink\">Xpday2004:SomeLink</a> <a href=\"view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
+    assert_equal(" a <a href=\"/view/Xpday2004/SomeLink\">Xpday2004:SomeLink</a> <a href=\"/view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
 
     formatted = formatter.format_line(" a {Xpday2004:SomeLink} AnotherLink Nolink ")
-    assert_equal(" a <a href=\"view/Xpday2004/SomeLink\">Xpday2004:SomeLink</a> <a href=\"view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
+    assert_equal(" a <a href=\"/view/Xpday2004/SomeLink\">Xpday2004:SomeLink</a> <a href=\"/view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
 
     formatted = formatter.format_line(" a %a link@SomeLink% AnotherLink Nolink ")
-    assert_equal(" a <a href=\"view/Xpday/SomeLink\">a link</a> <a href=\"view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
+    assert_equal(" a <a href=\"/view/Xpday/SomeLink\">a link</a> <a href=\"/view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
 
     formatted = formatter.format_line(" a {a link@SomeLink} AnotherLink Nolink ")
-    assert_equal(" a <a href=\"view/Xpday/SomeLink\">a link</a> <a href=\"view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
+    assert_equal(" a <a href=\"/view/Xpday/SomeLink\">a link</a> <a href=\"/view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
 
     formatted = formatter.format_line(" a %alink% AnotherLink Nolink ")
-    assert_equal(" a <a href=\"view/Xpday/alink\">alink</a> <a href=\"view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
+    assert_equal(" a <a href=\"/view/Xpday/alink\">alink</a> <a href=\"/view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
 
     formatted = formatter.format_line(" a {alink} AnotherLink Nolink ")
-    assert_equal(" a <a href=\"view/Xpday/alink\">alink</a> <a href=\"view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
+    assert_equal(" a <a href=\"/view/Xpday/alink\">alink</a> <a href=\"/view/Xpday/AnotherLink\">AnotherLink</a> Nolink ",formatted)
 
     formatted = formatter.format_line(" a {AnotherLink} ")
-    assert_equal(" a <a href=\"view/Xpday/AnotherLink\">AnotherLink</a> ",formatted)
+    assert_equal(" a <a href=\"/view/Xpday/AnotherLink\">AnotherLink</a> ",formatted)
 
     formatted = formatter.format_line(" a Wiki2GoStories ")
-    assert_equal(" a <a href=\"view/Xpday/Wiki2GoStories\">Wiki2GoStories</a> ",formatted)
+    assert_equal(" a <a href=\"/view/Xpday/Wiki2GoStories\">Wiki2GoStories</a> ",formatted)
 
   end
 
@@ -348,10 +348,10 @@ class TestLineFormatter <  Test::Unit::TestCase
     formatter = makeFormatter
 
     formatted = formatter.format_line("a {Subtopic/SubPage} ")
-    assert_equal("a <a href=\"view/Xpday/Subtopic/SubPage\">Subtopic/SubPage</a> ",formatted)
+    assert_equal("a <a href=\"/view/Xpday/Subtopic/SubPage\">Subtopic/SubPage</a> ",formatted)
 
     formatted = formatter.format_line("a {subpage@Subtopic/SubPage} ")
-    assert_equal("a <a href=\"view/Xpday/Subtopic/SubPage\">subpage</a> ",formatted)
+    assert_equal("a <a href=\"/view/Xpday/Subtopic/SubPage\">subpage</a> ",formatted)
 
   end
 
@@ -361,11 +361,11 @@ class TestLineFormatter <  Test::Unit::TestCase
 
     storage.find_it = true
     formatted = formatter.format_line(" a SomeLink ")
-    assert_equal(" a <a href=\"view/Xpday/SomeLink\">SomeLink</a> ",formatted)
+    assert_equal(" a <a href=\"/view/Xpday/SomeLink\">SomeLink</a> ",formatted)
 
     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=\"/edit/Xpday/SomeLink\">?</a> ",formatted)
 
   end
 
@@ -505,9 +505,9 @@ class TestLineFormatter <  Test::Unit::TestCase
   def test_dynamic_page_link
     formatter = makeFormatter
     formatted = formatter.format_line('{FrontPage.rbl}')
-    assert_equal('<a href="view/Xpday/FrontPage.rbl">FrontPage</a>',formatted)
+    assert_equal('<a href="/view/Xpday/FrontPage.rbl">FrontPage</a>',formatted)
     formatted = formatter.format_line('{The dynamic page@FrontPage.rbl}')
-    assert_equal('<a href="view/Xpday/FrontPage.rbl">The dynamic page</a>',formatted)
+    assert_equal('<a href="/view/Xpday/FrontPage.rbl">The dynamic page</a>',formatted)
   end
   
   

data/test/TestRepositoryMaker.rb

@@ -60,7 +60,7 @@ class TestRepositoryMaker < Test::Unit::TestCase
     maker.add_wiki(site,'test','Commit initial site')
     FileUtils::rm_r File.join(site,'texts','test.txt')
     updated,clashed = maker.update(site,'test')
-    puts updated
+#    puts updated
     assert_equal 1,updated.length
     assert_equal 0,clashed.length
 

data/test/TestWeb.rb

@@ -185,13 +185,12 @@ class TestWeb <  Test::Unit::TestCase
     assert_equal("Xpbe",web.name)
     assert_equal("PairProgramming/Parties",web.current_page)
     assert_equal("Xpbe/PairProgramming/Parties",web.path)
-    assert_equal("http://wiki.xp.be/sub_site/",web.base_url)
+    assert_equal("http://wiki.xp.be/",web.base_url)
+    assert_equal('sub_site',web.subsite)
   end
   
 end
 
 
-if $0 == __FILE__
-  RUNIT::CUI::TestRunner.run(TestWeb.suite)
-end
+
 

data/test/TestWeb2Go.rb

@@ -69,12 +69,11 @@ END_EXPECTED
   def test_mock_request
     
     request = Web2Go::MockRequest.new('http://localhost/view/user?id=5&detail=full',{ 'ENV_PARAM' => 'hello'})
-    assert_equal('localhost',request.server_variable['SERVER_NAME'])
-    assert_equal(80,request.server_variable['SERVER_PORT'])
-    assert_equal('view',request.server_variable['SCRIPT_NAME'])
-    assert_equal('user',request.server_variable['PATH_INFO'])
-    assert_equal('hello',request.server_variable['ENV_PARAM'])
-    assert_equal('id=5&detail=full',request.server_variable['QUERY_STRING'])
+    assert_equal('localhost',request.host)
+    assert_equal(80,request.port)
+    assert_equal('view',request.script_name)
+    assert_equal('user',request.path)
+    assert_equal('id=5&detail=full',request.query_string)
     
     assert_equal(['5'],request.params['id'])
     assert_equal(['full'],request.params['detail'])