Wiki2Go 1.14.3 → 1.14.4

data/lib/Web2Go/WebrickRequest.rb

@@ -95,8 +95,7 @@ module Web2Go
     end
 
     def parse_parameters
-      form = { }
-      form = add_parameters(form,WEBrick::HTTPUtils::parse_query(@request.body))
+      form = add_parameters({ },WEBrick::HTTPUtils::parse_query(@request.body))
       form = add_parameters(form,WEBrick::HTTPUtils::parse_query(@request.query_string))
       form
     end

data/lib/Wiki2Go/Install/make_site.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 require 'optparse'
 
 require 'rubygems'
-WIKI2GO_VERSION = '1.14'
+WIKI2GO_VERSION = '1.14.0'
 require_gem "Wiki2Go","~>#{WIKI2GO_VERSION}"
 
 require 'Wiki2Go/PublicWikiConfig'
@@ -297,7 +297,7 @@ module Wiki2Go
 
     def Install.make_config(config,baseconfig)
       template = <<-TEMPLATE_END
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 #
 require 'rubygems'

data/lib/Wiki2Go/Install/templates/admin_pages/regenerate.txt

@@ -6,7 +6,8 @@
   if !subwiki.nil? && subwiki.size > 0 then
     subwiki = subwiki[0]
     wiki = Wiki2Go::Wiki.new(@config)
-    pageweb = Wiki2Go::Web.new(@web.server,@web.port,@web.script_prefix,"regenerate",subwiki,'')
+    pageweb = @web.clone
+    pageweb.name = subwiki
     output = wiki.generate_html(pageweb)
   end
 

data/lib/Wiki2Go/Web.rb

@@ -10,18 +10,18 @@ module Wiki2Go
 
   class Web
     # The name of the subwiki
-    attr_reader :name
+    attr_accessor :name
     # The page of the subwiki
     attr_accessor :current_page
     # The 'verb' (action) that was executed
-    attr_reader :verb
+    attr_accessor :verb
     # URL to be used as the base for all URLs
-    attr_reader :server
-    attr_reader :port
+    attr_accessor :server
+    attr_accessor :port
     # extension for scripts
-    attr_reader :script_extension
+    attr_accessor :script_extension
     # directory containing scripts
-    attr_reader :script_prefix
+    attr_accessor :script_prefix
     
     MARKER = "#-#"
 

data/lib/Wiki2Go/Wiki2Go.rb

@@ -3,6 +3,7 @@
 require "Wiki2Go/WikiFormatter"
 
 require 'Web2Go/ERB_Interpreter'
+require 'Web2Go/MockRequest'
 
 module Wiki2Go
 
@@ -176,13 +177,15 @@ module Wiki2Go
       files.each do |file|
         @config.log("Generating file #{file}")
         report << "<li>#{file}</li>\r\n"
-        pageweb = Wiki2Go::Web.new(web.server,web.port,web.script_prefix,"view",web.name,file)
+        pageweb = @config.static_web(web)
+        pageweb.current_page = file
+#        pageweb = Wiki2Go::Web.new(web.server,web.port,web.script_prefix,"view",web.name,file)
         save_html(pageweb)
       end
       changes = @config.storage.read_changes_in(web.name,20,true)
       save_rss(web,changes)
       report << "</ul>\r\n"
-      return report
+      return report.join
     end
 
     def admin(request)
@@ -214,8 +217,10 @@ 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.log("Save html for static #{static_web.inspect}")
         @config.storage.save_html(static_web.name,static_web.current_page, view_html(static_web))
       end
     end

data/lib/Wiki2Go/Wiki2GoServlet.rb

@@ -129,6 +129,7 @@ module Wiki2Go
       wiki = Wiki2Go::Wiki.new(@config)
 
       res.content_type = "text/html"
+      @config.log("Generate static in servlet for #{wikiweb.inspect}")
       res.body = wiki.generate_html(wikiweb)
       true
     end

data/lib/Wiki2Go/cgi/changes.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

data/lib/Wiki2Go/cgi/display.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

data/lib/Wiki2Go/cgi/edit.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

data/lib/Wiki2Go/cgi/redirect.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

data/lib/Wiki2Go/cgi/save.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

data/lib/Wiki2Go/cgi/search.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

data/lib/Wiki2Go/cgi/secure/admin.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

data/lib/Wiki2Go/cgi/secure/generate_static.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

data/lib/Wiki2Go/cgi/secure/removespam.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

data/lib/Wiki2Go/cgi/upload.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

data/lib/Wiki2Go/cgi/versions.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

data/lib/Wiki2Go/cgi/view.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 
 require "CgiOptions.rb"
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.3
+rubygems_version: 0.8.10
 specification_version: 1
 name: Wiki2Go
 version: !ruby/object:Gem::Version 
-  version: 1.14.3
-date: 2005-06-12
+  version: 1.14.4
+date: 2005-06-25
 summary: Wiki2Go is a Ruby Wiki
 require_paths: 
   - lib