gf-Soks 1.0.4

data/test/test_soks-model.rb

@@ -0,0 +1,144 @@
+require 'test/unit'
+require 'mock-objects'
+require 'soks-model'
+
+class TestRevision < Test::Unit::TestCase
+	include TearDownableWiki
+	
+	def test_content
+		page = Page.new('test page')
+		page.revise('1','new author' )
+		revision = page.revisions.last
+		page.revise('2','new author' )
+		page.revise('3','new author' )
+		assert_equal('1', revision.content )
+		assert_equal('', revision.previous_content )
+	end
+	
+	def test_revision_after
+		1.upto(5) { |i| @wiki.revise 'revision test', "#{i}", 'tamc2' }
+		page = @wiki.page 'revision test'
+		assert_equal( page.revision(1), page.revision(0).following_revision)
+		assert_equal( page.revision(2), page.revision(1).following_revision )
+		assert_equal( nil, page.revision(4).following_revision )
+	end
+	
+	def test_revision_before
+		1.upto(5) { |i| @wiki.revise 'revision test', "#{i}", 'tamc2' }
+		page = @wiki.page 'revision test'
+		assert_equal( page.revision(0), page.revision(1).previous_revision)
+		assert_equal( page.revision(1), page.revision(2).previous_revision )
+		assert_equal( nil, page.revision(0).previous_revision )	
+	end	
+end
+
+class TestPage < Test::Unit::TestCase
+	include TearDownableWiki
+	
+	def test_empty
+		page = Page.empty('test page')
+		assert_equal( 'test page', page.name )
+		assert_equal( true, page.empty? )
+		assert_equal( false, page.deleted? )
+		assert_equal( "[[Create test page => /edit/test page ]]", page.textile )
+		assert_equal( "Type what you want here and click save", page.content )
+		assert_equal( 'NoOne', page.author )
+	end
+	
+	def test_new
+		page = Page.new('test page')
+		assert_equal( 'test page', page.name )
+		assert_equal( true, page.empty? )
+		assert_equal( false, page.deleted? )
+		assert_equal( "[[Create test page => /edit/test page ]]", page.textile )
+		assert_equal( '', page.content )
+		#assert_equal( '', page.author )
+	end
+	
+	def test_revision
+		page = Page.new('test page')
+		page.revise('new content','new author' )
+		assert_equal( 'test page', page.name )
+		assert_equal( false, page.empty? )
+		assert_equal( false, page.deleted? )
+		assert_equal( "new content", page.textile )
+		assert_equal( 'new content', page.content )
+		assert_equal( 'new author', page.author )	
+		assert_equal( [[['+',0,'new content']]], page.changes )	
+	end
+	
+	def test_rollback
+		page = Page.new('test page')
+		page.revise('1','new author' )
+		page.revise('2','new author' )
+		page.revise('3','new author' )
+		assert_equal( 3, page.revisions.size )
+		assert_equal( '3', page.content )
+		page.rollback( 0, 'rollbacker' )
+		assert_equal( 4, page.revisions.size )
+		assert_equal( '1', page.content )
+		assert_equal( 'rollbacker', page.author )
+		assert_equal( [[['-',0,'3'],['+',0,'1']]], page.changes )
+		page.rollback( -1, 'rollbacker' )
+		assert_equal( 5, page.revisions.size )
+		assert_equal( 'page deleted', page.content )
+		assert_equal( true, page.deleted? )
+	end
+end
+
+class TestWiki < Test::Unit::TestCase
+	include TearDownableWiki
+	
+	def test_change_page_caps()
+		assert_equal([], files )
+		@wiki.revise( 'home page', 'hello world', 'tamc2' )
+		assert_equal( true, @wiki.exists?('home page') )
+		assert_equal(['home%20page.textile','home%20page.yaml'],files)
+		@wiki.revise( 'Home Page', 'hello world', 'tamc2' )
+		assert_equal( true, @wiki.exists?('home page') )
+		assert_equal(['Home%20Page.textile','Home%20Page.yaml'],files)
+	end
+	
+	def test_page_delete_by_revising
+		assert_equal([],files)
+		@wiki.revise( 'home page', 'hello world', 'tamc2')
+		assert_equal( true, @wiki.exists?('home page') )
+		assert_equal( false, @wiki.page('home page').deleted? )
+		assert_equal(['home%20page.textile','home%20page.yaml'],files)
+		@wiki.revise( 'home page', $MESSAGES[:page_deleted], 'tamc2')
+		assert_equal( false, @wiki.exists?('home page') )
+		assert_equal( true, @wiki.page('home page').deleted? )
+		assert_equal(['home%20page.textile','home%20page.yaml'],files)
+		assert_equal( $MESSAGES[:page_deleted], @wiki.page('home page').content )
+	end
+
+	
+	def test_page_delete_by_method
+		assert_equal([],files)
+		@wiki.revise( 'home page', 'hello world', 'tamc2')
+		assert_equal( true, @wiki.exists?('home page') )
+		assert_equal( false, @wiki.page('home page').deleted? )
+		assert_equal(['home%20page.textile','home%20page.yaml'],files)
+		@wiki.delete( 'home page', 'tamc2')
+		assert_equal( false, @wiki.exists?('home page') )
+		assert_equal( true, @wiki.page('home page').deleted? )
+		assert_equal(['home%20page.textile','home%20page.yaml'],files)
+		assert_equal( $MESSAGES[:page_deleted], @wiki.page('home page').content )
+	end
+	
+	def test_page_delete_permanently
+		assert_equal([],files)
+		@wiki.revise( 'home page', 'hello world', 'tamc2')
+		assert_equal( true, @wiki.exists?('home page') )
+		assert_equal( false, @wiki.page('home page').deleted? )
+		assert_equal(['home%20page.textile','home%20page.yaml'],files)
+		
+		assert_raise( RuntimeError ) { @wiki.wipe_from_disk( 'Home Page' ) }
+		
+		@wiki.delete( 'Home Page', 'tamc2' )
+		@wiki.wipe_from_disk( 'Home Page' )
+		assert_equal( false, @wiki.exists?('home page') )
+		assert_equal( false, @wiki.page('home page').deleted? )
+		assert_equal([],files)
+	end
+end

data/test/test_soks-servlet.rb

@@ -0,0 +1,240 @@
+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_upload_clean_up_names
+	   filedata = MockFileData.new 'C:/Documents and Settings/AB/Desktop/bil_kleb1.jpg'
+        @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/bil_kleb1.jpg', 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

@@ -0,0 +1,108 @@
+require 'test/unit'
+require 'fileutils'
+require 'mock-objects'
+require 'soks-storage'
+
+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 test_no_cache
+		@cache_folder = nil
+		save_cache( :test, "test class" )
+		assert_equal( [], files )
+		assert_equal( nil, load_cache( :test ) )
+	end
+	
+	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 TearDownableWiki
+	
+	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
+		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( ['a%26b.textile'], files )
+	end
+	
+	def test_avoid_overwriting_on_rename
+		create_file 'a&b.textile', 'hello world'
+		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( ['a%26b.textile','a%26b1.textile'], files )
+	end
+	
+	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
+	
+	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 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
+	
+	private
+	
+	def create_file( name, content )
+		File.open( File.join( folder, name ), 'w') { |f| f.puts content }
+	end
+	
+end