instiki 0.9.2 → 0.10.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.10
 specification_version: 1
 name: instiki
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
-date: 2005-01-07
+  version: 0.10.0
+date: 2005-04-08
 summary: Easy to install WikiClone running on WEBrick and Madeleine
 require_paths: 
-  - libraries
+  - lib
 email: david@loudthinking.com
 homepage: http://www.instiki.org
 rubyforge_project: instiki
@@ -15,7 +15,7 @@ description: Instiki is a Wiki Clone written in Ruby that ships with an embedded
 autorequire: 
 default_executable: instiki
 bindir: "."
-has_rdoc: true
+has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
     - 
@@ -27,10 +27,17 @@ platform: ruby
 authors: 
   - David Heinemeier Hansson
 files: 
+  - CHANGELOG
   - README
   - instiki
-  - app/controllers/wiki.rb
+  - instiki.rb
+  - app/controllers/admin_controller.rb
+  - app/controllers/application.rb
+  - app/controllers/file_controller.rb
+  - app/controllers/wiki_controller.rb
+  - app/helpers/application_helper.rb
   - app/models/author.rb
+  - app/models/file_yard.rb
   - app/models/page.rb
   - app/models/page_lock.rb
   - app/models/page_set.rb
@@ -44,30 +51,30 @@ files:
   - app/models/chunks/engines.rb
   - app/models/chunks/include.rb
   - app/models/chunks/literal.rb
-  - app/models/chunks/match.rb
   - app/models/chunks/nowiki.rb
   - app/models/chunks/test.rb
   - app/models/chunks/uri.rb
   - app/models/chunks/wiki.rb
-  - app/views/bottom.rhtml
   - app/views/markdown_help.rhtml
+  - app/views/mixed_help.rhtml
   - app/views/navigation.rhtml
   - app/views/rdoc_help.rhtml
-  - app/views/static_style_sheet.rhtml
   - app/views/textile_help.rhtml
-  - app/views/top.rhtml
   - app/views/wiki_words_help.rhtml
+  - app/views/admin/create_system.rhtml
+  - app/views/admin/create_web.rhtml
+  - app/views/admin/edit_web.rhtml
+  - app/views/file/file.rhtml
+  - app/views/file/import.rhtml
+  - app/views/layouts/default.rhtml
   - app/views/wiki/authors.rhtml
   - app/views/wiki/edit.rhtml
-  - app/views/wiki/edit_web.rhtml
   - app/views/wiki/export.rhtml
   - app/views/wiki/feeds.rhtml
   - app/views/wiki/list.rhtml
   - app/views/wiki/locked.rhtml
   - app/views/wiki/login.rhtml
   - app/views/wiki/new.rhtml
-  - app/views/wiki/new_system.rhtml
-  - app/views/wiki/new_web.rhtml
   - app/views/wiki/page.rhtml
   - app/views/wiki/print.rhtml
   - app/views/wiki/published.rhtml
@@ -79,20 +86,40 @@ files:
   - app/views/wiki/tex.rhtml
   - app/views/wiki/tex_web.rhtml
   - app/views/wiki/web_list.rhtml
-  - libraries/action_controller_servlet.rb
-  - libraries/erb.rb
-  - libraries/madeleine_service.rb
-  - libraries/rdocsupport.rb
-  - libraries/redcloth_for_tex.rb
-  - libraries/view_helper.rb
-  - libraries/web_controller_server.rb
-  - libraries/diff/diff.rb
+  - lib/active_record_stub.rb
+  - lib/diff.rb
+  - lib/instiki_errors.rb
+  - lib/rdocsupport.rb
+  - lib/redcloth_for_tex.rb
+  - public/404.html
+  - public/500.html
+  - public/dispatch.rb
+  - public/favicon.ico
+  - public/javascripts/edit_web.js
+  - public/javascripts/prototype.js
+  - public/stylesheets/instiki.css
+  - natives/osx/desktop_launcher/AppDelegate.h
+  - natives/osx/desktop_launcher/AppDelegate.mm
+  - natives/osx/desktop_launcher/Credits.html
+  - natives/osx/desktop_launcher/Info.plist
+  - natives/osx/desktop_launcher/Instiki_Prefix.pch
+  - natives/osx/desktop_launcher/main.mm
+  - natives/osx/desktop_launcher/MakeDMG.sh
+  - natives/osx/desktop_launcher/version.plist
+  - natives/osx/desktop_launcher/English.lproj/InfoPlist.strings
+  - natives/osx/desktop_launcher/English.lproj/MainMenu.nib/classes.nib
+  - natives/osx/desktop_launcher/English.lproj/MainMenu.nib/info.nib
+  - natives/osx/desktop_launcher/English.lproj/MainMenu.nib/objects.nib
+  - natives/osx/desktop_launcher/Instiki.xcode/project.pbxproj
+  - config/environment.rb
+  - config/routes.rb
+  - config/environments/development.rb
+  - config/environments/production.rb
+  - config/environments/test.rb
+  - script/breakpointer
+  - script/server
 test_files: []
-rdoc_options: 
-  - "--title"
-  - "Instiki -- The Wiki"
-  - "--line-numbers"
-  - "--inline-source"
+rdoc_options: []
 extra_rdoc_files: []
 executables: 
   - instiki
@@ -111,32 +138,32 @@ dependencies:
             version: 0.7.1
       version: 
   - !ruby/object:Gem::Dependency 
-    name: BlueCloth
+    name: RedCloth
     version_requirement: 
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: 3.0.3
       version: 
   - !ruby/object:Gem::Dependency 
-    name: RedCloth
+    name: rubyzip
     version_requirement: 
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.11
+            version: 0.5.5
       version: 
   - !ruby/object:Gem::Dependency 
-    name: rubyzip
+    name: rails
     version_requirement: 
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.5.5
+            version: 0.11.1
       version: 

data/app/controllers/wiki.rb

@@ -1,389 +0,0 @@
-require "cgi"
-require "redcloth_for_tex"
-
-class WikiController < ActionControllerServlet
-  EXPORT_DIRECTORY = File.dirname(__FILE__) + "/../../storage/" unless const_defined?("EXPORT_DIRECTORY")
-
-  def index
-    if web_address
-      redirect_show "HomePage"
-    elsif !wiki.setup?
-      redirect_path "/new_system/"
-    elsif wiki.webs.length == 1
-      redirect_show "HomePage", wiki.webs.values.first.address
-    else
-      redirect_path "/web_list/"
-    end
-  end
-
-  # Administrating the Instiki setup --------------------------------------------
-
-  def new_system
-    wiki.setup? ? redirect_path("/") : render
-  end
-  
-  def new_web
-    redirect_path("/") if wiki.system["password"].nil?
-  end
-
-  def create_system
-    wiki.setup(@params["password"], @params["web_name"], @params["web_address"]) unless wiki.setup? 
-    redirect_path "/"
-  end
-
-  def create_web
-    redirect_path("/") unless wiki.authenticate(@params["system_password"])
-    wiki.create_web(@params["name"], @params["address"])
-    redirect_show("HomePage", @params["address"])
-  end
-  
-
-  # Outside a single web --------------------------------------------------------
-
-  def web_list
-    @system, @webs = wiki.system, wiki.webs.values
-    render "wiki/web_list"
-  end
-
-  def login
-    render "wiki/login"
-  end
-  
-  def authenticate
-    password_check(@params["password"]) ? redirect_show("HomePage") : redirect_action("login")
-  end
-
-  def static_style_sheet() render "static_style_sheet" end
-
-
-  # Within a single web ---------------------------------------------------------
-
-  def parse_category
-    @categories = web.categories
-    @category = @params["category"]
-    @pages_in_category = web.select { |page| page.in_category?(@category) }
-    @set_name = ( @categories.include?(@category) ? "category '#{@category}'" : "the web" )
-    @category_links = @categories.map do |c| 
-      (@category == c ? "<span class=\"selected\">#{c}</span>" : "<a href=\"?category=#{c}\">#{c}</a>")
-    end
-  end
-
-  def search
-    @query   = @params["query"]
-    @results = web.select { |page| page.content =~ /#{@query}/i }
-    @results.length == 1 ? redirect_show(@results.first.name) : render
-  end
-
-  def authors
-    @authors = web.select.authors
-  end
-  
-  def recently_revised
-    parse_category
-    @pages_by_revision = @pages_in_category.by_revision
-  end
-
-  def rss_with_content
-    @pages_by_revision = web.select.by_revision.first(15)
-    @uri = @req.request_uri
-    host = @req.meta_vars["HTTP_X_FORWARDED_HOST"] || "#{@uri.host}:#{@uri.port.to_s}"
-    @web_url = "#{@uri.scheme}://#{host}/#{@web.address}"
-    @res["Content-Type"] = "text/xml"
-    render "wiki/rss_feed"
-  end
-
-  def rss_with_headlines
-    @hide_description = true
-    rss_with_content
-  end
-
-  def list
-    parse_category
-    @pages_by_name = @pages_in_category.by_name 
-    @page_names_that_are_wanted = @pages_in_category.wanted_pages
-    @pages_that_are_orphaned = @pages_in_category.orphaned_pages
-  end
-  
-  def export_html
-    file_name = "#{web.address}-html-#{web.revised_on.strftime("%Y-%m-%d-%H-%M")}.zip"
-    file_path = EXPORT_DIRECTORY + file_name
-
-    export_pages_to_zip_file(file_path) unless FileTest.exists?(file_path)
-    send_export(file_name, file_path)
-  end
-
-  def export_markup
-    file_name = "#{web.address}-markup-#{web.revised_on.strftime("%Y-%m-%d-%H-%M")}.zip"
-    file_path = EXPORT_DIRECTORY + file_name
-
-    export_markup_to_zip_file(file_path) unless FileTest.exists?(file_path)
-    send_export(file_name, file_path)
-  end
-
-  def export_pdf
-    file_name = "#{web.address}-tex-#{web.revised_on.strftime("%Y-%m-%d-%H-%M")}"
-    file_path = EXPORT_DIRECTORY + file_name
-
-    export_web_to_tex(file_path + ".tex") unless FileTest.exists?(file_path + ".tex")
-    convert_tex_to_pdf(file_path + ".tex")
-    send_export(file_name + ".pdf", file_path + ".pdf")
-  end
-
-  def export_tex
-    file_name = "#{web.address}-tex-#{web.revised_on.strftime("%Y-%m-%d-%H-%M")}.tex"
-    file_path = EXPORT_DIRECTORY + file_name
-
-    export_web_to_tex(file_path) unless FileTest.exists?(file_path)
-    send_export(file_name, file_path)
-  end
-
-  def update_web
-    redirect_show("HomePage") unless wiki.authenticate(@params["system_password"])
-
-    wiki.update_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
-    )
-
-    redirect_show("HomePage", @params["address"])
-  end
-  
-  def remove_orphaned_pages
-    if wiki.authenticate(@params["system_password"])
-      wiki.remove_orphaned_pages(web_address)
-      redirect_action "list/"
-    else
-      redirect_show "HomePage"
-    end
-  end
-
-  # Within a single page --------------------------------------------------------
-  
-  def show
-    if @page = wiki.read_page(web_address, page_name)
-      begin
-        render_action "page"
-      rescue => e
-        $stderr << e.backtrace.join("\n")
-        redirect_action "edit/#{CGI.escape(page_name)}?msg=#{CGI.escape(e.message)}"
-      end
-    else
-      redirect_action "new/#{CGI.escape(page_name)}"
-    end
-  end
-  
-  def published
-    if web.published then @page = wiki.read_page(web_address, page_name || "HomePage") else redirect_show("HomePage") end
-  end
-  
-  def print
-    @page = wiki.read_page(web_address, page_name)
-  end
-
-  def tex
-    @page = wiki.read_page(web_address, page_name)
-    @tex_content = RedClothForTex.new(@page.content).to_tex
-  end
-
-  def pdf
-    page = wiki.read_page(web_address, page_name)
-    safe_page_name = page.name.gsub(/\W/, "")
-    file_name = "#{safe_page_name}-#{web.address}-#{page.created_at.strftime("%Y-%m-%d-%H-%M")}"
-    file_path = EXPORT_DIRECTORY + file_name
-
-    export_page_to_tex(file_path + ".tex") unless FileTest.exists?(file_path + ".tex")
-    convert_tex_to_pdf(file_path + ".tex")
-    send_export(file_name + ".pdf", file_path + ".pdf")
-  end
-
-  def new
-    @page_name, @author = page_name, default_author
-  end
-
-  def edit
-    @page = wiki.read_page(web_address, page_name)
-
-    if !@page.locked?(Time.now) || @params["break_lock"]
-      @page.lock(Time.now, default_author)
-      @author = default_author
-      render
-    else
-      render "wiki/locked"
-    end
-  end
-  
-  def cancel_edit
-    @page = wiki.read_page(web_address, page_name)
-    @page.unlock
-    redirect_show
-  end
-  
-  def save
-    if web.pages[page_name]
-      page = wiki.revise_page(
-        web_address, page_name, @params["content"], Time.now, 
-        Author.new(@params["author"], remote_ip)
-      )
-
-      page.unlock
-    else
-      page = wiki.write_page(
-        web_address, page_name, @params["content"], Time.now, 
-        Author.new(@params["author"], remote_ip)
-      )
-    end
-
-    write_cookie("author", @params["author"], true)
-    redirect_show(page_name)
-  end
-
-  def revision
-    @page = wiki.read_page(web_address, page_name)
-    @revision = @page.revisions[@params["rev"].to_i]
-  end
-
-  def rollback
-    @page = wiki.read_page(web_address, page_name)
-    @revision = @page.revisions[@params["rev"].to_i]  
-  end
-
-  
-  protected
-    def before_action
-      if in_a_web? && !authorized?(web_address) && !%w( login authenticate published ).include?(action_name)
-        redirect_action("login")
-        return false
-      elsif in_a_web?
-        @web, @page_name, @action_name = web, page_name, action_name
-      end
-    end
-  
-    def action_name
-      if in_a_web?
-        request_path[1]
-      elsif action_methods.include?(request_path[0])
-        request_path[0]
-      else
-        "index"
-      end
-    end
-
-    def redirect_show(page = @page.name, web = web_address)
-      redirect_path "/#{web}/show/#{CGI.escape(page)}"
-    end
-
-    def redirect_action(action, web = web_address)
-      redirect_path "/#{web}/#{action}"
-    end
-
-
-
-  private
-    def wiki
-      WikiService.instance
-    end
-    
-    def web
-      wiki.webs[web_address]
-    end
-    
-    def in_a_web?
-      request_path.length > 1
-    end
-  
-    def web_address
-      request_path[0]
-    end
-
-    def page_name
-      CGI.unescape(request_path[2]) if request_path[2]
-    end
-    
-    def authorized?(web_address)
-      web.nil? ||
-      web.password.nil? || 
-      (read_cookie(web_address) && read_cookie(web_address) == web.password) ||
-      password_check(@params["password"])
-    end
-    
-    def default_author
-      read_cookie("author") || "AnonymousCoward"
-    end
-    
-    def password_check(password)
-      @params["password"] == web.password && write_cookie(web_address, @params["password"])
-    end
-    
-    def export_pages_to_zip_file(zip_file_path)
-      Zip::ZipOutputStream.open(zip_file_path) do |zos|
-        web.select.by_name.each do |@page|
-          zos.put_next_entry(@page.name + ".html")
-          zos.puts(template_engine("print").result(binding))
-        end
-
-        zos.put_next_entry("index.html")
-        zos.puts('<html><head><META HTTP-EQUIV="Refresh" CONTENT="0;URL=HomePage.html"></head></html>')
-      end
-    end
-
-    def export_markup_to_zip_file(zip_file_path)
-      Zip::ZipOutputStream.open(zip_file_path) do |zos|
-        web.select.by_name.each do |page|
-          zos.put_next_entry(page.name + ".#{web.markup}")
-          zos.puts(page.content)
-        end
-      end
-    end
-
-    def export_web_to_tex(file_path)
-      @web_name    = web.name
-      @tex_content = table_of_contents(web.pages["HomePage"].content.dup, render_tex_web)
-      File.open(file_path, "w") { |f| f.write(template_engine("tex_web").result(binding)) }
-    end
-    
-    def render_tex_web
-      web.select.by_name.inject({}) do |tex_web, page|
-        tex_web[page.name] = RedClothForTex.new(page.content).to_tex
-        tex_web
-      end
-    end
-
-    def export_page_to_tex(file_path)
-      tex
-      File.open(file_path, "w") { |f| f.write(template_engine("tex").result(binding)) }
-    end
-    
-    def convert_tex_to_pdf(tex_path)
-      `cd #{File.dirname(tex_path)}; pdflatex --interaction=scrollmode '#{File.basename(tex_path)}'`
-    end
-
-    def truncate(text, length = 30, truncate_string = "...")
-      if text.length > length then text[0..(length - 3)] + truncate_string else text end
-    end
-    
-    def render_markup_help
-      web ? sub_template("#{web.markup}_help") : ''
-    end
-    
-    def send_export(file_name, file_path, content_type = "application/zip")
-      @res["Content-Type"] = content_type
-      @res["Content-Disposition"] = "attachment; filename=#{file_name}"
-      @res["Content-Length"] = File.size(file_path)
-      File.open(file_path, "rb") { |f| @res.body = f.read }
-    end
-    
-    def template_engine(template_name)
-      ERB.new(IO.readlines(action_template_path(template_name)).join)
-    end
-    
-    def remote_ip
-      $stderr << "#{@req.meta_vars['HTTP_X_FORWARDED_FOR']} || #{@req.meta_vars['REMOTE_ADDR']}"
-      @req.meta_vars["HTTP_X_FORWARDED_FOR"] || @req.meta_vars["REMOTE_ADDR"]
-    end
-end