Soks 0.0.5 → 0.0.6

data/lib/soks-storage.rb

@@ -55,9 +55,17 @@ module WikiFlatFileStore
 	def load_revisions( page )
 		return [] unless File.exists?( filename_for_revisions( page.name ) )
 		revisions = []
-		File.open( filename_for_revisions( page.name ) ) { |file| 
-			YAML.each_document( file ) { |array| revisions[ array[0] ] = Revision.new( page, *array ) } 
-		}
+		begin
+			File.open( filename_for_revisions( page.name ) ) { |file| 
+				YAML.each_document( file ) { |array|
+					next unless array.is_a? Array 
+					next unless array.size == 4
+					next unless array[0].is_a? Integer 
+					revisions[ array[0] ] = Revision.new( page, *array ) } 
+			}
+		rescue
+			$stderr.puts "Error loading revisions with #{$!.to_s} in file #{page.name}"
+		end
 		revisions.each_with_index { |r,i| $stderr.puts "#{page.name} missing revision #{i}" unless r }
 		revisions
 	end

data/lib/soks-utils.rb

@@ -12,12 +12,14 @@ module Notify
 	end
 	
 	def notify( event, *messages)
+		raise "Sorry! Shutting down..." if @shutting_down
 		self.event_queue.event( event, messages )
 	end
 	
 	def event_queue
 		@event_queue ||= EventQueue.new
 	end
+	
 end
 
 class EventQueue
@@ -43,6 +45,10 @@ class EventQueue
 		events.each { |event| attentive_watchers_for(event) << action_block }
 	end
 	
+	def empty?
+		@queue.empty?
+	end
+	
 	private
 	
 	def check_thread_ok
@@ -103,8 +109,6 @@ class EventQueue
 	
 end
 
-
-
 class String
 	# Return the left bit of a string e.g. "String".left(2) => "St"
   	def left( length ) self.slice( 0, length ) end  
@@ -113,7 +117,7 @@ class String
 	def url_encode
 	 self.gsub(/([^a-zA-Z0-9]+)/n) do
 	   '%' + $1.unpack('H2' * $1.size).join('%').upcase
-	 end.tr(' ', '+')	
+	 end
 	end
 
 	# Decode a string url encoded so it can be used in urls (code coppied from CGI)
@@ -188,3 +192,28 @@ class FiniteUniqueList
 		@list = @list.sort_by { |item| item.send( @sort_by ) }
 	end
 end
+
+# Kindly written by Bil Kleb
+class Numeric
+ # similar to  distance_of_time_in_words as found in
+ # actionpack-1.1.0/lib/action_view/helpers/date_helper.rb
+ def to_time_units
+  seconds = self.round
+  case seconds
+   when 0:                                "fraction of a second"
+   when 1:                                "second"
+   when 2..45:                            "#{seconds} seconds"
+   when 46..90:                           "minute"
+   when 91..(60*45):                      "#{(seconds.to_f/60.0).round} minutes"
+   when (60*45)..(60*90):                 "hour"
+   when (60*90)..(60*60*22):              "#{(seconds.to_f/60.0/60.0).round} hours"
+   when (60*60*22)..(60*60*36):           "day"
+   when (60*60*36)..(60*60*24*26):        "#{(seconds.to_f/60.0/60.0/24.0).round} days"
+   when (60*60*24*26)..(60*60*24*45):     "month"
+   when (60*60*24*45)..(60*60*24*30*11):  "#{(seconds.to_f/60.0/60.0/24.0/30.0).round} months"
+   when (60*60*24*30*11)..(60*60*24*500): "year"
+  else                                    "#{(seconds.to_f/60.0/60.0/24.0/365.0).round} years"
+  end
+ end
+end
+

data/lib/soks-view.rb

@@ -38,7 +38,6 @@ class Links
 		linksto = Array.new
 		@links.each do | pagefrom, pagesto |
 			next if pagefrom == thispage
-			next if [ "site index", "recent changes to this site" ].include? pagefrom.name.downcase
 			next if linksto.include? pagefrom
 			linksto << pagefrom if pagesto.include? thispage 
 		end
@@ -46,73 +45,48 @@ class Links
 	end
 end
 
-# This class matches against a text finding the longest matches it can.
-# Note that it isn't that sophisticated, and will tend to match
-# the first thing it can, rather than skipping a shorter match to enable
-# a longer one that starts at a later point in the text
-class RollingMatch
-	WORD_REGEX = /\w*/
-	SPACE_REGEX = /\W*/
+class BruteMatch
+	
 	IGNORE_CASE = true
-
+	
 	def initialize
-		@firstwords, @matches = Hash.new, Hash.new
+		@matches = Hash.new
+		@titles = Array.new #sorted array for speed 
 	end
-	
+
 	def []( title ) @matches[ lower_case(title) ] end
 	alias :object_for :[]
 	
 	def delete( title ) 
 		@matches.delete( title )
+		update_titles
 	end
 	
 	# Use this to add a string to match and an associated object to return
 	# if an object is matched.
 	def []=( title, object )
 		@matches[lower_case(title)] = object
-		unless lengths_for_first_word_of( title ).include? title.length
-			(lengths_for_first_word_of( title ) << title.length).sort!
-		end
+		update_titles
 	end
-  	
-  	# This returns the longest match that starts with the first word in the text
-	def longest_match( text, *dont_match )
-		lengths_for_first_word_of( text ).reverse_each do |length|
-			next if length > text.length
-			if object_for(text.left(length)) && !dont_match.include?( lower_case( text.left(length) ) )
-      			return text.left(length)
-      		end
-    	end
-		nil	
-	end
-	
-	# This iterates through the text returning the longest matches 
-	def rolling_match( text, *dont_match )
-		text = text.dup
-		skipped_text = ""
-		until text.empty?
-			skipped_text << text.slice!( SPACE_REGEX ) # Skip to the end of the next space
-			matching_title = longest_match( text, *dont_match )
-			if matching_title
-				yield skipped_text, matching_title, object_for( matching_title )
-				text.slice!( 0, matching_title.length ) # Skip to the end of the matched bit
-				skipped_text = ""
-			else
-				skipped_text << text.slice!( WORD_REGEX ) # Skip to the next word
-			end
+	
+	def match( text )
+		@titles.each do |title|
+			regexp = /#{Regexp.escape(title)}/i
+			page = @matches[ title ]
+			text.gsub!( regexp ) { |match| yield match, page }
 		end
-		yield skipped_text, nil, nil	
+		text
 	end
-  
+	
 	private
-	  
-	def lengths_for_first_word_of(title)
-	    @firstwords[ lower_case( title ).slice( WORD_REGEX ) ] ||= Array.new
+	
+	def update_titles
+		@titles = @matches.keys.sort_by { |title| title.length }.reverse
 	end
-	  
+	
 	def lower_case( text )
 	    IGNORE_CASE ? text.downcase : text
-	end  
+	end
 end
 
 # This adds some extra match types to (a bodged version of) RedCloth
@@ -130,6 +104,7 @@ class WikiRedCloth < RedCloth
 		@wiki, @page = wiki, page
 		@internal_links_from_page = []
 		super(insert_sub_strings( string.dup ), [ :no_span_caps])
+		self.hard_breaks = true if $SETTINGS[:redcloth_hard_breaks]
 	end
 	
 	def to_html
@@ -143,7 +118,7 @@ class WikiRedCloth < RedCloth
 		inline_soks_automatic_link text
 		unhide text
 		@wiki.links.set_links_from( @page, @internal_links_from_page )
-        text
+      text
 	end
 
 	private
@@ -153,7 +128,7 @@ class WikiRedCloth < RedCloth
 	end
 
 	def hide_html_tags( text )
-		text.gsub!(/<.*?>/) { |m| hide m }
+		text.gsub!(/<.*?>/m) { |m| hide m }
 	end 
 	
 	def unhide( text )
@@ -174,13 +149,17 @@ class WikiRedCloth < RedCloth
 
 	def insert_sub_strings( text, count = 0 )
 	  return text if count > 5 # Stops us getting locked into a cycle if people mess up the insert
-	  text.gsub!(/\[\[\s*insert (.+?)\]\]/i) do |m|
-	  	inserted_page = @wiki.page( $1.to_s.strip )
-	  	if @wiki.exists? inserted_page.name
-			@internal_links_from_page << inserted_page
-		  	inserted_page.is_inserted_into( @page )
-		 end
-		insert_sub_strings( "#{inserted_page.textile}\n", count + 1 ) 
+	  text.gsub!(/\[\[\s*(insert (.+?))\s*\]\]/i) do |m|
+		unless @wiki.exists? $1 # So we don't accidentlaly match a page whose name starts 'insert'
+	  		inserted_page = @wiki.page( $2 )
+		  	if @wiki.exists? inserted_page.name
+				@internal_links_from_page << inserted_page
+			  	inserted_page.is_inserted_into( @page )
+			end
+			insert_sub_strings( "#{inserted_page.textile}\n", count + 1 )
+		else
+			m
+		end 
 	  end
 	  text
 	end		
@@ -205,13 +184,8 @@ class WikiRedCloth < RedCloth
 		end
 	end
        
-  def inline_soks_automatic_link( text )	
-		linkedtext = ""
-		@wiki.rollingmatch.rolling_match( text, @page.name.downcase ) do |skip, title, page|
-			linkedtext << skip
-			linkedtext << wiki_link( page.name, title, 'automatic' ) if title
-		end
-		text.replace( linkedtext )
+  	def inline_soks_automatic_link( text )	
+		@wiki.rollingmatch.match( text ) { |title, page| wiki_link( page.name, title, 'automatic' ) }
 	end
 	
 	def wiki_link( pagename, title, css_class = nil )
@@ -241,7 +215,7 @@ class View
 
 	def initialize( wiki, name )
 		@wikiname = name
-		@rollingmatch, @links, @redcloth_cache, @erb_cache = RollingMatch.new, Links.new, Hash.new, Hash.new
+		@rollingmatch, @links, @redcloth_cache, @erb_cache = BruteMatch.new, Links.new, Hash.new, Hash.new
 		@wiki = wiki
 		wiki.watch_attentively_for( :page_revised ) { |event,page,revision| refresh_redcloth( page ) }
 	end
@@ -275,8 +249,7 @@ class View
 			@wiki.revise( newpagename, content, person )
 		else
 			@wiki.revise( newpagename, content, person )
-		end
-		
+		end		
 	end
 	
 	def move( oldpagename, person, newpagename )
@@ -297,8 +270,8 @@ class View
 		
 	def refresh_redcloth( page )
 		$stderr.puts "Refreshing #{page}"
-		clear_redcloth_cache( page )
-		redcloth( page )
+		@redcloth_cache[page] = "" if page.textile.strip == ""
+		@redcloth_cache[ page ] = WikiRedCloth.new( self, page, page.textile ).to_html
 	end
 	
 	def redcloth( page )
@@ -311,7 +284,7 @@ class View
 	end
 	
 	def html( klass, view, _binding )
-		#@erb_cache.clear
+		@erb_cache.clear if $SETTINGS[:reload_erb_each_request]
 		( @erb_cache[ path_for( klass, view ) ] ||= ERB.new( IO.readlines( erb_filename( klass, view ) ).join ) ).result( _binding )
 	end
   
@@ -334,6 +307,7 @@ class View
 	end
 	
 	def frame_erb
+		@frame_erb = nil if $SETTINGS[:reload_erb_each_request]
 		@frame_erb ||= load_frame_erb
 	end
 	
@@ -345,6 +319,11 @@ class View
 		end
 	end
 	
+	# CGI and FCGI can't access this global directly, so call through here
+	def settings
+		$SETTINGS
+	end
+	
 	def method_missing( method, *args, &block ) 
 		@wiki.send( method, *args, &block ) 
   	end

data/lib/soks.rb

@@ -22,15 +22,18 @@ Socket.do_not_reverse_lookup = true
 
 # These are the default settings.  Can be overriden in the call to soks-servlet.rb#start_wiki
 $SETTINGS = {
-	:name => 'test',
+	:name => 'A Soks Wiki',
 	:description => 'A Soks Wiki',
 	:root_directory => 'soks-wiki',
 	:check_files_every => 60, # Seconds
 	:url => 'http://localhost:8000',
 	:port => 8000,
+	:home_page => 'Home Page',
 	:dont_frame_templates => ['print','rss'],
-	:strict_html_removal => true, # True to prevent users from adding html.
-	:authenticators => [ [ %r{/(view|rss|print|find|meta)/.*}, WEBrick::HTTPAuth::NoAuthenticationRequired.new ],
+	:force_no_cache => false, # Adds headers to restrict the cacheing of pages
+	:redcloth_hard_breaks => false, # Set Redcloth to use hard breaks
+	:server_type =>  WEBrick::SimpleServer, # Could be WEBrick::Daemon if you wish to fork
+	:authenticators => [ [ %r{/(view|rss|print|find|meta|attachment)/.*}, WEBrick::HTTPAuth::NoAuthenticationRequired.new ],
 								# [ %r{/upload/.*}, WEBrick::HTTPAuth::NotPermitted.new ],
 								# [ %r{/(edit|save)/home page}, WEBrick::HTTPAuth::SiteWidePassword.new('password','You need to enter the site wide password to edit the home page') ],
 								# [ %r{/(view|edit|save)/private.*},WEBrick::HTTPAuth::BasicAuth.new( :UserDB => htpasswd, :Realm => realm ) ], # See webrick documentation

data/templates/default/attachment/newpage.js

@@ -38,4 +38,13 @@ function hotkey( event )
 		}
 	}
 	}
+}
+
+function validateTitle( proposed_title ) 
+{
+	var illegalcharacters = /[\\\[\]\?<>&\^]/;
+	if (illegalcharacters.test( proposed_title ) == true ) 
+	{
+		alert( 'Unfortunately the characters \ [ ] ? < > & ^ in titles cause problems with Soks. Please try not to use them');
+	}
 }

data/templates/default/attachment/pngbehavior.htc

@@ -0,0 +1,86 @@
+<public:component lightWeight="true">
+<public:attach event="onpropertychange" onevent="propertyChanged()" />
+<public:attach event="onbeforeprint" onevent="beforePrint()" for="window"/>
+<public:attach event="onafterprint" onevent="afterPrint()" for="window"/>
+<script>
+
+/*
+ * PNG Behavior
+ *
+ * This script was created by Erik Arvidsson (http://webfx.eae.net/contact.html#erik)
+ * for WebFX (http://webfx.eae.net)
+ * Copyright 2002-2004
+ *
+ * For usage see license at http://webfx.eae.net/license.html
+ *
+ * Version: 1.02
+ * Created: 2001-??-??	First working version
+ * Updated: 2002-03-28	Fixed issue when starting with a non png image and
+ *                      switching between non png images
+ *          2003-01-06	Fixed RegExp to correctly work with IE 5.0x
+ *          2004-05-09  When printing revert to original
+ *
+ */
+
+var supported = /MSIE ((5\.5)|[6789])/.test(navigator.userAgent) &&
+				navigator.platform == "Win32";
+
+var realSrc;
+var blankSrc = "blank.gif";
+var isPrinting = false;
+
+if (supported) fixImage();
+
+function propertyChanged() {
+	if (!supported || isPrinting) return;
+
+	var pName = event.propertyName;
+	if (pName != "src") return;
+	// if not set to blank
+	if (!new RegExp(blankSrc).test(src))
+		fixImage();
+};
+
+function fixImage() {
+	// get src
+	var src = element.src;
+
+	// check for real change
+	if (src == realSrc && /\.png$/i.test(src)) {
+		element.src = blankSrc;
+		return;
+	}
+
+	if ( ! new RegExp(blankSrc).test(src)) {
+		// backup old src
+		realSrc = src;
+	}
+
+	// test for png
+	if (/\.png$/i.test(realSrc)) {
+		// set blank image
+		element.src = blankSrc;
+		// set filter
+		element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft." +
+					"AlphaImageLoader(src='" + src + "',sizingMethod='scale')";
+	}
+	else {
+		// remove filter
+		element.runtimeStyle.filter = "";
+	}
+}
+
+function beforePrint() {
+	isPrinting = true;
+	element.src = realSrc;
+	element.runtimeStyle.filter = "";
+	realSrc = null;
+}
+
+function afterPrint() {
+	isPrinting = false;
+	fixImage();
+}
+
+</script>
+</public:component>

data/templates/default/attachment/robots.txt

@@ -2,4 +2,5 @@ User-agent: *
 Disallow: /edit/
 Disallow: /find/
 Disallow: /rss/
-Disallow: /print/
+Disallow: /print/
+Disallow: /meta/

data/templates/default/attachment/stylesheet.css

@@ -1,55 +1,106 @@
-/* Based, with permission, on bluerobot.com */
-
-body {	margin:0px;	padding:0px;
-	font-size:smaller;	font-family:verdana, arial, helvetica, sans-serif;	color:#333;	background-color:white;	}
-
-h1 {	color:#E00000;	}
-
-a {	color:#09c;	text-decoration:none;	}
-
-a:link {color:#09c;}a:visited {color:#07a;}
+body {	margin:0px;	
+		padding:0px;
+		font-size:small;
+		color:#333;
+		font-family: arial, sans-serif;	
+		background-color:white;	
+	}
+
+h1, h1 a, h1 a:visited { color:#008000;	}
+h2, h2 a, h2 a:visited { color:#008000;	}
+
+a {	
+	color:#888;	
+	text-decoration:none;	
+}
+
+a:visited {color:#888;}
 
-a:hover {background-color:#eee;}
+a:hover {	
+	text-decoration:underline;
+	color: #000;
+}
 
 a.missing {
 	color:#E00000;
 }
 
-#content {	margin:0px 210px 50px 10px;	padding:10px;	}
-
-#menu {	position:absolute;	top:12px;	right:10px;	width:162px;	padding:10px;	background-color:#E00000;	border:1px solid #000000;/* Again, the ugly brilliant hack. */	voice-family: "\"}\"";	voice-family:inherit;	width:150px;	}/* Again, "be nice to Opera 5". */body>#menu {width:150px;}
-
 td {
 	font-size:smaller;
+}
+
+img {
+	border-style: none;
+	max-width: 300px;
 }
 
-#menu a {
-	display: block;
-	color:#000000;
-	border-top: solid 1px #F00000;
+#content {	
+	margin:0px 210px 50px 10px;	
+	padding:10px;	
+}
+
+/* Based, with permission, on bluerobot.com */
+#menu {		
+	position:absolute;	
+	top:40px;	
+	right:10px;	
+	width:162px;
+	text-align: center;	
+	background-color:#E00000;	
+	border:1px solid #000000;
+	/* Again, the ugly brilliant hack. */	voice-family: "\"}\"";	voice-family:inherit;	width:152px;	}/* Again, "be nice to Opera 5". */body>#menu {width:152px;}
+
+#menu input.search {
+	width:149px;
 }
 
-#menu input.search {
-	width:149px;
-	padding:0px;
-	margin:0px;
-	display: block;
-}
+#menu h1 {
+	font-size: smaller;
+	background-color: #900000;
+	color: white;
+	padding: 5px;
+	margin: 0px;
+	font-weight: bold;
+}
 
-.pagename {
-	font-size: xx-small;
+#menu h2 {
+	font-size: smaller;
+	background-color: #900000;
+	color: white;
+	padding: 5px;
+	margin: 12px 0px 0px 0px;
+	font-weight: bold;
+}
+
+#menu h2 a, #menu h2 a:visited {
+	color: white;
+}
+
+.linklist {
+}
+
+.linklist a, .linklist a:visited {
+	margin: 0px;
+	padding: 3px 5px;
+	color: black;
 	display: block;
 }
 
-img {
-	border-style: none;
-	max-width: 600px;
+.linklist a:hover {
+	background-color:#F4E600;
+	text-decoration: none;
 }
 
-.disclaimer {
+.pagename {
 	font-size: xx-small;
 	display: block;
 }
+
+.command {
+	border-top: 1px solid #333;
+	padding-top: 5px;
+	margin-top: 20px;
+}
 
 .subpage {
 	padding: 10px;
@@ -62,11 +113,12 @@ p.more {
 	font-size: xx-small;
 	text-align: right;
 	padding: 0px;
-	font-color: #grey;
-	color: gray;
+	font-color: #grey;
+	color: gray;
 }
 
-.subpage h1 {
+.subpage h1 {
+	color:#008000;
 }
 
 .calendar td {
@@ -76,7 +128,8 @@ p.more {
 
 .upcomingevents {
 	padding: 0px 10px 0px 10px;
-	margin: 0px;	border: solid 1px #AAAAAA;
+	margin: 0px;	
+	border: solid 1px #AAAAAA;
 }
 
 a.pageview {
@@ -87,12 +140,66 @@ pre.change {
 	margin: 0px;
 	padding: 0px;
 }
+
+.change {
+	margin-top: 20px;
+	border-top: solid 1px #AAAAAA;
+}
+
+#fileedittitle input {
+	width: 85%;
+}
+
+#edittitle input {
+	width: 95%;
+}
+
+#editcontent textarea {
+	width: 100%;
+	height: 75%;
+}
+
+#tips h1 {
+	padding-left: 5px;
+	margin-top: 0px;
+}
 
-ul.tips {
-	list-style-type: none;
+#tips li, #tips ul {
+	list-style-type: none;
+	padding-left: 5px;
 }
 
 .metacolumn {
 	display: inline;
 	font-size: smaller;
 }
+
+form.editpage {
+	display: inline;
+}
+
+div.undochange {
+	border-top: solid 1px #AAAAAA;
+	margin-top: 10px;
+}
+
+.undochange li {
+	list-style-type: none;
+	padding-left: 0px;
+}
+
+.undochange input {
+	margin-left: 40px;
+	margin-top: 0px;
+	margin-bottom: 10px;
+}
+
+.undochange p {
+	font-weight: bold;
+	margin-top: 5px;
+}
+
+.help {
+	color: red;
+	text-align: center;
+}