Soks 0.0.5 → 0.0.6

data/README.txt

@@ -2,6 +2,7 @@ h1. SOKS: Another Ruby Wiki
 
 * This application is a Wiki (a system to allow the easy and collaborative editing of web pages).
 * The project has been kindly hosted at http://rubyforge.org/projects/soks/
+* The project wiki/home page is at www.soks.org
 
 Quickstart:
 # gem install Soks
@@ -17,12 +18,13 @@ h2. AUTHOR
 
 * This software is copyright (c) Thomas Counsell 2004, 2005. tamc@rubyforge.org 
 * It is licensed under the Ruby Licence, a liberal open source licence.  See LICENCE for more details.
+* The author appreciates the code, suggestions and libraries provided by a buch of other people, see www.soks.org/author for individual acknowledgements.
 
 h2. INSTALL
 
 Preferably:
 # Install rubygems from http://rubyforge.org/projects/rubygems/
-# gem install Soks (you may need to be root first)
+# @gem install Soks@ (you may need to be root first)
 
 Alternatively
 # Download the tar or zip file from http://rubyforge.org/projects/soks/
@@ -31,13 +33,17 @@ Alternatively
 
 h2. USE
 
-execute soks-create-wiki.rb (will be in your path if installed by gems, otherwise ./bin/soks-create-wiki.rb from the soks directory)
+execute @soks-create-wiki.rb@ (will be in your path if installed by gems, otherwise @./bin/soks-create-wiki.rb@ from the soks directory)
 This will create a folder called soks-wiki in the current directory and launch the wiki.  Surfing to http://localhost:8000 to see it (it is initially accessible from localhost only)
 
 To restart the wiki change into the soks-wiki directory and execute ruby start.rb
 
 To change the settings (url, port, etc) edit the start.rb file in the soks-wiki directory.
 
+h2. UPGRADE
+
+If you already have a previous version of soks then to upgrade, run @soks-create-wiki.rb --destination-dir=path/to/your/wiki@ and it will guide you through the upgrade.
+
 h2. FEATURES
 
 # Runs on its own webrick server (no independent web server required)
@@ -52,12 +58,16 @@ h2. FEATURES
 h2. BUGS
 
 I suspect there are many, as befits its version number.  In particular it has:
-* No authentication on pictures and attachments
-* Punctuation in page titles problematic. ? <> and [] cause problems.  : and / are ok.
 * Insert page commands are not inhibited by notextile, pre or code tags
+* Does not permit browsers to cache pages
+* Not user friendly in the way it handles simultaneous edits of a page (last person to save wins)
+* Some bugs in layout and formatting of text.
+
+See http://www.soks.org/wiki/KnownBugs for details.
 
 h2. RELEASES
 
+# 2005 Mar 15 - soks-0.0.6 - Fourth public release (alpha)
 # 2005 Feb 12 - soks-0.0.5 - Third public release (alpha)
 # 2005 Jan 24 - soks-0.0.4 - Second public release  (alpha)
 # 2005 Jan 11 - soks-0.0.2 - First public release (alpha)

data/bin/soks-create-wiki.rb

@@ -95,7 +95,7 @@ if create && !File.exists?( destination)
 	end
 	puts "Creating wiki at #{destination} from #{source}"
 	copy_template( source, destination )
-	fill_out_script_template( destination, 'start.rb', { :root_directory => File.expand_path( destination ), :soks_libraries => soks_library, :url => url, :port => port } )
+	fill_out_script_template( destination, 'start.rb', { :root_directory => File.expand_path( destination ), :soks_libraries => soks_library, :url => url, :port => port, :version => version_number_from_wiki( destination )  } )
 end
 
 if upgrade
@@ -166,7 +166,7 @@ if upgrade
 			old_port = prompt.ask("What port will this wiki be accessed from?",old_port )
 		end
 		
-		fill_out_script_template( destination, 'start.rb', { :root_directory => File.expand_path( destination ), :soks_libraries => soks_library, :url => old_url, :port => old_port } )
+		fill_out_script_template( destination, 'start.rb', { :root_directory => File.expand_path( destination ), :soks_libraries => soks_library, :url => old_url, :port => old_port, :version => version_number_from_wiki( destination ) } )
 		
 		puts "\nI'm very sorry, but if you modified the authenticators, or added any AutomaticSummaries or AutomaticCalendars or suchlike, then you will need to copy them across manually from #{old_wiki}/start.rb to #{destination}/start.rb.\n Note that their api may have changed, so please look at the examples in #{destination}/start.rb\n\nOnce you have done that, run ruby #{destination}/start.rb to start."
 		exit

data/contrib/redcloth-3.0.3.rb

@@ -297,7 +297,6 @@ class RedCloth < String
         clean_html text if filter_html
         text.strip!
         text
-
     end
 
     #######

data/lib/helpers/default-helpers.rb

@@ -114,7 +114,7 @@ class AutomaticSummary
 				content, tail = $1, $2
 			end
 		end
-		content ||= "h2. #{@settings[:pagename]}\n\np{font-size: x-small;}. #{@settings[:pagename]} was created automatically from pages whose title matches #{@settings[:regexp_for_title].inspect}.\n\n<automaticsummary>"
+		content ||= "h2. #{@settings[:pagename]}\n\np{font-size: x-small;}. #{@settings[:pagename]} was created automatically from pages whose title matches ==#{@settings[:regexp_for_title].inspect}==.\n\n<automaticsummary>"
 		tail ||= "</automaticsummary>"
 		content << "\n\n"
 		if @pages_in_summary.empty?
@@ -160,13 +160,14 @@ class AutomaticRecentChanges
 	
 	def initialize( wiki, changes = 200, pagename = "Recent Changes to This Site", author = "AutomaticRecentChanges" )
 			AutomaticSummary.new( wiki, { :pagename => pagename,
-													:author => author,
-													:only_new_pages => false,
-													:sort_pages_by => :revised_on,
-													:include_metadata => true,
-													:summarise_revisions => true,
-													:reverse_sort => true,
-													:remove_deleted_pages => false,
+											:max_pages_to_show => changes,
+											:author => author,
+											:only_new_pages => false,
+											:sort_pages_by => :revised_on,
+											:include_metadata => true,
+											:summarise_revisions => true,
+											:reverse_sort => true,
+											:remove_deleted_pages => false,
 													} )		
 	end
 end
@@ -227,7 +228,7 @@ class AutomaticCalendar
 	end
 	
 	def calendar_for( month )
-		content = "<div class='calendar'>\n"
+		content = "<div class='calendar'>\n\n"
 		content << "|_. Su |_. Mo |_. Tu |_. We |_. Th |_. Fr |_. Sa |\n"
 		1.upto( time_for( month, 1 ).wday ) { content << "| . " }
 		day = nil
@@ -240,7 +241,7 @@ class AutomaticCalendar
 		day.wday.upto( 5 ) { content << "| . " }
 		content << "|\n"
 		content << "\n\n< #{month_pagename( month-1 )}  #{month_pagename( month+1 )} >\n"	
-		content << "</div>"	
+		content << "\n</div>"	
 	end
 	
 	def time_for( month, day = 1 )
@@ -282,14 +283,14 @@ class AutomaticUpcomingEvents
 	end
 	
 	def render_upcoming_events
-		content = "<div class='upcomingevents'>\n"
+		content = "<div class='upcomingevents'>\n\n"
 		Time.now.day.upto( Time.now.day+7 ) do |day|
 			time =  @calendar.time_for( Time.now.month, day )
 			content << "| [[ #{relative_day( time ) } => #{@calendar.day_pagename( time )} ]] |"
 			content << (@wiki.exists?( @calendar.day_pagename(time) ) ? render_event( @calendar.day_pagename( time ) ) : "&nbsp; |\n")	
 		end
 		content << "\n\np(more). [[(more) => #{@calendar.month_pagename}]]\n\n"
-		content << "</div>\n"
+		content << "\n</div>\n"
 		@wiki.revise( "Upcoming Events", content , "AutomaticCalendar" ) 
 	end
 	

data/lib/helpers/mail2wiki-helper.rb

@@ -9,6 +9,7 @@ class Message
 		envelope = @imap.fetch( @message_id, 'ENVELOPE' ).first.attr['ENVELOPE']
 		@subject = envelope['subject']
 		@sender_name = envelope['from'].first['name']
+		@date = envelope['date']
 		@sender_email = envelope['from'].first['mailbox'] + '@' + envelope['from'].first['host']
 		@text = plain_text_content_from_message( message_id )
 	end
@@ -18,9 +19,14 @@ class Message
 		text.gsub!(/\r\n/,"\n")
 		text.gsub!(/\r/,"\n")
 		text.gsub!(/=\n/,'')
-		text.gsub!(/((?:=[0-9a-fA-F]{2})+)/n) { [$1.delete('=')].pack('H*') }
+		#text.gsub!(/((?:=[0-9a-fA-F]{2})+)/n) { [$1.delete('=')].pack('H*') }
+	
 		text
 	end
+	
+	def textile
+		text.gsub(/[\*-]{2,}/,'').gsub(/([^\n])\n([^\n])/,'\1\2').gsub(/^[ \t]+/,'')
+	end
 
 end
 
@@ -29,9 +35,9 @@ class Mail2WikiHelper
 	DEFAULT_SETTINGS = {
 		:server => 'imap.hermes.cam.ac.uk',
 		:username => 'tamc2',
-		:password => '',
+		:password => 'missing_a_password',
 		:mailbox => 'mcr notices',
-		:check_frequency => 600, # Seconds
+		:check_period => 600, # Seconds
 		:subject_regexp => /.*/,
 	}
 	
@@ -41,7 +47,7 @@ class Mail2WikiHelper
 		check_mailbox
 		Thread.new do 
 			loop do
-				sleep @settings[:check_frequency ]
+				sleep @settings[:check_period ]
 				check_mailbox
 			end
 		end
@@ -52,7 +58,6 @@ class Mail2WikiHelper
 	def check_mailbox
 		login
 		select_mailbox
-		p "Checking for emails in #{@settings[:server]}"
 		new_messages_for_wiki do |message_id|
 			this_message = Message.new( @imap, message_id )
 			if this_message.subject =~ @settings[:subject_regexp]
@@ -70,9 +75,9 @@ class Mail2WikiHelper
 		else
 			text = current_page.textile
 		end
-		text << "\n\n----\n\n"
+		text << "\n\n"
 		text << "#{message.date} from #{message.sender_name} #{message.sender_email}\n"
-		text << message.text.gsub(/[\*-]{2,}/,'').gsub(/\n\s+/,"\n").gsub(/\n/,"\n\n") 		
+		text << message.text 		
 		@wiki.revise(message.subject, text, message.sender_name )
 	end
 	

data/lib/helpers/mail2wiki-test.rb

@@ -0,0 +1,15 @@
+require 'mail2wiki-helper'
+
+@imap = Net::IMAP.new('imap.hermes.cam.ac.uk')
+@imap.login( 'tamc2', 'iama8yes' )
+
+@imap.select 'mcr notices'
+
+message = Message.new( @imap, 1 )
+
+p message.date
+p message.subject
+p message.textile
+
+@imap.logout
+@imap.disconnect

data/lib/helpers/wiki2html.rb

@@ -0,0 +1,60 @@
+class Wiki2Html
+	
+	DEFAULT_SETTINGS = {
+		:views_to_copy => ['view','meta','rss'],
+		:extension => '.html',
+		:destination_dir => '/Users/tamc2/Sites',
+		:destination_url => 'http://localhost/~tamc2'
+	}
+	
+	def initialize( wiki, view, settings = {} )
+		@settings = DEFAULT_SETTINGS.merge( settings )
+		@wiki, @view = wiki, view
+		@wiki.watch_for( :page_created, :page_deleted ) { |event, page| new_page( page ) }
+		@wiki.watch_for( :page_revised ) { |event, page| page_revised( page ) }
+		update_all_pages
+	end
+
+	def new_page( page )
+		copy_all_views( page.name )
+		titleregex = Regexp.new( page.name, Regexp::IGNORECASE )
+		@wiki.each { |name, linkedpage | 
+			page_revised( linkedpage ) if linkedpage.textile =~ titleregex
+		}
+	end
+	
+	def page_revised( page )
+		copy_all_views( page.name )
+		page.inserted_into.each { |including_page| copy_all_views( including_page.name ) }
+	end
+	
+	def update_all_pages
+		@wiki.each { |pagename, page| copy_all_views( pagename) }
+	end
+	
+	def copy_all_views( pagename )
+		@settings[:views_to_copy].each { |view| copy_view( pagename, view ) }
+	end
+	
+	def copy_view( pagename, view )
+		$stderr.puts "Copying #{pagename} #{view}"
+		html =  @view.view( pagename, view )
+		update_links html
+		destination = "#{@settings[:destination_dir]}/#{view}/#{pagename}#{@settings[:extension]}".downcase
+		File.mkpath(File.dirname(destination)) unless File.exists?(File.dirname(destination))
+		File.open( destination,'w') {|file| file.puts html}
+	end
+	
+	def update_links( html )
+		old_link = /['"]#{$SETTINGS[:url]}\/(.*?)\/(.*?)(\.\w*)?['"]/
+		html.gsub!(old_link) do |match|
+			if ($1.downcase == 'attachment' || @settings[:views_to_copy].include?( $1.downcase ))
+				"'#{@settings[:destination_url]}\/#{$1.downcase}\/#{$2.downcase}#{$3 || @settings[:extension]}'"
+			else
+				match
+			end
+		end
+		html
+	end	
+	
+end

data/lib/soks-drb.rb

@@ -0,0 +1,20 @@
+#!/usr/local/bin/ruby
+require 'drb'
+
+def start_wiki( settings = {}, &automatic_agents )
+
+	$SETTINGS.merge! settings	
+	$MESSAGES = YAML.load( IO.readlines("#{$SETTINGS[:root_directory]}/views/messages.yaml").join )
+	
+	wiki = Wiki.new( "#{$SETTINGS[:root_directory]}/content" )
+	view = View.new( wiki, $SETTINGS[:name] )
+
+	Thread.new( automatic_agents, wiki, view ) do |block, wiki, view|
+		block.call( wiki, view )
+	end.priority = -2
+	
+	DRb.start_service( 'druby://localhost:9001', view)
+	DRb.thread.join
+	
+	$stderr.puts "Wiki started as DRb on druby://localhost:9001"
+end

data/lib/soks-fcgi.rb

@@ -0,0 +1,127 @@
+#!/usr/local/bin/ruby
+require 'cgi'
+require 'drb'
+# Require authenticators
+
+class CGI
+  def redirect( where )
+    print this.header( { 'Status' => '302 Moved', 'location' =>
+'#{where}' } )
+  end
+end
+
+# Default settings moved to soks.rb
+
+class WikiCgi
+
+	def initialize( cgi, wiki, settings )
+		@cgi, @wiki, @name, @wikiurl, @authenticators = server, wiki, settings[:name] , settings[:url] , settings[:authenticators]
+	end
+		
+	def service( cgi )
+		case cgi.path_translated
+		# Redirect some cgis to static file servlet
+		when '/robots.txt', '/favicon.ico' ; 
+			cgi.redirect( "#{@wikiurl}/attachment#{cgi.path_translated}")
+		# If cgi of the form /verb/pagename then execute the approriate method
+		when /\/(\w+?)\/(.+)/
+			verb, pagename = $1, $2
+			# authenticate cgi, response	
+			if self.respond_to?( "do#{verb.capitalize}" )
+				self.send( "do#{verb.capitalize}", cgi, pagename, cgi.remote_user )
+			else
+				cgi.out { @wiki.view( pagename, verb, cgi.remote_user ) }
+			end
+		when /\/(.+)/	; redirect( cgi, $1, 'view' )	 # No verb given
+		when "/"		; redirect( cgi, "Home Page", 'view' ) # No page or verb given
+		end
+				
+		#response['Content-Type'] ||= "text/html"
+		#response['Cache-control'] ||= 'no-cache'
+		#response['Pragma'] ||= 'no-cache'
+	end 
+	
+	def authenticate( cgi  )
+		@authenticators.each do |path_regex,authenticator|
+			if cgi.path_translated.downcase =~ path_regex
+				authenticator.authenticate( cgi )
+				break
+			end
+		end
+	end
+	
+	def redirect( cgi, pagename, verb = 'view' )
+		pagename = pagename.url_encode # Reformat into url encoding
+		cgi.redirect( verb ? "#{@wikiurl}/#{verb}/#{pagename}" : "#{@wikiurl}/#{pagename}")
+	end
+	
+	def doWiki( cgi,  pagename, person )
+		redirect(  pagename.gsub(/([a-z])([A-Z])/,'\1 \2') )
+	end
+
+	def doFind( cgi,  pagename, person ) 
+		cgi.out { @wiki.find( cgi.query['regex'].strip ) }	
+	end
+
+	def doSave( cgi,  pagename, person )
+		content = cgi.query["content"].to_s
+		newpagename = cgi.query["titleprefix"].to_s + cgi.query["newtitle"].to_s
+		@wiki.revise( pagename, content.gsub(/\r\n/,"\n"), person, newpagename) if content
+		redirect(  newpagename )
+	end
+	
+	def doRollback( cgi,  pagename, person )
+		revision = cgi.query['revision'] ? cgi.query['revision'].to_i : nil
+		@wiki.rollback( pagename, revision, person ) if revision
+		redirect(  pagename )
+	end
+	
+	def doDelete( cgi,  pagename, person )
+		@wiki.delete( pagename, person )
+		redirect(  pagename )
+	end
+	
+	def doUpload( cgi, pagename, person )
+		newpagename = cgi.query["titleprefix"].to_s + cgi.query["newtitle"].to_s
+		unless cgi.query['file'] == ""
+			@wiki.revise( pagename, upload( cgi.query['file'].filename[/[0-9A-Za-z.]*$/], cgi.query['file'] ) , person, newpagename )
+		else
+			@wiki.move( pagename, person, newpagename )
+		end
+		redirect(  newpagename )
+	end
+	
+	def doRss( cgi, pagename, person )
+		cgi.out { @wiki.view( pagename, 'rss', person ) }
+		# response["Content-Type"] = "text/xml"
+	end
+
+	private
+		
+	def upload( filename, filedata )
+		path = "#{$SETTINGS[:root_directory]}/attachment/"
+		filename = unique_filename( path ,filename )
+		File.open( File.join( path, filename ), 'wb' ) { |file| filedata.list.each { |data| file << data } }
+		"/attachment/#{filename}"
+	end
+	
+	def unique_filename( path, filename )
+		bits = filename.split(/\./)
+		while File.exist? File.join( path, filename )
+			if bits.length >= 1
+				bits[-2].succ!
+			else
+				bits[0].succ!
+			end
+			filename = bits.join('.')
+		end
+		filename
+	end
+end
+
+wiki = DRbObject.new( nil, 'druby://localhost:9001')
+settings = wiki.settings
+cgi = CGI.new
+
+cgi = WikiCgi.new( cgi, wiki, settings )
+cgi.service

data/lib/soks-model.rb

@@ -130,8 +130,8 @@ class UploadPage < Page
 end
 
 class ImagePage < UploadPage
-  def textile( content = @content )
-  	deleted? ? content : "!#{content}(#{@name})!:/#{@name.url_encode}\n" 	
+  def textile( content = @content )	
+  	deleted? ? content : "!#{$SETTINGS[:url]}#{content.strip}!:#{$SETTINGS[:url]}/view/#{@name.url_encode}" 	
   end
   
   def name_for_index; 	@name[10..-1].strip.downcase	end
@@ -139,7 +139,7 @@ end
 
 class AttachmentPage < UploadPage 
   def textile( content = @content )
-  	deleted? ? content :  %Q{"#{@name}":#{content}\n} 	
+  	deleted? ? content :  %Q{[[ #{name} => #{$SETTINGS[:url]}#{content} ]]\n} 	
   end
   def name_for_index; 	@name[ 9..-1].strip.downcase end
 end
@@ -159,10 +159,16 @@ class Wiki
 	def initialize( folder )
 		@folder = folder
 		@pages = {}
+		@shutting_down = false
 		load_all_pages
 		start_watching_files
 	end
 	
+	def shutdown
+		sleep(1) until event_queue.empty?
+		@shutting_down = true # Stop further modifications
+	end
+	
 	def page( name )
 	 	page_named( name )|| new_page( name, :empty )
 	end
@@ -176,11 +182,13 @@ class Wiki
 	end
   
 	def revise( pagename, content, author )
+		raise "Sorry! Shutting down..." if @shutting_down
 		check_disk_for_updated_page pagename
 		mutate( pagename ) { |page| page.revise( content, author ) }
 	end
 	
 	def rollback( pagename, number, author )
+		raise "Sorry! Shutting down..." if @shutting_down
 		check_disk_for_updated_page pagename
 		mutate( pagename ) { |page| page.rollback( number, author ) }
 	end

data/lib/soks-servlet.rb

@@ -6,31 +6,30 @@ require 'yaml'
 
 class WikiServlet < WEBrick::HTTPServlet::AbstractServlet
 
-	def initialize( server, wiki, settings )
-		@server, @wiki, @name, @wikiurl, @authenticators = server, wiki, settings[:name] , settings[:url] , settings[:authenticators]
+	def initialize( server, view, settings )
+		@server, @view, @wikiurl, @authenticators = server, view, settings[:url] , settings[:authenticators]
 	end
 		
 	def service( request, response )
 		case request.path
-		# Redirect some requests to static file servlet
-		when '/robots.txt', '/favicon.ico' ; 
-			response.set_redirect(WEBrick::HTTPStatus::Found, "#{@wikiurl}/attachment#{request.path}")
-		# If request of the form /verb/pagename then execute the approriate method
-		when /\/(\w+?)\/(.+)/
-			verb, pagename = $1, $2
+		when '/robots.txt', '/favicon.ico' # Catch some requests to static files
+			doAttachment( request, response, request.path[1..-1] )
+		when /\/(\w+?)\/(.+)/ # If request of the form /verb/pagename then doVerb on this class
+			verb, pagename = $1, make_pagename_valid( $2 )
 			authenticate request, response	
 			if self.respond_to?( "do#{verb.capitalize}" )
 				self.send( "do#{verb.capitalize}", request, response, pagename, request.user )
 			else
-				response.body = @wiki.view( pagename, verb, request.user )
+				unknownView( request, response, pagename, verb, request.user )
 			end
 		when /\/(.+)/	; redirect( response, $1, 'view' )	 # No verb given
-		when "/"		; redirect( response, "Home Page", 'view' ) # No page or verb given
+		when "/"			; redirect( response, $SETTINGS[:home_page], 'view' ) # No page or verb given
+		end
+		
+		if $SETTINGS[:force_no_cache]		
+			response['Cache-control'] ||= 'no-cache'
+			response['Pragma'] ||= 'no-cache'
 		end
-				
-		response['Content-Type'] ||= "text/html"
-		response['Cache-control'] ||= 'no-cache'
-		response['Pragma'] ||= 'no-cache'
 	end 
 	
 	def authenticate( request, response )
@@ -47,67 +46,84 @@ class WikiServlet < WEBrick::HTTPServlet::AbstractServlet
 		response.set_redirect(WEBrick::HTTPStatus::Found, verb ? "#{@wikiurl}/#{verb}/#{pagename}" : "#{@wikiurl}/#{pagename}")
 	end
 	
-	def doWiki( request, response, pagename, person )
-		redirect( response, pagename.gsub(/([a-z])([A-Z])/,'\1 \2') )
+	# These methods deal with the various views
+		
+	def doAttachment( request, response, pagename, person = nil )
+		request.script_name = 'attachment'
+	  	request.path_info = "/#{pagename}"
+		WEBrick::HTTPServlet::FileHandler.get_instance(@server, "#{$SETTINGS[:root_directory] }/attachment",true).service(request, response)
 	end
 
 	def doFind( request, response, pagename, person ) 
-		response.body = @wiki.find( request.query['regex'].strip )	
+		response.body = @view.find( request.query['regex'].strip )
+		response['Content-Type'] ||= "text/html"
+	end
+	
+	def doRss( request, response, pagename, person )
+		response.body = @view.view( pagename, 'rss', person )
+		response["Content-Type"] = "application/xml"
+	end
+	
+	# This captures all unkown view types
+	def unknownView( request, response, pagename, view, person )
+		response.body = @view.view( pagename, view, person )
+		response['Content-Type'] ||= "text/html"
 	end
 
+	# All the following methods change the wiki, then redirect
+
+	def doWiki( request, response, pagename, person )
+		redirect( response, pagename.gsub(/([a-z])([A-Z])/,'\1 \2') )
+	end
+	
 	def doSave( request, response, pagename, person )
 		content = request.query["content"].to_s
-		newpagename = request.query["titleprefix"].to_s + request.query["newtitle"].to_s
-		@wiki.revise( pagename, content.gsub(/\r\n/,"\n"), person, newpagename) if content
+		newpagename = make_pagename_valid( request.query["titleprefix"].to_s + request.query["newtitle"].to_s)
+		@view.revise( pagename, content.gsub(/\r\n/,"\n"), person, newpagename) if content
 		redirect( response, newpagename )
 	end
 	
 	def doRollback( request, response, pagename, person )
 		revision = request.query['revision'] ? request.query['revision'].to_i : nil
-		@wiki.rollback( pagename, revision, person ) if revision
+		@view.rollback( pagename, revision, person ) if revision
 		redirect( response, pagename )
 	end
 	
 	def doDelete( request, response, pagename, person )
-		@wiki.delete( pagename, person )
+		@view.delete( pagename, person )
 		redirect( response, pagename )
 	end
 	
 	def doUpload( request, response, pagename, person )
-		newpagename = request.query["titleprefix"].to_s + request.query["newtitle"].to_s
+		newpagename = make_pagename_valid( request.query["titleprefix"].to_s + request.query["newtitle"].to_s)
 		unless request.query['file'] == ""
-			@wiki.revise( pagename, upload( request.query['file'].filename[/[0-9A-Za-z.]*$/], request.query['file'] ) , person, newpagename )
+			@view.revise( pagename, upload_file_data( request.query['file'] ), person, newpagename )
 		else
-			@wiki.move( pagename, person, newpagename )
+			@view.move( pagename, person, newpagename )
 		end
 		redirect( response, newpagename )
 	end
-	
-	def doRss( request, response, pagename, person )
-		response.body = @wiki.view( pagename, 'rss', person )
-		response["Content-Type"] = "text/xml"
-	end
 
 	private
 		
-	def upload( filename, filedata )
+	def upload_file_data( upload_data  )
 		path = "#{$SETTINGS[:root_directory]}/attachment/"
-		filename = unique_filename( path ,filename )
-		File.open( File.join( path, filename ), 'wb' ) { |file| filedata.list.each { |data| file << data } }
+		filename = unique_filename( path , upload_data.filename )
+		File.open( File.join( path, filename ), 'wb' ) { |file| upload_data.list.each { |data| file << data } }
 		"/attachment/#{filename}"
 	end
 	
 	def unique_filename( path, filename )
-		bits = filename.split(/\./)
-		while File.exist? File.join( path, filename )
-			if bits.length >= 1
-				bits[-2].succ!
-			else
-				bits[0].succ!
-			end
-			filename = bits.join('.')
-		end
-		filename
+		filename.gsub!(' ','') # Unfortunately no spaces permitted in redcloth links
+		return filename unless File.exist? File.join( path, filename ) # Leave as is, if doesn't exist
+		name, counter, extension = File.basename( filename, '.*'), 1, File.extname( filename )
+		counter += 1 while File.exist? File.join( path, "#{name}#{counter}#{extension}" )
+		return "#{name}#{counter}#{extension}"
+	end
+	
+	# Certain characters cause problems in titles, so delete
+	def make_pagename_valid( pagename )
+		pagename.tr('\[]?{}&^`<>','')
 	end
 end
 
@@ -123,11 +139,18 @@ def start_wiki( settings = {}, &automatic_agents )
 		block.call( wiki, view )
 	end.priority = -2
 	
-	server = WEBrick::HTTPServer.new( { :Port => $SETTINGS[:port] } )
-	server.mount("/attachment", WEBrick::HTTPServlet::FileHandler, "#{ $SETTINGS[:root_directory] }/attachment", true)
+	server = WEBrick::HTTPServer.new( { :Port => $SETTINGS[:port], 
+													:ServerType=> $SETTINGS[:server_type] 
+												} )
+												
 	server.mount("/", WikiServlet, view, $SETTINGS  )
 
-	trap("INT") { server.shutdown }
+	trap("INT") { 
+		$stderr.puts "Trying to shutdown gracefully"
+		server.shutdown 
+		wiki.shutdown
+		$stderr.puts "Shutdown."
+	}
 
 	server.start
 end