Wiki2Go 1.17.5 → 1.22.0

data/lib/Wiki2Go/BlackList.rb

@@ -2,41 +2,48 @@
 module Wiki2Go
 
   class BlackList
-
+  
     attr_reader :name
-
-    def initialize(name,items)
+    
+    def initialize(name,items,normalize_urls=false)
       @name   = name
       @banned = []
       items = items.collect {|line| 
         line.strip!
-        (line.empty? || line[0] == '#' ? nil : line)
+        (line.empty? || line[0] == '#'[0] ? nil : (normalize_urls ? normalize(line) : line ))
       }
-      @banned = items.compact
+      @banned = items.compact.sort.uniq
     end
-
+    
     def all
       return @banned
     end
-
+    
+    def each(&block)
+      @banned.each(&block)
+    end
+    
     def add(item)
-      if item =~ /(:\/\/[^\/:]+)/ then
-        item = $1
+      if item =~ /(:\/\/([^\/:]+))/ then
+        item = extract_domain($2)
+      else
+        item = escape_regex(item)
+      end
+      if !item.nil? then
+        @banned << item
+        @banned = @banned.sort.uniq
       end
-      item = escape_regex(item)
-      @banned << item
-      @banned = @banned.sort.uniq
     end
-
+    
     def length
       return @banned.length
     end
-
+    
     def contains(user)
       match = @banned.find { |ban| user =~ Regexp.new(ban,Regexp::IGNORECASE) }
       ! match.nil?
     end
-
+    
     def found_in(lines)
       lines = lines.join(' ') if lines.kind_of? Array
       @banned.each do | pattern |
@@ -45,21 +52,37 @@ module Wiki2Go
       end
       return false
     end
-
+    
     private
-
+    
     def escape_regex(item)
       item.gsub(/\./,'\.')
     end
-
-    def add_line(item)
-      if item =~ /(:\/\/[^\/:]+)/ then
-        item = $1
+    
+    def extract_domain(host)
+      parts = host.split('.')
+      if parts.length >= 3 then
+        if parts[-2] == 'co' || parts[-2] == 'ac' then
+          url = "#{parts[-3]}\\.#{parts[-2]}\\.#{parts[-1]}"
+        else
+          url = "#{parts[-2]}\\.#{parts[-1]}"
+        end
+      else
+        return nil if parts.length < 2
+        url = parts.join('\.')
       end
-      @banned << item
-      @banned = @banned.sort.uniq
+      'https?:\/\/([^\/]*\.)?' + url
+    end
+    
+    def normalize(item)
+      item = item.gsub('https?:\/\/([^\/]*\.)?','://').gsub('\.','.')
+      if item =~ /(:\/\/([^\/:]+))/ then
+        item = extract_domain($2)
+      else
+        item = escape_regex(item)
+      end
+      item
     end
-
   end
-
+  
 end

data/lib/Wiki2Go/DotGraphics.rb

@@ -79,7 +79,7 @@ module Wiki2Go
 
     def write(graph,format,output)
       command = @path.empty? ? 'dot' : File.join(@path,'dot')
-      cmdline = "#{command} -T#{format} -o#{output}" 
+      cmdline = "#{command} -T#{format} -o\"#{output}\"" 
       IO.popen(cmdline,"w+") do |f|
         f.puts graph
         f.close_write

data/lib/Wiki2Go/FileStorage.rb

@@ -9,281 +9,281 @@ require 'fileutils.rb'
 
 module Wiki2Go
 
-  class FileStorage
-
-    def initialize(dynamic_files,static_files)
-      @path = dynamic_files
-      @html = static_files
-      @cached_templates = Hash.new 
-    end
-
-    def exists?(path)
-      return FileTest.exists?(text_path(path,"txt"))
-    end
-
-    alias :exists :exists?
-
-    def load_page(subwiki,name)
-      lines = Array.new(1)
-      lines[0] = "" 
-      modified_time = Time.now
-      if exists?(File.join(subwiki,name)) then
-        path = text_filename(subwiki,name,"txt") 
-        File.open(path) do |f|
-          lines = f.readlines
-          modified_time = File.mtime(path)
+    class FileStorage
+    
+        def initialize(dynamic_files,static_files)
+            @path = dynamic_files
+            @html = static_files
         end
-      end
-      return Page.make_page(name,lines,modified_time)
-    end
-
-    def save_page(subwiki,page)
-      path    = text_filename(subwiki,page.filename,"txt")
-      logfile = text_filename(subwiki,page.filename,"log")
-      ensure_directory_exists(path)
-      append_current_text_to_logfile(path,logfile,page.author)
-      File.open(path,File::CREAT|File::TRUNC|File::RDWR) do |file|
-        page.write(file)
-      end
-    end
-
-    def save_spam(subwiki,name,content,author)
-      path = text_filename(subwiki,name,"spam")
-      ensure_directory_exists(path)
-      File.open(path,File::CREAT|File::APPEND|File::WRONLY) do |file|
-        file.puts("=== SPAM by #{author} on #{Time.now.strftime("%d/%m/%Y %H:%M")} ===")
-        file.puts(content)
-        file.puts("$LASTMODIFIED:#{Time.now.to_i}$")
-        file.puts("$AUTHOR:#{author}$")
-      end
-    end
-
-    def delete_spam(subwiki,page)
-      text = text_filename(subwiki,page.filename,"txt")
-      spam_path = text_filename(subwiki,page.filename,"spam")
-      FileUtils::mv text,spam_path,:force => true
-    end
-
-    def save_html(subwiki,page, content)
-      path = File.join(@html,subwiki,page + ".html")
-      ensure_directory_exists(path)
-      File.open(path,File::CREAT|File::TRUNC|File::RDWR) do |file|
-        file.puts content
-      end
-    end
-
-    def store_page(subwiki,page)
-      save_page(subwiki,page)
-    end
-
-    def load_template(subwiki,name)
-      path = template_filename(subwiki,name)
-      template = @cached_templates.fetch(path,nil)
-      if template.nil? then
-        template = ""
-        File.open(path) do |f|
-          template = f.gets(nil) 
+        
+        def exists?(path)
+            return FileTest.exists?(text_path(path,"txt"))
         end
-        template.gsub!(/\<!--\s*include=(\S*)\s*--\>/i) { load_template(subwiki,$1).rstrip }
-#        @cached_templates[path] = template
-      end
-      template
-    end
-
-    def store_web_file(subwiki,page,content)
-      path = static_filename(subwiki,page)
-      ensure_directory_exists(path)
-      File.open(path,"wb") do |f|
-        f.puts content
-      end
-    end
-
-    def search(subwiki,phrase)
-      pages = Array.new
-      to_search_for = Regexp.new(phrase,Regexp::IGNORECASE)
-      topics = all_pages_in(subwiki)
-      topics.each do |topic|
-        page = load_page(subwiki,topic)
-        page.lines.each do |line|
-          if line =~ to_search_for then
-            pages << page
-            break 
-          end
+        
+        alias :exists :exists?
+        
+        def load_page(subwiki,name)
+            lines = Array.new(1,"")
+            modified_time = Time.now
+            if exists?(File.join(subwiki,name)) then
+                path = text_filename(subwiki,name,"txt") 
+                File.open(path) do |f|
+                    lines = f.read
+                    lines = lines.split($/)
+                    modified_time = File.mtime(path)
+                end
+            end
+            return Page.make_page(name,lines,modified_time)
         end
-      end
-      pages.sort! { |a,b| b.lastmodified <=> a.lastmodified }
-      return pages
-    end
-
-    def all_pages_in(subwiki) 
-      textdir = text_directory(subwiki)
-      pattern = File.join(textdir,"**/*.txt")
-      files = Dir[pattern]
-      dirlen = pattern.length - 8
-
-      files = files.collect {|file| file[dirlen..-5] }
-      return files
-    end
-
-    def wikis
-      textdir = text_directory('')
-      pattern = File.join(textdir,"*")
-      dirs = Dir[pattern]
-      dirs = dirs.find_all { |name| 
-        FileTest.directory?(name) && name[0] != '.' && File.basename(name) != 'CVS' 
-      }
-      dirs = dirs.collect { |name| File.basename(name) }
-    end
-
-    def read_changes_in(subwiki,max_number) 
-      files = all_pages_in(subwiki)
-      nbfiles = (max_number < files.length ? max_number : files.length)
-
-      changed_pages = files.collect { |file| load_page(subwiki,file) }
-      changed_pages.sort! { |a,b| b.lastmodified <=> a.lastmodified }
-      return changed_pages[0..nbfiles-1] 
-    end
-
-    def all_versions_of(subwiki,topic)
-      logfile = text_filename(subwiki,topic,"log")
-      versions = Array.new
-      if File.exists?(logfile) then
-        pattern = /^\*\*\* Modified by (.*) \*\*$/
-        lines = Array.new
-        File.open(logfile,"r") do |f|
-          f.each do |line|
-            if line =~ pattern then
-              add_new_version_to(versions,topic,lines,File.mtime(logfile))
-              lines = Array.new
-            else
-              lines << line
+        
+        def save_page(subwiki,page)
+            path    = text_filename(subwiki,page.filename,"txt")
+            logfile = text_filename(subwiki,page.filename,"log")
+            ensure_directory_exists(path)
+            append_current_text_to_logfile(path,logfile,page.author)
+            File.open(path,File::CREAT|File::TRUNC|File::RDWR) do |file|
+                page.write(file)
             end
-          end
         end
-        add_new_version_to(versions,topic,lines,File.mtime(logfile))
-      end      
-
-      versions << load_page(subwiki,topic)
-      return versions.reverse
-    end
-
-    def load_blacklist(type = 'user')
-      filename = config_filename(type + "_blacklist","txt")
-      banned = Array.new
-      if File.exists?(filename) then
-        File.open(filename,"r") do |f|
-          banned = f.readlines
+        
+        def backup_page(subwiki,pagename)
+            text   = text_filename(subwiki,pagename,"txt")
+            backup = text_filename(subwiki,pagename,"bak")
+            ensure_directory_exists(text)
+            FileUtils::cp text,backup
         end
-      end
-      return BlackList.new(filename,banned)
-    end
-
-    def load_whitelist
-      filename = config_filename("whitelist","txt")
-      allowed = Array.new
-      if File.exists?(filename) then
-        File.open(filename,"r") do |f|
-          allowed = f.readlines
+        
+        def save_spam(subwiki,name,content,author)
+            path = text_filename(subwiki,name,"spam")
+            ensure_directory_exists(path)
+            File.open(path,File::CREAT|File::APPEND|File::WRONLY) do |file|
+                file.puts("=== SPAM by #{author} on #{Time.now.strftime("%d/%m/%Y %H:%M")} ===")
+                file.puts(content)
+                file.puts("$LASTMODIFIED:#{Time.now.to_i}$")
+                file.puts("$AUTHOR:#{author}$")
+            end
         end
-      end
-      return WhiteList.new(allowed)
-    end
-
-    def load_greylist
-      filename = config_filename("greylist","txt")
-      listed = Array.new
-      if File.exists?(filename) then
-        File.open(filename,"r") do |f|
-          listed = f.readlines
+        
+        def delete_spam(subwiki,page)
+            text = text_filename(subwiki,page.filename,"txt")
+            spam_path = text_filename(subwiki,page.filename,"spam")
+            FileUtils::mv text,spam_path,:force => true
+            cached = File.join(@html,subwiki,page.filename + ".html")
+            FileUtils::rm cached if File.exists?(cached)
         end
-      end
-      return GreyList.new(filename,listed)
-    end
-
-    def save_list(list)
-      filename = list.name
-      ensure_directory_exists(filename)
-      File.open(filename,File::CREAT|File::TRUNC|File::RDWR) do |f|
-        f.puts list.all
-      end
-    end
-
-    def update_chongqed_spamlist(content)
-      filename = config_filename('chonqed_blacklist','txt')
-      ensure_directory_exists(filename)
-      File.open(filename,File::CREAT|File::TRUNC|File::RDWR) do |f|
-        f.puts content
-      end
-    end
-
-    private
-
-    def add_new_version_to(versions,topic,lines,modified_time)
-      if !lines.empty? then
-        page = Page.make_page(topic,lines,modified_time)
-        versions << page
-      end
-    end    
-
-    def append_current_text_to_logfile(file,logfile,author)
-      if File.exists?(file) then
-        File.open(file,"r") do |f|
-          text = f.read
-          File.open(logfile,"a") do |log|
-            log.puts "*** Modified by #{author} **"
-            log.puts text
-          end
+        
+        def save_html(subwiki,page, content)
+            path = File.join(@html,subwiki,page + ".html")
+            ensure_directory_exists(path)
+            File.open(path,File::CREAT|File::TRUNC|File::RDWR) do |file|
+                file.puts content
+            end
         end
-      end
-    end
-
-    def ensure_directory_exists(path)
-      dir,filename = File.split(path)
-      FileUtils.mkdir_p(dir,{ :mode => 0775}) unless File.directory?(dir)
-    end
-
-    def text_path(path,ext) 
-      dir = File.dirname(path)
-      file = File.basename(path) + '.' + ext
-      File.join(text_directory(dir),file)
-    end
-
-    def text_filename(subwiki,page,ext)
-      return File.join(text_directory(subwiki),"#{page}.#{ext}")
-    end
-
-    def text_directory(subwiki)
-      dir = File.join(@path,"texts",subwiki)
-      ensure_directory_exists(dir)
-      return dir
-    end
-
-    def config_filename(page,ext)
-      return File.join(config_directory,"#{page}.#{ext}")
-    end
-
-    def config_directory
-      dir = File.join(@path,"config")
-      ensure_directory_exists(dir)
-      return dir
-    end
-
-    def template_filename(subwiki,name)
-      template_dir = File.join(@path,"templates")
-      path = File.join(template_dir,subwiki,name)
-      if !File.exists?(path) then
-        path = File.join(template_dir,name)
-        if !File.exists?(path) then
-          path = File.join(File.dirname(__FILE__),"Install","templates",name)
+        
+        def store_page(subwiki,page)
+            save_page(subwiki,page)
         end
-      end
-      return path
-    end
-
-    def static_filename(subwiki,name)
-      return File.join(@html,"html",subwiki,name)
+        
+        def load_template(subwiki,name)
+            path = template_filename(subwiki,name)
+            template = ""
+            File.open(path) do |f|
+                template = f.gets(nil) 
+            end
+            template.gsub!(/\<!--\s*include=(\S*)\s*--\>/i) { load_template(subwiki,$1).rstrip }
+            template
+        end
+        
+        def store_web_file(subwiki,page,content)
+            path = static_filename(subwiki,page)
+            ensure_directory_exists(path)
+            File.open(path,"wb") do |f|
+                f.puts content
+            end
+        end
+        
+        def search(subwiki,phrase)
+            pages = Array.new
+            to_search_for = Regexp.new(Regexp.escape(phrase),Regexp::IGNORECASE)
+            topics = all_pages_in(subwiki)
+            topics.each do |topic|
+                page = load_page(subwiki,topic)
+                if page.author =~ to_search_for || page.name =~ to_search_for || page.alias =~ to_search_for then
+                    pages << page
+                else
+                    page.lines.each do |line|
+                        if line =~ to_search_for then
+                            pages << page
+                            break 
+                        end
+                    end
+                end
+            end
+            pages.sort! { |a,b| b.lastmodified <=> a.lastmodified }
+            return pages
+        end
+        
+        def all_pages_in(subwiki) 
+            textdir = text_directory(subwiki)
+            pattern = File.join(textdir,"**/*.txt")
+            files = Dir[pattern]
+            dirlen = pattern.length - 8
+            
+            files = files.collect {|file| file[dirlen..-5] }.sort
+            return files
+        end
+        
+        def wikis
+            textdir = text_directory('')
+            pattern = File.join(textdir,"*")
+            dirs = Dir[pattern]
+            dirs = dirs.find_all { |name| 
+                FileTest.directory?(name) && name[0] != '.' && File.basename(name) != 'CVS' 
+            }
+            dirs = dirs.collect { |name| File.basename(name) }
+        end
+        
+        def read_changes_in(subwiki,max_number) 
+            files = all_pages_in(subwiki)
+            nbfiles = (max_number < files.length ? max_number : files.length)
+            
+            changed_pages = files.collect { |file| load_page(subwiki,file) }
+            changed_pages.sort! { |a,b| b.lastmodified <=> a.lastmodified }
+            return changed_pages[0..nbfiles-1] 
+        end
+        
+        def all_versions_of(subwiki,topic)
+            logfile = text_filename(subwiki,topic,"log")
+            versions = Array.new
+            if File.exists?(logfile) then
+                pattern = /^\*\*\* Modified by (.*) \*\*$/
+                mtime = File.mtime(logfile)
+                lines = Array.new
+                File.open(logfile,"r") do |f|
+                    readlines = f.read
+                    readlines = readlines.split($/)
+                    readlines.each do |line|
+                        if line =~ pattern then
+                            add_new_version_to(versions,topic,lines,mtime)
+                            lines = Array.new
+                        else
+                            lines << line#.chomp
+                        end
+                    end
+                end
+                add_new_version_to(versions,topic,lines,mtime)
+            end      
+            
+            versions << load_page(subwiki,topic)
+            return versions.reverse
+        end
+        
+        def load_blacklist(type = 'user',normalize_urls=false)
+            filename = config_filename(type + "_blacklist","txt")
+            banned = Array.new
+            if File.exists?(filename) then
+                File.open(filename,"r") do |f|
+                    banned = f.readlines
+                end
+            end
+            return BlackList.new(filename,banned,normalize_urls)
+        end
+        
+      
+        def load_greylist
+            filename = config_filename("greylist","txt")
+            listed = Array.new
+            if File.exists?(filename) then
+                File.open(filename,"r") do |f|
+                    listed = f.readlines
+                end
+            end
+            return GreyList.new(filename,listed)
+        end
+        
+        def save_list(list)
+            filename = list.name
+            ensure_directory_exists(filename)
+            File.open(filename,File::CREAT|File::TRUNC|File::RDWR) do |f|
+                f.puts list.all
+            end
+        end
+        
+        def update_chongqed_spamlist(content)
+            filename = config_filename('chonqed_blacklist','txt')
+            ensure_directory_exists(filename)
+            File.open(filename,File::CREAT|File::TRUNC|File::RDWR) do |f|
+                f.puts content
+            end
+        end
+        
+        private
+        
+        def add_new_version_to(versions,topic,lines,modified_time)
+            if !lines.empty? then
+                page = Page.make_page(topic,lines,modified_time)
+                versions << page
+            end
+        end    
+        
+        def append_current_text_to_logfile(file,logfile,author)
+            if File.exists?(file) then
+                File.open(file,"r") do |f|
+                    text = f.read
+                    File.open(logfile,"a") do |log|
+                        log.puts "*** Modified by #{author} **"
+                        log.puts text
+                    end
+                end
+            end
+        end
+        
+        def ensure_directory_exists(path)
+            dir,filename = File.split(path)
+            FileUtils.mkdir_p(dir,{ :mode => 0775}) unless File.directory?(dir)
+        end
+        
+        def text_path(path,ext) 
+            dir = File.dirname(path)
+            file = File.basename(path) + '.' + ext
+            File.join(text_directory(dir),file)
+        end
+        
+        def text_filename(subwiki,page,ext)
+            return File.join(text_directory(subwiki),"#{page}.#{ext}")
+        end
+        
+        def text_directory(subwiki)
+            dir = File.join(@path,"texts",subwiki)
+            return dir
+        end
+        
+        def config_filename(page,ext)
+            return File.join(config_directory,"#{page}.#{ext}")
+        end
+        
+        def config_directory
+            dir = File.join(@path,"config")
+            ensure_directory_exists(dir)
+            return dir
+        end
+        
+        def template_filename(subwiki,name)
+            template_dir = File.join(@path,"templates")
+            path = File.join(template_dir,subwiki,name)
+            if !File.exists?(path) then
+                path = File.join(template_dir,name)
+                if !File.exists?(path) then
+                    path = File.join(File.dirname(__FILE__),"Install","templates",name)
+                end
+            end
+            return path
+        end
+        
+        def static_filename(subwiki,name)
+            return File.join(@html,"html",subwiki,name)
+        end
+        
     end
-
-  end
-
+    
 end