Wiki2Go 1.14.1 → 1.14.3

data/lib/Wiki2Go/Install/config/passwords

@@ -1 +1 @@
-admin:PtbdbFXq/1qM6
+admin:PtbdbFXq/1qM6

data/lib/Wiki2Go/Install/make_site.rb

@@ -6,7 +6,7 @@ require 'optparse'
 
 require 'rubygems'
 WIKI2GO_VERSION = '1.14'
-require_gem "Wiki2Go","=#{WIKI2GO_VERSION}"
+require_gem "Wiki2Go","~>#{WIKI2GO_VERSION}"
 
 require 'Wiki2Go/PublicWikiConfig'
 require 'Wiki2Go/PrivateWikiConfig'
@@ -39,7 +39,7 @@ module Wiki2Go
       @server       = 'localhost'
       @port         = '80'
       @default_wiki = ''
-      @directory    =  Dir.getwd
+      @directory    = Dir.getwd
       @type         = ''
       @source_dir   = File.expand_path(File.dirname(__FILE__))
     end
@@ -86,6 +86,7 @@ module Wiki2Go
       if configuration.server.empty? or configuration.type.empty? then
         puts opts
       else
+        oldmask = File.umask(02)
         ensure_path_exists(configuration.directory)
         cd(configuration.directory) {
           case configuration.type
@@ -98,6 +99,7 @@ module Wiki2Go
           end
         }
         set_owner(configuration.directory,configuration.user)
+        File.umask(oldmask)
         puts "Installed."
         puts "Include #{configuration.directory}/config/site.conf in your Apache configuration"
         puts "  and restart Apache to activate your wiki."
@@ -122,6 +124,7 @@ module Wiki2Go
       if configuration.type.empty? then
         puts opts
       else
+        oldmask = File.umask(02)
         cd(configuration.directory) {
           case configuration.type
           when 'private' then
@@ -133,6 +136,7 @@ module Wiki2Go
           end
         }
         set_owner(configuration.directory,configuration.user)
+        File.umask(oldmask)
       end
     end
 
@@ -151,10 +155,12 @@ module Wiki2Go
       end
       opts.parse(args)
 
+      oldmask = File.umask(02)
       cd(configuration.directory) {
         do_make_wiki(configuration)
       }      
       set_owner(configuration.directory,configuration.user)
+      File.umask(oldmask)
     end
 
     private
@@ -168,8 +174,6 @@ module Wiki2Go
       do_make_wiki( configuration)
 
       make_public_apache_config( configuration)
-
-      set_owner( configuration.directory, configuration.user)
     end    
 
     def Install.do_make_readwrite_site( configuration)
@@ -181,8 +185,6 @@ module Wiki2Go
       do_make_wiki( configuration)
 
       make_readwrite_apache_config( configuration)
-
-      set_owner( configuration.directory, configuration.user)
     end    
 
     def Install.do_make_private_site(configuration)
@@ -195,8 +197,6 @@ module Wiki2Go
       do_make_wiki( configuration)
 
       make_apache_private_config( configuration)
-
-      set_owner( configuration.directory, configuration.user)
     end    
 
 
@@ -285,9 +285,10 @@ module Wiki2Go
         if !owner.group.nil? then
           group_id = Etc.getgrnam(owner.group).gid
         end
-        Dir.glob('**/*').each do |file|
+        Dir.glob(File.join(dir,'**/*')).each do |file|
           if file[0] != '.' then
-            puts "Changing ownership of #{file} to #{user_id}:#{group_id}"
+            mode = File.stat(file).mode | 0020
+            File.chmod(mode,file)
             File.chown(user_id,group_id,file)
           end
         end
@@ -300,9 +301,12 @@ module Wiki2Go
 
 #
 require 'rubygems'
-require_gem "Wiki2Go","=#{WIKI2GO_VERSION}"
+require_gem "Wiki2Go","~>#{WIKI2GO_VERSION}"
 require "Wiki2Go/#{baseconfig}"
 
+# Uncomment if you want to add 'dot' graphics to your page (see http://www.graphviz.org)
+# require 'Wiki2Go/DotGraphics'
+
 class CgiOptions < #{baseconfig}
 
   def initialize
@@ -319,6 +323,10 @@ class CgiOptions < #{baseconfig}
     @user = '#{config.user.user}'
     # System group who has access to the files
     @group = '#{config.user.group}'
+
+    # Uncomment if you want to add 'dot' graphics to your page (see http://www.graphviz.org)
+    # The path must point to the 'dot' exexcutable
+    # add_processor('GRAPH',Wiki2Go::DotGraphics.new('/usr/bin/'))
   end  
 
 end

data/lib/Wiki2Go/Install/templates/admin.htm

@@ -34,7 +34,6 @@
                                 <li><%= formatter.admin_link("regenerate","Regenerate&nbsp;HTML")%></li>
                                 <li><%= formatter.admin_link("passwords","Passwords")%></li>
                                 <li><%= formatter.admin_link("greylist","Greylist")%></li>
-                                <li><%= formatter.admin_link("update","CVS&nbsp;Update")%></li>
                               </ul>
                               </TD>
                                 <TD width="100%" valign="top">$BODY$</TD>

data/lib/Wiki2Go/PrivateWikiConfig.rb

@@ -22,6 +22,11 @@ class PrivateWikiConfig < Wiki2Go::Config
     @generate_html
   end
 
+  def static_web(web) 
+    web.clone
+  end
+
+
 end
 
 

data/lib/Wiki2Go/Web.rb

@@ -40,6 +40,10 @@ module Wiki2Go
       @title = nil
     end
 
+    def clone
+      return Web.new(@server,@port,@script_prefix,@verb,@name,@current_page,@request)
+    end
+
     def user
       @request.nil? ? 'unknown' : @request.user
     end

data/lib/Wiki2Go/WebrickServlet.rb

@@ -39,173 +39,6 @@ class WikiServlet < HTTPServlet::AbstractServlet
 
   private
 
-  def perform_save(req,res,wikiweb)
-
-    content = get_parameter(req,'text')
-    name = get_parameter(req,'title') || wikiweb.current_page
-
-    wiki = Wiki2Go::Wiki.new(@config)
-    wiki.title = name
-
-    redirect_to = wiki.save(wikiweb,content) 
-    res.body = "Redirect to #{redirect_to}"
-    res['Content-Type'] = "text/html"
-    res.set_redirect(WEBrick::HTTPStatus[300],redirect_to)
-  end
-
-  def perform_removespam(req,res,wikiweb)
-
-    user = get_parameter(req,'user')
-
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    if !user.nil? && !user.empty? then
-      wiki.blacklist(user)
-    end
-
-    res.body = wiki.remove_spam(wikiweb)
-    res['Content-Type'] = "text/html"
-  end
-
-  def perform_upload(req,res,wikiweb)
-
-    uploaded_file = req.query['FILE']
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    res.body = wiki.upload(wikiweb,uploaded_file.filename,uploaded_file.list[0])
-    res['Content-Type'] = "text/html"
-  end
-
-  def perform_view(req,res,wikiweb)
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    res.body = wiki.view(wikiweb)
-    res['Content-Type'] = "text/html"
-  end
-
-  def perform_versions(req,res,wikiweb)
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    res.body = wiki.versions(wikiweb)
-    res['Content-Type'] = "text/html"
-  end
-
-  def perform_changes(req,res,wikiweb)
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    res.body = wiki.changes(wikiweb)
-    res['Content-Type'] = "text/html"
-  end
-
-  def perform_search(req,res,wikiweb)
-    topic = get_parameter(req,'text')
-
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    res.body = wiki.search(wikiweb,topic)
-    res['Content-Type'] = "text/html"
-  end
-
-  def perform_redirect(req,res,wikiweb)
-    redirect_to = get_parameter(req,'url')
-
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    res.body = "Redirect to #{redirect_to}"
-    res['Content-Type'] = "text/html"
-    res.set_redirect(WEBrick::HTTPStatus[300],redirect_to)
-  end
-
-  def perform_generate_static(req,res,wikiweb)
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    res.body = wiki.generate_html(wikiweb)
-    res['Content-Type'] = "text/html"
-  end
-
-
-  def perform_edit(req,res,wikiweb)
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    res.body = wiki.edit(wikiweb)
-    res['Content-Type'] = "text/html"
-  end
-
-  def perform_stop(req,res,wikiweb)
-    res.body = "<HTML>STOPPING...</HTML>"
-    res['Content-Type'] = "text/html"
-    @server.shutdown
-  end
-
-  def perform_admin(req,res,wikiweb)
-    request = Web2Go::WebrickRequest.new(req)
-    wiki = Wiki2Go::Wiki.new(@config)
-    result = wiki.admin(request)
-
-    res.body = result
-    res['Content-Type'] = "text/html"
-  end
-
-  def perform_unknown_verb(req,res,wikiweb)
-    res.body = "<HTML><BODY>Unknown command #{wikiweb.verb}</BODY></HTML>"
-    res['Content-Type'] = "text/html"
-  end
-
-  private
-
-  def get_parameter(req,name)
-    form = WEBrick::HTTPUtils::parse_query(req.body)
-    value = form[name]
-    if value.nil? || value.empty? then
-      form = WEBrick::HTTPUtils::parse_query(req.query_string)
-      value = form[name]
-    end
-    value
-  end
-
-  def execute_command(req,res)
-    if req.path =~ /\/([^\/\?]*)(\/|\?|$)/ then
-      command = $1
-      method = 'perform_' + command
-      if self.private_methods.include?(method) then
-        wikiweb = Wiki2Go::Web.page_url(req.host,req.port,req.path,command,@config.multi_wiki)
-        find_user(req,wikiweb)
-        return self.send(method,req,res,wikiweb)
-      end
-    end
-    execute_default_command(req,res)
-  end
-
-  def execute_default_command(req,res)
-    if req.path == "" or req.path == "/" then
-      wikiweb = @config.default_wiki
-      perform_view(req,res,wikiweb)    
-    else 
-      @file_servlet.do_GET(req,res)
-    end
-  end
-
-  def execute_default_command(req,res)
-    if req.path == "" or req.path == "/" then
-      wikiweb = @config.default_wiki
-      perform_view(req,res,wikiweb)    
-    else 
-      @file_servlet.do_GET(req,res)
-    end
-  end
-
-  def find_user(req,wikiweb)
-    user = ENV['USER'] || ENV['USERNAME']
-    if user.nil? or user.length == 0 then
-      user = req.peeraddr[2] 
-      if user.nil? or user.length == 0 then
-        user = req.peeraddr[3]
-      end
-    end
-
-    wikiweb.user = user    
-    wikiweb.secure = true
-  end  
 end
 
 

data/lib/Wiki2Go/WikiFormatter.rb

@@ -80,7 +80,10 @@ module Wiki2Go
 
     def format_line(line)
       @added_bullets = false
+      line = escape_wiki_markers(line)
       line = format_wiki_markup(line)
+      line = format_table(line)
+      line = remove_markers(line)
       if !@added_bullets then
         emit_bullets
       end
@@ -348,8 +351,6 @@ module Wiki2Go
     end     
 
     def format_wiki_markup(line)
-      line = escape_wiki_markers(line)
-
       if line =~ /^(.*)<(\S.*)\>(.*)$/ then
         before,match,after = $1,$2,$3
         line =  append(format_wiki_markup(before),escape_url_markers(format_tag(match)),format_wiki_markup(after))
@@ -372,8 +373,6 @@ module Wiki2Go
       end
       line = format_bullets(line)
       line = format_markup(line)
-      line = format_table(line)
-      line = remove_markers(line)
       return line
     end    
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.3
 specification_version: 1
 name: Wiki2Go
 version: !ruby/object:Gem::Version 
-  version: 1.14.1
-date: 2005-06-08
+  version: 1.14.3
+date: 2005-06-12
 summary: Wiki2Go is a Ruby Wiki
 require_paths: 
   - lib