instiki 0.10.0 → 0.10.1

data/app/controllers/admin_controller.rb

@@ -1,94 +1,94 @@
-require 'application'
-
-class AdminController < ApplicationController
-
-  layout 'default'
-
-  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
-      redirect_show('HomePage', @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
-      redirect_to :web => @params['web_address'], :controller => 'wiki', :action => 'new', 
-          :id => 'HomePage'
-    else
-      # no form submitted -> go to template
-    end
-  end
-
-  def create_web
-    if @params['address']
-      # form submitted
-      if @wiki.authenticate(@params['system_password'])
-        begin
-          @wiki.create_web(@params['name'], @params['address'])
-          flash[:info] = "New web '#{@params['name']}' successfully created."
-          redirect_to :web => @params['address'], :controller => 'wiki', :action => 'new', 
-              :id => 'HomePage'
-        rescue Instiki::ValidationError => e
-          flash[:error] = e.message
-          # and re-render the form again
-        end
-      else 
-        redirect_to :controller => 'wiki', :action => 'index'
-      end
-    else
-      # no form submitted -> render template
-    end
-  end
-
-  def edit_web
-    system_password = @params['system_password']
-    if system_password
-      # form submitted
-      if wiki.authenticate(system_password)
-        begin
-          wiki.edit_web(
-            @web.address, @params['address'], @params['name'], 
-            @params['markup'].intern, 
-            @params['color'], @params['additional_style'], 
-            @params['safe_mode'] ? true : false, 
-            @params['password'].empty? ? nil : @params['password'],
-            @params['published'] ? true : false, 
-            @params['brackets_only'] ? true : false,
-            @params['count_pages'] ? true : false,
-            @params['allow_uploads'] ? true : false,
-            @params['max_upload_size']
-          )
-          flash[:info] = "Web '#{@params['address']}' was successfully updated"
-          redirect_show('HomePage', @params['address'])
-        rescue Instiki::ValidationError => e
-          flash[:error] = e.message
-          # and re-render the same template again
-        end
-      else
-        flash[:error] = password_error(system_password)
-        # and re-render the same template again
-      end
-    else
-      # no form submitted - go to template
-    end
-  end
-
-  def remove_orphaned_pages
-    if wiki.authenticate(@params['system_password_orphaned'])
-      wiki.remove_orphaned_pages(@web_name)
-      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
-    end
-  end
-
-end
+require 'application'
+
+class AdminController < ApplicationController
+
+  layout 'default'
+
+  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
+      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
+      redirect_to :web => @params['web_address'], :controller => 'wiki', :action => 'new', 
+          :id => 'HomePage'
+    else
+      # no form submitted -> go to template
+    end
+  end
+
+  def create_web
+    if @params['address']
+      # form submitted
+      if @wiki.authenticate(@params['system_password'])
+        begin
+          @wiki.create_web(@params['name'], @params['address'])
+          flash[:info] = "New web '#{@params['name']}' successfully created."
+          redirect_to :web => @params['address'], :controller => 'wiki', :action => 'new', 
+              :id => 'HomePage'
+        rescue Instiki::ValidationError => e
+          flash[:error] = e.message
+          # and re-render the form again
+        end
+      else 
+        redirect_to :controller => 'wiki', :action => 'index'
+      end
+    else
+      # no form submitted -> render template
+    end
+  end
+
+  def edit_web
+    system_password = @params['system_password']
+    if system_password
+      # form submitted
+      if wiki.authenticate(system_password)
+        begin
+          wiki.edit_web(
+            @web.address, @params['address'], @params['name'], 
+            @params['markup'].intern, 
+            @params['color'], @params['additional_style'], 
+            @params['safe_mode'] ? true : false, 
+            @params['password'].empty? ? nil : @params['password'],
+            @params['published'] ? true : false, 
+            @params['brackets_only'] ? true : false,
+            @params['count_pages'] ? true : false,
+            @params['allow_uploads'] ? true : false,
+            @params['max_upload_size']
+          )
+          flash[:info] = "Web '#{@params['address']}' was successfully updated"
+          redirect_home(@params['address'])
+        rescue Instiki::ValidationError => e
+          flash[:error] = e.message
+          # and re-render the same template again
+        end
+      else
+        flash[:error] = password_error(system_password)
+        # and re-render the same template again
+      end
+    else
+      # no form submitted - go to template
+    end
+  end
+
+  def remove_orphaned_pages
+    if wiki.authenticate(@params['system_password_orphaned'])
+      wiki.remove_orphaned_pages(@web_name)
+      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
+    end
+  end
+
+end

data/app/controllers/application.rb

@@ -1,131 +1,135 @@
-# The filters added to this controller will be run for all controllers in the application.
-# Likewise will all the methods added be available for all controllers.
-class ApplicationController < ActionController::Base
-
-  before_filter :set_utf8_http_header, :connect_to_model
-  after_filter :remember_location
-
-  # For injecting a different wiki model implementation. Intended for use in tests
-  def self.wiki=(the_wiki)
-    # a global variable is used here because Rails reloads controller and model classes in the 
-    # development environment; therefore, storing it as a class variable does not work
-    # class variable is, anyway, not much different from a global variable
-    $instiki_wiki_service = the_wiki
-    logger.debug("Wiki service: #{the_wiki.to_s}")
-  end
-
-  def self.wiki
-    $instiki_wiki_service
-  end
-
-  protected
-  
-  def authorized?
-    @web.nil? ||
-    @web.password.nil? || 
-    cookies['web_address'] == @web.password || 
-    password_check(@params['password'])
-  end
-
-  def check_authorization
-    if in_a_web? and needs_authorization?(@action_name) and not authorized? and 
-      redirect_to :controller => 'wiki', :action => 'login', :web => @web_name
-      return false
-    end
-  end
-
-  def connect_to_model
-    @action_name = @params['action'] || 'index'
-    @web_name = @params['web']
-    @wiki = wiki
-    if @web_name
-      @web = @wiki.webs[@web_name] 
-      if @web.nil?
-        render_text "Unknown web '#{@web_name}'", '404 Not Found'
-        return false
-      end
-    end
-    @page_name = @file_name = @params['id']
-    @page = @wiki.read_page(@web_name, @page_name) unless @page_name.nil?
-    @author = cookies['author'] || 'AnonymousCoward'
-    check_authorization
-  end
-
-  FILE_TYPES = {
-    '.exe' => 'application/octet-stream',
-    '.gif' => 'image/gif',
-    '.jpg' => 'image/jpeg',
-    '.pdf' => 'application/pdf',
-    '.png' => 'image/png',
-    '.txt' => 'text/plain',
-    '.zip' => 'application/zip'
-  } unless defined? FILE_TYPES
-
-  def send_file(file, options = {})
-    options[:type] ||= (FILE_TYPES[File.extname(file)] || 'application/octet-stream')
-    super(file, options)
-  end
-
-  def in_a_web?
-    not @web_name.nil?
-  end
-
-  def password_check(password)
-    if password == @web.password
-      cookies['web_address'] = password
-      true
-    else
-      false
-    end
-  end
-
-  def password_error(password)
-    if password.nil? or password.empty?
-      'Please enter the password.'
-    else 
-      'You entered a wrong password. Please enter the right one.'
-    end
-  end
-
-  def redirect_show(page_name = @page_name, web = @web_name)
-    redirect_to :web => web, :controller => 'wiki', :action => 'show', 
-        :id => (page_name || 'HomePage')
-  end
-
-  @@REMEMBER_NOT = ['locked', 'save', 'back', 'file', 'pic', 'import']
-  def remember_location
-    if @response.headers['Status'] == '200 OK'
-      unless @@REMEMBER_NOT.include? action_name or @request.method != :get
-        @session[:return_to] = @request.request_uri
-        logger.debug("Session ##{session.object_id}: remembered URL '#{@session[:return_to]}'")
-      end
-    end
-  end
-
-  def return_to_last_remembered
-    # Forget the redirect location
-    redirect_target, @session[:return_to] = @session[:return_to], nil
-    # then try to redirect to it
-    if redirect_target.nil?
-      logger.debug("Session ##{session.object_id}: no remembered redirect location, trying /")
-      redirect_to_url '/'
-    else
-      logger.debug("Session ##{session.object_id}: " +
-          "redirect to the last remembered URL #{redirect_target}")
-      redirect_to_url(redirect_target)
-    end
-  end
-
-  def set_utf8_http_header
-    @response.headers['Content-Type'] = 'text/html; charset=UTF-8'
-  end
-
-  def wiki
-    $instiki_wiki_service
-  end
-
-  def needs_authorization?(action)
-    not %w( login authenticate published rss_with_content rss_with_headlines ).include?(action)
-  end
-
-end
+# The filters added to this controller will be run for all controllers in the application.
+# Likewise will all the methods added be available for all controllers.
+class ApplicationController < ActionController::Base
+
+  before_filter :set_utf8_http_header, :connect_to_model
+  after_filter :remember_location
+
+  # For injecting a different wiki model implementation. Intended for use in tests
+  def self.wiki=(the_wiki)
+    # a global variable is used here because Rails reloads controller and model classes in the 
+    # development environment; therefore, storing it as a class variable does not work
+    # class variable is, anyway, not much different from a global variable
+    $instiki_wiki_service = the_wiki
+    logger.debug("Wiki service: #{the_wiki.to_s}")
+  end
+
+  def self.wiki
+    $instiki_wiki_service
+  end
+
+  protected
+  
+  def authorized?
+    @web.nil? ||
+    @web.password.nil? || 
+    cookies['web_address'] == @web.password || 
+    password_check(@params['password'])
+  end
+
+  def check_authorization
+    if in_a_web? and needs_authorization?(@action_name) and not authorized? and 
+      redirect_to :controller => 'wiki', :action => 'login', :web => @web_name
+      return false
+    end
+  end
+
+  def connect_to_model
+    @action_name = @params['action'] || 'index'
+    @web_name = @params['web']
+    @wiki = wiki
+    if @web_name
+      @web = @wiki.webs[@web_name] 
+      if @web.nil?
+        render_text "Unknown web '#{@web_name}'", '404 Not Found'
+        return false
+      end
+    end
+    @page_name = @file_name = @params['id']
+    @page = @wiki.read_page(@web_name, @page_name) unless @page_name.nil?
+    @author = cookies['author'] || 'AnonymousCoward'
+    check_authorization
+  end
+
+  FILE_TYPES = {
+    '.exe' => 'application/octet-stream',
+    '.gif' => 'image/gif',
+    '.jpg' => 'image/jpeg',
+    '.pdf' => 'application/pdf',
+    '.png' => 'image/png',
+    '.txt' => 'text/plain',
+    '.zip' => 'application/zip'
+  } unless defined? FILE_TYPES
+
+  def send_file(file, options = {})
+    options[:type] ||= (FILE_TYPES[File.extname(file)] || 'application/octet-stream')
+    super(file, options)
+  end
+
+  def in_a_web?
+    not @web_name.nil?
+  end
+
+  def password_check(password)
+    if password == @web.password
+      cookies['web_address'] = password
+      true
+    else
+      false
+    end
+  end
+
+  def password_error(password)
+    if password.nil? or password.empty?
+      'Please enter the password.'
+    else 
+      'You entered a wrong password. Please enter the right one.'
+    end
+  end
+
+  def redirect_home(web = @web_name)
+    redirect_to_page('HomePage', web)
+  end
+
+  def redirect_to_page(page_name = @page_name, web = @web_name)
+    redirect_to :web => web, :controller => 'wiki', :action => 'show', 
+        :id => (page_name || 'HomePage')
+  end
+
+  @@REMEMBER_NOT = ['locked', 'save', 'back', 'file', 'pic', 'import']
+  def remember_location
+    if @response.headers['Status'] == '200 OK'
+      unless @@REMEMBER_NOT.include? action_name or @request.method != :get
+        @session[:return_to] = @request.request_uri
+        logger.debug("Session ##{session.object_id}: remembered URL '#{@session[:return_to]}'")
+      end
+    end
+  end
+
+  def return_to_last_remembered
+    # Forget the redirect location
+    redirect_target, @session[:return_to] = @session[:return_to], nil
+    # then try to redirect to it
+    if redirect_target.nil?
+      logger.debug("Session ##{session.object_id}: no remembered redirect location, trying /")
+      redirect_to_url '/'
+    else
+      logger.debug("Session ##{session.object_id}: " +
+          "redirect to the last remembered URL #{redirect_target}")
+      redirect_to_url(redirect_target)
+    end
+  end
+
+  def set_utf8_http_header
+    @response.headers['Content-Type'] = 'text/html; charset=UTF-8'
+  end
+
+  def wiki
+    $instiki_wiki_service
+  end
+
+  def needs_authorization?(action)
+    not %w( login authenticate published rss_with_content rss_with_headlines ).include?(action)
+  end
+
+end