Soks 1.0.1 → 1.0.2

data/templates/default/version.txt

@@ -1 +1 @@
-1.0.1
+1.0.2

data/templates/default/views/frame.rhtml

@@ -17,9 +17,9 @@
 	
 	<div id='menu'>
 	
-		<h1><%= @wikiname %></h1>
+		<h1><%= self.name %></h1>
 		<a href='<%= url 'Home Page' %>' accesskey='H' >
-			<img width='149' src='<%= file 'logo.jpg' %>' alt='<%= @wikiname %>' />
+			<img width='149' src='<%= file 'logo.jpg' %>' alt='<%= self.name %>' />
 		</a> 
 	
 		<h2>Search</h2>	

data/test/test_counter-helper.rb

@@ -49,14 +49,16 @@ class TestViewCountHelper < Test::Unit::TestCase
 		test_page_count
 		@wiki.notify( :test_event )
 		wait_for_queue_to_empty
-		desired_content = "h1. Popular Pages\n\n"
-		desired_content << "Count since #{start_time}. Updated on #{@wiki.page('Popular Pages').revised_on}\n\n"
-		desired_content << "| count1 | 3 |\n"
-		desired_content << "| count2 | 2 |\n"
-		desired_content << "| 1 others | 1 |\n"
-		desired_content << "| *Total* | *6* |\n"
-		assert_equal( desired_content, @wiki.page('Popular Pages').content)
+		content = @wiki.page('Popular Pages').content.split "\n"
+		[	[ 0, "h1. Popular Pages" ],
+			[ 4, "| count1 | 3 |" ],
+			[ 5, "| count2 | 2 |" ],
+			[ 6, "| 1 others | 1 |" ],
+			[ 7, "| *Total* | *6* |" ] ].each do |i,line|
+				assert_equal line, content[i]
+		end
 	end
+	
 end
 
 class TestViewerCountHelper < Test::Unit::TestCase
@@ -103,13 +105,14 @@ class TestViewerCountHelper < Test::Unit::TestCase
 		test_viewer_count
 		@wiki.notify( :test_event )
 		wait_for_queue_to_empty
-		desired_content = "h1. Popular Pages\n\n"
-		desired_content << "Count since #{start_time}. Updated on #{@wiki.page('Popular Pages').revised_on}\n\n"
-		desired_content << "| Author1 | 3 |\n"
-		desired_content << "| Author2 | 2 |\n"
-		desired_content << "| 1 others | 1 |\n"
-		desired_content << "| *Total* | *6* |\n"
-		assert_equal( desired_content, @wiki.page('Popular Pages').content)
+		content = @wiki.page('Popular Pages').content.split "\n"
+		[	[ 0, "h1. Popular Pages" ],
+			[ 4, "| Author1 | 3 |" ],
+			[ 5, "| Author2 | 2 |" ],
+			[ 6, "| 1 others | 1 |" ],
+			[ 7, "| *Total* | *6* |" ] ].each do |i,line|
+				assert_equal line, content[i]
+		end
 	end
 end
 
@@ -147,12 +150,13 @@ class TestAuthorCountHelper < Test::Unit::TestCase
 		test_author_count
 		@wiki.notify( :test_event )
 		wait_for_queue_to_empty
-		desired_content = "h1. Principal Authors\n\n"
-		desired_content << "Count since #{start_time}. Updated on #{@wiki.page('Popular Pages').revised_on}\n\n"
-		desired_content << "| t1 | 3 |\n"
-		desired_content << "| t2 | 2 |\n"
-		desired_content << "| 1 others | 1 |\n"
-		desired_content << "| *Total* | *6* |\n"
-		assert_equal( desired_content, @wiki.page('Principal Authors').content)
+		content = @wiki.page('Principal Authors').content.split "\n"
+		[	[ 0, "h1. Principal Authors" ],
+			[ 4, "| t1 | 3 |" ],
+			[ 5, "| t2 | 2 |" ],
+			[ 6, "| 1 others | 1 |" ],
+			[ 7, "| *Total* | *6* |" ] ].each do |i,line|
+				assert_equal line, content[i]
+		end		
 	end
 end

data/test/test_soks-helpers.rb

@@ -4,6 +4,47 @@ require 'mock-objects'
 require 'helpers/default-helpers'
 require 'generator'
 
+class TestAutomaticSummary < Test::Unit::TestCase
+	include TearDownableWiki
+	
+	def test_basics
+		AutomaticSummary.new( @wiki, 'automatic summary' ) { |page| page.name =~ /hello/i }
+		@wiki.revise 'hello world', 'hello world', 'test author'
+		@wiki.revise 'hello john', 'hello john', 'test author'
+		@wiki.revise 'hello frank', 'hello frank', 'test author'
+		@wiki.revise 'hello frank', 'page deleted', 'test author'
+		@wiki.revise 'goodbye world', 'goodbye world', 'test author'
+		wait_for_queue_to_empty
+		content = @wiki.page('automatic summary').content
+		assert_match /hello world/, content
+		assert_match /hello john/, content
+		assert_no_match /goodbye world/, content
+		assert_no_match /hello frank/, content
+	end
+	
+	def test_updates_on_revision
+		as = AutomaticSummary.new( @wiki, 'update on revision test' ) { |page| page.name =~ /summarise/i }
+		@wiki.revise('summarise 1','initial content','test author')
+		wait_for_queue_to_empty
+		assert_match(/initial content/,@wiki.page('update on revision test').content )
+		@wiki.revise('summarise 1','updated content','test author')
+		wait_for_queue_to_empty
+		assert_match(/updated content/,@wiki.page('update on revision test').content )
+	end
+
+	def test_removes_when_no_longer_true
+		AutomaticSummary.new( @wiki, 'remove when not true test' ) { |page| page.content =~ /hello/i }
+		@wiki.revise('summarise 1','hello','test author')
+		wait_for_queue_to_empty
+		assert_match(/hello/,@wiki.page('remove when not true test').content )
+		@wiki.revise('summarise 1','bye','test author')
+		wait_for_queue_to_empty
+		assert_no_match(/hello/,@wiki.page('remove when not true test').content )
+		assert_no_match(/bye/,@wiki.page('remove when not true test').content )
+	end
+
+end
+
 class TestRecentChanges < Test::Unit::TestCase
 	include TearDownableWiki
 	
@@ -12,7 +53,7 @@ class TestRecentChanges < Test::Unit::TestCase
 		@wiki.revise( 'testpage','B','normal person')
 		@wiki.revise( 'testpage2','A','normal person')
 		wait_for_queue_to_empty
-		assert_equal(2, rc.pages_in_summary.to_a.size)
+		assert_equal(2, rc.summary.to_a.size)
 		assert_match( /normal person/i, rctextile )
 	end
 	
@@ -21,7 +62,7 @@ class TestRecentChanges < Test::Unit::TestCase
 		@wiki.revise( 'testpage','B','normal person')
 		@wiki.revise( 'testpage','A','normal person')
 		wait_for_queue_to_empty
-		assert_equal(1, rc.pages_in_summary.to_a.size)
+		assert_equal(1, rc.summary.to_a.size)
 		assert_match( /normal person/i, rctextile )
 	end
 	
@@ -30,7 +71,7 @@ class TestRecentChanges < Test::Unit::TestCase
 		@wiki.revise( 'testpage','B','p1')
 		@wiki.revise( 'testpage','A','p2')
 		wait_for_queue_to_empty
-		assert_equal(2, @rc.pages_in_summary.to_a.size)
+		assert_equal(2, @rc.summary.to_a.size)
 		assert_match( /p1/i, rctextile )
 		assert_match( /p2/i, rctextile )
 	end
@@ -41,7 +82,7 @@ class TestRecentChanges < Test::Unit::TestCase
 		@wiki.revise( 'testpage2','A','normal person')
 		rc = AutomaticRecentChanges.new( @wiki)
 		assert_equal(['recent changes to this site','testpage','testpage2'],@wiki.map{|name,page| name }.sort)
-		assert_equal(2, rc.pages_in_summary.to_a.size)
+		assert_equal(2, rc.summary.to_a.size)
 		assert_match( /normal person/i, rctextile )
 		assert_no_match( /AutomaticPageMover/i, rctextile )
 	end
@@ -53,7 +94,7 @@ class TestRecentChanges < Test::Unit::TestCase
 		@wiki.revise( 'testpage2','A','normal person')
 		wait_for_queue_to_empty
 		assert_equal(['recent changes to this site','testpage','testpage2'],@wiki.map{|name,page| name }.sort)
-		assert_equal(2, rc.pages_in_summary.to_a.size)
+		assert_equal(2, rc.summary.to_a.size)
 		assert_match( /normal person/i, rctextile )
 		assert_no_match( /AutomaticPageMover/i, rctextile )
 	end

data/test/test_soks-view.rb

@@ -52,9 +52,13 @@ class TestBruteMatch < Test::Unit::TestCase
 		assert_equal( [['.Site Index A.',:dot_index_a]],match(".Site Index A. ball") )
 	end
 	
-	def match( text )
+	def test_do_not_match
+		assert_equal [], match("Oh! L'EQUIPE? C'est...", ["l'equipe"])
+	end
+	
+	def match( text, do_not_match = [] )
 		matches = []
-		@match.match( text ) { |m,p| 
+		@match.match( text, do_not_match ) { |m,p| 
 			matches << [m,p]
 			"$1"
 		}
@@ -162,6 +166,14 @@ class TestWikiRedCloth < Test::Unit::TestCase
 		assert_equal( %q{<p><a href='http://testsite.com/view/AGreatPageOfStuff' class='automatic'>A "great page" of stuff</a></p>},html('test quotes in title'))
 	end
 	
+	def test_dont_match_the_page_title
+		@view.revise('Ruby','a page about ruby','tamc2')
+		@view.revise('not ruby','a page about ruby','tamc2')
+		wait_for_queue_to_empty
+		assert_equal( %q{<p>a page about <a href='http://testsite.com/view/Ruby' class='automatic'>ruby</a></p>},html('not ruby'))
+		assert_equal( %q{<p>a page about ruby</p>},html('ruby'))
+	end
+	
 	def test_wiki_links
 		@view.revise('test1','[[test => a wonderfull page?great=good ]]','tamc2')
 		@view.revise('test2','[[test => /edit/a wonderfull page?great =good ]]','tamc2')

data/test/test_soks.rb

@@ -0,0 +1,9 @@
+require 'test/unit'
+require 'soks'
+
+class TestSoks < Test::Unit::TestCase
+
+	def test_version_number
+		assert_match /^\d+\.\d+\.\d+$/, SOKS_VERSION
+	end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: Soks
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2005-08-09 00:00:00 +01:00
+  version: 1.0.2
+date: 2005-09-27 00:00:00 +01:00
 summary: Yet another wiki.
 require_paths: 
   - lib
@@ -84,7 +84,7 @@ files:
   - templates/default/content/Automatic%20counters.textile
   - templates/default/content/Automatic%20exporters.textile
   - templates/default/content/Automatic%20importers.textile
-  - templates/default/content/Automatic%20linking%20between%20pages.textile
+  - templates/default/content/Automatic%20linking.textile
   - templates/default/content/Automatic%20maintenance%20helpers.textile
   - templates/default/content/Automatic%20Summaries.textile
   - templates/default/content/Bug%3A%20Competing%20edits.textile
@@ -111,7 +111,6 @@ files:
   - templates/default/content/How%20to%20report%20a%20bug.textile
   - templates/default/content/How%20to%20upgrade%20soks.textile
   - templates/default/content/How%20to%20use%20the%20Automatic%20Helper%20classes.textile
-  - templates/default/content/How%20to%20use%20the%20keyboard%20shortcuts.textile
   - templates/default/content/How%20to%20use%20this%20wiki.textile
   - templates/default/content/List%20of%20changes.textile
   - templates/default/content/News%3A%20Version%201%2D0%2D0%20released.textile
@@ -126,7 +125,7 @@ files:
   - templates/default/content/Sidebar%20Page.textile
   - templates/default/content/Site%20Index.textile
   - templates/default/content/SOKS%20features.textile
-  - templates/default/content/Soks%20Licence.textile
+  - templates/default/content/Soks%27s%20Licence.textile
   - templates/default/content/Tag%3A%20Include%20this%20page%20in%20the%20distribution.textile
   - templates/default/views/frame.rhtml
   - templates/default/views/messages.yaml
@@ -152,6 +151,7 @@ files:
   - test/test_soks-storage.rb
   - test/test_soks-utils.rb
   - test/test_soks-view.rb
+  - test/test_soks.rb
   - test/html/2006Mar.html
   - test/html/poignant.html
   - test/html/poignant.textile

data/templates/default/content/How%20to%20use%20the%20keyboard%20shortcuts.textile

@@ -1,17 +0,0 @@
-h1. Keyboard Shortcuts
-
-Soks has a number of keyboard short cuts.  Depending on your browser, only some of them will work:
-
-* ctrl-n : New page.  Will use whatever text you had selected as the title of the new page (definitely only works on a few browsers[1])
-* ctrl-e: Edit page, and if you are editing:
-** ctrl-s saves the page 
-** ctrl-c cancels the editing
-** ctrl-u undos the previous edit
-** ctrl-a shows all the previous changes
-* ctrl-h: Home page
-
-*Note:* On Linux/Firefox and WindowsXP/IE6.0, substitute "meta" or "alt" for "ctrl".  And for WindowsXP/IE6.0, these will only move you to the link on the page -- you then have to hit enter to proceed.
-
-fn1. Does not work on Linux/Firefox1.0 or WindowsXP/IE6.0
-
-Tag: Include this page in the distribution