Soks 0.0.6 → 0.0.7

data/templates/default/views/Page_edit.rhtml

@@ -22,7 +22,9 @@
 	</ul>
 </div>
 	
-<form class='editpage' method='post' action='<%= url pagename, "save" %>' >	
+<form class='editpage' method='post' action='<%= url pagename, "save" %>' >
+	<fieldset>
+	
 	<div id='edittitle'>
 		Title: 
 		<input 	name='newtitle' 
@@ -37,10 +39,11 @@
 		<textarea 	name='content' 
 						rows=30 
 						cols=65   
-						onclick="this.value=this.value.replace('Type what you want here and click save','')" 
-			><%= page.content %></textarea>
+						onfocus="if( this.value == 'Type what you want here and click save' ) { this.value = '' }" ><%= page.content %></textarea>
 	</div>
 	
+	</fieldset>
+	
 	Hello <a href='<%= url person %>'><%= person %></a> (Quit browser to log out). Would you like to 
 	<input name='action' value='Save Changes' type='submit' accesskey="S" /></form>,  
 	<form class='editpage' method='post' action='<%= url pagename %>' >

data/templates/default/views/frame.rhtml

@@ -27,7 +27,7 @@
 			<input 	class='search' 
 					name='regex' 
 					value='Enter word & press return'
-			 		onClick="this.value=this.value.replace('Enter word & press return','')" 
+			 		onfocus="this.value=this.value.replace('Enter word & press return','')" 
 			 		size='17' />
 		</form>
 		
@@ -39,6 +39,7 @@
 		
 		<% if page %>
 			<% dynamic_links  = page.links_to - sidebarpage.links_from - [ sidebarpage ] %>
+			<% dynamic_links.delete_if { |page| page.name =~ /^Site Index ([a-z]|Other)\./i } %>
 			<% unless dynamic_links.empty? %>
 				<h2>Pages that link here</h2>
 				<div class='linklist'>
@@ -57,6 +58,6 @@
 		</div>
 		
 		<h2>Powered by <a href='http://www.soks.org'>Soks</a></h2>
-	</div> <!-- menu --!>
+	</div> <!-- menu -->
 </body>
 </html>

data/test/test_soks-storage.rb

@@ -0,0 +1,69 @@
+require 'test/unit'
+require 'fileutils'
+require 'soks-storage'
+
+class MockWiki
+	include WikiFlatFileStore
+	
+	def initialize( folder )
+		@folder = folder
+		@pages = {}
+	end
+	
+	def mutate( pagename ) 
+		p yield( @pages[pagename.downcase] ||= Page.new( pagename ) )
+	end
+end
+
+class TestWikiFlatFileStore < Test::Unit::TestCase
+	include FileUtils
+	
+	def setup
+		@wiki = MockWiki.new(folder)	
+	end
+	
+	def test_rename
+		create_file 'a handy file.textile', 'hello world' 
+		assert_equal( ['a handy file.textile'], files )
+		@wiki.move_files_if_names_are_not_url_encoded
+		assert_equal( ['a%20handy%20file.textile'], files )
+	end
+	
+	def test_remove_unwanted_characters
+		create_file 'a&b.textile', 'hello world'
+		assert_equal( ['a&b.textile'], files )
+		@wiki.move_files_if_names_are_not_url_encoded
+		assert_equal( ['ab.textile'], files )
+	end
+	
+	def test_avoid_overwriting_on_rename
+		create_file 'a&b.textile', 'hello world'
+		create_file 'ab.textile', 'hello world'
+		assert_equal( ['a&b.textile','ab.textile'], files )
+		@wiki.move_files_if_names_are_not_url_encoded
+		assert_equal( ['ab.textile','ab1.textile'], files )
+	end
+	
+	def teardown
+		rmtree( folder )
+	end
+
+	private
+	
+	def create_file( name, content )
+		File.open( File.join( folder, name ), 'w') { |f| f.puts content }
+	end
+	
+	def files
+		Dir.entries( folder ).delete_if { |name| name =~ /^\.+$/ }
+	end
+	
+	def folder
+		@folder ||= make_folder
+	end
+	
+	def make_folder
+		mkdir( 'testcontent' )
+		'testcontent'
+	end
+end

data/test/test_soks-utils.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'soks-utils'
+require 'fileutils'
 
 class ToTimeUnitsMT < Test::Unit::TestCase
 
@@ -34,4 +35,87 @@ class ToTimeUnitsMT < Test::Unit::TestCase
 		assert_equal( 'year',     (60*60*24*30*14).to_time_units )
 		assert_equal( '11 years', (60*60*24*365*11).to_time_units )
 	end
+end
+
+class TimeSameDay < Test::Unit::TestCase
+	
+	def test_simple
+		other_day = Time.local(2005,04,01,9,30)
+		assert( other_day.same_day?( Time.local(2005,04,01,23,59) ) )
+		assert( other_day.same_day?( Time.local(2005,04,01,0,0) ) )
+	end
+	
+	def test_not_match
+		other_day = Time.local(2005,04,01,9,30)
+		assert_equal( false, other_day.same_day?( Time.local(2004,04,02,9,30) ) )
+		assert_equal( false, other_day.same_day?( Time.local(2004,03,01,9,30) ) )
+		assert_equal( false, other_day.same_day?( Time.local(2003,04,01,9,30) ) )	
+	end
+end
+
+class StringToValidPageName < Test::Unit::TestCase
+	
+	def test_punctuation
+		assert_equal( 'abcdefghijklm', 'a/b\\c[d]e?f{g}h&i^j`k<l>m'.to_valid_pagename )
+	end
+	
+	def test_trailing_space
+		assert_equal( 'abcdefghijklm', ' abcdefghijklm '.to_valid_pagename )
+	end
+end
+
+class FileUniqueFilename < Test::Unit::TestCase
+	include FileUtils
+	
+	def teardown
+		rmtree( folder )
+	end
+
+	def test_no_collision
+		assert_equal( 'ok.txt', File.unique_filename( folder, 'ok.txt' ) )
+		create_file 'ok.jpg', ''
+		assert_equal( 'ok.txt', File.unique_filename( folder, 'ok.txt' ) ) 
+	end
+	
+	def test_whitespace
+		assert_equal( 'ok.txt', File.unique_filename( folder, 'o k.txt' ) )
+	end
+
+	def test_collision
+		assert_equal( 'ok.txt', File.unique_filename( folder, 'ok.txt' ) )
+		create_file 'ok.txt', ''
+		assert_equal( 'ok1.txt', File.unique_filename( folder, 'ok.txt' ) )
+	end
+	
+	def test_numbered_collision
+		assert_equal( 'ok1.txt', File.unique_filename( folder, 'ok1.txt' ) )
+		create_file 'ok1.txt', ''
+		assert_equal( 'ok11.txt', File.unique_filename( folder, 'ok1.txt' ) )
+	end
+
+	def test_high_number_collision
+		create_file 'ok.txt', ''
+		1.upto( 9 ) { |n| create_file "ok#{n}.txt", '' }
+		assert_equal( 'ok10.txt', File.unique_filename( folder, 'ok.txt' ) )
+	end
+
+	private
+	
+	def create_file( name, content )
+		File.open( File.join( folder, name ), 'w') { |f| f.puts content }
+	end
+	
+	def files
+		Dir.entries( folder ).delete_if { |name| name =~ /^\.+$/ }
+	end
+	
+	def folder
+		@folder ||= make_folder
+	end
+	
+	def make_folder
+		mkdir( 'testcontent' )
+		'testcontent'
+	end
+
 end

data/test/test_soks-view.rb

@@ -0,0 +1,43 @@
+require 'test/unit'
+require 'contrib/redcloth-3.0.3'
+require 'soks-view'
+
+class TestBruteMatch < Test::Unit::TestCase
+
+	def setup
+		@match = BruteMatch.new
+		@match['one'] = :one
+		@match['two'] = :two
+		@match['one two'] = :one_two
+		@match['two three'] = :two_three
+		@match['three: four'] = :three_colon_four
+	end
+	
+	def test_basic
+		assert_equal( [['three: four',:three_colon_four],['two',:two]], match('two three: four or more') )
+	end
+	
+	def test_case
+		assert_equal( [['One',:one]] , match('One') )
+	end
+	
+	def test_length
+		assert_equal( [['one two',:one_two]], match("a one two\nthree four") )
+		assert_equal( [['two three',:two_three],['one',:one]], match('a one two three four') )
+	end
+	
+	def test_fullwords
+		assert_equal( [['two',:two]], match('aone two.') )
+		assert_equal( [['two three',:two_three]], match('two three: fourormore') )
+	end
+	
+	def match( text )
+		matches = []
+		@match.match( text ) { |m,p| 
+			matches << [m,p]
+			"$1"
+		}
+		matches
+	end
+	
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: Soks
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
-date: 2005-03-15
+  version: 0.0.7
+date: 2005-03-21
 summary: Yet another wiki.
 require_paths: 
   - lib
@@ -12,7 +12,7 @@ require_paths:
 email: tamc@rubyforge.org
 homepage: http://rubyforge.org/projects/soks/
 rubyforge_project: 
-description: 
+description: Another Ruby Wiki. See http://www.soks.org for details
 autorequire: soks
 default_executable: 
 bindir: bin
@@ -80,18 +80,22 @@ files:
   - templates/default/attachment/rss.png
   - templates/default/attachment/stylesheet.css
   - templates/default/attachment/tiny-logo thumb.bmp
+  - templates/default/content/A%20page%20with%20an%20umlaut%20%F6%20in%20its%20title.textile
   - templates/default/content/All%20News.textile
   - templates/default/content/Api%20for%20classes%20to%20modify%20the%20wiki.textile
-  - templates/default/content/Attached%20ruby%20logo.textile
-  - templates/default/content/Attached%20test%20thing.textile
   - templates/default/content/Author.textile
   - templates/default/content/Automatic%20linking%20between%20pages.textile
   - templates/default/content/Automatic%20Summaries.textile
+  - templates/default/content/Bil%20Kleb.textile
+  - templates/default/content/Bil.textile
+  - templates/default/content/Bill%20Wood.textile
   - templates/default/content/bug%3A%20competing%20edits.textile
+  - templates/default/content/Bug%3A%20Does%20not%20make%20use%20of%20if%2Dmodified%2Dsince%20r.textile
   - templates/default/content/Bug%3A%20GEM%20limits%20title%20lengths.textile
   - templates/default/content/Bug%3A%20notextile%20does%20not%20prevent%20page%20inserts.textile
   - templates/default/content/Bug%3A%20RSS%20feed%20does%20not%20validate.textile
   - templates/default/content/Bug%3A%20Textile%20mishandles%20paragraphs.textile
+  - templates/default/content/Bug%3A%20Type%20a%20title%20here.textile
   - templates/default/content/Bug%3A%20Unanticipated%20Rollbacks.textile
   - templates/default/content/ctrl%2Dn.textile
   - templates/default/content/Home%20Page.textile
@@ -108,30 +112,27 @@ files:
   - templates/default/content/How%20to%20use%20the%20keyboard%20shortcuts.textile
   - templates/default/content/How%20to%20use%20this%20wiki.textile
   - templates/default/content/Instructions%20and%20Howtos.textile
-  - templates/default/content/Known%20bugs.textile
   - templates/default/content/Latest%20News.textile
   - templates/default/content/let%20me%20know.textile
   - templates/default/content/List%20of%20changes.textile
   - templates/default/content/New%20page%20templates%20or%20categories%20code.textile
   - templates/default/content/New%20Recent%20Changes%20class.textile
+  - templates/default/content/News%3A%20Version%200%2E0%2E6%20Released.textile
   - templates/default/content/Per%20Wiki%20Templates.textile
-  - templates/default/content/Picture%20of%20a%20logo%20for%20the%20ruby%20language.textile
   - templates/default/content/Picture%20of%20a%20pair%20of%20soks.textile
-  - templates/default/content/Picture%20of%20powered%20by%20ruby%20logo.textile
-  - templates/default/content/Picture%20of%20Type%20a%20title%20here.textile
   - templates/default/content/Planned%20Features.textile
   - templates/default/content/README.textile
   - templates/default/content/Recent%20Blog%20Entries.textile
   - templates/default/content/Recent%20Changes%20to%20This%20Site.textile
-  - templates/default/content/Recent%20News.textile
   - templates/default/content/RSS%20feed.textile
   - templates/default/content/Ruby.textile
+  - templates/default/content/sandbox.textile
   - templates/default/content/Sidebar%20Page.textile
+  - templates/default/content/Skorgu.textile
   - templates/default/content/SOKS%20features.textile
   - templates/default/content/Soks%20Licence.textile
   - templates/default/content/tamc.textile
   - templates/default/content/tamc2.textile
-  - templates/default/content/Type%20a%20title%20here.textile
   - templates/default/views/frame.rhtml
   - templates/default/views/messages.yaml
   - templates/default/views/Page_content.rhtml
@@ -143,7 +144,9 @@ files:
   - templates/default/views/Page_search_results.rhtml
   - templates/default/views/Page_view.rhtml
   - templates/default/views/UploadPage_edit.rhtml
+  - test/test_soks-storage.rb
   - test/test_soks-utils.rb
+  - test/test_soks-view.rb
   - LICENSE.txt
   - README.txt
 test_files: []

data/templates/default/content/Attached%20ruby%20logo.textile

@@ -1 +0,0 @@
-page deleted

data/templates/default/content/Attached%20test%20thing.textile

@@ -1 +0,0 @@
-content moved to [[Attached ruby logo]]

data/templates/default/content/Known%20bugs.textile

@@ -1,18 +0,0 @@
-h2. Known bugs
-
-p{font-size: x-small;}. Known bugs was created automatically from pages whose title matches /^Bug:/i.
-
-<automaticsummary>
-
-* [[ Bug: Does not make use of if-modified-since request headers ]] revised on 2005 Jan 25 18:23 by AutomaticImport
-* [[ Bug: GEM limits title lengths ]] revised on 2005 Jan 26 08:55 by tamc2
-* [[ Bug: notextile does not prevent page inserts ]] revised on 2005 Feb 12 12:00 by tamc2
-* [[ Bug: RSS feed does not validate ]] revised on 2005 Mar 15 16:24 by tamc2
-* [[ Bug: Unanticipated Rollbacks ]] revised on 2005 Mar 08 05:50 by Bil Kleb
-* [[ Bug: Textile mishandles paragraphs ]] revised on 2005 Mar 09 05:13 by tamc2
-* [[ bug: competing edits ]] revised on 2005 Mar 10 14:47 by tamc2
-
-
-</automaticsummary>
-
-How to report a bug

data/templates/default/content/Picture%20of%20Type%20a%20title%20here.textile

@@ -1 +0,0 @@
-page deleted

data/templates/default/content/Picture%20of%20a%20logo%20for%20the%20ruby%20language.textile

@@ -1 +0,0 @@
-/attachment/ruby.gif

data/templates/default/content/Picture%20of%20powered%20by%20ruby%20logo.textile

@@ -1 +0,0 @@
-content moved to [[Picture of a logo for the ruby language]]

data/templates/default/content/Recent%20News.textile

@@ -1,9 +0,0 @@
-h2. Recent News
-
-p{font-size: x-small;}. Recent News was created automatically from pages whose title matches /^News:/i.
-
-<automaticsummary>
-
-No pages found to summarise
-
-</automaticsummary>

data/templates/default/content/Type%20a%20title%20here.textile

@@ -1 +0,0 @@
-content moved to [[Bug: Search textarea and button rendered w/o vertical separation?]]