instiki 0.10.0 → 0.10.1

data/app/models/web.rb

@@ -1,176 +1,182 @@
-require 'cgi'
-require 'page'
-require 'page_set'
-require 'wiki_words'
-require 'zip/zip'
-
-class Web
-  attr_accessor :name, :password, :markup, :color, :safe_mode, :pages
-  attr_accessor :additional_style, :published, :brackets_only, :count_pages, :allow_uploads
-  attr_accessor :max_upload_size
-  
-  attr_reader :address
-
-  def initialize(parent_wiki, name, address, password = nil)
-    self.address = address
-    @wiki, @name, @password = parent_wiki, name, password
-
-    # default values
-    @markup = :textile 
-    @color = '008B26'
-    @safe_mode = false
-    @pages = {}
-    @allow_uploads = true
-    @additional_style = nil
-    @published = false
-    @brackets_only = false
-    @count_pages = false
-    @allow_uploads = true
-    @max_upload_size = 100
-  end
-
-  def add_page(page)
-    @pages[page.name] = page
-  end
-
-  def address=(the_address)
-    if the_address != CGI.escape(the_address)
-      raise Instiki::ValidationError.new('Web name should contain only valid URI characters') 
-    end
-    @address = the_address
-  end
-
-  def authors 
-    select.authors 
-  end
-
-  def categories
-    select.map { |page| page.categories }.flatten.uniq.sort
-  end
-
-  def has_page?(name)
-    pages[name]
-  end
-
-  def has_file?(name)
-    wiki.file_yard(self).has_file?(name)
-  end
-
-  def make_file_link(mode, name, text, base_url)
-    link = CGI.escape(name)
-    case mode
-    when :export
-      if has_file?(name) then "<a class=\"existingWikiWord\" href=\"#{link}.html\">#{text}</a>"
-      else "<span class=\"newWikiWord\">#{text}</span>" end
-    when :publish
-      if has_file?(name) then "<a class=\"existingWikiWord\" href=\"#{base_url}/published/#{link}\">#{text}</a>"
-      else "<span class=\"newWikiWord\">#{text}</span>" end
-    else 
-      if has_file?(name)
-        "<a class=\"existingWikiWord\" href=\"#{base_url}/file/#{link}\">#{text}</a>"
-      else 
-        "<span class=\"newWikiWord\">#{text}<a href=\"#{base_url}/file/#{link}\">?</a></span>"
-      end
-    end
-  end
-
-  # Create a link for the given page name and link text based
-  # on the render mode in options and whether the page exists
-  # in the this web.
-  # The links a relative, and will work only if displayed on another WikiPage.
-  # It should not be used in menus, templates and such - instead, use link_to_page helper
-  def make_link(name, text = nil, options = {})
-    text = CGI.escapeHTML(text || WikiWords.separate(name))
-    mode = options[:mode] || :show
-    base_url = options[:base_url] || '..'
-    link_type = options[:link_type] || :show
-    case link_type.to_sym
-    when :show
-      make_page_link(mode, name, text, base_url)
-    when :file
-      make_file_link(mode, name, text, base_url)
-    when :pic
-      make_pic_link(mode, name, text, base_url)
-    else
-      raise "Unknown link type: #{link_type}"
-    end
-  end
-
-  def make_page_link(mode, name, text, base_url)
-    link = CGI.escape(name)
-    case mode.to_sym
-    when :export
-      if has_page?(name) then %{<a class="existingWikiWord" href="#{link}.html">#{text}</a>}
-      else %{<span class="newWikiWord">#{text}</span>} end
-    when :publish
-      if has_page?(name) then %{<a class="existingWikiWord" href="#{base_url}/published/#{link}">#{text}</a>}
-      else %{<span class="newWikiWord">#{text}</span>} end
-    else 
-      if has_page?(name)
-        %{<a class="existingWikiWord" href="#{base_url}/show/#{link}">#{text}</a>}
-      else 
-        %{<span class="newWikiWord">#{text}<a href="#{base_url}/show/#{link}">?</a></span>}
-      end
-    end
-  end
-
-  def make_pic_link(mode, name, text, base_url)
-    link = CGI.escape(name)
-    case mode.to_sym
-    when :export
-      if has_file?(name) then %{<img alt="#{text}" src="#{link}" />}
-      else %{<img alt="#{text}" src="no image" />} end
-    when :publish
-      if has_file?(name) then %{<img alt="#{text}" src="#{link}" />}
-      else %{<span class="newWikiWord">#{text}</span>} end
-    else 
-      if has_file?(name) then %{<img alt="#{text}" src="#{base_url}/pic/#{link}" />}
-      else %{<span class="newWikiWord">#{text}<a href="#{base_url}/pic/#{link}">?</a></span>} end
-    end
-  end
-
-  def max_upload_size
-    @max_upload_size || 100
-  end
-
-  # Clears the display cache for all the pages with references to 
-  def refresh_pages_with_references(page_name)
-    select.pages_that_reference(page_name).each { |page| 
-      page.revisions.each { |revision| revision.clear_display_cache }
-    }
-  end
-  
-  def refresh_revisions
-    select.each { |page| page.revisions.each { |revision| revision.clear_display_cache } }
-  end
-
-  def remove_pages(pages_to_be_removed)
-    pages.delete_if { |page_name, page| pages_to_be_removed.include?(page) }
-  end
-  
-  def revised_on
-    select.most_recent_revision
-  end
-    
-  def select(&condition)
-    PageSet.new(self, @pages.values, condition)
-  end
-  
-  # This ensures compatibility with 0.9 storages
-  def wiki
-    @wiki ||= WikiService.instance
-  end
-
-  private
-
-    # Returns an array of all the wiki words in any current revision
-    def wiki_words
-      pages.values.inject([]) { |wiki_words, page| wiki_words << page.wiki_words }.flatten.uniq
-    end
-    
-    # Returns an array of all the page names on this web
-    def page_names
-      pages.keys
-    end
-    
-end
+require 'cgi'
+require 'page'
+require 'page_set'
+require 'wiki_words'
+require 'zip/zip'
+
+class Web
+  attr_accessor :name, :password, :safe_mode, :pages
+  attr_accessor :additional_style, :allow_uploads, :published
+  attr_reader :address
+
+  # there are getters for all these attributes, too
+  attr_writer :markup, :color, :brackets_only, :count_pages, :max_upload_size
+
+  def initialize(parent_wiki, name, address, password = nil)
+    self.address = address
+    @wiki, @name, @password = parent_wiki, name, password
+
+    set_compatible_defaults
+
+    @pages = {}
+    @allow_uploads = true
+    @additional_style = nil
+    @published = false
+    @count_pages = false
+    @allow_uploads = true
+  end
+
+  # Explicitly sets value of some web attributes to defaults, unless they are already set
+  def set_compatible_defaults
+    @markup = markup()
+    @color = color()
+    @safe_mode = safe_mode()
+    @brackets_only = brackets_only()
+    @max_upload_size = max_upload_size()
+    @wiki = wiki
+  end
+  # All below getters know their default values. This is necessary to ensure compatibility with 
+  # 0.9 storages, where they were not defined.
+  def brackets_only() @brackets_only || false end
+  def color() @color ||= '008B26' end
+  def count_pages()   @count_pages || false end
+  def markup() @markup ||= :textile end
+  def max_upload_size() @max_upload_size || 100; end
+  def wiki() @wiki ||= WikiService.instance; end
+
+  def add_page(page)
+    @pages[page.name] = page
+  end
+
+  def address=(the_address)
+    if the_address != CGI.escape(the_address)
+      raise Instiki::ValidationError.new('Web name should contain only valid URI characters') 
+    end
+    @address = the_address
+  end
+
+  def authors
+    select.authors 
+  end
+
+  def categories
+    select.map { |page| page.categories }.flatten.uniq.sort
+  end
+
+  def has_page?(name)
+    pages[name]
+  end
+
+  def has_file?(name)
+    wiki.file_yard(self).has_file?(name)
+  end
+
+  def make_file_link(mode, name, text, base_url)
+    link = CGI.escape(name)
+    case mode
+    when :export
+      if has_file?(name) then "<a class=\"existingWikiWord\" href=\"#{link}.html\">#{text}</a>"
+      else "<span class=\"newWikiWord\">#{text}</span>" end
+    when :publish
+      if has_file?(name) then "<a class=\"existingWikiWord\" href=\"#{base_url}/published/#{link}\">#{text}</a>"
+      else "<span class=\"newWikiWord\">#{text}</span>" end
+    else 
+      if has_file?(name)
+        "<a class=\"existingWikiWord\" href=\"#{base_url}/file/#{link}\">#{text}</a>"
+      else 
+        "<span class=\"newWikiWord\">#{text}<a href=\"#{base_url}/file/#{link}\">?</a></span>"
+      end
+    end
+  end
+
+  # Create a link for the given page name and link text based
+  # on the render mode in options and whether the page exists
+  # in the this web.
+  # The links a relative, and will work only if displayed on another WikiPage.
+  # It should not be used in menus, templates and such - instead, use link_to_page helper
+  def make_link(name, text = nil, options = {})
+    text = CGI.escapeHTML(text || WikiWords.separate(name))
+    mode = options[:mode] || :show
+    base_url = options[:base_url] || '..'
+    link_type = options[:link_type] || :show
+    case link_type.to_sym
+    when :show
+      make_page_link(mode, name, text, base_url)
+    when :file
+      make_file_link(mode, name, text, base_url)
+    when :pic
+      make_pic_link(mode, name, text, base_url)
+    else
+      raise "Unknown link type: #{link_type}"
+    end
+  end
+
+  def make_page_link(mode, name, text, base_url)
+    link = CGI.escape(name)
+    case mode.to_sym
+    when :export
+      if has_page?(name) then %{<a class="existingWikiWord" href="#{link}.html">#{text}</a>}
+      else %{<span class="newWikiWord">#{text}</span>} end
+    when :publish
+      if has_page?(name) then %{<a class="existingWikiWord" href="#{base_url}/published/#{link}">#{text}</a>}
+      else %{<span class="newWikiWord">#{text}</span>} end
+    else 
+      if has_page?(name)
+        %{<a class="existingWikiWord" href="#{base_url}/show/#{link}">#{text}</a>}
+      else 
+        %{<span class="newWikiWord">#{text}<a href="#{base_url}/show/#{link}">?</a></span>}
+      end
+    end
+  end
+
+  def make_pic_link(mode, name, text, base_url)
+    link = CGI.escape(name)
+    case mode.to_sym
+    when :export
+      if has_file?(name) then %{<img alt="#{text}" src="#{link}" />}
+      else %{<img alt="#{text}" src="no image" />} end
+    when :publish
+      if has_file?(name) then %{<img alt="#{text}" src="#{link}" />}
+      else %{<span class="newWikiWord">#{text}</span>} end
+    else 
+      if has_file?(name) then %{<img alt="#{text}" src="#{base_url}/pic/#{link}" />}
+      else %{<span class="newWikiWord">#{text}<a href="#{base_url}/pic/#{link}">?</a></span>} end
+    end
+  end
+
+  # Clears the display cache for all the pages with references to 
+  def refresh_pages_with_references(page_name)
+    select.pages_that_reference(page_name).each { |page| 
+      page.revisions.each { |revision| revision.clear_display_cache }
+    }
+  end
+  
+  def refresh_revisions
+    select.each { |page| page.revisions.each { |revision| revision.clear_display_cache } }
+  end
+
+  def remove_pages(pages_to_be_removed)
+    pages.delete_if { |page_name, page| pages_to_be_removed.include?(page) }
+  end
+  
+  def revised_on
+    select.most_recent_revision
+  end
+    
+  def select(&condition)
+    PageSet.new(self, @pages.values, condition)
+  end
+  
+  private
+
+    # Returns an array of all the wiki words in any current revision
+    def wiki_words
+      pages.values.inject([]) { |wiki_words, page| wiki_words << page.wiki_words }.flatten.uniq
+    end
+    
+    # Returns an array of all the page names on this web
+    def page_names
+      pages.keys
+    end
+    
+end

data/app/models/wiki_content.rb

@@ -1,207 +1,207 @@
-require 'cgi'
-require 'chunks/engines'
-require 'chunks/category'
-require 'chunks/include'
-require 'chunks/wiki'
-require 'chunks/literal'
-require 'chunks/uri'
-require 'chunks/nowiki'
-
-# Wiki content is just a string that can process itself with a chain of
-# actions. The actions can modify wiki content so that certain parts of
-# it are protected from being rendered by later actions.
-#
-# When wiki content is rendered, it can be interrogated to find out 
-# which chunks were rendered. This means things like categories, wiki 
-# links, can be determined.
-#
-# Exactly how wiki content is rendered is determined by a number of 
-# settings that are optionally passed in to a constructor. The current
-# options are:
-#  * :engine 
-#    => The structural markup engine to use (Textile, Markdown, RDoc)
-#  * :engine_opts
-#    => A list of options to pass to the markup engines (safe modes, etc)
-#  * :pre_engine_actions
-#    => A list of render actions or chunks to be processed before the
-#       markup engine is applied. By default this is:    
-#       Category, Include, URIChunk, WikiChunk::Link, WikiChunk::Word        
-#  * :post_engine_actions
-#    => A list of render actions or chunks to apply after the markup 
-#       engine. By default these are:    
-#       Literal::Pre, Literal::Tags
-#  * :mode
-#    => How should the content be rendered? For normal display (show), 
-#       publishing (:publish) or export (:export)?
-#
-# AUTHOR: Mark Reid <mark @ threewordslong . com>
-# CREATED: 15th May 2004
-# UPDATED: 22nd May 2004
-
-module ChunkManager
-  attr_reader :chunks_by_type, :chunks_by_id, :chunks, :chunk_id
-  
-  ACTIVE_CHUNKS = [ NoWiki, Category, WikiChunk::Link, URIChunk, LocalURIChunk, 
-                    WikiChunk::Word ] 
-
-  HIDE_CHUNKS = [ Literal::Pre, Literal::Tags ]
-
-  MASK_RE = { 
-    ACTIVE_CHUNKS => Chunk::Abstract.mask_re(ACTIVE_CHUNKS),
-    HIDE_CHUNKS => Chunk::Abstract.mask_re(HIDE_CHUNKS)
-  }
-  
-  def init_chunk_manager
-    @chunks_by_type = Hash.new
-    Chunk::Abstract::derivatives.each{|chunk_type| 
-      @chunks_by_type[chunk_type] = Array.new 
-    }
-    @chunks_by_id = Hash.new
-    @chunks = []
-    @chunk_id = 0
-  end
-
-  def add_chunk(c)
-      @chunks_by_type[c.class] << c
-      @chunks_by_id[c.id] = c
-      @chunks << c
-      @chunk_id += 1
-  end
-
-  def delete_chunk(c)
-    @chunks_by_type[c.class].delete(c)
-    @chunks_by_id.delete(c.id)
-    @chunks.delete(c)
-  end
-
-  def merge_chunks(other)
-    other.chunks.each{|c| add_chunk(c)}
-  end
-
-  def scan_chunkid(text)
-    text.scan(MASK_RE[ACTIVE_CHUNKS]){|a| yield a[0] }
-  end
-  
-  def find_chunks(chunk_type)
-    @chunks.select { |chunk| chunk.kind_of?(chunk_type) and chunk.rendered? }
-  end
-
-  # for testing and WikiContentStub; we need a page_id even if we have no page
-  def page_id
-    0
-  end
-
-end
-
-# A simplified version of WikiContent. Useful to avoid recursion problems in 
-# WikiContent.new
-class WikiContentStub < String
-  attr_reader :options
-  include ChunkManager
-  def initialize(content, options)
-    super(content)
-    @options = options
-    init_chunk_manager
-  end
-
-  # Detects the mask strings contained in the text of chunks of type chunk_types
-  # and yields the corresponding chunk ids
-  # example: content = "chunk123categorychunk <pre>chunk456categorychunk</pre>" 
-  # inside_chunks(Literal::Pre) ==> yield 456
-  def inside_chunks(chunk_types)
-    chunk_types.each{|chunk_type|  chunk_type.apply_to(self) }
-    
-    chunk_types.each{|chunk_type| @chunks_by_type[chunk_type].each{|hide_chunk|
-        scan_chunkid(hide_chunk.text){|id| yield id }
-      }
-    } 
-  end
-end
-
-class WikiContent < String
-
-  include ChunkManager
-
-  DEFAULT_OPTS = {
-    :active_chunks       => ACTIVE_CHUNKS,
-    :engine              => Engines::Textile,
-    :engine_opts         => [],
-    :mode                => :show
-  }.freeze
-
-  attr_reader :web, :options, :revision, :not_rendered, :pre_rendered
-
-  # Create a new wiki content string from the given one.
-  # The options are explained at the top of this file.
-  def initialize(revision, options = {})
-    @revision = revision
-    @web = @revision.page.web
-
-    @options = DEFAULT_OPTS.dup.merge(options)
-    @options[:engine] = Engines::MAP[@web.markup] 
-    @options[:engine_opts] = [:filter_html, :filter_styles] if @web.safe_mode
-    @options[:active_chunks] = (ACTIVE_CHUNKS - [WikiChunk::Word] ) if @web.brackets_only
-
-    super(@revision.content)
-    init_chunk_manager
-    build_chunks
-    @not_rendered = String.new(self)
-  end
-
-  # Call @web.page_link using current options.
-  def page_link(name, text, link_type)
-    @options[:link_type] = (link_type || :show)
-    @web.make_link(name, text, @options)
-  end
-
-  def build_chunks
-    # create and mask Includes and "active_chunks" chunks
-    Include.apply_to(self)
-    @options[:active_chunks].each{|chunk_type| chunk_type.apply_to(self)}
-
-    # Handle hiding contexts like "pre" and "code" etc..
-    # The markup (textile, rdoc etc) can produce such contexts with its own syntax.
-    # To reveal them, we work on a copy of the content.
-    # The copy is rendered and used to detect the chunks that are inside protecting context  
-    # These chunks are reverted on the original content string.
-
-    copy = WikiContentStub.new(self, @options)
-    @options[:engine].apply_to(copy)
-
-    copy.inside_chunks(HIDE_CHUNKS) do |id|
-      @chunks_by_id[id].revert
-    end
-  end
-
-  def pre_render!
-    unless @pre_rendered 
-      @chunks_by_type[Include].each{|chunk| chunk.unmask }
-      @pre_rendered = String.new(self)
-    end
-    @pre_rendered 
-  end
-
-  def render!
-    pre_render!
-    @options[:engine].apply_to(self)
-    # unmask in one go. $~[1] is the chunk id
-    gsub!(MASK_RE[ACTIVE_CHUNKS]){ 
-      if chunk = @chunks_by_id[$~[1]]
-        chunk.unmask_text 
-        # if we match a chunkmask that existed in the original content string
-        # just keep it as it is
-      else 
-        $~[0]
-      end}
-    self
-  end
-
-  def page_name
-    @revision.page.name
-  end
-
-  def page_id
-    @revision.page.id
-  end
-
-end
+require 'cgi'
+require 'chunks/engines'
+require 'chunks/category'
+require 'chunks/include'
+require 'chunks/wiki'
+require 'chunks/literal'
+require 'chunks/uri'
+require 'chunks/nowiki'
+
+# Wiki content is just a string that can process itself with a chain of
+# actions. The actions can modify wiki content so that certain parts of
+# it are protected from being rendered by later actions.
+#
+# When wiki content is rendered, it can be interrogated to find out 
+# which chunks were rendered. This means things like categories, wiki 
+# links, can be determined.
+#
+# Exactly how wiki content is rendered is determined by a number of 
+# settings that are optionally passed in to a constructor. The current
+# options are:
+#  * :engine 
+#    => The structural markup engine to use (Textile, Markdown, RDoc)
+#  * :engine_opts
+#    => A list of options to pass to the markup engines (safe modes, etc)
+#  * :pre_engine_actions
+#    => A list of render actions or chunks to be processed before the
+#       markup engine is applied. By default this is:    
+#       Category, Include, URIChunk, WikiChunk::Link, WikiChunk::Word        
+#  * :post_engine_actions
+#    => A list of render actions or chunks to apply after the markup 
+#       engine. By default these are:    
+#       Literal::Pre, Literal::Tags
+#  * :mode
+#    => How should the content be rendered? For normal display (show), 
+#       publishing (:publish) or export (:export)?
+#
+# AUTHOR: Mark Reid <mark @ threewordslong . com>
+# CREATED: 15th May 2004
+# UPDATED: 22nd May 2004
+
+module ChunkManager
+  attr_reader :chunks_by_type, :chunks_by_id, :chunks, :chunk_id
+  
+  ACTIVE_CHUNKS = [ NoWiki, Category, WikiChunk::Link, URIChunk, LocalURIChunk, 
+                    WikiChunk::Word ] 
+
+  HIDE_CHUNKS = [ Literal::Pre, Literal::Tags ]
+
+  MASK_RE = { 
+    ACTIVE_CHUNKS => Chunk::Abstract.mask_re(ACTIVE_CHUNKS),
+    HIDE_CHUNKS => Chunk::Abstract.mask_re(HIDE_CHUNKS)
+  }
+  
+  def init_chunk_manager
+    @chunks_by_type = Hash.new
+    Chunk::Abstract::derivatives.each{|chunk_type| 
+      @chunks_by_type[chunk_type] = Array.new 
+    }
+    @chunks_by_id = Hash.new
+    @chunks = []
+    @chunk_id = 0
+  end
+
+  def add_chunk(c)
+      @chunks_by_type[c.class] << c
+      @chunks_by_id[c.id] = c
+      @chunks << c
+      @chunk_id += 1
+  end
+
+  def delete_chunk(c)
+    @chunks_by_type[c.class].delete(c)
+    @chunks_by_id.delete(c.id)
+    @chunks.delete(c)
+  end
+
+  def merge_chunks(other)
+    other.chunks.each{|c| add_chunk(c)}
+  end
+
+  def scan_chunkid(text)
+    text.scan(MASK_RE[ACTIVE_CHUNKS]){|a| yield a[0] }
+  end
+  
+  def find_chunks(chunk_type)
+    @chunks.select { |chunk| chunk.kind_of?(chunk_type) and chunk.rendered? }
+  end
+
+  # for testing and WikiContentStub; we need a page_id even if we have no page
+  def page_id
+    0
+  end
+
+end
+
+# A simplified version of WikiContent. Useful to avoid recursion problems in 
+# WikiContent.new
+class WikiContentStub < String
+  attr_reader :options
+  include ChunkManager
+  def initialize(content, options)
+    super(content)
+    @options = options
+    init_chunk_manager
+  end
+
+  # Detects the mask strings contained in the text of chunks of type chunk_types
+  # and yields the corresponding chunk ids
+  # example: content = "chunk123categorychunk <pre>chunk456categorychunk</pre>" 
+  # inside_chunks(Literal::Pre) ==> yield 456
+  def inside_chunks(chunk_types)
+    chunk_types.each{|chunk_type|  chunk_type.apply_to(self) }
+    
+    chunk_types.each{|chunk_type| @chunks_by_type[chunk_type].each{|hide_chunk|
+        scan_chunkid(hide_chunk.text){|id| yield id }
+      }
+    } 
+  end
+end
+
+class WikiContent < String
+
+  include ChunkManager
+
+  DEFAULT_OPTS = {
+    :active_chunks       => ACTIVE_CHUNKS,
+    :engine              => Engines::Textile,
+    :engine_opts         => [],
+    :mode                => :show
+  }.freeze
+
+  attr_reader :web, :options, :revision, :not_rendered, :pre_rendered
+
+  # Create a new wiki content string from the given one.
+  # The options are explained at the top of this file.
+  def initialize(revision, options = {})
+    @revision = revision
+    @web = @revision.page.web
+
+    @options = DEFAULT_OPTS.dup.merge(options)
+    @options[:engine] = Engines::MAP[@web.markup] 
+    @options[:engine_opts] = [:filter_html, :filter_styles] if @web.safe_mode
+    @options[:active_chunks] = (ACTIVE_CHUNKS - [WikiChunk::Word] ) if @web.brackets_only
+
+    super(@revision.content)
+    init_chunk_manager
+    build_chunks
+    @not_rendered = String.new(self)
+  end
+
+  # Call @web.page_link using current options.
+  def page_link(name, text, link_type)
+    @options[:link_type] = (link_type || :show)
+    @web.make_link(name, text, @options)
+  end
+
+  def build_chunks
+    # create and mask Includes and "active_chunks" chunks
+    Include.apply_to(self)
+    @options[:active_chunks].each{|chunk_type| chunk_type.apply_to(self)}
+
+    # Handle hiding contexts like "pre" and "code" etc..
+    # The markup (textile, rdoc etc) can produce such contexts with its own syntax.
+    # To reveal them, we work on a copy of the content.
+    # The copy is rendered and used to detect the chunks that are inside protecting context  
+    # These chunks are reverted on the original content string.
+
+    copy = WikiContentStub.new(self, @options)
+    @options[:engine].apply_to(copy)
+
+    copy.inside_chunks(HIDE_CHUNKS) do |id|
+      @chunks_by_id[id].revert
+    end
+  end
+
+  def pre_render!
+    unless @pre_rendered 
+      @chunks_by_type[Include].each{|chunk| chunk.unmask }
+      @pre_rendered = String.new(self)
+    end
+    @pre_rendered 
+  end
+
+  def render!
+    pre_render!
+    @options[:engine].apply_to(self)
+    # unmask in one go. $~[1] is the chunk id
+    gsub!(MASK_RE[ACTIVE_CHUNKS]){ 
+      if chunk = @chunks_by_id[$~[1]]
+        chunk.unmask_text 
+        # if we match a chunkmask that existed in the original content string
+        # just keep it as it is
+      else 
+        $~[0]
+      end}
+    self
+  end
+
+  def page_name
+    @revision.page.name
+  end
+
+  def page_id
+    @revision.page.id
+  end
+
+end