Soks 0.0.7 → 1.0.0

data/test/test_soks-servlet.rb

@@ -0,0 +1,231 @@
+require 'test/unit'
+require 'fileutils'
+require 'mock-objects' 
+
+class MockFileData
+	
+	attr_accessor :filename, :list
+	
+	def initialize( filename = 'test file.txt', list = ['0123456789'])
+		@filename, @list = filename, list
+	end
+end
+
+class WEBrick::HTTPServlet::FileHandler
+	
+	def service( request, response )
+		response.body = "File #{request.script_name.downcase} #{request.path_info}"
+	end
+	
+end
+
+class MockRequest < Hash
+
+	def path_info
+		return path
+	end
+	
+	def method_missing( method, *args )
+		if method.to_s[-1,1] == '=' && args.length == 1
+			self[method.to_s[0...-1].to_sym] = args.first
+		else
+			self[method]
+		end
+	end
+	
+end
+
+class MockResponse < Hash
+	
+	def set_redirect( type, destination )
+		self[:redirect_type] = type
+		self[:redirect_destination] = destination
+	end	
+	
+	def method_missing( method, *args )
+		if method.to_s[-1,1] == '=' && args.length == 1
+			self[method.to_s[0...-1].to_sym] = args.first
+		else
+			self[method]
+		end
+	end
+end
+
+class MockServer
+	
+	def config
+		{:Logger => 'a' }
+	end
+	
+end
+
+class TestWikiServlet < Test::Unit::TestCase
+	include TearDownableWiki
+	
+	def setup
+		super
+		@servlet = WikiServlet.new( MockServer.new, ServletSettings.new(@wiki,@view) )
+		@servlet.settings.static_file_directories['Attachment'] = "#{folder}/attachment"
+		@servlet.settings.upload_directory = 'Attachment'
+	end
+	
+	def test_static_files
+		@servlet.service( re = MockRequest[ :path => '/favicon.ico' ], rp = MockResponse.new )
+		assert_equal( nil, rp[:redirect_destination] )
+		assert_equal( "File attachment /favicon.ico", rp[:body])
+		@servlet.service( re = MockRequest[ :path => '/robots.txt' ], rp = MockResponse.new )
+		assert_equal( nil, rp[:redirect_destination] )
+		assert_equal( "File attachment /robots.txt", rp[:body])
+	end
+	
+	def test_standard_attachment
+		@servlet.service( re = MockRequest[ :path => '/attachment/logo.jpg' ], rp = MockResponse.new )
+		assert_equal( nil, rp[:redirect_destination] )
+		assert_equal( "File attachment /attachment/logo.jpg", rp[:body])
+	end
+	
+	def test_second_attachment
+		@servlet.settings.static_file_directories['Www'] = '/var/www'
+		test_standard_attachment
+		@servlet.service( re = MockRequest[ :path => '/www/logo.jpg' ], rp = MockResponse.new )
+		assert_equal( nil, rp[:redirect_destination] )
+		assert_equal( "File www /www/logo.jpg", rp[:body])
+	end
+	
+	def test_redirect_to_home_page
+		@servlet.service( re = MockRequest[ :path => '/' ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/HomePage', rp[:redirect_destination])
+	end
+	
+	def test_redirect_to_view
+		@servlet.service( re = MockRequest[ :path => '/randompage' ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/Randompage', rp[:redirect_destination])
+	end
+	
+	def test_missing_view
+		assert_raise(WEBrick::HTTPStatus::NotFound) { @servlet.service( re = MockRequest[ :path => '/missing/randompage', :user => 'test user' ], rp = MockResponse.new ) }
+	end
+	
+	def test_view_page
+		@wiki.revise('test view','hello world','tamc2')
+		assert_equal('hello world', @wiki.page('test view').content )
+		@servlet.service( re = MockRequest[ :path => '/view/test view', :user => 'test user', :query => {} ], rp = MockResponse.new )
+		assert_equal( nil, rp[:redirect_destination] )
+		assert_match( /<p>hello world<\/p>/, rp[:body])
+	end
+	
+	def test_name_to_url_conversion
+		@wiki.revise('page!','exclamation','one')
+		@wiki.revise('page?','question','one')
+		@servlet.service( re = MockRequest[ :path => '/view/Page', :user => 'test user', :query => {} ], rp = MockResponse.new )
+		assert_match( /<p>exclamation<\/p>/, rp[:body])
+		@servlet.service( re = MockRequest[ :path => '/view/Page-2', :user => 'test user', :query => {} ], rp = MockResponse.new )
+		assert_match( /<p>question<\/p>/, rp[:body])
+	end
+	
+	def test_create_page
+		@servlet.service( re = MockRequest[ :path => '/save/test save', :user => 'test user', :query => { 'content' => 'hello world', 'newtitle' => 'test save' } ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/TestSave', rp[:redirect_destination] )
+		page = @wiki.page('test save')
+		assert_equal( 'test user', page.author )
+		assert_equal( 'hello world', page.content )
+	end
+
+	def test_revise_page
+		@wiki.revise('test save','stuff','someone')
+		@servlet.service( re = MockRequest[ :path => '/save/TestSave', :user => 'test user', :query => { 'content' => 'hello world', 'newtitle' => 'test save' } ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/TestSave', rp[:redirect_destination] )
+		page = @wiki.page('test save')
+		assert_equal( 'test save',page.name )
+		assert_equal( 'test user', page.author )
+		assert_equal( 'hello world', page.content )
+	end
+	
+	def test_revise_prefix_page
+		@servlet.service( re = MockRequest[ :path => '/save/test save', :user => 'test user', :query => { 'content' => 'hello world', 'titleprefix' => 'test ', 'newtitle' => 'save' } ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/TestSave', rp[:redirect_destination] )
+		page = @wiki.page('test save')
+		assert_equal( 'test user', page.author )
+		assert_equal( 'hello world', page.content )
+	end
+	
+	def test_revise_change_capitalisation_on_page	
+		@servlet.service( re = MockRequest[ :path => '/edit/test caps', :user => 'test user', :query => {} ], rp = MockResponse.new )
+		@servlet.service( re = MockRequest[ :path => '/save/TestCaps', :user => 'test user', :query => { 'content' => 'hello world', 'newtitle' => 'test caps' } ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/TestCaps', rp[:redirect_destination] )
+		assert_equal('test caps', @wiki.page('test caps').name )
+		@servlet.service( re = MockRequest[ :path => '/save/TestCaps', :user => 'test user', :query => { 'content' => 'hello world', 'newtitle' => 'Test Caps' } ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/TestCaps', rp[:redirect_destination] )
+		assert_equal('Test Caps', @wiki.page('test caps').name )
+	end
+	
+	def test_revise_and_move_page
+		@wiki.revise('test view','hello world','tamc2')
+		assert_equal('hello world', @wiki.page('test view').content )
+		@servlet.service( re = MockRequest[ :path => '/save/test view', :user => 'test user', :query => { 'content' => 'hello world', 'newtitle' => 'test save' } ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/TestSave', rp[:redirect_destination] )
+		newpage = @wiki.page('test save')
+		assert_equal( 'test user', newpage.author )
+		assert_equal( 'hello world', newpage.content )
+		oldpage = @wiki.page('test view')
+		assert_equal( 'test user', oldpage.author )
+		assert_equal( 'content moved to [[test save]]', oldpage.content )
+	end
+	
+	def test_revise_and_dont_move_template_page
+		@wiki.revise('test type a title here','hello world','tamc2')
+		@servlet.service( re = MockRequest[ :path => '/save/test type a title here', :user => 'test user', :query => { 'content' => 'hello world', 'newtitle' => 'test save' } ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/TestSave', rp[:redirect_destination] )
+		newpage = @wiki.page('test save')
+		assert_equal( 'test user', newpage.author )
+		assert_equal( 'hello world', newpage.content )
+		oldpage = @wiki.page('test type a title here')
+		assert_equal( 'tamc2', oldpage.author )
+		assert_equal( 'hello world', oldpage.content )
+	end
+	
+	def test_delete_page
+		@wiki.revise('test delete','hello world','tamc2')
+		page = @wiki.page('test delete')
+		assert_equal('hello world', page.content )
+		assert_equal( false, page.deleted? )
+		@servlet.service( re = MockRequest[ :path => '/delete/test delete', :user => 'test user', :query => {} ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/TestDelete', rp[:redirect_destination] )
+		assert_equal( 'test user', page.author )
+		assert_equal('page deleted', page.content )
+		assert_equal( true, page.deleted? )
+	end
+	
+	def test_rollback_page
+		0.upto(5) { |i| @wiki.revise('rollback test', i.to_s, 'test') }
+		assert_equal( '5', @wiki.page('rollback test').textile )
+		assert_equal( 'test', @wiki.page('rollback test').author )
+		@servlet.service( re = MockRequest[ :path => '/rollback/rollback test', :user => 'rollbacker', :query => { 'revision' => 3 } ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/RollbackTest', rp[:redirect_destination] )
+		assert_equal( '3', @wiki.page('rollback test').textile )
+		assert_equal( 'rollbacker', @wiki.page('rollback test').author )
+	end
+	
+	def test_upload
+		filedata = MockFileData.new
+		@servlet.service( re = MockRequest[ :path => '/upload/upload test', :user => 'uploader', :query => { 'file' => filedata, 'titleprefix' => 'upload ', 'newtitle' => 'test'} ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/UploadTest', rp[:redirect_destination] )
+		page = @wiki.page('upload test')
+		assert_equal( 'uploader', page.author )
+		assert_equal( '/Attachment/testfile.txt', page.content )
+	end
+	
+	def test_move_upload
+		test_upload
+		filedata = MockFileData.new
+		@servlet.service( re = MockRequest[ :path => '/upload/upload test', :user => 'uploader2', :query => { 'file' => filedata, 'titleprefix' => 'upload ', 'newtitle' => 'second test'} ], rp = MockResponse.new )
+		assert_equal( 'http://testsite.com/view/UploadSecondTest', rp[:redirect_destination] )
+		newpage = @wiki.page('upload second test')
+		assert_equal( 'uploader2', newpage.author )
+		assert_equal( '/Attachment/testfile1.txt', newpage.content )
+		oldpage = @wiki.page('upload test')
+		assert_equal( 'uploader2', oldpage.author )
+		assert_equal( 'content moved to [[upload second test]]', oldpage.content )
+	end
+	
+end

data/test/test_soks-storage.rb

@@ -1,28 +1,44 @@
 require 'test/unit'
 require 'fileutils'
+require 'mock-objects'
 require 'soks-storage'
 
-class MockWiki
-	include WikiFlatFileStore
+module TestMod
+	class TestClass
+		def initialize(stuff)
+			@stuff = stuff
+		end
+	end
+end
+
+class TestWikiCacheStore < Test::Unit::TestCase
+	include WikiCacheStore
+	include TearDownableWiki
+	
+	def setup
+		@cache_folder = folder
+	end
 	
-	def initialize( folder )
-		@folder = folder
-		@pages = {}
+	def test_no_cache
+		@cache_folder = nil
+		save_cache( :test, "test class" )
+		assert_equal( [], files )
+		assert_equal( nil, load_cache( :test ) )
 	end
 	
-	def mutate( pagename ) 
-		p yield( @pages[pagename.downcase] ||= Page.new( pagename ) )
+	def test_cache
+		save_cache( :test, "test class" )
+		assert_equal( ['test.marshal'], files )
+		assert_equal( "test class", load_cache( :test ) )
+		assert_equal( [], files ) # Caches deleted on load
+		assert_equal( nil, load_cache( :test ) )
 	end
 end
 
 class TestWikiFlatFileStore < Test::Unit::TestCase
-	include FileUtils
+	include TearDownableWiki
 	
-	def setup
-		@wiki = MockWiki.new(folder)	
-	end
-	
-	def test_rename
+	def test_rename_if_not_url_encoded
 		create_file 'a handy file.textile', 'hello world' 
 		assert_equal( ['a handy file.textile'], files )
 		@wiki.move_files_if_names_are_not_url_encoded
@@ -33,37 +49,60 @@ class TestWikiFlatFileStore < Test::Unit::TestCase
 		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 )
+		assert_equal( ['a%26b.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 )
+		create_file 'a%26b.textile', 'hello world'
+		assert_equal( ['a%26b.textile','a&b.textile'], files )
 		@wiki.move_files_if_names_are_not_url_encoded
-		assert_equal( ['ab.textile','ab1.textile'], files )
+		assert_equal( ['a%26b.textile','a%26b1.textile'], files )
 	end
 	
-	def teardown
-		rmtree( folder )
+	def test_rename_on_caps_change
+		create_file 'Hello%20World.textile', 'hello world'
+		create_file 'Hello%20World.yaml', 'hello world'
+		assert_equal( ['Hello%20World.textile', 'Hello%20World.yaml'], files)
+		@wiki.move_files_for_page( 'Hello World', 'hello world' )
+		assert_equal( ['hello%20world.textile','hello%20world.yaml'], files)
 	end
-
-	private
 	
-	def create_file( name, content )
-		File.open( File.join( folder, name ), 'w') { |f| f.puts content }
+	def test_delete_files_for_page
+		create_file 'Hello%20World.textile', 'hello world'
+		create_file 'Hello%20World.yaml', 'hello world'
+		assert_equal( ['Hello%20World.textile', 'Hello%20World.yaml'], files)
+		@wiki.delete_files_for_page( 'Hello World')
+		assert_equal( [], files)
 	end
 	
-	def files
-		Dir.entries( folder ).delete_if { |name| name =~ /^\.+$/ }
+	def test_write_all_revisions
+		1.upto(5) do |i|
+			@wiki.revise('test page',"#{i}","test author")
+		end
+		
+		page = @wiki.page('test page')
+		assert_equal( 5, page.revisions.size )
+
+		revisions = @wiki.load_revisions( page )
+		assert_equal( 5, revisions.size )
+		
+		page.revisions = [ [0,[[[0,'+','5']]],'test author',Time.now] ]
+		assert_equal( 1, page.revisions.size )
+		@wiki.revise('test page','extra revision', 'second author')
+		assert_equal( 2, page.revisions.size )
+		assert_equal( 5, @wiki.load_revisions( page ).size )
+		
+		@wiki.save_all_revisions( page )
+		revisions = @wiki.load_revisions( page )
+		assert_equal( 2, revisions.size )
+		assert_equal( 'second author', revisions[1].author )
 	end
 	
-	def folder
-		@folder ||= make_folder
-	end
+	private
 	
-	def make_folder
-		mkdir( 'testcontent' )
-		'testcontent'
+	def create_file( name, content )
+		File.open( File.join( folder, name ), 'w') { |f| f.puts content }
 	end
+	
 end

data/test/test_soks-utils.rb

@@ -37,7 +37,7 @@ class ToTimeUnitsMT < Test::Unit::TestCase
 	end
 end
 
-class TimeSameDay < Test::Unit::TestCase
+class TimeSameDayTest < Test::Unit::TestCase
 	
 	def test_simple
 		other_day = Time.local(2005,04,01,9,30)
@@ -53,18 +53,18 @@ class TimeSameDay < Test::Unit::TestCase
 	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 StringToValidPageNameTest < 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
+class FileUniqueFilenameTest < Test::Unit::TestCase
 	include FileUtils
 	
 	def teardown
@@ -118,4 +118,103 @@ class FileUniqueFilename < Test::Unit::TestCase
 		'testcontent'
 	end
 
-end
+end
+
+class TimeNextText < Test::Unit::TestCase
+
+	def test_next_second
+		assert_equal( Time.local(2004,12,31,23,0,1), Time.local(2004,12,31,23,0,0).next(:sec) )
+		assert_equal( Time.local(2005,1,1), Time.local(2004,12,31,23,59,59).next(:sec) )
+	end
+
+	def test_next_minute
+		assert_equal( Time.local(2004,12,31,23,1), Time.local(2004,12,31,23,0).next(:min) )
+		assert_equal( Time.local(2005,1,1), Time.local(2004,12,31,23,59).next(:min) )
+	end
+
+	def test_next_hour
+		assert_equal( Time.local(2004,12,31,23,0), Time.local(2004,12,31,22,59).next(:hour) )
+		assert_equal( Time.local(2005,1,1), Time.local(2004,12,31,23).next(:hour) )
+	end
+	
+	def test_next_day
+		assert_equal( Time.local(2004,12,31,0,0), Time.local(2004,12,30,22,00).next(:day) )
+		assert_equal( Time.local(2005,1,1), Time.local(2004,12,31,23).next(:day) )
+	end
+	
+	def test_next_month
+		assert_equal( Time.local(2004,12), Time.local(2004,11,30,22,00).next(:month) )
+		assert_equal( Time.local(2005,1,1), Time.local(2004,12,31,23).next(:month) )
+		assert_equal( Time.local(2005,2,1), Time.local(2005,1,31).next(:month) )
+		assert_equal( Time.local(2005,2), Time.local(2005,1).next(:month) )
+	end
+	
+	def test_next_year
+		assert_equal( Time.local(2005), Time.local(2004,11,30,22,00).next(:year) )
+		assert_equal( Time.local(2005,1,1), Time.local(2004,12,31,23).next(:year) )
+		assert_equal( Time.local(2006), Time.local(2005).next(:year) )
+	end
+	
+end
+
+class DaysFromTest < Test::Unit::TestCase
+	
+	def test_days_from
+		t1 = Time.local( 2005,01,01,19,27)
+		assert_equal(0, t1.days_from( t1 ) )
+		assert_equal(-1, t1.days_from( Time.local( 2005,01,02 ) ) )
+		assert_equal(1, t1.days_from( Time.local( 2004,12,31 ) ) )
+	end
+	
+end
+
+class RelativeDayTest < Test::Unit::TestCase
+	
+	def test_today
+		assert_equal("Today", Time.now.relative_day )
+	end
+	
+	def test_yesterday
+		assert_equal(-1, (Time.now-24*60*60).days_from( Time.now ) )
+		assert_equal("Yesterday", (Time.now-24*60*60).relative_day)
+	end
+	
+	def test_some_time_ago
+		some_time_ago = Time.now - (10*24*60*60)
+		assert_equal(some_time_ago.strftime('%d %b'), some_time_ago.relative_day)
+	end
+	
+	def test_long_time_ago
+		some_time_ago = Time.now - (400*24*60*60)
+		assert_equal(some_time_ago.strftime('%d %b %Y'), some_time_ago.relative_day)
+	end
+	
+end
+
+class PeriodicNotificationTest < Test::Unit::TestCase
+ 	
+ 	def test_seconds
+ 		time_at_last_call = Time.now
+ 		total_time_between_calls = 0
+ 		total_number_of_calls = 0
+ 		PeriodicNotification.new(:second) do |period|
+ 			total_time_between_calls = total_time_between_calls + (Time.now - time_at_last_call)
+ 			time_at_last_call = Time.now
+ 			total_number_of_calls += 1
+ 		end
+ 		sleep( 3 )
+ 		assert_equal( 3, total_number_of_calls )
+ 		assert_equal( 1, (total_time_between_calls/total_number_of_calls).round )
+ 	end
+ 	
+ end
+ 
+ class StringDiffsTest < Test::Unit::TestCase
+ 	
+ 	def test_simple
+ 		version_one = "A\nB\nC\n"
+ 		version_two = "A\nC\nC\n"
+ 		assert_equal( [[['-',1,'B'],['+',1,'C']]], version_two.changes_from( version_one ) )
+ 	end
+ 
+ end