Wiki2Go 1.17.5 → 1.22.0

data/bin/Wiki2Go_firewall_blacklist.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+gem "Wiki2Go"
+
+require 'Wiki2Go/firewall_blacklist.rb'
+
+Wiki2Go::FirewallBlacklist.generate(ARGV) { |msg| puts msg }

data/bin/Wiki2Go_make_cvs_repository.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
+gem "Wiki2Go"
 
 require 'fileutils'
 require 'Wiki2Go/Install/make_repository'

data/bin/Wiki2Go_make_site.rb

@@ -3,8 +3,7 @@
 require 'rubygems'
 gem "Wiki2Go"
 
-require 'fileutils'
 require 'Wiki2Go/Install/make_site'
 
-Wiki2Go::Install::make_site(ARGV)
+Wiki2Go::Install::make_site(ARGV) { |msg| puts msg }
 

data/bin/Wiki2Go_update_site.rb

@@ -3,8 +3,7 @@
 require 'rubygems'
 gem "Wiki2Go"
 
-require 'fileutils'
 require 'Wiki2Go/Install/make_site'
 
-Wiki2Go::Install::update_site(ARGV)
+Wiki2Go::Install::update_site(ARGV) { |msg| puts msg }
 

data/lib/Web2Go/CGIRequest.rb

@@ -75,9 +75,15 @@ module Web2Go
       @cgi.query_string
     end
 
-    def authenticated
+    def authenticated?
       !@cgi.auth_type.nil? && !@cgi.auth_type.empty?
-    end
+  end
+
+	alias :authenticated :authenticated?
+  
+  def request_method
+      @cgi.request_method
+  end
 
     def parameter(name,default_value=nil)
       value = @params[name]

data/lib/Web2Go/CGIResponse.rb

@@ -10,6 +10,7 @@ module Web2Go
       @cgi = cgi
       @content_type = 'text/html'
       @redirect = nil
+      @cookies = Hash.new
     end
 
     def redirect_to=(redirect_url)
@@ -20,27 +21,36 @@ module Web2Go
       options = Hash.new
       options['type'] = @content_type
 
-      if @cgi.cookies.length > 0 then
-        options['cookie'] = @cgi.cookies
+      if @cookies.length > 0 then
+        options['cookie'] = @cookies
       end
       if !@redirect.nil? then
         options['Status'] = '302 Moved' 
-        options[ 'location'] = @redirect
+        options['location'] = @redirect
       end
-
-
+      
       @cgi.out(options) do 
         content
       end
 
     end
 
+    def failed
+      options = Hash.new
+      options['type'] = @content_type
+      options['Status'] = '404 Not Found'
+      @cgi.out(options) do 
+        ""
+      end
+    end
+
     def set_cookie(cookie)
-      @cgi.cookies[cookie.name] = cookie
+      @cookies.delete(cookie.name)
+      @cookies[cookie.name] = cookie 
     end
 
     def cookies
-      @cgi.cookies
+      @cookies
     end
 
     def add_cookie(name,value,domain=nil,path=nil,expires=nil)
@@ -51,13 +61,6 @@ module Web2Go
       set_cookie(cookie)
     end
 
-    def add_cookies(cookies)
-      #      cookies.each do |cookie|
-      #        set_cookie(cookie)
-      #      end
-    end
-
-
   end
 end
 

data/lib/Web2Go/MockRequest.rb

@@ -26,9 +26,9 @@ module Web2Go
     #Request interface    
     attr_reader   :params
     attr_accessor :user
-    attr_accessor :authenticated
     attr_accessor :cookies
     attr_reader   :server_variable
+    attr_accessor :request_method
 
     def initialize(url = 'http://localhost/',env=ENV)
       @server_variable = get_server_variables(url)
@@ -39,6 +39,7 @@ module Web2Go
       @authenticated = env.has_key?('AUTH_TYPE')
       @uploaded_files = {}
       @cookies = {} 
+      @request_method = env['REQUEST_METHOD'] || 'GET'
     end
 
     def script_name
@@ -61,10 +62,19 @@ module Web2Go
       @server_variable['QUERY_STRING']
     end
 
+    def authenticated?
+        @authenticated
+    end
+
+    alias :authenticated :authenticated?
+
+    def authenticated=(on)
+        @authenticated = on
+    end
 
     def parameter(name,default_value=nil)
       value = @params[name]
-      if value.nil? then
+      if value.nil? || value.length ==0 then
         return default_value
       else
         return value[0]

data/lib/Web2Go/MockResponse.rb

@@ -9,11 +9,12 @@ module Web2Go
     attr_accessor :body
     attr_accessor :content_type    
     attr_accessor :redirect_to   
-    attr_accessor  :cookies
+    attr_accessor :cookies
 
     def initialize
       @content_type = 'text/html'
       @cookies = { }
+      @failed = false
     end
 
     def set_cookie(cookie)
@@ -23,13 +24,15 @@ module Web2Go
     def add_cookie(name,value,domain=nil,path=nil,expires=nil)
       @cookies[name] = MockCookie.new(name,value,domain,expires)
     end
-
-    def add_cookies(cookies)
-      cookies.each do |cookie|
-        set_cookie(cookie)
-      end
+    
+    def failed
+      @failed = true
     end
-
+    
+    def failed?
+      @failed
+    end
+  
   end
 
 end

data/lib/Web2Go/WebrickRequest.rb

@@ -2,126 +2,131 @@ require 'webrick/httputils'
 
 module Web2Go
 
-  class WebrickFile
-    def initialize(file)
-      @file = file
-    end
+    class WebrickFile
+        def initialize(file)
+            @file = file
+        end
 
-    def filename
-      @file.filename
-    end
+        def filename
+            @file.filename
+        end
+
+        def content
+            @file.list[0]
+        end
 
-    def content
-      @file.list[0]
     end
 
-  end
+    class WebrickRequest
 
-  class WebrickRequest
+        attr_reader :server_variable
+        attr_reader :params
+        attr_reader :user
 
-    attr_reader :server_variable
-    attr_reader :params
-    attr_reader :user
-    attr_reader :authenticated
+        def initialize(request)
+            @request = request
+            @server_variable = request.meta_vars
+            @server_variable['SCRIPT_NAME'], @server_variable['PATH_INFO'] = split_script_and_path(clean(request.path))
+            find_user(request)      
+            @params = parse_parameters
+        end
 
-    def initialize(request)
-      @request = request
-      @server_variable = request.meta_vars
-      @server_variable['SCRIPT_NAME'], @server_variable['PATH_INFO'] = split_script_and_path(clean(request.path))
-      find_user(request)      
-      @params = parse_parameters
-    end
+        def script_name
+            @server_variable['SCRIPT_NAME']
+        end
 
-    def script_name
-      @server_variable['SCRIPT_NAME']
-    end
-    
-    def path
-      @server_variable['PATH_INFO']
-    end
+        def path
+            @server_variable['PATH_INFO']
+        end
 
-    def host
-      @request.host
-    end
+        def host
+            @request.host
+        end
 
-    def port
-      @request.port
-    end
+        def port
+            @request.port
+        end
 
-    def parameter(name,default_value=nil)
-      value = @params[name]
-      if value.nil? then
-        return default_value
-      else
-        return value[0]
-      end
-    end
+        def authenticated?
+            @authenticated
+        end
+        
+        alias :authenticated :authenticated?
+        
+        def parameter(name,default_value=nil)
+            value = @params[name]
+            if value.nil? then
+                return default_value
+            else
+                return value[0]
+            end
+        end
 
-    def uploaded_file(name,pos=0)
-      file = @request.query[name]
-      if !file.nil? then
-        return WebrickFile.new(file)
-      end
-      nil
-    end
+        def uploaded_file(name,pos=0)
+            file = @request.query[name]
+            if !file.nil? then
+                return WebrickFile.new(file)
+            end
+            nil
+        end
 
 
-    def cookie(name)
-      return @request.cookies.find { |cookie| cookie.name == name }
-    end
+        def cookie(name)
+            return @request.cookies.find { |cookie| cookie.name == name }
+        end
 
-    def cookies
-      @request.cookies
-    end
-    
-    private
-
-    def find_user(req)
-      @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
-      @authenticated = true
-    end  
-
-    def add_parameters(form,values)
-      values.each { |key,value|
-        if form.has_key?(key)
-          form[key].push(value) 
-        else
-          form[key] = [ value ]
-        end
-      }
-      form
-    end
+        def cookies
+            @request.cookies
+        end
 
-    def parse_parameters
-      form = add_parameters({ },WEBrick::HTTPUtils::parse_query(@request.body))
-      form = add_parameters(form,WEBrick::HTTPUtils::parse_query(@request.query_string))
-      form
-    end
+        def request_method
+            @request.request_method
+        end
 
-    def split_script_and_path(path)
-      if path =~ /\// then
-        path =~ /^([^\/]+)\/(.*)$/
-        return $1,$2
-      else
-        return path,""
-      end
+        private
+
+        def find_user(req)
+            @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
+            @authenticated = true
+        end  
+
+        def parse_parameters
+            form = {}
+
+            @request.query.each { |key,value|
+                if form.has_key?(key)
+                    form[key].push(value) 
+                else
+                    form[key] = [ value ]
+                end
+            }
+            form
+        end
 
-    end
+        def split_script_and_path(path)
+            if path =~ /\// then
+                path =~ /^([^\/]+)\/(.*)$/
+                return $1,$2
+            else
+                return path,""
+            end
 
-    def clean(path)
-      if path.nil? then
-        return ""
-      else
-        return path.squeeze('/').gsub(/^\//,'').gsub(/\/$/,'')
-      end
-    end
+        end
+
+        def clean(path)
+            if path.nil? then
+                return ""
+            else
+                return path.squeeze('/').gsub(/^\//,'').gsub(/\/$/,'')
+            end
+        end
 
-  end
+    end
 
 end

data/lib/Web2Go/WebrickResponse.rb

@@ -21,6 +21,10 @@ module Web2Go
       @response.set_redirect(WEBrick::HTTPStatus[302],url)
     end
 
+    def failed
+      @response.set_error(HTTPStatus::RC_NOT_FOUND)
+    end
+    
     def set_cookie(cookie)
       @response.cookies.delete_if { |item| item.name == cookie.name }
       @response.cookies.push(cookie)
@@ -37,14 +41,6 @@ module Web2Go
       cookie.path    = path.nil? ? '/' : path
       set_cookie(cookie)
     end
-
-    def add_cookies(cookies)
-      cookies.each do |cookie|
-        set_cookie(cookie)
-      end
-    end
-
   end
-
 end