Pimki 1.3.092 → 1.4.092

data/app/models/chunks/uri_test.rb

@@ -1,92 +1,92 @@
-require 'chunks/uri'
-require 'chunks/match'
-require 'test/unit'
-
-class URITest < Test::Unit::TestCase
-  include ChunkMatch
-
-  def test_non_matches
-    assert_no_match(URIChunk.pattern, 'There is no URI here') 
-    assert_no_match(URIChunk.pattern, 'One gemstone is the garnet:reddish in colour, like ruby') 
-  end
-
-  def test_simple_uri
-    match(URIChunk, 'http://www.example.com',
-		:scheme =>'http', :host =>'www.example.com', :path => nil,
-		:link_text => 'http://www.example.com'
-	)
-    match(URIChunk, 'http://www.example.com/',
-		:scheme =>'http', :host =>'www.example.com', :path => '/',
-		:link_text => 'http://www.example.com/'
-	)
-    match(URIChunk, 'www.example.com', 
-		:scheme =>'http', :host =>'www.example.com', :link_text => 'www.example.com'
-	)
-    match(URIChunk, 'example.com', 
-		:scheme =>'http',:host =>'example.com', :link_text => 'example.com'
-    )
-    match(URIChunk, 'http://example.com.au/', 
-		:scheme =>'http', :host =>'example.com.au', :link_text => 'http://example.com.au/'
-	)
-    match(URIChunk, 'example.com.au',  
-		:scheme =>'http', :host =>'example.com.au', :link_text => 'example.com.au'
-	)
-    match(URIChunk, 'http://www.example.co.uk/',
-		:scheme =>'http', :host =>'www.example.co.uk',
-		:link_text => 'http://www.example.co.uk/'
-	)
-    match(URIChunk, 'example.co.uk',
-		:scheme =>'http', :host =>'example.co.uk', :link_text => 'example.co.uk'
-	)
-	match(URIChunk, 'http://moinmoin.wikiwikiweb.de/HelpOnNavigation',
-		:scheme => 'http', :host => 'moinmoin.wikiwikiweb.de', :path => '/HelpOnNavigation',
-		:link_text => 'http://moinmoin.wikiwikiweb.de/HelpOnNavigation'
-	)
-	match(URIChunk, 'moinmoin.wikiwikiweb.de/HelpOnNavigation',
-		:scheme => 'http', :host => 'moinmoin.wikiwikiweb.de', :path => '/HelpOnNavigation',
-		:link_text => 'moinmoin.wikiwikiweb.de/HelpOnNavigation'
-	)
-  end
-
-  def test_email_uri
-	match(URIChunk, 'mail@example.com', 
-		:user => 'mail', :host => 'example.com', :link_text => 'mail@example.com'
-	)
-  end
-
-  def test_non_email
-	# The @ is part of the normal text, but 'example.com' is marked up.
-	match(URIChunk, 'Not an email: @example.com', :user => nil, :uri => 'http://example.com')
-  end
-
-  def test_non_uri
-	assert_no_match(URIChunk.pattern, 'httpd.conf')
-	assert_no_match(URIChunk.pattern, 'libproxy.so')
-  end
-
-  def test_uri_in_text
-    match(URIChunk, 'Go to: http://www.example.com/', :host => 'www.example.com', :path =>'/')
-    match(URIChunk, 'http://www.example.com/ is a link.', :host => 'www.example.com')
-    match(URIChunk, 
-      'Email david@loudthinking.com', 
-      :scheme =>'mailto', :user =>'david', :host =>'loudthinking.com'
-    )
-  end
-
-  def test_uri_in_parentheses
-    match(URIChunk, 'URI (http://brackets.com.de) in brackets', :host => 'brackets.com.de')
-    match(URIChunk, 'because (as shown at research.net) the results', :host => 'research.net')
-    match(URIChunk, 
-      'A wiki (http://wiki.org/wiki.cgi?WhatIsWiki) page', 
-      :scheme => 'http', :host => 'wiki.org', :path => '/wiki.cgi', :query => 'WhatIsWiki'
-    )
-  end
-  
-  def test_uri_list_item
-    match(
-      URIChunk, 
-      '* http://www.btinternet.com/~mail2minh/SonyEricssonP80xPlatform.sis', 
-      :path => '/~mail2minh/SonyEricssonP80xPlatform.sis'
-    )
-  end
-end
+require 'chunks/uri'
+require 'chunks/match'
+require 'test/unit'
+
+class URITest < Test::Unit::TestCase
+  include ChunkMatch
+
+  def test_non_matches
+    assert_no_match(URIChunk.pattern, 'There is no URI here') 
+    assert_no_match(URIChunk.pattern, 'One gemstone is the garnet:reddish in colour, like ruby') 
+  end
+
+  def test_simple_uri
+    match(URIChunk, 'http://www.example.com',
+		:scheme =>'http', :host =>'www.example.com', :path => nil,
+		:link_text => 'http://www.example.com'
+	)
+    match(URIChunk, 'http://www.example.com/',
+		:scheme =>'http', :host =>'www.example.com', :path => '/',
+		:link_text => 'http://www.example.com/'
+	)
+    match(URIChunk, 'www.example.com', 
+		:scheme =>'http', :host =>'www.example.com', :link_text => 'www.example.com'
+	)
+    match(URIChunk, 'example.com', 
+		:scheme =>'http',:host =>'example.com', :link_text => 'example.com'
+    )
+    match(URIChunk, 'http://example.com.au/', 
+		:scheme =>'http', :host =>'example.com.au', :link_text => 'http://example.com.au/'
+	)
+    match(URIChunk, 'example.com.au',  
+		:scheme =>'http', :host =>'example.com.au', :link_text => 'example.com.au'
+	)
+    match(URIChunk, 'http://www.example.co.uk/',
+		:scheme =>'http', :host =>'www.example.co.uk',
+		:link_text => 'http://www.example.co.uk/'
+	)
+    match(URIChunk, 'example.co.uk',
+		:scheme =>'http', :host =>'example.co.uk', :link_text => 'example.co.uk'
+	)
+	match(URIChunk, 'http://moinmoin.wikiwikiweb.de/HelpOnNavigation',
+		:scheme => 'http', :host => 'moinmoin.wikiwikiweb.de', :path => '/HelpOnNavigation',
+		:link_text => 'http://moinmoin.wikiwikiweb.de/HelpOnNavigation'
+	)
+	match(URIChunk, 'moinmoin.wikiwikiweb.de/HelpOnNavigation',
+		:scheme => 'http', :host => 'moinmoin.wikiwikiweb.de', :path => '/HelpOnNavigation',
+		:link_text => 'moinmoin.wikiwikiweb.de/HelpOnNavigation'
+	)
+  end
+
+  def test_email_uri
+	match(URIChunk, 'mail@example.com', 
+		:user => 'mail', :host => 'example.com', :link_text => 'mail@example.com'
+	)
+  end
+
+  def test_non_email
+	# The @ is part of the normal text, but 'example.com' is marked up.
+	match(URIChunk, 'Not an email: @example.com', :user => nil, :uri => 'http://example.com')
+  end
+
+  def test_non_uri
+	assert_no_match(URIChunk.pattern, 'httpd.conf')
+	assert_no_match(URIChunk.pattern, 'libproxy.so')
+  end
+
+  def test_uri_in_text
+    match(URIChunk, 'Go to: http://www.example.com/', :host => 'www.example.com', :path =>'/')
+    match(URIChunk, 'http://www.example.com/ is a link.', :host => 'www.example.com')
+    match(URIChunk, 
+      'Email david@loudthinking.com', 
+      :scheme =>'mailto', :user =>'david', :host =>'loudthinking.com'
+    )
+  end
+
+  def test_uri_in_parentheses
+    match(URIChunk, 'URI (http://brackets.com.de) in brackets', :host => 'brackets.com.de')
+    match(URIChunk, 'because (as shown at research.net) the results', :host => 'research.net')
+    match(URIChunk, 
+      'A wiki (http://wiki.org/wiki.cgi?WhatIsWiki) page', 
+      :scheme => 'http', :host => 'wiki.org', :path => '/wiki.cgi', :query => 'WhatIsWiki'
+    )
+  end
+  
+  def test_uri_list_item
+    match(
+      URIChunk, 
+      '* http://www.btinternet.com/~mail2minh/SonyEricssonP80xPlatform.sis', 
+      :path => '/~mail2minh/SonyEricssonP80xPlatform.sis'
+    )
+  end
+end

data/app/models/chunks/wiki.rb

@@ -43,14 +43,14 @@ module WikiChunk
 
     def initialize(match_data, revision)
       super(match_data, revision)
-      @escape = match_data[1] || match_data[3]
-      # @chunk_text = match_data[2] || ''
+      @escaped = match_data[1] || match_data[3]
+      @text.delete! '\\' if @escaped
       @page_name = @link_text = match_data[2]
     end
 
     def mask(content) pre_mask + post_mask; end
     def regexp() Regexp.new(pre_mask + post_mask) end
-    def escaped_text() (@escape.nil? ? nil : page_name) end
+    def escaped_text() (@escaped.nil? ? nil : page_name) end
     def link_text() WikiWords.separate(page_name) end	
   end
 
@@ -84,7 +84,7 @@ module WikiChunk
 
     def mask(content) pre_mask + post_mask; end
     def regexp() Regexp.new(pre_mask + post_mask) end
-    def escaped_text() (@escape.nil? ? nil : page_name) end
+    def escaped_text() (@escape.nil? ? nil : page_name) end # TODO: never set?
     def link_text() WikiWords.separate(page_name) end	
   end
 

data/app/models/chunks/wiki_symbols.rb

@@ -1,22 +1,22 @@
-
-class WikiSymbol < Chunk::Abstract
-    def self.pattern() /<:(.*?)>/ end
-
-    attr_accessor :symbol_code
-
-    def initialize(match_data, revision)
-      super(match_data, revision)
-      @symbol_code = match_data[1]
-    end
-    
-    def unmask(content)
-      tag = case symbol_code
-        when 'cbx'  then '<input type="checkbox" disabled />'
-        when 'cbxc' then '<input type="checkbox" disabled checked />'
-        else symbol_code
-      end
-
-      return self if content.gsub!( Regexp.new(mask(content)), tag )
-    end
-end
-
+
+class WikiSymbol < Chunk::Abstract
+    def self.pattern() /<:(.*?)>/ end
+
+    attr_accessor :symbol_code
+
+    def initialize(match_data, revision)
+      super(match_data, revision)
+      @symbol_code = match_data[1]
+    end
+    
+    def unmask(content)
+      tag = case symbol_code
+        when 'cbx'  then '<input type="checkbox" disabled />'
+        when 'cbxc' then '<input type="checkbox" disabled checked />'
+        else symbol_code
+      end
+
+      return self if content.gsub!( Regexp.new(mask(content)), tag )
+    end
+end
+

data/app/models/chunks/wiki_test.rb

@@ -1,36 +1,36 @@
-require 'chunks/wiki'
-require 'chunks/match'
-require 'test/unit'
-
-class WikiTest < Test::Unit::TestCase
-  include ChunkMatch
-
-  def test_simple
-	match(WikiChunk::Word, 'This is a WikiWord okay?', :page_name => 'WikiWord')
-  end
-
-  def test_escaped
-	match(WikiChunk::Word, 'Do not link to an \EscapedWord',
-		:page_name => 'EscapedWord', :escaped_text => 'EscapedWord'
-	)
-  end
-
-  def test_simple_brackets
-	match(WikiChunk::Link, 'This is a [[bracketted link]]',
-		:page_name => 'bracketted link', :escaped_text => nil
-	)
-  end
-
-  def test_complex_brackets
-	match(WikiChunk::Link, 'This is a tricky link [[Sperberg-McQueen]]',
-		:page_name => 'Sperberg-McQueen', :escaped_text => nil
-	)
-  end
-
-# MDR: I'm not sure how to deal with this case just yet...
-#
-#  def test_textile_link
-#	assert_no_match(WikiChunk::Word.pattern, '"Here is a special link":SpecialLink')
-#  end
-
-end
+require 'chunks/wiki'
+require 'chunks/match'
+require 'test/unit'
+
+class WikiTest < Test::Unit::TestCase
+  include ChunkMatch
+
+  def test_simple
+	match(WikiChunk::Word, 'This is a WikiWord okay?', :page_name => 'WikiWord')
+  end
+
+  def test_escaped
+	match(WikiChunk::Word, 'Do not link to an \EscapedWord',
+		:page_name => 'EscapedWord', :escaped_text => 'EscapedWord'
+	)
+  end
+
+  def test_simple_brackets
+	match(WikiChunk::Link, 'This is a [[bracketted link]]',
+		:page_name => 'bracketted link', :escaped_text => nil
+	)
+  end
+
+  def test_complex_brackets
+	match(WikiChunk::Link, 'This is a tricky link [[Sperberg-McQueen]]',
+		:page_name => 'Sperberg-McQueen', :escaped_text => nil
+	)
+  end
+
+# MDR: I'm not sure how to deal with this case just yet...
+#
+#  def test_textile_link
+#	assert_no_match(WikiChunk::Word.pattern, '"Here is a special link":SpecialLink')
+#  end
+
+end

data/app/models/page.rb

@@ -17,13 +17,27 @@ class Page
     revise(content, created_at, author)
   end
 
-  def revise(content, created_at, author)
-    if !@revisions.empty? && continous_revision?(created_at, author)
-      @revisions.last.created_at = Time.now
-      @revisions.last.content    = content
-      @revisions.last.clear_display_cache
-    else
-      @revisions << Revision.new(self, @revisions.length, content, created_at, author)
+  def revise(content, created_at, author, edit_type='default')
+    case edit_type
+      when 'major'
+        revise_major(content, created_at, author)
+      
+      when 'minor'
+        if !@revisions.empty? # sanity check
+          revise_minor(content, created_at, author)
+        else
+          revise_major(content, created_at, author)
+        end
+        
+      when 'default'
+        if !@revisions.empty? && continous_revision?(created_at, author)
+          revise_minor(content, created_at, author)
+        else
+          revise_major(content, created_at, author)
+        end
+        
+      else
+        revise_major(content, created_at, author)
     end
     
     web.refresh_pages_with_references(name) if @revisions.length == 1
@@ -61,6 +75,10 @@ class Page
   def references
     web.select.pages_that_reference(name)
   end
+  
+  def bliki_references
+    web.select_bliki.pages_that_reference(name)
+  end
 
   # Returns the original wiki-word name as separate words, so "MyPage" becomes "My Page".
   def plain_name
@@ -78,6 +96,9 @@ class Page
   def last_visited()  @last_visited || revisions.last.created_at end
   def viewed() @viewed ||= 0 end
   
+  def has_todos?
+    not display_content.find_chunks(Todo).empty?
+  end
   
   private
     def continous_revision?(created_at, author)
@@ -88,6 +109,17 @@ class Page
     def method_missing(method_symbol)
       revisions.last.send(method_symbol)
     end
+    
+    def revise_minor(content, created_at, author) #{{{
+      @revisions.last.created_at = Time.now
+      @revisions.last.content    = content
+      @revisions.last.clear_display_cache
+    end #}}}
+    
+    def revise_major(content, created_at, author) #{{{
+      @revisions << Revision.new(self, @revisions.length, content, created_at, author)
+    end #}}}
+
 end
 
 # jEdit :folding=indent:collapseFolds=1:

data/app/models/page_lock.rb

@@ -1,24 +1,24 @@
-# Contains all the lock methods to be mixed in with the page
-module PageLock
-  LOCKING_PERIOD = 30 * 60 # 30 minutes
-
-  def lock(time, locked_by)
-    @locked_at, @locked_by = time, locked_by
-  end
-  
-  def lock_duration(time)
-    ((time - @locked_at) / 60).to_i unless @locked_at.nil?
-  end
-  
-  def unlock
-    @locked_at = nil
-  end
-  
-  def locked?(comparison_time)
-    @locked_at + LOCKING_PERIOD > comparison_time unless @locked_at.nil?
-  end
-
-  def locked_by_link
-    web.make_link(@locked_by)
-  end
+# Contains all the lock methods to be mixed in with the page
+module PageLock
+  LOCKING_PERIOD = 30 * 60 # 30 minutes
+
+  def lock(time, locked_by)
+    @locked_at, @locked_by = time, locked_by
+  end
+  
+  def lock_duration(time)
+    ((time - @locked_at) / 60).to_i unless @locked_at.nil?
+  end
+  
+  def unlock
+    @locked_at = nil
+  end
+  
+  def locked?(comparison_time)
+    @locked_at + LOCKING_PERIOD > comparison_time unless @locked_at.nil?
+  end
+
+  def locked_by_link
+    web.make_link(@locked_by)
+  end
 end