Soks 0.0.7 → 1.0.0

data/templates/default/views/Page_rss.rhtml

@@ -5,17 +5,17 @@ RSS::Maker.make("2.0") do |maker|
   	
   	maker.encoding = 'iso-8859-1'
   	
-  	maker.channel.title = "#{$SETTINGS[:name]} #{pagename}"
-	maker.channel.description = $SETTINGS[:description]
-	maker.channel.link = $SETTINGS[:url]
+  	maker.channel.title = "#{name} #{page.name}"
+	maker.channel.description = description
+	maker.channel.link = root_url
 
-	maker.image.title = "#{$SETTINGS[:name]}"
-	maker.image.url = "#{$SETTINGS[:url]}/attachment/logo.png"
+	maker.image.title = name
+	maker.image.url = file "logo.png"
 
 	maker.textinput.title = "Search"
-	maker.textinput.description = "Search #{$SETTINGS[:name]}'s text"
+	maker.textinput.description = "Search #{name}'s text"
 	maker.textinput.name = "regex"
-	maker.textinput.link = "#{$SETTINGS[:url]}/find/searchpage"
+	maker.textinput.link = url('searchpage','find')
 
 	maker.items.do_sort = true
 
@@ -23,7 +23,7 @@ RSS::Maker.make("2.0") do |maker|
 	page.revisions.reverse_each do |revision|
 		break if (count +=1) == 15
 		item = maker.items.new_item
-		item.link = "#{$SETTINGS[:url]}/#{pagename}"
+		item.link = url(page.name)
 		# Get the first change that makes an addition and use as the title
 		title = nil
 		revision.changes.each do |group|

data/templates/default/views/Page_view.rhtml

@@ -1,8 +1,8 @@
-<span class='pagename'><a href='<%= url pagename, "meta" %>'><%= pagename %></a> <%= page.deleted? ? "(Deleted)" : '' %></span>
+<span class='pagename'><a href='<%= url page.name, "meta" %>'><%= pagename %></a> <%= page.deleted? ? "(Deleted)" : '' %></span>
 
 <%= renderedview %>
 
 <div class='command'>
-	<a href='<%= url pagename, "edit" %>' accesskey="E" >Edit this page</a> or
-	watch for changes using <a href='<%= url pagename, 'rss' %>'>RSS</a>.
+	<a href='<%= url page.name, "edit" %>' accesskey="E" >Edit this page</a> or
+	watch for changes using <a href='<%= url page.name, 'rss' %>'>RSS</a>.
 </div>

data/templates/default/views/UploadPage_edit.rhtml

@@ -1,5 +1,5 @@
 <span class='pagename'>
-	<a href='<%= url pagename, "meta" %>'><%= pagename %></a> 
+	<a href='<%= url page.name, "meta" %>'><%= page.name %></a> 
 	<%= page.deleted? ? "(Deleted)" : '' %>
 </span>
 
@@ -10,15 +10,15 @@
 	<p>You can put add a link to the file from another page in the wiki by typing its title (e.g. "attached claim form").  To make a picture appear as part of another page write [[ insert picture name ]] (e.g. [[insert picture of a beautiful balloon]]).</p>
 </div>
 
-<form  class='editpage' action='<%= url pagename, "upload" %>' method='post' enctype='multipart/form-data' >
+<form  class='editpage' action='<%= url page.name, "upload" %>' method='post' enctype='multipart/form-data' >
 	<div id='fileedittitle'>
 		Title: 
 		<% if page.is_a? ImagePage %>
 			<input type=hidden name='titleprefix' value='Picture of ' />
-			Picture of <input name='newtitle' size = '51' value='<%= pagename[ 10..-1].strip %>'  
+			Picture of <input name='newtitle' size = '51' value='<%= page.name[ 10..-1].strip %>'  
 		<% else %>
 			<input type=hidden name='titleprefix' value='Attached ' />
-			Attached <input name='newtitle' size = '52' value='<%= pagename[ 9..-1].strip %>' 
+			Attached <input name='newtitle' size = '52' value='<%= page.name[ 9..-1].strip %>' 
 		<% end %>
 		onBlur="validateTitle( this.value );"  onClick="this.value=this.value.replace('Type a title here','')" />
 	</div>
@@ -29,10 +29,10 @@
 	
 	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 %>' >
+	<form class='editpage' method='post' action='<%= url page.name %>' >
 		<input name='action' value='Cancel Changes' type=submit accesskey="C" />
 	</form> or
-	<form class='editpage' method='post' action='<%= url pagename, 'delete' %>' >
+	<form class='editpage' method='post' action='<%= url page.name, 'delete' %>' >
 		<input name='action' value='Delete this Page' type='submit' accesskey="D" />
 	</form>?
 
@@ -55,9 +55,9 @@
 			%>
 	</div>
 	<p>
-		<form class='editpage' method=post action='<%= url pagename, "rollback" %>' >
+		<form class='editpage' method=post action='<%= url page.name, "rollback" %>' >
 			<input name='revision' value='<%= page.number-1  %>' type='hidden' />
 			<input name='action' value='Undo this change' type='submit' accesskey="U" />
-		</form> or <a href='<%= url pagename, "revisions" %>' accesskey="A" >Show <b>A</b>ll changes</a>.
+		</form> or <a href='<%= url page.name, "revisions" %>' accesskey="A" >Show <b>A</b>ll changes</a>.
 	</p>
 <% end %>

data/templates/default/views/frame.rhtml

@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-	<title><%= pagename %></title>
-	<meta name='description' content='<%= $SETTINGS[:description] %>' />
-	<meta name='keywords' content='Soks, <%= $SETTINGS[:name] %>' />
+	<title><%= page.name %></title>
+	<meta name='description' content='<%= description %>' />
+	<meta name='keywords' content='Soks, <%= name %>' />
 	<link href='<%= file 'stylesheet.css' %>' rel='stylesheet' type='text/css' media='screen' />
 	<link href='<%= file 'print_stylesheet.css' %>' rel='stylesheet' type='text/css' media='print' />	
-	<link rel='alternate' type='application/rss+xml' title='RSS' href='<%= url pagename, 'rss' %>' />
+	<link rel='alternate' type='application/rss+xml' title='RSS' href='<%= url page.name, 'rss' %>' />
 	<script src='<%= file 'newpage.js' %>' type='text/javascript'></script>
 </head>
-<body onkeypress='hotkey(event);'>
+<body onkeypress='hotkey(event,"<%= root_url %>/edit/");'>
 	
 	<div id='content'>
 		<%= content_of_page %>
@@ -18,15 +18,15 @@
 	<div id='menu'>
 	
 		<h1><%= @wikiname %></h1>
-		<a href='<%= url $SETTINGS[:home_page] %>' accesskey='H' >
+		<a href='<%= url 'Home Page' %>' accesskey='H' >
 			<img width='149' src='<%= file 'logo.jpg' %>' alt='<%= @wikiname %>' />
 		</a> 
 	
 		<h2>Search</h2>	
-		<form method='get' action='<%= url pagename, 'find' %>' >
+		<form method='get' action='<%= url page.name, 'find' %>' >
 			<input 	class='search' 
 					name='regex' 
-					value='Enter word & press return'
+					value='<%= query['regex'] || "Enter word & press return" %>'
 			 		onfocus="this.value=this.value.replace('Enter word & press return','')" 
 			 		size='17' />
 		</form>

data/templates/default/views/messages.yaml

@@ -1,4 +1,5 @@
 :some_content_has_been_deleted : "Some content has been deleted"
+:Type_a_title_here : "Type a title here"
 :Type_what_you_want_here_and_click_save : "Type what you want here and click save"
 :Create : "Create"
 :page_deleted : "page deleted"

data/test/html/2006Mar.html

@@ -0,0 +1,66 @@
+<div class='calendar'>
+
+	<table>
+		<tr>
+			<th>Su </th>
+			<th>Mo </th>
+			<th>Tu </th>
+			<th>We </th>
+			<th>Th </th>
+			<th>Fr </th>
+			<th>Sa </th>
+		</tr>
+		<tr>
+			<td> . </td>
+			<td> . </td>
+			<td> . </td>
+			<td> <a href='http://testsite.com/view/2006Mar01' class='missing'>1</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar02' class='missing'>2</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar03' class='missing'>3</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar04' class='missing'>4</a> </td>
+		</tr>
+		<tr>
+			<td> <a href='http://testsite.com/view/2006Mar05' class='missing'>5</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar06' class='missing'>6</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar07' class='missing'>7</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar08' class='missing'>8</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar09' class='missing'>9</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar10' class='missing'>10</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar11' class='missing'>11</a> </td>
+		</tr>
+		<tr>
+			<td> <a href='http://testsite.com/view/2006Mar12' class='missing'>12</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar13' class='missing'>13</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar14' class='missing'>14</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar15' class='missing'>15</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar16' class='missing'>16</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar17' class='missing'>17</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar18' class='missing'>18</a> </td>
+		</tr>
+		<tr>
+			<td> <a href='http://testsite.com/view/2006Mar19' class='missing'>19</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar20' class='missing'>20</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar21' class='missing'>21</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar22' class='missing'>22</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar23' class='missing'>23</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar24' class='missing'>24</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar25' class='missing'>25</a> </td>
+		</tr>
+		<tr>
+			<td> <a href='http://testsite.com/view/2006Mar26' class='missing'>26</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar27' class='missing'>27</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar28' class='missing'>28</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar29' class='missing'>29</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar30' class='missing'>30</a> </td>
+			<td> <a href='http://testsite.com/view/2006Mar31' class='missing'>31</a> </td>
+			<td> . </td>
+		</tr>
+	</table>
+
+
+
+
+	<p><a href='http://testsite.com/view/2006Feb' class='automatic'>2006 Feb</a> <a href='http://testsite.com/view/2006Apr' class='automatic'>2006 Apr</a></p>
+
+
+</div>

data/test/html/poignant.html

@@ -0,0 +1,36 @@
+<h3>False</h3>
+
+	<p style="float:left"><img src="i/blix-neg.gif" title="Shape of a cat." alt="Shape of a cat." /></p>
+
+	<p><em>The cat Trady Blix.  Frozen in emptiness.  Immaculate whiskers rigid.  Placid eyes of lake.  Tail of warm icicle.  Sponsored by a Very Powerful Pause Button.</em></p>
+
+	<p>The darkness surrounding Blix can be called <strong>negative space</strong>.  Hang on to that phrase. Let it suggest that the emptiness has a negative connotation.  In a similar way, <code>nil</code> has a slightly sour note that it whistles.</p>
+
+	<p>Generally speaking, everything in Ruby has a positive charge to it.  This spark flows through strings, numbers, regexps, all of it.  Only two keywords wear a shady cloak: <code>nil</code> and <code>false</code> draggin us down.</p>
+
+	<p>You can test that charge with an <code>if</code> keyword.  It looks very much like the <code>do</code> blocks we saw in the last chapter, in that both end with an <code>end</code>.</p>
+
+
+<pre>
+  if plastic_cup
+    print "Plastic cup is on the up 'n' up!" 
+  end
+</pre>
+	<p>If <code>plastic_cup</code> contains either <code>nil</code> or <code>false</code>, you won&#8217;t see anything print to the screen.  They&#8217;re not on the <code>if</code> guest list.  So <code>if</code> isn&#8217;t going to run any of the code it&#8217;s protecting.</p>
+
+	<p>But <code>nil</code> and <code>false</code> need not walk away in shame.  They may be of questionable character, but <code>unless</code> runs a smaller establishment that caters to the bedraggled. The <code>unless</code> keyword has a policy of only allowing those with a negative charge in. Who are: <code>nil</code> and <code>false</code>.</p>
+
+
+<pre>
+  unless plastic_cup
+    print "Plastic cup is on the down low." 
+  end
+</pre>
+	<p>You can also use <code>if</code> and <code>unless</code> at the end of a single line of code, if that&#8217;s all that is being protected.</p>
+
+
+<pre>
+  print "Yeah, plastic cup is up again!" if plastic_cup
+  print "Hardly. It's down." unless plastic_cup
+</pre>
+	<p>Now that you&#8217;ve met <code>false</code>, I&#8217;m sure you can see what&#8217;s on next.</p>

data/test/html/poignant.textile

@@ -0,0 +1,36 @@
+h3. False
+
+!<i/blix-neg.gif(Shape of a cat.)!
+
+_The cat Trady Blix.  Frozen in emptiness.  Immaculate whiskers rigid.  Placid eyes of lake.  Tail of warm icicle.  Sponsored by a Very Powerful Pause Button._
+
+The darkness surrounding Blix can be called *negative space*.  Hang on to that phrase. Let it suggest that the emptiness has a negative connotation.  In a similar way, @nil@ has a slightly sour note that it whistles.
+
+Generally speaking, everything in Ruby has a positive charge to it.  This spark flows through strings, numbers, regexps, all of it.  Only two keywords wear a shady cloak: @nil@ and @false@ draggin us down.
+
+You can test that charge with an @if@ keyword.  It looks very much like the @do@ blocks we saw in the last chapter, in that both end with an @end@.
+
+<pre>
+  if plastic_cup
+    print "Plastic cup is on the up 'n' up!"
+  end
+</pre>
+
+If @plastic_cup@ contains either @nil@ or @false@, you won't see anything print to the screen.  They're not on the @if@ guest list.  So @if@ isn't going to run any of the code it's protecting.
+
+But @nil@ and @false@ need not walk away in shame.  They may be of questionable character, but @unless@ runs a smaller establishment that caters to the bedraggled. The @unless@ keyword has a policy of only allowing those with a negative charge in. Who are: @nil@ and @false@.
+
+<pre>
+  unless plastic_cup
+    print "Plastic cup is on the down low."
+  end
+</pre>
+
+You can also use @if@ and @unless@ at the end of a single line of code, if that's all that is being protected.
+
+<pre>
+  print "Yeah, plastic cup is up again!" if plastic_cup
+  print "Hardly. It's down." unless plastic_cup
+</pre>
+
+Now that you've met @false@, I'm sure you can see what's on next.

data/test/mock-objects.rb

@@ -0,0 +1,69 @@
+$:.unshift( "contrib" )
+
+require 'yaml'
+$MESSAGES = YAML.load( IO.readlines("templates/default/views/messages.yaml").join )
+
+require 'logger'
+$LOG = Logger.new(STDOUT)
+$LOG.level = Logger::WARN
+
+begin
+	require 'rubygems'
+	require_gem 'ruby-breakpoint'
+rescue LoadError
+	$LOG.info "Breakpoint library not found.  Shouldn't matter"
+end
+
+require 'fileutils'
+require 'soks'
+
+class MockWikiStore
+	include WikiFlatFileStore
+	
+	def initialize( folder )
+		@folder = folder
+		@pages = {}
+	end
+	
+	def mutate( pagename ) 
+		p yield( @pages[pagename.downcase] ||= Page.new( pagename ) )
+	end
+end
+
+module TearDownableWiki
+	include FileUtils
+
+	def setup
+		@wiki = Wiki.new( folder )
+		@view = View.new( @wiki, 'http://testsite.com','testcontent/views' )
+	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 =~ /^(\.+|attachment|views)$/ }.sort
+	end
+	
+	def folder
+		@folder ||= make_folder
+	end
+	
+	def make_folder
+		mkdir( 'testcontent' )
+		mkdir('testcontent/attachment')
+		File.symlink(File.join(Dir.getwd,'templates/default/views'),'testcontent/views')
+		'testcontent'
+	end
+	
+	def wait_for_queue_to_empty
+		sleep(0.1) until @wiki.event_queue.empty?
+	end
+end

data/test/stress_url_calls.rb

@@ -0,0 +1,33 @@
+require 'open-uri'
+urls = IO.readlines(ARGV[0])
+end_time = Time.now + (ARGV[1] || 60).to_i
+threads = (ARGV[2] || 10).to_i
+sleep_time = 0.1
+
+def time
+	start = Time.now
+	yield
+	Time.now - start
+end
+
+threads.times do |i|
+	Thread.new(i) do |i| 
+		total_elapsed = 0.0
+		count = 0
+		while Time.now < end_time
+			url = urls[rand(urls.size)]
+			elapsed = time do
+				open( url ) do |f|
+					f.each_line {|line| } # ignore contents
+				end
+			end
+			total_elapsed += elapsed
+			count += 1
+			p "#{i}: #{elapsed}"
+			sleep sleep_time
+		end
+		p "#{i}: Average #{1.0/(total_elapsed/count)} req/s"
+	end
+end
+
+sleep( (end_time - Time.now)+5 )

data/test/stress_urls.txt

@@ -0,0 +1,68 @@
+http://localhost:8000/view/2005%20Aug
+http://localhost:8000/view/2005%20Dec
+http://localhost:8000/view/2005%20Jul
+http://localhost:8000/view/2005%20Jun
+http://localhost:8000/view/2005%20May
+http://localhost:8000/view/2005%20Nov
+http://localhost:8000/view/2005%20Oct
+http://localhost:8000/view/2005%20Sep
+http://localhost:8000/view/2006%20Apr
+http://localhost:8000/view/2006%20Feb
+http://localhost:8000/view/2006%20Jan
+http://localhost:8000/view/2006%20Mar
+http://localhost:8000/view/2006%20May
+http://localhost:8000/view/Picture%20of%20a%20pair%20of%20soks
+http://localhost:8000/view/All%20News
+http://localhost:8000/view/Api%20for%20classes%20to%20modify%20the%20wiki
+http://localhost:8000/view/Author
+http://localhost:8000/view/Automatic%20linking%20between%20pages
+http://localhost:8000/view/Automatic%20Summaries
+http://localhost:8000/view/Bil
+http://localhost:8000/view/Bil%20Kleb
+http://localhost:8000/view/Bill%20Wood
+http://localhost:8000/view/bug:%20competing%20edits
+http://localhost:8000/view/Bug:%20Does%20not%20make%20use%20of%20if-modified-since%20r
+http://localhost:8000/view/Bug:%20GEM%20limits%20title%20lengths
+http://localhost:8000/view/Bug:%20notextile%20does%20not%20prevent%20page%20inserts
+http://localhost:8000/view/Bug:%20RSS%20feed%20does%20not%20validate
+http://localhost:8000/view/Bug:%20Textile%20mishandles%20paragraphs
+http://localhost:8000/view/Bug:%20Type%20a%20title%20here
+http://localhost:8000/view/Bug:%20Unanticipated%20Rollbacks
+http://localhost:8000/view/ctrl-n
+http://localhost:8000/view/Home%20Page
+http://localhost:8000/view/How%20to%20administrate%20this%20wiki
+http://localhost:8000/view/How%20to%20change%20the%20way%20this%20wiki%20looks
+http://localhost:8000/view/How%20to%20export%20a%20site%20from%20this%20wiki
+http://localhost:8000/view/How%20to%20get%20the%20latest%20Soks%20from%20cvs
+http://localhost:8000/view/How%20to%20hack%20soks
+http://localhost:8000/view/How%20to%20import%20a%20site%20from%20instiki
+http://localhost:8000/view/How%20to%20import%20data%20to%20this%20wiki
+http://localhost:8000/view/How%20to%20install%20Soks
+http://localhost:8000/view/How%20to%20password%20protect%20your%20wiki
+http://localhost:8000/view/How%20to%20report%20a%20bug
+http://localhost:8000/view/How%20to%20use%20the%20keyboard%20shortcuts
+http://localhost:8000/view/How%20to%20use%20this%20wiki
+http://localhost:8000/view/Instructions%20and%20Howtos
+http://localhost:8000/view/Known%20bugs
+http://localhost:8000/view/Latest%20News
+http://localhost:8000/view/let%20me%20know
+http://localhost:8000/view/List%20of%20changes
+http://localhost:8000/view/New%20page%20templates%20or%20categories%20code
+http://localhost:8000/view/New%20Recent%20Changes%20class
+http://localhost:8000/view/News:%20Version%200.0.6%20Released
+http://localhost:8000/view/Per%20Wiki%20Templates
+http://localhost:8000/view/Planned%20Features
+http://localhost:8000/view/Popular%20Pages
+http://localhost:8000/view/Prolific%20Viewers
+http://localhost:8000/view/README
+http://localhost:8000/view/Recent%20Blog%20Entries
+http://localhost:8000/view/Recent%20changes%20to%20this%20site
+http://localhost:8000/view/RSS%20feed
+http://localhost:8000/view/Ruby
+http://localhost:8000/view/sandbox
+http://localhost:8000/view/Sidebar%20Page
+http://localhost:8000/view/Skorgu
+http://localhost:8000/view/SOKS%20features
+http://localhost:8000/view/Soks%20Licence
+http://localhost:8000/view/tamc
+http://localhost:8000/view/tamc2