Wiki2Go 1.15.0 → 1.15.1

data/lib/Web2Go/MockResponse.rb

@@ -20,7 +20,7 @@ module Web2Go
       @cookies[cookie.name] = cookie
     end
 
-    def add_cookie(name,value,domain=nil,expires=nil)
+    def add_cookie(name,value,domain=nil,path=nil,expires=nil)
       @cookies[name] = MockCookie.new(name,value,domain,expires)
     end
 

data/lib/Wiki2Go/Install/make_site.rb

@@ -299,9 +299,12 @@ module Wiki2Go
         if !owner.group.nil? then
           group_id = Etc.getgrnam(owner.group).gid
         end
+        mode = File.stat(dir).mode | 02775
+        File.chmod(mode,dir)
+        File.chown(user_id,group_id,dir)
         Dir.glob(File.join(dir,'**/*')).each do |file|
           if file[0] != '.' then
-            mode = File.stat(file).mode | 0020
+            mode = File.stat(file).mode | 02775
             File.chmod(mode,file)
             File.chown(user_id,group_id,file)
           end

data/lib/Wiki2Go/Web.rb

@@ -23,7 +23,7 @@ module Wiki2Go
     # directory containing scripts
     attr_accessor :script_prefix
     # CGI/Webrick request
-    attr_reader   :request
+    attr_accessor :request
     # subdirectory where to find the wiki
     attr_accessor :subsite
     
@@ -46,7 +46,10 @@ module Wiki2Go
     end
 
     def clone
-      return Web.new(@server,@port,@subsite,@script_prefix,@verb,@name,@current_page,@request)
+      copy =  Web.new(@server,@port,@subsite,@script_prefix,@verb,@name,@current_page,@request)
+      copy.alias = @alias
+      copy.title = @title 
+      return copy
     end
 
     def user

data/lib/Wiki2Go/Wiki2Go.rb

@@ -13,7 +13,7 @@ module Wiki2Go
     end
 
     def view(web)
-      @config.log("Wiki2Go view #{web.inspect}")
+#      @config.log("Wiki2Go view #{web.inspect}")
       html = @config.redirect_to_html?(web)
       formatter = Wiki2Go::Formatter.new(web,@config.storage,@config,html,@config.editable?(web))
 
@@ -178,7 +178,6 @@ module Wiki2Go
       report = ["Generating HTML\r\n" , "<ul>"]
       files = @config.storage.all_pages_in(web.name)
       files.each do |file|
-        @config.log("Generating file #{file}")
         report << "<li>#{file}</li>\r\n"
         pageweb = @config.static_web(web)
         pageweb.current_page = file
@@ -216,8 +215,6 @@ module Wiki2Go
 
     def perform(web,request)
 
-      @config.log("Wiki2Go perform #{web.inspect}")
-
       if @config.allow_dynamic_pages then
         html = @config.redirect_to_html?(web)
         formatter = Wiki2Go::Formatter.new(web,@config.storage,@config,html,@config.editable?(web))
@@ -251,6 +248,7 @@ module Wiki2Go
 
     def save_changes(web,changes)
       if @config.generate_html then
+        web = @config.static_web(web)
         html = true
         formatter = Wiki2Go::Formatter.new(web,@config.storage,@config,html,@config.editable?(web))
 
@@ -262,7 +260,6 @@ module Wiki2Go
     end
 
     def save_html(web)
-      @config.log("Save html for #{web.inspect}")
       if @config.generate_html then
         static_web = @config.static_web(web)
         @config.storage.save_html(static_web.name,static_web.current_page, view_html(static_web))
@@ -275,10 +272,8 @@ module Wiki2Go
       files = @config.storage.search(web.name,pagename)
       files << @config.storage.load_page(web.name,pagename)
       files.each do |file|
-        pageweb = @config.static_web(web)
-        pageweb.current_page = file.title
-        static_web = @config.static_web(pageweb)
-        @config.log("Generating HTML for #{file.title}, web = #{static_web.inspect}")
+        static_web = @config.static_web(web)
+        static_web.current_page = file.title
         @config.storage.save_html(static_web.name,static_web.current_page, view_html_of_page(static_web,file))
       end
     end

data/lib/Wiki2Go/Wiki2GoConfig.rb

@@ -86,9 +86,11 @@ module Wiki2Go
     end
 
     def static_web(web) 
-      server = web.server.gsub(/^edit\./,"www.")
-      script_prefix = web.script_prefix.gsub(/\/secure/,"")
-      return Wiki2Go::Web.new(server,web.port,@subsite,script_prefix,web.verb,web.name,web.current_page)
+      copy = web.clone
+      copy.server        = web.server.gsub(/^edit\./,"www.")
+      copy.script_prefix = web.script_prefix.gsub(/\/secure/,"")
+      copy.request       = nil
+      return copy
     end
 
     def accept_page?(web,content)

data/lib/Wiki2Go/Wiki2GoServlet.rb

@@ -15,10 +15,9 @@ module Wiki2Go
     end
 
     def execute(request,response)
-      @config.log("Request cookies = #{request.cookies}")
-      response.add_cookies(request.cookies)
+      @config.log("Request cookies = #{request.cookies.inspect}")
       result = execute_command(request,response)
-      @config.log("Response cookies = #{response.cookies}")
+      @config.log("Response cookies = #{response.cookies.inspect}")
       result
     end
 
@@ -48,13 +47,13 @@ module Wiki2Go
       name    = req.parameter('title',wikiweb.current_page)
       author = req.parameter('author') 
       remember_me = req.parameter('remember_me')
-      @config.log("Author = #{author}, remember = #{remember_me}")
+     @config.log("Author = #{author}, remember = #{remember_me}")
 
 
       if !author.nil? && author.length > 0 then # !wikiweb.secure && 
         wikiweb.alias = author
         timeout = Time.now + 7 * 24 * 3600
-        res.add_cookie(USER_COOKIE,author,nil,nil,timeout) unless remember_me.nil?
+        res.add_cookie(USER_COOKIE,author,nil,'/',timeout) unless remember_me.nil?
       end
 
       wiki = Wiki2Go::Wiki.new(@config)
@@ -162,7 +161,7 @@ module Wiki2Go
 
     def execute_command(req,res)
       wikiweb = Wiki2Go::Web.from_request(req,@config)
-      @config.log("WIKI Web = #{wikiweb.inspect}")
+#      @config.log("WIKI Web = #{wikiweb.inspect}")
       command = wikiweb.verb
       if command =~ /^([^\.]+)\./ then
         command = $1
@@ -182,18 +181,17 @@ module Wiki2Go
 
     def perform(method,req,res,wikiweb)
       begin
-        @config.log("==> Cookies for #{method}: #{req.cookies.inspect}")
+#        @config.log("==> Cookies for #{method}: #{req.cookies.inspect}")
         cookie = req.cookie(USER_COOKIE)
-        @config.log("User Cookie = #{cookie.inspect}") unless cookie.nil?
+#        @config.log("User Cookie = #{cookie.inspect}") unless cookie.nil?
 
-        author = cookie.value unless cookie.nil?
+        author = cookie.value.to_s unless cookie.nil?
 
         if !author.nil? && author.length > 0 then #  !wikiweb.secure &&
-          wikiweb.alias = author[0]
+          wikiweb.alias = author
         end
 
         result = self.send(method,req,res,wikiweb)
-        @config.log("<== Cookies for #{method}: #{res.cookies.inspect}")
         return result
       rescue WEBrick::HTTPStatus::Redirect => redirect then
         raise redirect

data/lib/Wiki2Go/WikiFormatter.rb

@@ -131,11 +131,11 @@ module Wiki2Go
     end
 
     def absolute_url
-      return @web.base_url + view_url(@web.name,@web.current_page)
+      return @web.base_url + view_page_url(@web.name,@web.current_page)
     end
 
     def absolute_url_of_topic(topic)
-      return @web.base_url + view_url(@web.name,topic)
+      return @web.base_url + view_page_url(@web.name,topic)
     end
 
     def edit_link(subwiki,page,name)
@@ -202,7 +202,7 @@ module Wiki2Go
       return "<a href=\"#{changes_url}\">#{desc}</a>"
     end
 
-     def view_url(subwiki,page)
+    def view_page_url(subwiki,page)
       if @generate_html then 
         return join(subwiki,page + ".html") 
       else
@@ -210,6 +210,14 @@ module Wiki2Go
       end
     end
 
+     def view_url(subwiki,page)
+      if @absolute_urls then
+        return File.join(@web.base_url,view_page_url(subwiki,page))
+      else
+        return view_page_url(subwiki,page)
+      end
+    end
+
     
 
     def view_link(subwiki,page,name)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: Wiki2Go
 version: !ruby/object:Gem::Version 
-  version: 1.15.0
-date: 2005-07-22 00:00:00 +02:00
+  version: 1.15.1
+date: 2005-07-24 00:00:00 +02:00
 summary: Wiki2Go is a Ruby Wiki
 require_paths: 
   - lib