Pimki 1.3.092 → 1.4.092

data/app/models/wiki_service_test.rb

@@ -1,15 +1,15 @@
-require "test/unit"
-require "wiki_service"
-
-class WikiServiceTest < Test::Unit::TestCase
-  def setup
-    WikiService.restart
-    @s = WikiService.instance
-    @s.create_web "Instiki", "instiki"
-  end
-
-  def test_read_write_page
-    @s.write_page "instiki", "FirstPage", "Electric shocks, I love 'em", Time.now, "DavidHeinemeierHansson"
-    assert_equal "Electric shocks, I love 'em", @s.read_page("instiki", "FirstPage").content
-  end
-end
+require "test/unit"
+require "wiki_service"
+
+class WikiServiceTest < Test::Unit::TestCase
+  def setup
+    WikiService.restart
+    @s = WikiService.instance
+    @s.create_web "Instiki", "instiki"
+  end
+
+  def test_read_write_page
+    @s.write_page "instiki", "FirstPage", "Electric shocks, I love 'em", Time.now, "DavidHeinemeierHansson"
+    assert_equal "Electric shocks, I love 'em", @s.read_page("instiki", "FirstPage").content
+  end
+end

data/app/models/wiki_words.rb

@@ -22,7 +22,7 @@ module WikiWords
     if ignore_separation
       wiki_word
     else
-        wiki_word.gsub(/([a-z#{I18N_LOWER_CASE_LETTERS}]|[A-Z]{3,})([A-Z#{I18N_HIGHER_CASE_LETTERS}#{DIGITS}])/u, '\1 \2').gsub(/(\d+)/u, ' \1 ')
+      wiki_word.gsub(/([a-z#{I18N_LOWER_CASE_LETTERS}#{DIGITS}]|[A-Z#{I18N_HIGHER_CASE_LETTERS}]{2,})(?=[A-Z#{I18N_HIGHER_CASE_LETTERS}])/u, '\1 \2').gsub(/(\d+)/u, ' \1')
     end
   end
 end

data/app/models/wiki_words_test.rb

@@ -1,12 +1,12 @@
-require "test/unit"
-require "wiki_words"
-
-class WikiWordsTest < Test::Unit::TestCase
-  
-  def test_utf8_characters_in_wiki_word
-    assert_equal "Æåle Øen", WikiWords.separate("ÆåleØen")
-    assert_equal "ÆÅØle Øen", WikiWords.separate("ÆÅØleØen")
-    assert_equal "Æe ÅØle Øen", WikiWords.separate("ÆeÅØleØen")
-    assert_equal "Legetøj", WikiWords.separate("Legetøj")
-  end
-end
+require "test/unit"
+require "wiki_words"
+
+class WikiWordsTest < Test::Unit::TestCase
+  
+  def test_utf8_characters_in_wiki_word
+    assert_equal "Æåle Øen", WikiWords.separate("ÆåleØen")
+    assert_equal "ÆÅØle Øen", WikiWords.separate("ÆÅØleØen")
+    assert_equal "Æe ÅØle Øen", WikiWords.separate("ÆeÅØleØen")
+    assert_equal "Legetøj", WikiWords.separate("Legetøj")
+  end
+end

data/app/views/bottom.rhtml

@@ -1,4 +1,4 @@
-  </div>
-</div>
-</body>
+  </div>
+</div>
+</body>
 </html>

data/app/views/markdown_help.rhtml

@@ -1,16 +1,16 @@
-<div id="TextileHelp" style="float: right; width: 250px; margin-top: 5px">
-		<h3>Markdown formatting tips (<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">advanced</a>)</h3>
-		<table cellspacing="0" cellpadding="0">
-			<tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
-			<tr><td>**your text**</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>
-			<tr><td>`my code`</td><td class="arrow">&rarr;</td><td><code>my code</code></td></tr>
-			<tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
-			<tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
-			<tr><td>[link name](URL)</td><td class="arrow">&rarr;</td><td><a href="URL">link name</a></td></tr>
-			<tr><td>***</td><td class="arrow">&rarr;</td><td>Horizontal ruler</td></tr>
-			<tr><td>&lt;http://url><br />&lt;email@add.com></td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
-			<tr><td>![Alt text](URL)</td><td class="arrow">&rarr;</td><td>Image</td></tr>
-    </table>
-
-    <%= sub_template "wiki_words_help" %>
+<div id="TextileHelp" style="float: right; width: 250px; margin-top: 5px">
+		<h3>Markdown formatting tips (<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">advanced</a>)</h3>
+		<table cellspacing="0" cellpadding="0">
+			<tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
+			<tr><td>**your text**</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>
+			<tr><td>`my code`</td><td class="arrow">&rarr;</td><td><code>my code</code></td></tr>
+			<tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
+			<tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
+			<tr><td>[link name](URL)</td><td class="arrow">&rarr;</td><td><a href="URL">link name</a></td></tr>
+			<tr><td>***</td><td class="arrow">&rarr;</td><td>Horizontal ruler</td></tr>
+			<tr><td>&lt;http://url><br />&lt;email@add.com></td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
+			<tr><td>![Alt text](URL)</td><td class="arrow">&rarr;</td><td>Image</td></tr>
+    </table>
+
+    <%= sub_template "wiki_words_help" %>
 </div>

data/app/views/menu.rhtml

@@ -1,20 +1,20 @@
-<div id="Menu" width="150">
-  <p>
-  <table>
-  <% begin %>
-        <tr><th><%= @web.name %> Quick Links</th></tr>
-        <tr><td><a href='../edit_menu/' style="font-size: 9px;">Edit Menu Contents</a></td></tr>
-        <tr><td>&nbsp;</td></tr>
-        <% if @menu_pages.nil? %>
-            <tr><td><%= @menu_content %></td></tr>
-        <% else %>
-          <% for page in @menu_pages %>
-            <tr><td><a href="../show/<%= page.name %>"><%= truncate(page.plain_name, 35) %></a></td></tr>
-          <% end %>
-        <% end %>
-  <% rescue Exception
-     end
-  %>
-  </table>
-</div>
-
+<div id="Menu" width="150">
+  <p>
+  <table>
+  <% begin %>
+        <tr><th><%= @web.name %> Quick Links</th></tr>
+        <tr><td><a href='../edit_menu/' style="font-size: 9px;">Edit Menu Contents</a></td></tr>
+        <tr><td>&nbsp;</td></tr>
+        <% if @menu_pages.nil? %>
+            <tr><td><%= @menu_content %></td></tr>
+        <% else %>
+          <% for page in @menu_pages %>
+            <tr><td><a href="../show/<%= page.name %>"><%= truncate(page.plain_name, 35) %></a></td></tr>
+          <% end %>
+        <% end %>
+  <% rescue Exception
+     end
+  %>
+  </table>
+</div>
+

data/app/views/navigation.rhtml

@@ -1,26 +1,26 @@
-<%
-def list_item(title, url, description, accesskey = nil)
-  if @title == title
-    "<b class=\"navOn\" title=\"#{description}\" accesskey=\"#{accesskey}\">#{title}</b>"
-  else
-    "<a href=\"#{url}\" title=\"#{description}\" accesskey=\"#{accesskey}\">#{title}</a>"
-  end
-end
-%>
-
-<form id="navigationForm" class="navigation" action="../search/" action="get" style="font-size: 10px">  
-  <%= list_item "Home Page", "../show/HomePage", "Home, Sweet Home", "H" %> | 
-  <%= list_item "All Pages", "../list/", "Alphabetically sorted list of pages", "A" %> |
-  <% if `dot -V 2>&1` =~ /dot version/ %>
-    <%= list_item "Mind Map", "../mind/", "A 'Mind Map' graph of wiki pages", "M" %> |
-  <% end %>
-  <%= list_item "Bliki", "../bliki/", "Bliki", "B" %> |
-  <%= list_item "ToDo", "../todo/", "Todo items from all pages", "T" %> |
-  <%= list_item "Recently Revised", "../recently_revised/", "Pages sorted by when they were last changed", "U" %> |
-  <!-- Moved to bottom of HomePage:
-  <%= list_item "Authors", "../authors/", "Who wrote what" %> | 
-  <%= list_item "Feeds", "../feeds/", "Subscribe to changes by RSS" %> | 
-  <%= list_item "Export", "../export/", "Download a zip with all the pages in this wiki", "X" %> |
-  -->
-  <input type="text" id="searchField" name="query" style="font-size: 10px" value="Search" onClick="this.value == 'Search' ? this.value = '' : true">
-</form>
+<%
+def list_item(title, url, description, accesskey = nil)
+  if @title == title
+    "<b class=\"navOn\" title=\"#{description}\" accesskey=\"#{accesskey}\">#{title}</b>"
+  else
+    "<a href=\"#{url}\" title=\"#{description}\" accesskey=\"#{accesskey}\">#{title}</a>"
+  end
+end
+%>
+
+<form id="navigationForm" class="navigation" action="../search/" method="get" style="font-size: 10px">  
+  <%= list_item "Home Page", "../show/HomePage", "Home, Sweet Home", "H" %> | 
+  <%= list_item "All Pages", "../list/", "Alphabetically sorted list of pages", "A" %> |
+  <% if `dot -V 2>&1` =~ /dot version/ %>
+    <%= list_item "Mind Map", "../mind/", "A 'Mind Map' graph of wiki pages", "M" %> |
+  <% end %>
+  <%= list_item "Bliki", "../bliki/", "Bliki", "B" %> |
+  <%= list_item "ToDo", "../todo/", "Todo items from all pages", "T" %> |
+  <%= list_item "Recently Revised", "../recently_revised/", "Pages sorted by when they were last changed", "U" %> |
+  <!-- Moved to bottom of HomePage:
+  <%= list_item "Authors", "../authors/", "Who wrote what" %> | 
+  <%= list_item "Feeds", "../feeds/", "Subscribe to changes by RSS" %> | 
+  <%= list_item "Export", "../export/", "Download a zip with all the pages in this wiki", "X" %> |
+  -->
+  <input type="text" id="searchField" name="query" style="font-size: 10px" value="Search" onClick="this.value == 'Search' ? this.value = '' : true">
+</form>

data/app/views/rdoc_help.rhtml

@@ -1,16 +1,16 @@
-<div id="TextileHelp" style="float: right; width: 250px; margin-top: 5px">
-		<h3>RDoc formatting tips (<a target="_new" href="http://rdoc.sourceforge.net/doc/files/markup/simple_markup_rb.html">advanced</a>)</h3>
-		<table cellspacing="0" cellpadding="0">
-			<tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
-			<tr><td>*your text*</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>
-			<tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
-			<tr><td>1. Numbered list<br />2. Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
-			<tr><td>+my_code+</td><td class="arrow">&rarr;</td><td><code>my_code</code></td></tr>
-			<tr><td>---</td><td class="arrow">&rarr;</td><td>Horizontal ruler</td></tr>
-			<tr><td>[[URL linkname]]</td><td class="arrow">&rarr;</td><td><a href="URL">linkname</a></td></tr>
-			<tr><td>http://url<br />mailto:e@add.com</td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
-			<tr><td>imageURL</td><td class="arrow">&rarr;</td><td>Image</td></tr>
-    </table>
-
-    <%= sub_template "wiki_words_help" %>
+<div id="TextileHelp" style="float: right; width: 250px; margin-top: 5px">
+		<h3>RDoc formatting tips (<a target="_new" href="http://rdoc.sourceforge.net/doc/files/markup/simple_markup_rb.html">advanced</a>)</h3>
+		<table cellspacing="0" cellpadding="0">
+			<tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
+			<tr><td>*your text*</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>
+			<tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
+			<tr><td>1. Numbered list<br />2. Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
+			<tr><td>+my_code+</td><td class="arrow">&rarr;</td><td><code>my_code</code></td></tr>
+			<tr><td>---</td><td class="arrow">&rarr;</td><td>Horizontal ruler</td></tr>
+			<tr><td>[[URL linkname]]</td><td class="arrow">&rarr;</td><td><a href="URL">linkname</a></td></tr>
+			<tr><td>http://url<br />mailto:e@add.com</td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
+			<tr><td>imageURL</td><td class="arrow">&rarr;</td><td>Image</td></tr>
+    </table>
+
+    <%= sub_template "wiki_words_help" %>
 </div>

data/app/views/static_style_sheet.rhtml

@@ -1,237 +1,237 @@
-#Menu {
-  float:      left;
-  margin:     0 auto;
-  text-align: left;
-  width:      180px;
-}
-
-#Menu a, existingWikiWord, newWikiWord {
-	font-size:  11px;
-}
-
-
-#Menu th {
-  color:      darkgreen;
-  font-size:  12px;
-  text-align: left
-}
-
-#Container {
-	float: left;
-	margin: 0 auto;
-	text-align: center;
-}
-
-#Content {
-	margin: 0;
-	padding: 5px;
-	text-align: left;
-	border-top: none;
-	float: right;
-}
-
-body { background-color: #fff; color: #333; }
-
-body, p, ol, ul, td {
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-size:   13px;
-	line-height: 18px;
-}
-
-a { color: #000; }
-
-.newWikiWord { background-color: #eee; }
-.newWikiWord a:hover { background-color: white; }
-
-// a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
-
-/* a.edit:link, a.edit:visited { color: #DA0006; } */
-
-
-h1, h2, h3 { color: #333; font-family: georgia, verdana; }
-h1 { font-size: 28px; color: blue }
-h2 { font-size: 19px; color: darkblue }
-h3 { font-size: 16px; color: darkblue }
-
-h1#pageName {
-	margin: 5px 0px 0px 0px;
-	padding: 0px 0px 0px 0px;
-	line-height: 28px;
-}
-
-h1#pageName small {
-  color: grey;
-	line-height: 10px;
-  font-size: 10px;
-  padding: 0px;
-}
-
-a.nav, a.nav:link, a.nav:visited { color: #000; }
-a.nav:hover { color: #fff; background-color:#000; }
-
-li { margin-bottom: 7px }
-
-.navigation {
-  margin-top: 5px;
-	font-size : 12px;
-  color: #999;
-}
-
-.navigation a:hover { color: #fff; background-color:#000; }
-
-.navigation a {
-	font-size: 11px;
-	color: black;
-	font-weight: bold;
-}
-
-.navigation small a {
-  font-weight: normal;
-  font-size: 11px;
-}
-  
-.navOn{
-	font-size: 11px;
-	color: grey;
-	font-weight: bold;
-	text-decoration: none;
-}
-
-.help {
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-size: 11px;
-}
-
-.inputBox {
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-size: 11px;
-  background-color: #eee;
-  padding: 5px;
-  margin-bottom: 20px;
-}
-
-blockquote {
-	display: block;
-	margin: 0px 0px 20px 0px;
-	padding: 0px 30px;
-	font-size:11px;
-	line-height:17px;
-  font-style: italic;  
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-ol.setup {
-  font-size: 19px;
-  font-family: georgia, verdana;
-  padding-left: 25px;
-}
-
-ol.setup li {
-  margin-bottom: 20px
-}
-
-.byline {
-  font-size: 10px;
-  font-style: italic;  
-  margin-bottom: 10px;
-  color: #999;
-}
-
-.references {
-  font-size: 10px;
-}
-
-.diffdel {
-  background: pink;
-}
-del.diffmod {
-  background: pink;
-}
-
-.diffins {
-  background: lightgreen;
-}
-ins.diffmod {
-  background: lightgreen;
-}
-
-#TextileHelp table {
-	margin-bottom: 0;
-}
-
-#TextileHelp table+h3 {
-	margin-top: 11px;
-}
-
-#TextileHelp table td {
-	font-size: 11px;
-	padding: 3px;
-	vertical-align: top;
-	border-top: 1px dotted #ccc;
-}
-
-#TextileHelp table td.arrow {
-	padding-right: 5px;
-	padding-left: 10px;
-	color: #999;
-}
-
-#TextileHelp table td.label {
-	font-weight: bold;
-	white-space: nowrap;
-	font-size: 10px;
-	padding-right: 15px;
-	color: #000;
-}
-
-#TextileHelp h3 {
-	font-size: 11px;
-	font-weight: bold;
-	font-weight: normal;
-	margin: 0 0 5px 0;
-	padding: 5px 0 0 0;
-}
-
-#TextileHelp p {
-	font-size: 10px;
-}
-
-.rightHandSide {
-   float: right;
-   width: 147px;
-   margin-left: 10px;
-   padding-left: 20px;
-   border-left: 1px dotted #ccc;
-}
-
-.rightHandSide p {
-   font-size: 10px;
-}
- 
-.newsList {
-   margin-top: 20px;
-}
-
-.newsList p {
-  margin-bottom:30px
-}
-
-.todo {
-  color     : red;
-}
-
-.todoFuture {
-  color     : darkred;
-}
-
-.searchresult {
-  color:        purple;
-  font-weight:  bold;
-  font-style:   italic;
-}
+#Menu {
+  float:      left;
+  margin:     0 auto;
+  text-align: left;
+  width:      180px;
+}
+
+#Menu a, existingWikiWord, newWikiWord {
+	font-size:  11px;
+}
+
+
+#Menu th {
+  color:      darkgreen;
+  font-size:  12px;
+  text-align: left
+}
+
+#Container {
+	float: left;
+	margin: 0 auto;
+	text-align: center;
+}
+
+#Content {
+	margin: 0;
+	padding: 5px;
+	text-align: left;
+	border-top: none;
+	float: right;
+}
+
+body { background-color: #fff; color: #333; }
+
+body, p, ol, ul, td {
+	font-family: verdana, arial, helvetica, sans-serif;
+	font-size:   13px;
+	line-height: 18px;
+}
+
+a { color: #000; }
+
+.newWikiWord { background-color: #eee; }
+.newWikiWord a:hover { background-color: white; }
+
+// a:visited { color: #666; }
+a:hover { color: #fff; background-color:#000; }
+
+/* a.edit:link, a.edit:visited { color: #DA0006; } */
+
+
+h1, h2, h3 { color: #333; font-family: georgia, verdana; }
+h1 { font-size: 28px; color: blue }
+h2 { font-size: 19px; color: darkblue }
+h3 { font-size: 16px; color: darkblue }
+
+h1#pageName {
+	margin: 5px 0px 0px 0px;
+	padding: 0px 0px 0px 0px;
+	line-height: 28px;
+}
+
+h1#pageName small {
+  color: grey;
+	line-height: 10px;
+  font-size: 10px;
+  padding: 0px;
+}
+
+a.nav, a.nav:link, a.nav:visited { color: #000; }
+a.nav:hover { color: #fff; background-color:#000; }
+
+li { margin-bottom: 7px }
+
+.navigation {
+  margin-top: 5px;
+	font-size : 12px;
+  color: #999;
+}
+
+.navigation a:hover { color: #fff; background-color:#000; }
+
+.navigation a {
+	font-size: 11px;
+	color: black;
+	font-weight: bold;
+}
+
+.navigation small a {
+  font-weight: normal;
+  font-size: 11px;
+}
+  
+.navOn{
+	font-size: 11px;
+	color: grey;
+	font-weight: bold;
+	text-decoration: none;
+}
+
+.help {
+	font-family: verdana, arial, helvetica, sans-serif;
+	font-size: 11px;
+}
+
+.inputBox {
+	font-family: verdana, arial, helvetica, sans-serif;
+	font-size: 11px;
+  background-color: #eee;
+  padding: 5px;
+  margin-bottom: 20px;
+}
+
+blockquote {
+	display: block;
+	margin: 0px 0px 20px 0px;
+	padding: 0px 30px;
+	font-size:11px;
+	line-height:17px;
+  font-style: italic;  
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+ol.setup {
+  font-size: 19px;
+  font-family: georgia, verdana;
+  padding-left: 25px;
+}
+
+ol.setup li {
+  margin-bottom: 20px
+}
+
+.byline {
+  font-size: 10px;
+  font-style: italic;  
+  margin-bottom: 10px;
+  color: #999;
+}
+
+.references {
+  font-size: 10px;
+}
+
+.diffdel {
+  background: pink;
+}
+del.diffmod {
+  background: pink;
+}
+
+.diffins {
+  background: lightgreen;
+}
+ins.diffmod {
+  background: lightgreen;
+}
+
+#TextileHelp table {
+	margin-bottom: 0;
+}
+
+#TextileHelp table+h3 {
+	margin-top: 11px;
+}
+
+#TextileHelp table td {
+	font-size: 11px;
+	padding: 3px;
+	vertical-align: top;
+	border-top: 1px dotted #ccc;
+}
+
+#TextileHelp table td.arrow {
+	padding-right: 5px;
+	padding-left: 10px;
+	color: #999;
+}
+
+#TextileHelp table td.label {
+	font-weight: bold;
+	white-space: nowrap;
+	font-size: 10px;
+	padding-right: 15px;
+	color: #000;
+}
+
+#TextileHelp h3 {
+	font-size: 11px;
+	font-weight: bold;
+	font-weight: normal;
+	margin: 0 0 5px 0;
+	padding: 5px 0 0 0;
+}
+
+#TextileHelp p {
+	font-size: 10px;
+}
+
+.rightHandSide {
+   float: right;
+   width: 147px;
+   margin-left: 10px;
+   padding-left: 20px;
+   border-left: 1px dotted #ccc;
+}
+
+.rightHandSide p {
+   font-size: 10px;
+}
+ 
+.newsList {
+   margin-top: 20px;
+}
+
+.newsList p {
+  margin-bottom:30px
+}
+
+.todo {
+  color     : red;
+}
+
+.todoFuture {
+  color     : darkred;
+}
+
+.searchresult {
+  color:        purple;
+  font-weight:  bold;
+  font-style:   italic;
+}