instiki 0.10.1 → 0.10.2

data/CHANGELOG

@@ -1,3 +1,15 @@
+ * 0.10.2:
+          Upgraded to Rails 0.13.1
+          Fixed HTML export
+          Added layout=no option to the export_html action (it exports page contents processed 
+          by the markup engine, but without the default layout - so that they can be wrapped in 
+          some other layout)
+          <nowiki> tag can span several lines (before it was applied when both opening and closing 
+          tags were on the same line only)
+          Resolved the "endless redirection loop" condition and otherwise improved handling of 
+          errors in the rendering engines
+          Fixed rendering of Markdown hyperlinks such as [Text](http://something.com/foo)
+
  * 0.10.1:
           Upgraded Rails to 0.12.0
           Upgraded rubyzip to version 0.5.8

data/app/controllers/admin_controller.rb

@@ -6,19 +6,17 @@ class AdminController < ApplicationController
 
   def create_system
     if @wiki.setup?
-      flash[:error] = <<-EOL
-          Wiki has already been created in '#{@wiki.storage_path}'. Shut down Instiki and delete 
-          this directory if you want to recreate it from scratch.<br/><br/>
-          (WARNING: this will destroy content of your current wiki).
-      EOL
+      flash[:error] = 
+          "Wiki has already been created in '#{@wiki.storage_path}'. " +
+          "Shut down Instiki and delete this directory if you want to recreate it from scratch." +
+          "\n\n" +
+          "(WARNING: this will destroy content of your current wiki)."
       redirect_home(@wiki.webs.keys.first)
     elsif @params['web_name']
       # form submitted -> create a wiki
       @wiki.setup(@params['password'], @params['web_name'], @params['web_address']) 
-      flash[:info] = <<-EOL
-          Your new wiki '#{@params['web_name']}' is created!<br/>
-          Please edit its home page and press Submit when finished.
-      EOL
+      flash[:info] = "Your new wiki '#{@params['web_name']}' is created!\n" + 
+          "Please edit its home page and press Submit when finished."
       redirect_to :web => @params['web_address'], :controller => 'wiki', :action => 'new', 
           :id => 'HomePage'
     else
@@ -36,7 +34,7 @@ class AdminController < ApplicationController
           redirect_to :web => @params['address'], :controller => 'wiki', :action => 'new', 
               :id => 'HomePage'
         rescue Instiki::ValidationError => e
-          flash[:error] = e.message
+          @error = e.message
           # and re-render the form again
         end
       else 
@@ -48,6 +46,7 @@ class AdminController < ApplicationController
   end
 
   def edit_web
+
     system_password = @params['system_password']
     if system_password
       # form submitted
@@ -68,11 +67,11 @@ class AdminController < ApplicationController
           flash[:info] = "Web '#{@params['address']}' was successfully updated"
           redirect_home(@params['address'])
         rescue Instiki::ValidationError => e
-          flash[:error] = e.message
+          @error = e.message
           # and re-render the same template again
         end
       else
-        flash[:error] = password_error(system_password)
+        @error = password_error(system_password)
         # and re-render the same template again
       end
     else
@@ -86,8 +85,8 @@ class AdminController < ApplicationController
       flash[:info] = 'Orphaned pages removed'
       redirect_to :controller => 'wiki', :web => @web_name, :action => 'list'
     else
-      flash[:error] = password_error(@params['system_password'])
-      return_to_last_remembered
+      flash[:error] = password_error(@params['system_password_orphaned'])
+      redirect_to :controller => 'admin', :web => @web_name, :action => 'edit_web'
     end
   end
 

data/app/controllers/application.rb

@@ -88,7 +88,11 @@ class ApplicationController < ActionController::Base
   end
 
   def redirect_home(web = @web_name)
-    redirect_to_page('HomePage', web)
+    if web
+      redirect_to_page('HomePage', web)
+    else
+      redirect_to_url '/'
+    end
   end
 
   def redirect_to_page(page_name = @page_name, web = @web_name)
@@ -106,13 +110,30 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def rescue_action_in_public(exception)
+    message = <<-EOL
+      <html><body>
+        <h2>Internal Error 500</h2>
+        <p>An application error occurred while processing your request.</p>
+        <!-- \n#{exception}\n#{exception.backtrace.join("\n")}\n  -->
+      </body></html>
+    EOL
+    render_text message, 'Internal Error 500'
+  end
+
   def return_to_last_remembered
     # Forget the redirect location
     redirect_target, @session[:return_to] = @session[:return_to], nil
+    tried_home, @session[:tried_home] = @session[:tried_home], false
+
     # then try to redirect to it
     if redirect_target.nil?
-      logger.debug("Session ##{session.object_id}: no remembered redirect location, trying /")
-      redirect_to_url '/'
+      if tried_home
+        raise 'Application could not render the index page'
+      else
+        logger.debug("Session ##{session.object_id}: no remembered redirect location, trying home")
+        redirect_home
+      end
     else
       logger.debug("Session ##{session.object_id}: " +
           "redirect to the last remembered URL #{redirect_target}")

data/app/controllers/file_controller.rb

@@ -36,8 +36,8 @@ class FileController < ApplicationController
     if @params['file']
       # form supplied
       file_yard.upload_file(@file_name, @params['file'])
-      flash[:info] = "Image '#{@file_name}' successfully uploaded"
       @web.refresh_pages_with_references(@file_name)
+      flash[:info] = "Image '#{@file_name}' successfully uploaded"
       return_to_last_remembered
     elsif file_yard.has_file?(@file_name)
       send_file(file_yard.file_path(@file_name))
@@ -59,7 +59,7 @@ class FileController < ApplicationController
       if @problems.empty?
         flash[:info] = 'Import successfully finished'
       else
-        flash[:info] = "Import finished, but some pages were not imported:<li>" + 
+        flash[:error] = "Import finished, but some pages were not imported:<li>" + 
             @problems.join('</li><li>') + '</li>'
       end
       return_to_last_remembered

data/app/controllers/wiki_controller.rb

@@ -42,14 +42,14 @@ class WikiController < ApplicationController
   # Within a single web ---------------------------------------------------------
 
   def authors
-    @authors = @web.select.authors
+    @authors = @web.select.authors.sort
   end
   
   def export_html
     export_pages_as_zip('html') do |page| 
       @page = page
       @link_mode = :export
-      render_to_string('wiki/print', use_layout = true)
+      render_to_string('wiki/print', use_layout = (@params['layout'] != 'no'))
     end
   end
 
@@ -122,7 +122,7 @@ class WikiController < ApplicationController
 
   def edit
     if @page.nil?
-      redirect_to :action => 'index'
+      redirect_home
     elsif @page.locked?(Time.now) and not @params['break_lock']
       redirect_to :web => @web_name, :action => 'locked', :id => @page_name
     else
@@ -172,28 +172,28 @@ class WikiController < ApplicationController
   end
 
   def save
-    redirect_to :action => 'index' if @page_name.nil?
+    redirect_home if @page_name.nil?
     cookies['author'] = @params['author']
 
     begin
-      page = @web.pages[@page_name]
-      if @web.pages[@page_name]
-        wiki.revise_page(
-            @web_name, @page_name, @params['content'], Time.now, 
-            Author.new(@params['author'], remote_ip)
-        )
-        page.unlock
+      if @page
+        wiki.revise_page(@web_name, @page_name, @params['content'], Time.now, 
+            Author.new(@params['author'], remote_ip))
+        @page.unlock
       else
-        wiki.write_page(
-            @web_name, @page_name, @params['content'], Time.now, 
-            Author.new(@params['author'], remote_ip)
-        )
+        wiki.write_page(@web_name, @page_name, @params['content'], Time.now, 
+            Author.new(@params['author'], remote_ip))
       end
       redirect_to_page @page_name
-    rescue Instiki::ValidationError => e
-      page.unlock if defined? page
+    rescue => e
       flash[:error] = e
-      return_to_last_remembered
+      flash[:content] = @params['content']
+      if @page
+        @page.unlock
+        redirect_to :action => 'edit', :web => @web_name, :id => @page_name
+      else
+        redirect_to :action => 'new', :web => @web_name, :id => @page_name
+      end
     end
   end
 
@@ -205,9 +205,9 @@ class WikiController < ApplicationController
       # the application itself (for application errors, it's better not to rescue the error at all)
       rescue => e
         logger.error e
+        flash[:error] = e.message
         if in_a_web?
-          redirect_to :web => @web_name, :action => 'edit',
-              :action_suffix => "#{@page_name}?msg=#{e.message}"
+          redirect_to :action => 'edit', :web => @web_name, :id => @page_name
         else
           raise e
         end
@@ -260,13 +260,8 @@ class WikiController < ApplicationController
       # add an index file, if exporting to HTML
       if file_type.to_s.downcase == 'html'
         zip_out.put_next_entry 'index.html'
-        zip_out.puts <<-EOL
-          <html>
-            <head>
-              <META HTTP-EQUIV="Refresh" CONTENT="0;URL=HomePage.#{file_type}">
-            </head>
-          </html>
-        EOL
+        zip_out.puts "<html><head>" +
+            "<META HTTP-EQUIV=\"Refresh\" CONTENT=\"0;URL=HomePage.#{file_type}\"></head></html>"
       end
     end
     FileUtils.rm_rf(Dir[File.join(@wiki.storage_path, file_prefix + '*.zip')])
@@ -338,9 +333,12 @@ class WikiController < ApplicationController
 
   def render_to_string(template_name, with_layout = false)
     add_variables_to_assigns
-    @content_for_layout = @template.render_file(template_name)
-    if with_layout then @template.render_file('layouts/default');
-    else @content_for_layout; end
+    self.assigns['content_for_layout'] = @template.render_file(template_name)
+    if with_layout 
+      @template.render_file('layouts/default')
+    else 
+      self.assigns['content_for_layout']
+    end
   end
   
   def rss_with_content_allowed?

data/app/helpers/application_helper.rb

@@ -36,18 +36,20 @@ module ApplicationHelper
   # Creates a hyperlink to a Wiki page, without checking if the page exists or not
   def link_to_existing_page(page, text = nil, html_options = {})
     link_to(
-        text || page.name, 
+        text || page.plain_name, 
         {:web => @web.address, :action => 'show', :id => page.name, :only_path => true},
         html_options)
   end
   
-  
   # Creates a hyperlink to a Wiki page, or to a "new page" form if the page doesn't exist yet
   def link_to_page(page_name, web = @web, text = nil, options = {})
     raise 'Web not defined' if web.nil?
-    home_page_url = url_for :web => web.address, :action => 'show', :id => 'HomePage', :only_path => true
-    base_url = home_page_url.sub(%r-/show/HomePage/?$-, '')
-    web.make_link(page_name, text, options.merge(:base_url => base_url))
+    web.make_link(page_name, text, options.merge(:base_url => "#{base_url}/#{web.address}"))
+  end
+
+  def base_url
+    home_page_url = url_for :controller => 'admin', :action => 'create_system', :only_path => true
+    home_page_url.sub(%r-/create_system/?$-, '')
   end
 
   # Creates a menu of categories
@@ -65,4 +67,9 @@ module ApplicationHelper
     end
   end
 
+  # Performs HTML escaping on text, but keeps linefeeds intact (by replacing them with <br/>)
+  def escape_preserving_linefeeds(text)
+    h(text).gsub(/\n/, '<br/>')
+  end
+
 end

data/app/models/chunks/chunk.rb

@@ -58,7 +58,7 @@ module Chunk
 
     # We should not use object_id because object_id is not guarantied 
     # to be unique when we restart the wiki (new object ids can equal old ones
-    # that were restored form madeleine storage)  
+    # that were restored from madeleine storage)  
     def id
       @id ||= "#{@content.page_id}n#{@content.chunk_id}"
     end

data/app/models/chunks/include.rb

@@ -9,7 +9,7 @@ require 'chunks/wiki'
 
 class Include < WikiChunk::WikiReference
 
-  INCLUDE_PATTERN = /\[\[!include(.*)\]\]\s*/i
+  INCLUDE_PATTERN = /\[\[!include\s+(.*?)\]\]\s*/i
   def self.pattern() INCLUDE_PATTERN end
 
 
@@ -23,10 +23,10 @@ class Include < WikiChunk::WikiReference
   
   def get_unmask_text_avoiding_recursion_loops
     if refpage then
+      refpage.clear_display_cache
       if refpage.wiki_includes.include?(@content.page_name)
         # this will break the recursion
         @content.delete_chunk(self)
-        refpage.clear_display_cache
         return "<em>Recursive include detected; #{@page_name} --> #{@content.page_name} " + 
                "--> #{@page_name}</em>\n"
       else

data/app/models/chunks/nowiki.rb

@@ -15,7 +15,7 @@ require 'chunks/chunk'
 # Created: 8th June 2004
 class NoWiki < Chunk::Abstract
 
-  NOWIKI_PATTERN = Regexp.new('<nowiki>(.*?)</nowiki>')
+  NOWIKI_PATTERN = Regexp.new('<nowiki>(.*?)</nowiki>', Regexp::MULTILINE)
   def self.pattern() NOWIKI_PATTERN end
 
   attr_reader :plain_text

data/app/models/chunks/uri.rb

@@ -71,7 +71,7 @@ class URIChunk < Chunk::Abstract
         '(?=\.?(?:\s|\)|\z))'         # ends only with optional dot + space or ")" 
                                       # or end of the string
 
-    SUSPICIOUS_PRECEDING_CHARACTER = '(!|\"\:|\"|\\\')?'  # any of !, ":, ", '
+    SUSPICIOUS_PRECEDING_CHARACTER = '(!|\"\:|\"|\\\'|\]\()?'  # any of !, ":, ", ', ](
   
     INTERNET_URI_REGEXP = 
         Regexp.new(SUSPICIOUS_PRECEDING_CHARACTER + INTERNET_URI, Regexp::EXTENDED, 'N')

data/app/models/chunks/wiki.rb

@@ -99,7 +99,7 @@ module WikiChunk
   class Link < WikiLink
     
     unless defined? WIKI_LINK
-      WIKI_LINK = /(":)?\[\[([^\]]+)\]\]/
+      WIKI_LINK = /(":)?\[\[\s*([^\]\s][^\]]+?)\s*\]\]/
       LINK_TYPE_SEPARATION = Regexp.new('^(.+):((file)|(pic))$', 0, 'utf-8')
       ALIAS_SEPARATION = Regexp.new('^(.+)\|(.+)$', 0, 'utf-8')
     end    

data/app/models/file_yard.rb

@@ -6,10 +6,9 @@ class FileYard
   attr_reader :files_path
 
   def initialize(files_path, max_upload_size)
-    @files_path = files_path
-    @max_upload_size = max_upload_size
-    FileUtils.mkdir_p(files_path) unless File.exist?(files_path)
-    @files = Dir["#{files_path}/*"].collect{|path| File.basename(path) if File.file?(path) }.compact
+    @files_path, @max_upload_size = files_path, max_upload_size
+    FileUtils.mkdir_p(@files_path) unless File.exist?(@files_path)
+    @files = Dir["#{@files_path}/*"].collect{|path| File.basename(path) if File.file?(path) }.compact
   end
 
   def upload_file(name, io)
@@ -17,6 +16,7 @@ class FileYard
     if io.kind_of?(Tempfile)
       io.close
       check_upload_size(io.size)
+      File.chmod(600, file_path(name)) if File.exists? file_path(name)
       FileUtils.mv(io.path, file_path(name))
     else
       content = io.read
@@ -39,12 +39,12 @@ class FileYard
     "#{files_path}/#{name}"
   end
 
-  SANE_FILE_NAME = /[-_\.A-Za-z0-9]{1,255}/
+  SANE_FILE_NAME = /[a-zA-Z0-9\-_\. ]{1,255}/
 
   def sanitize_file_name(name)
-    unless name =~ SANE_FILE_NAME
+    unless name =~ SANE_FILE_NAME or name == '.' or name == '..'
       raise Instiki::ValidationError.new("Invalid file name: '#{name}'.\n" +
-            "Only latin characters, digits, dots, underscores and dashes are accepted.")
+            "Only latin characters, digits, dots, underscores, dashes and spaces are accepted.")
     end
   end
   

data/app/models/page.rb

@@ -10,9 +10,10 @@ class Page
   attr_reader :name, :web
   attr_accessor :revisions
   
-  def initialize(web, name, content, created_at, author)
+  def initialize(web, name)
+    raise 'nil web' if web.nil?
+    raise 'nil name' if name.nil?
     @web, @name, @revisions = web, name, []
-    revise(content, created_at, author)
   end
 
   def revise(content, created_at, author)
@@ -22,6 +23,10 @@ class Page
           "You have tried to save page '#{name}' without changing its content")
     end
 
+    # Try to render content to make sure that markup engine can take it,
+    # before addin a revision to the page
+    Revision.new(self, @revisions.length, content, created_at, author).force_rendering
+
     # A user may change a page, look at it and make some more changes - several times.
     # Not to record every such iteration as a new revision, if the previous revision was done 
     # by the same author, not more than 30 minutes ago, then update the last revision instead of
@@ -41,6 +46,9 @@ class Page
     self.revisions.last.clear_display_cache
     
     @web.refresh_pages_with_references(@name) if @revisions.length == 1
+    
+    self
+    
   end
 
   def rollback(revision_number, created_at, author_ip = nil)

data/app/models/revision.rb

@@ -26,6 +26,8 @@ class Revision
     ).strftime "%B %e, %Y %H:%M" 
   end
 
+
+# todo: drop next_revision, previuous_revision and number from here - unused code
   def next_revision
     page.revisions[number + 1]
   end
@@ -107,15 +109,17 @@ class Revision
   def force_rendering
     begin
       display_content.render!
-    rescue Exception => e
+    rescue => e
       ApplicationController.logger.error "Failed rendering page #{@name}"
       ApplicationController.logger.error e
-      message = e.message.gsub(/\n/, '<br/>')
+      message = e.message
       # substitute content with an error message
-      content = <<-EOL
+      self.content = <<-EOL
           <p>Markup engine has failed to render this page, raising the following error:</p>
           <p>#{message}</p>
+          <pre>#{self.content}</pre>
       EOL
+      clear_display_cache
       raise e
     end
   end

data/app/models/web.rb

@@ -44,10 +44,12 @@ class Web
   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 add_page(name, content, created_at, author)
+     page = Page.new(self, name)
+     page.revise(content, created_at, author)
+     @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') 

data/app/models/wiki_content.rb

@@ -33,10 +33,6 @@ require 'chunks/nowiki'
 #  * :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
@@ -141,7 +137,9 @@ class WikiContent < String
     @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
-
+    
+    @not_rendered = @pre_rendered = nil
+    
     super(@revision.content)
     init_chunk_manager
     build_chunks

data/app/models/wiki_service.rb

@@ -38,6 +38,34 @@ module AbstractWikiService
     @system = {}
   end
   
+  def edit_web(old_address, new_address, name, markup, color, additional_style, safe_mode = false, 
+      password = nil, published = false, brackets_only = false, count_pages = false, 
+      allow_uploads = true, max_upload_size = nil)
+
+    if not @webs.key? old_address
+      raise Instiki::ValidationError.new("Web with address '#{old_address}' does not exist")
+    end
+
+    if old_address != new_address
+      if @webs.key? new_address
+        raise Instiki::ValidationError.new("There is already a web with address '#{new_address}'")
+      end
+      @webs[new_address] = @webs[old_address]
+      @webs.delete(old_address)
+      @webs[new_address].address = new_address
+    end
+
+    web = @webs[new_address]
+    web.refresh_revisions if settings_changed?(web, markup, safe_mode, brackets_only)
+
+    web.name, web.markup, web.color, web.additional_style, web.safe_mode = 
+      name, markup, color, additional_style, safe_mode
+
+    web.password, web.published, web.brackets_only, web.count_pages =
+      password, published, brackets_only, count_pages, allow_uploads
+    web.allow_uploads, web.max_upload_size = allow_uploads, max_upload_size.to_i
+  end
+
   def read_page(web_address, page_name)
     ApplicationController.logger.debug "Reading page '#{page_name}' from web '#{web_address}'"
     web = @webs[web_address]
@@ -58,13 +86,11 @@ module AbstractWikiService
   def revise_page(web_address, page_name, content, revised_on, author)
     page = read_page(web_address, page_name)
     page.revise(content, revised_on, author)
-    page
   end
 
   def rollback_page(web_address, page_name, revision_number, created_at, author_id = nil)
     page = read_page(web_address, page_name)
     page.rollback(revision_number, created_at, author_id)
-    page
   end
   
   def setup(password, web_name, web_address)
@@ -76,44 +102,14 @@ module AbstractWikiService
     not (@webs.empty?)
   end
 
-  def edit_web(old_address, new_address, name, markup, color, additional_style, safe_mode = false, 
-      password = nil, published = false, brackets_only = false, count_pages = false, 
-      allow_uploads = true, max_upload_size = nil)
-
-    if not @webs.key? old_address
-      raise Instiki::ValidationError.new("Web with address '#{old_address}' does not exist")
-    end
-
-    if old_address != new_address
-      if @webs.key? new_address
-        raise Instiki::ValidationError.new("There is already a web with address '#{new_address}'")
-      end
-      @webs[new_address] = @webs[old_address]
-      @webs.delete(old_address)
-      @webs[new_address].address = new_address
-    end
-
-    web = @webs[new_address]
-    web.refresh_revisions if settings_changed?(web, markup, safe_mode, brackets_only)
-
-    web.name, web.markup, web.color, web.additional_style, web.safe_mode = 
-      name, markup, color, additional_style, safe_mode
-
-    web.password, web.published, web.brackets_only, web.count_pages =
-      password, published, brackets_only, count_pages, allow_uploads
-    web.allow_uploads, web.max_upload_size = allow_uploads, max_upload_size.to_i
-  end
-
-  def write_page(web_address, page_name, content, written_on, author)
-    page = Page.new(@webs[web_address], page_name, content, written_on, author)
-    @webs[web_address].add_page(page)
-    page
-  end
-
   def storage_path
     self.class.storage_path
   end
   
+  def write_page(web_address, page_name, content, written_on, author)
+    @webs[web_address].add_page(page_name, content, written_on, author)
+  end
+
   private
     def settings_changed?(web, markup, safe_mode, brackets_only)
       web.markup != markup || 

data/app/views/admin/create_system.rhtml

@@ -6,7 +6,9 @@
   you'll need to do a brief one-time setup.
 </p>
 
-<form action="../create_system" id="setup" method="post" onSubmit="return validateSetup()">
+<%= form_tag({ :controller => 'admin', :action => 'create_system'},
+             {'id' => 'setup', 'method' => 'post', 'onSubmit' => 'return validateSetup()'})
+%>
 <ol class="setup">
   <li>
 
@@ -43,7 +45,7 @@
 <p align="right">
     <input type="submit" value="Setup" style="margin-left: 40px" />
 </p>
-</form>
+<%= end_form_tag %>
 
 <script>
 function proposeAddress() {

data/app/views/admin/create_web.rhtml

@@ -5,8 +5,9 @@
   so different subjects or projects can write about different <i>MuppetShows</i>.
 </p>
 
-<form action="../create_web" id="setup" method="post" onSubmit="cleanAddress(); 
-      return validateSetup()">
+<%= form_tag({ :controller => 'admin', :action => 'create_web'},
+             {'id' => 'setup', 'method' => 'post', 'onSubmit' => 'cleanAddress(); return validateSetup()'})
+%>
 
 <ol class="setup">
   <li>
@@ -35,7 +36,7 @@
   </small>
 </p>
 
-</form>
+<%= end_form_tag %>
 
 <script>
 function proposeAddress() {

data/app/views/admin/edit_web.rhtml

@@ -1,7 +1,9 @@
 <% @title = "Edit Web" %>
 
-<form action="edit_web" id="setup" method="post" 
-      onSubmit="cleanAddress(); return validateEditWebForm()">
+<%= form_tag({ :controller => 'admin', :action => 'edit_web', :web => @web.address },
+             {'id' => 'setup', 'method' => 'post', 'onSubmit' => 'cleanAddress(); return validateSetup()'})
+%>
+
   <h2 style="margin-bottom: 3px">Name and address</h2>
   <div class="help">
     The name of the web is included in the title on all pages. 
@@ -113,7 +115,7 @@ TODO Enable these input elements again after release 0.10
   </small>
 </p>
 
-</form>
+<%= end_form_tag %>
 
 <br/>
 <h1>Other administrative tasks</h1>
@@ -133,5 +135,4 @@ TODO Enable these input elements again after release 0.10
   </p>
 <%= end_form_tag %>
 
-<script type="text/javascript" src="/javascripts/edit_web.js" />
-<script type="text/javascript">overrideAutocomplete()</script>
+<%= javascript_include_tag 'edit_web' %>

data/app/views/layouts/default.rhtml

@@ -26,26 +26,21 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     <%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>
   </style>
 
-  <link rel="Stylesheet" href="/stylesheets/instiki.css" type="text/css" media="screen" />
+  <%= stylesheet_link_tag 'instiki' unless @inline_style %>
 
   <style type="text/css">
     <%= @style_additions %>
     <%= @web ? @web.additional_style : '' %>
   </style>
-  
+
   <% if @web %>
-    <link rel="alternate" type="application/rss+xml" title="<%= h @web.name %> - Headlines RSS" 
-          href="<%= url_for :controller => 'wiki', :web => @web.address, 
-                      :action => 'rss_with_headlines' %>"
-    />
-    <link rel="alternate" type="application/rss+xml" title="<%= h @web.name %> - Full Pages RSS" 
-          href="<%= url_for :controller => 'wiki', :web => @web.address, 
-                      :action => 'rss_with_content' %>"
-    />
+  	<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_headlines') %>
+  	<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_content') %>
   <% end %>
 </head>
 
 <body>
+
 <div id="Container">
 <div id="Content">
   <h1 id="pageName">
@@ -59,12 +54,12 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     <% end %>
   </h1>
 
-<% if @flash[:error] %> <div id="error">
-    <hr/><p><%= @flash[:error].to_s %></p><hr/></div>
+<% if @error or @flash[:error] %> <div id="error">
+    <hr/><p><%= escape_preserving_linefeeds(@error || @flash[:error]) %></p><hr/></div>
 <% end %>
 
 <% if @flash[:info] %> <div id="info">
-    <hr/><p><%= @flash[:info].to_s %></p><hr/></div>
+    <hr/><p><%= escape_preserving_linefeeds @flash[:info] %></p><hr/></div>
 <% end %>
 
 <%= render 'navigation' unless @web.nil? || @hide_navigation %>

data/app/views/navigation.rhtml

@@ -8,8 +8,10 @@ def list_item(text, link_options, description, accesskey = nil)
 end
 %>
 
-<form id="navigationForm" class="navigation" action="../search/" method="get" style="font-size: 10px">  
-  
+<%= form_tag({ :controller => 'wiki', :action => 'search', :web => @web.address},
+             {'id' => 'navigationForm', 'class' => 'navigation', 'method' => 'get'})
+%>
+
   <% if @action_name != 'published' then %>
     <%= list_item 'Home Page', {:action => 'show', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> | 
     <%= list_item 'All Pages', {:action => 'list'}, 'Alphabetically sorted list of pages', 'A' %> | 
@@ -27,4 +29,4 @@ end
   	<%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> | 
   <% end%>
 
-</form>
+<%= end_form_tag %>

data/app/views/textile_help.rhtml

@@ -1,4 +1,4 @@
-<h3>Textile formatting tips (<a href="#" onClick="quickRedReference(); return false;">advanced</a>)</h3>
+<h3>Textile formatting tips (<a href="http://hobix.com/textile/quick.html" onClick="quickRedReference(); return false;">advanced</a>)</h3>
 <table cellspacing="0" cellpadding="0">
   <tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
   <tr><td>*your text*</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>

data/app/views/wiki/authors.rhtml

@@ -5,7 +5,7 @@
     <li>
       <%= link_to_page author %>
       co- or authored:
-      <%= @web.select.pages_authored_by(author).collect { |page| link_to_page(page.name) }.join ', ' %>
+      <%= @web.select.pages_authored_by(author).collect { |page| link_to_page(page.name) }.sort.join ', ' %>
     </li>
   <% end %>
 </ul>

data/app/views/wiki/edit.rhtml

@@ -4,19 +4,17 @@
   @hide_navigation = true
 %>
 
-<%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>
-
 <div id="MarkupHelp" style="float: right; width: 250px; margin-top: 5px">
   <%= render("#{@web.markup}_help") %>
   <%= render 'wiki_words_help' %>
 </div>
 
 <%= form_tag({ :action => 'save', :web => @web.address, :id => @page.name},
-             {'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();'})
+             {'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName()'})
 %>
 
 <p>
-    <textarea name="content" style="width: 450px; height: 500px"><%= h @page.content %></textarea>
+    <textarea name="content" style="width: 450px; height: 500px"><%= h(@flash[:content] || @page.content) %></textarea>
 </p>
 <p>
     <input type="submit" value="Submit" accesskey="s"/> as 

data/app/views/wiki/list.rhtml

@@ -56,7 +56,7 @@
   <ul style="margin-bottom: 35px">
     <% @pages_that_are_orphaned.each do |orphan_page| %>
       <li>
-        <%= link_to_existing_page orphan_page %>
+        <%= link_to_existing_page orphan_page, truncate(orphan_page.plain_name, 35) %>
       </li>
     <% end %>
   </ul>

data/app/views/wiki/new.rhtml

@@ -14,7 +14,7 @@
 %>
 
 <p>
-    <textarea name="content" style="width: 450px; height: 500px"></textarea>
+    <textarea name="content" style="width: 450px; height: 500px"><%= h(@flash[:content] || '') %></textarea>
 </p>
 <p>
     <input type="submit" value="Submit" accesskey="s"/> as 

data/app/views/wiki/page.rhtml

@@ -7,16 +7,19 @@
   <%= @page.display_content %>
 </div>
 
-<div id="changes" style="display: none">
-  <p style="background: #eee; padding: 3px; border: 1px solid silver">
-    <small>
-      Showing changes from revision #<%= @page.number - 1 %> to #<%= @page.number %>:
-      <ins class="diffins">Added</ins> | <del class="diffdel">Removed</del>
-    </small>
-  </p>
 
-  <%= @page.display_diff %>
-</div>
+<% if @page.revisions.length > 1 %>
+  <div id="changes" style="display: none">
+    <p style="background: #eee; padding: 3px; border: 1px solid silver">
+      <small>
+        Showing changes from revision #<%= @page.number - 1 %> to #<%= @page.number %>:
+        <ins class="diffins">Added</ins> | <del class="diffdel">Removed</del>
+      </small>
+    </p>
+
+    <%= @page.display_diff %>
+  </div>
+<% end %>
 
 <div class="byline">
   <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_at %> 
@@ -32,17 +35,17 @@
   <% if @page.name == "HomePage" %>
     <%= link_to('Edit Page', 
           {:web => @web.address, :action => 'edit', :id => @page.name}, 
-          {:class => 'navlink', :accesskey => 'E'})
+          {:class => 'navlink', :accesskey => 'E', :name => 'edit'})
     %>
     | 
     <%= link_to('Edit Web', 
             {:web => @web.address, :action => 'edit_web'}, 
-            {:class => 'navlink'})
+            {:class => 'navlink', :name => 'edit_web'})
     %>
   <% else %>
     <%= link_to('Edit', 
           {:web => @web.address, :action => 'edit', :id => @page.name}, 
-          {:class => 'navlink', :accesskey => 'E'})
+          {:class => 'navlink', :accesskey => 'E', :name => 'edit'})
     %>
   <% end %>
 
@@ -51,16 +54,16 @@
     <%= link_to('Back in time', 
           {:web => @web.address, :action => 'revision', :id => @page.name, 
            :rev => @page.revisions.length - 2},
-          {:class => 'navlink', :accesskey => 'R'})
+          {:class => 'navlink', :accesskey => 'R', :name => 'to_previous_revision'})
     %>
     <small>(<%= @page.revisions.length - 1 %> revisions)</small>
   <% end %>
 
   <% if @page.revisions.length > 1 %>
     <span id="show_changes">
-      | <a href="#" onClick="toggleChanges(); return false;">See changes</a>
+      | <a href="#" name="see_changes" onClick="toggleChanges(); return false;">See changes</a>
     </span>
-    <span id="hide_changes" style="display: none">
+    <span id="hide_changes" name="hide_changes" style="display: none">
       | <a href="#" onClick="toggleChanges(); return false;">Hide changes</a>
     </span>
   <% end %>
@@ -69,12 +72,14 @@
     | Views: 
     <%= link_to('Print',
           {:web => @web.address, :action => 'print', :id => @page.name},
-          {:accesskey => 'p'}) %>
+          {:accesskey => 'p', :name => 'view_print'}) %>
   <% if defined? RedClothForTex and RedClothForTex.available? and @web.markup == :textile %>
     | 
-    <%= link_to 'TeX', :web => @web.address, :action => 'tex', :id => @page.name %>
+    <%= link_to 'TeX', {:web => @web.address, :action => 'tex', :id => @page.name}, 
+            {:name => 'view_tex'} %>
     | 
-    <%= link_to 'PDF', :web => @web.address, :action => 'pdf', :id => @page.name %>
+    <%= link_to 'PDF', {:web => @web.address, :action => 'pdf', :id => @page.name},
+            {:name => 'view_pdf'} %>
   <% end %>
   </small>
 

data/app/views/wiki/revision.rhtml

@@ -28,15 +28,15 @@
       <%= link_to('Forward in time',
               {:web => @web.address, :action => 'revision', :id => @page.name, 
                :rev => @revision.next_revision.number},
-              {:class => 'navlink'})
+              {:class => 'navlink', :name => 'to_next_revision'})
       %>
     <% else %>
       <%= link_to('Forward in time',
               {:web => @web.address, :action => 'show', :id => @page.name},
-              {:class => 'navlink'})
+              {:class => 'navlink', :name => 'to_next_revision'})
       %>
     <% end %>
-    (<%= @revision.page.revisions.length - @revision.next_revision.number %> more)
+    <small>(<%= @revision.page.revisions.length - @revision.next_revision.number %> more)</small>
   <% end %>
 
   <% if @revision.next_revision && @revision.previous_revision %>
@@ -47,14 +47,14 @@
     <%= link_to('Back in time',
           {:web => @web.address, :action => 'revision', :id => @page.name, 
            :rev => @revision.previous_revision.number},
-          {:class => 'navlink'})
+          {:class => 'navlink', :name => 'to_previous_revision'})
     %>
-    (<%= @revision.previous_revision.number + 1 %> more)
+    <small>(<%= @revision.previous_revision.number + 1 %> more)</small>
   <% end %>
 
   | 
   <%= link_to('See current', {:web => @web.address, :action => 'show', :id => @page.name},
-          {:class => 'navlink'})
+          {:class => 'navlink', :name => 'to_current_revision'})
   %>
 
   <% if @revision.previous_revision %>
@@ -70,7 +70,7 @@
   
   <%= link_to('Rollback', 
         {:web => @web.address, :action => 'rollback', :id => @page.name, :rev => @revision.number},
-        {:class => 'navlink'})
+        {:class => 'navlink', :name => 'rollback'})
   %>
   
   <% if @page.references.length > 0 %>

data/app/views/wiki/search.rhtml

@@ -24,7 +24,7 @@
 <% end %>
 
 <% if (@results + @title_results).empty? %>
-  <h2>No pages contains "<%= @params["query"] %>" </h2>
+  <h2>No pages contain "<%= @params["query"] %>" </h2>
   <p>
     Perhaps you should try expanding your query. Remember that Instiki searches for entire 
     phrases, so if you search for "all that jazz" it will not match pages that contain these 

data/config/environment.rb

@@ -62,7 +62,7 @@ require_dependency "environments/#{RAILS_ENV}"
 unless defined? RAILS_DEFAULT_LOGGER
   RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
   ActionController::Base.logger ||= RAILS_DEFAULT_LOGGER
-  if defined? INSTIKI_DEBUG_LOG and INSTIKI_DEBUG_LOG
+  if $instiki_debug_logging
     RAILS_DEFAULT_LOGGER.level = Logger::DEBUG
     ActionController::Base.logger.level = Logger::DEBUG
   else

data/config/environments/development.rb

@@ -2,4 +2,4 @@ Dependencies.mechanism = :require
 ActionController::Base.consider_all_requests_local = true
 ActionController::Base.perform_caching = false
 BREAKPOINT_SERVER_PORT = 42531
-INSTIKI_DEBUG_LOG = true unless defined? INSTIKI_DEBUG_LOG
+$instiki_debug_logging = true

data/config/environments/test.rb

@@ -11,7 +11,7 @@ unless defined? TEST_LOGGER
   $stderr.puts "To see the Rails log:\n    less #{log_name}"
   
   TEST_LOGGER = ActionController::Base.logger = Logger.new(log_name)
-  INSTIKI_DEBUG_LOG = true unless defined? INSTIKI_DEBUG_LOG
+  $instiki_debug_logging = true
   
   WikiService.storage_path = RAILS_ROOT + '/storage/test/'
 end

data/config/routes.rb

@@ -1,18 +1,32 @@
-ActionController::Routing.draw do |map|
+# Create a route to DEFAULT_WEB, if such is specified; also register a generic route
+def connect_to_web(map, generic_path, generic_routing_options)
+  if defined? DEFAULT_WEB
+    explicit_path = generic_path.gsub(/:web\/?/, '')
+    explicit_routing_options = generic_routing_options.merge(:web => DEFAULT_WEB)
+    map.connect(explicit_path, explicit_routing_options)
+  end
+  map.connect(generic_path, generic_routing_options)
+end
+
+ActionController::Routing::Routes.draw do |map|
   map.connect 'create_system', :controller => 'admin', :action => 'create_system'
   map.connect 'create_web', :controller => 'admin', :action => 'create_web'
-  map.connect ':web/edit_web', :controller => 'admin', :action => 'edit_web'
   map.connect 'remove_orphaned_pages', :controller => 'admin', :action => 'remove_orphaned_pages'
+  map.connect 'web_list', :controller => 'wiki', :action => 'web_list'
 
-  map.connect ':web/file/:id', :controller => 'file', :action => 'file'
-  map.connect ':web/pic/:id', :controller => 'file', :action => 'pic'
-  map.connect ':web/import/:id', :controller => 'file', :action => 'import'
+  connect_to_web map, ':web/edit_web', :controller => 'admin', :action => 'edit_web'
+  connect_to_web map, ':web/file/:id', :controller => 'file', :action => 'file'
+  connect_to_web map, ':web/pic/:id', :controller => 'file', :action => 'pic'
+  connect_to_web map, ':web/import/:id', :controller => 'file', :action => 'import'
+  connect_to_web map, ':web/login', :controller => 'wiki', :action => 'login'
+  connect_to_web map, ':web/web_list', :controller => 'wiki', :action => 'web_list'
+  connect_to_web map, ':web/:action/:id', :controller => 'wiki'
+  connect_to_web map, ':web/:action', :controller => 'wiki'
+  connect_to_web map, ':web', :controller => 'wiki', :action => 'index'
 
-  map.connect ':web/login', :controller => 'wiki', :action => 'login'
-  map.connect 'web_list', :controller => 'wiki', :action => 'web_list'
-  map.connect ':web/web_list', :controller => 'wiki', :action => 'web_list'
-  map.connect ':web/:action/:id', :controller => 'wiki'
-  map.connect ':web/:action', :controller => 'wiki'
-  map.connect ':web', :controller => 'wiki', :action => 'index'
-  map.connect '', :controller => 'wiki', :action => 'index'
+  if defined? DEFAULT_WEB
+    map.connect '', :controller => 'wiki', :web => DEFAULT_WEB, :action => 'index'
+  else
+    map.connect '', :controller => 'wiki', :action => 'index'
+  end
 end

data/public/javascripts/edit_web.js

@@ -50,3 +50,6 @@ function overrideAutocomplete() {
     }//loop thru input elements
   }
 }
+
+// This line is executed when the script is loaded
+overrideAutocomplete();

data/public/stylesheets/instiki.css

@@ -21,13 +21,15 @@ body, p, ol, ul, td {
 }
 
 a { color: #000; }
+a:visited { color: #666; }
+a:hover { 
+  color: #fff; 
+  background-color:#000; 
+}
 
 .newWikiWord { background-color: #eee; }
 .newWikiWord a:hover { background-color: white; }
 
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
-
 h1, h2, h3 { color: #333; font-family: georgia, verdana, sans-serif; }
 h1 { font-size: 28px }
 h2 { font-size: 19px }
@@ -103,6 +105,7 @@ pre {
   background-color: #eee;
   padding: 10px;
   font-size: 11px;
+  overflow: auto;
 }
 
 ol.setup {
@@ -220,3 +223,19 @@ ol.setup li {
 .newsList p {
   margin-bottom:30px
 }
+
+td {border:thin solid grey;}
+table {
+   border:  double black;
+   border-collapse: collapse;
+}
+
+.byline {
+  padding-top: 15px;
+}
+
+/* Affects the display of "category: ..." */
+.property {
+  color: grey;
+  font-size: 10px;
+}

data/script/debug_storage

@@ -0,0 +1,97 @@
+#!/usr/bin/ruby
+
+=begin
+The purpose of this script is to help people poke around in the Madeleine storage. 
+
+Two caveats:
+1. You MUST be a reasonably good Ruby programmer to use it successfully for anything non-trivial.
+2. It's very easy to screw up something by poking in the storage internals. If you do, please 
+   undo your changes by deleting the most recent snapshot(s) and don't ask for help.
+
+Usage example:
+
+E:\eclipse\workspace\instiki\script>irb
+irb(main):001:0> load 'debug_storage'
+Enter path to storage [E:/eclipse/workspace/instiki/storage/2500]:
+Loading storage from the default storage path (E:/eclipse/workspace/instiki/storage/2500)
+Instiki storage from E:/eclipse/workspace/instiki/storage/2500 is loaded.
+Access it via global variable $wiki.
+Happy poking!
+=> true
+irb(main):003:0> $wiki.system
+=> {"password"=>"foo"}
+irb(main):005:0> $wiki.system['password'] = 'bar'
+=> "bar"
+irb(main):006:0> $wiki.webs.keys
+=> ["wiki1", "wiki2"]
+irb(main):007:0> $wiki.webs['wiki1'].password = 'the_password'
+=> "the_password"
+irb(main):008:0> WikiService::snapshot
+=> []
+
+
+Things that are possible:
+
+# cleaning old revisions
+$wiki.webs['wiki'].pages['HomePage'].revisions = $wiki.webs['wiki'].pages['HomePage'].revisions[-1..-1]
+
+# Changing contents of a revision
+$wiki.webs['wiki'].pages['HomePage'].revisions[-1] = 'new content'
+
+# Checking that all pages can be rendered by the markup engine
+$wiki.webs['wiki'].pages.each_pair do |name, page|
+  page.revisions.each_with_index do |revision, i|
+    begin
+      revision.display_content
+    rescue =>
+      puts "Error when rendering revision ##{i} of page #{name.inspect}:"
+      puts e.message
+      puts e.backtrace.join("\n")
+    end
+end
+=end
+
+require 'fileutils'
+require 'optparse'
+require 'webrick'
+
+default_storage_path = File.expand_path(File.dirname(__FILE__) + "/../storage/2500")
+
+print "Enter path to storage [#{default_storage_path}]: "
+storage_path = gets.chomp
+if storage_path.empty?
+  storage_path = default_storage_path
+  puts "Loading storage from the default storage path (#{storage_path})"
+else
+  puts "Loading storage from the path you entered (#{storage_path})"
+end
+
+unless File.directory?(storage_path) and not 
+    (Dir["#{storage_path}/*.snapshot"] + Dir["#{storage_path}/*.command_log"]).empty?
+  raise "Found no storage at #{storage_path}" 
+end
+
+RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../') unless defined? RAILS_ROOT
+
+unless defined? ADDITIONAL_LOAD_PATHS
+  ADDITIONAL_LOAD_PATHS = %w(
+    app/models 
+    lib 
+    vendor/madeleine-0.7.1/lib
+    vendor/RedCloth-3.0.3/lib
+    vendor/rubyzip-0.5.8/lib
+  ).map { |dir| "#{File.expand_path(File.join(RAILS_ROOT, dir))}"
+  }.delete_if { |dir| not File.exist?(dir) }
+
+  # Prepend to $LOAD_PATH
+  ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
+end
+
+require 'wiki_service'
+
+WikiService.storage_path = storage_path
+$wiki = WikiService.instance
+puts "Instiki storage from #{storage_path} is loaded."
+puts 'Access it via global variable $wiki.'
+puts 'Happy poking!'
+nil

data/script/server

@@ -64,7 +64,7 @@ end
 FileUtils.mkdir_p(storage_path)
 
 ENV['RAILS_ENV'] = OPTIONS[:environment]
-INSTIKI_DEBUG_LOG = OPTIONS[:verbose]
+$instiki_debug_logging = OPTIONS[:verbose]
 require File.expand_path(File.dirname(__FILE__) + '/../config/environment')
 WikiService.storage_path = storage_path
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: instiki
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
-date: 2005-05-01
+  version: 0.10.2
+date: 2005-07-30
 summary: Easy to install WikiClone running on WEBrick and Madeleine
 require_paths: 
   - lib
@@ -118,6 +118,7 @@ files:
   - config/environments/production.rb
   - config/environments/test.rb
   - script/breakpointer
+  - script/debug_storage
   - script/server
 test_files: []
 rdoc_options: []
@@ -166,5 +167,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.11.1
+            version: 0.13.1
       version: