knjrbfw 0.0.101 → 0.0.102

data/lib/knj/knj.rb

@@ -47,7 +47,18 @@ module Knj
   
   #Loads a gem by a given name. First tries to load the gem from a custom parent directory to enable loading of development-gems.
   def self.gem_require(gem_const, gem_name = nil)
+    #Support given an array for multiple gem-names in one call.
+    if gem_const.is_a?(Array) and gem_name == nil
+      gem_const.each do |gem_i|
+        self.gem_require(gem_i)
+      end
+      
+      return nil
+    end
+    
+    #Set correct names.
     gem_name = gem_const.to_s.downcase.strip if !gem_name
+    gem_const = "#{gem_const.to_s[0].upcase}#{gem_const.to_s[1, gem_name.length]}"
     
     #Return false if the constant is already loaded.
     return false if ::Kernel.const_defined?(gem_const)
@@ -68,6 +79,7 @@ module Knj
     
     #Custom-path could not be loaded - load gem normally.
     if !found_custom
+      require "rubygems"
       require gem_name
     end
     

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql.rb

@@ -161,18 +161,17 @@ class KnjDB_mysql
         end
       end
     rescue => e
-      if tries < 3
+      if tries <= 3
         if e.message == "MySQL server has gone away" or e.message == "closed MySQL connection" or e.message == "Can't connect to local MySQL server through socket"
           sleep 0.5
           self.reconnect
           retry
-        elsif e.to_s.index("No operations allowed after connection closed") != nil or e.message == "This connection is still waiting for a result, try again once you have the result"
+        elsif e.message.include?("No operations allowed after connection closed") or e.message == "This connection is still waiting for a result, try again once you have the result" or e.message == "Lock wait timeout exceeded; try restarting transaction"
           self.reconnect
           retry
         end
       end
       
-      #print str
       raise e
     end
   end
@@ -584,13 +583,13 @@ class KnjDB_java_mysql_result
     
     if @as_hash
       ret = {}
-      1.upto(@keys.length) do |count|
-        ret[@keys[count - 1]] = @result.string(count)
+      1.upto(@count) do |count|
+        ret[@keys[count - 1]] = @result.object(count)
       end
     else
       ret = []
       1.upto(@count) do |count|
-        ret << @result.string(count)
+        ret << @result.object(count)
       end
     end
     

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql_columns.rb

@@ -26,6 +26,7 @@ class KnjDB_mysql::Columns
     sql << " COMMENT '#{@args[:db].escape(data["comment"])}'" if data.key?("comment")
     sql << " AFTER `#{@args[:db].esc_col(data["after"])}`" if data["after"] and !data["first"]
     sql << " FIRST" if data["first"]
+    sql << " STORAGE #{data["storage"].to_s.upcase}" if data["storage"]
     
     return sql
   end

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql_indexes.rb

@@ -56,6 +56,12 @@ class KnjDB_mysql::Indexes::Index
     end
   end
   
+  #Returns true if the index is a primary-index.
+  def primary?
+		return true if @args[:data][:Index_type] == "BTREE"
+		return false
+  end
+  
   #Inspect crashes if this is not present? - knj.
   def to_s
     return "#<#{self.class.name}>"

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql_tables.rb

@@ -1,3 +1,5 @@
+require "monitor"
+
 #This class handels various MySQL-table-specific behaviour.
 class KnjDB_mysql::Tables
   attr_reader :db, :list
@@ -7,7 +9,7 @@ class KnjDB_mysql::Tables
     @args = args
     @db = @args[:db]
     @subtype = @db.opts[:subtype]
-    @list_mutex = Mutex.new
+    @list_mutex = Monitor.new
     @list = Wref_map.new
     @list_should_be_reloaded = true
   end
@@ -84,7 +86,7 @@ class KnjDB_mysql::Tables
       sql << @db.cols.data_sql(col_data)
     end
     
-    if data["indexes"]
+    if data["indexes"] and !data["indexes"].empty?
       sql << ", "
       sql << KnjDB_mysql::Tables::Table.create_indexes(data["indexes"], {
         :db => @db,
@@ -353,4 +355,89 @@ class KnjDB_mysql::Tables::Table
   def insert(data)
     @db.insert(self.name, data)
   end
+  
+  #Returns the current engine of the table.
+  def engine
+		return @data[:Engine]
+  end
+  
+  def clone(newname, args = {})
+    raise "Invalid name." if newname.to_s.strip.empty?
+    
+    sql = "CREATE TABLE `#{@db.esc_table(newname)}` ("
+    first = true
+    pkey_found = false
+    pkeys = []
+    
+    self.columns do |col|
+      sql << ", " if !first
+      first = false if first
+      
+      col_data = col.data
+      pkey_found = true if !pkey_found and col_data["primarykey"] and args[:force_single_pkey]
+      
+      if args[:no_pkey] or (pkey_found and col_data["primarykey"] and args[:force_single_pkey])
+				col_data["primarykey"] = false
+			end
+			
+			if col_data["primarykey"]
+				pkeys << col_data["name"]
+				col_data.delete("primarykey")
+			end
+			
+			if args[:all_cols_storage]
+				col_data["storage"] = args[:all_cols_storage]
+			end
+			
+      sql << @db.cols.data_sql(col_data)
+    end
+    
+    if !pkeys.empty?
+			sql << ", PRIMARY KEY ("
+			
+			first = true
+			pkeys.each do |pkey|
+				sql << ", " if !first
+				first = false if first
+				sql << "`#{@db.esc_col(pkey)}`"
+			end
+			
+			sql << ")"
+    end
+    
+    sql << ")"
+    sql << " TABLESPACE #{args[:tablespace]}" if args[:tablespace]
+    sql << " ENGINE=#{args[:engine]}" if args[:engine]
+    sql << ";"
+    
+    puts sql
+    
+    #Create table.
+    @db.query(sql)
+    
+    
+    #Insert data of previous data in a single query.
+    @db.query("INSERT INTO `#{newname}` SELECT * FROM `#{self.name}`")
+    
+    
+    #Create indexes.
+    new_table = @db.tables[newname]
+    indexes_list = []
+    self.indexes do |index|
+			indexes_list << index.data if !index.primary?
+    end
+    
+    new_table.create_indexes(indexes_list)
+    
+    
+    #Return new table.
+    return new_table
+  end
+  
+  #Changes the engine for a table.
+  def engine=(newengine)
+		raise "Invalid engine: '#{newengine}'." if !newengine.to_s.match(/^[A-z]+$/)
+		@db.query("ALTER TABLE `#{@db.esc_table(self.name)}` ENGINE = #{newengine}") if self.engine.to_s != newengine.to_s
+		@data[:Engine] = newengine
+  end
 end

data/lib/knj/knjdb/libknjdb.rb

@@ -1,8 +1,4 @@
-if !Kernel.const_defined?(:Wref) or !Kernel.const_defined?(:Datet)
-  require "rubygems"
-  require "wref" if !Kernel.const_defined?(:Wref)
-  require "datet" if !Kernel.const_defined?(:Datet)
-end
+Knj.gem_require([:wref, :datet])
 
 #A wrapper of several possible database-types.
 #

data/lib/knj/knjdb/query_buffer.rb

@@ -11,11 +11,13 @@ class Knj::Db::Query_buffer
     
     STDOUT.puts "Query buffer started." if @debug
     
-    begin
-      yield(self)
-    ensure
-      self.flush
-    end
+    if block_given?
+			begin
+				yield(self)
+			ensure
+				self.flush
+			end
+		end
   end
   
   #Adds a query to the buffer.

data/lib/knj/memory_analyzer.rb

@@ -27,6 +27,9 @@ class Knj::Memory_analyzer
     self.global_vars(to)
     GC.start
     
+    self.procs(to)
+    GC.start
+    
     to.print "</div>\n"
   end
   
@@ -35,9 +38,9 @@ class Knj::Memory_analyzer
     to.print "<h1>Garbage collector</h1>\n"
     
     if GC.enable
-      to.print "<div>Garbage collector was not enabled! But it is again now!</div>\n"
+      to.print "<div>Garbage collector is not enabled! But it is again now!</div>\n"
     else
-      to.print "<div>Garbage collector was already enabled.</div>\n"
+      to.print "<div>Garbage collector is enabled.</div>\n"
     end
     
     GC.start
@@ -288,6 +291,44 @@ class Knj::Memory_analyzer
       end
     end
   end
+  
+  #Writes information about which files (with line numbers) has spawned the most alive procs. This can give hints about memory leaks.
+  def procs(to = $stdout)
+    procs = {}
+    
+    ObjectSpace.each_object(Proc) do |blk|
+      sloc_arr = blk.source_location
+      next if !sloc_arr
+      
+      sloc = "#{sloc_arr[0]}:#{sloc_arr[1]}"
+      procs[sloc] = 0 if !procs.key?(sloc)
+      procs[sloc] += 1
+    end
+    
+    procs = Knj::ArrayExt.hash_sort(procs) do |ele1, ele2|
+      ele2[1] <=> ele1[1]
+    end
+    
+    to.puts "<h1>Alive procs by source</h1>"
+    to.puts "<table style=\"width: 600px;\">"
+    to.puts "\t<tbody>"
+    
+    procs.each do |sloc, count|
+      next if count <= 2
+      
+      to.puts "\t\t<tr>"
+      to.puts "\t\t\t<td>"
+      to.puts "\t\t\t\t#{sloc}"
+      to.puts "\t\t\t</td>"
+      to.puts "\t\t\t<td style=\"text-align: right;\">"
+      to.puts "\t\t\t\t#{_hb.num(count, 0)}"
+      to.puts "\t\t\t</td>"
+      to.puts "\t\t</tr>"
+    end
+    
+    to.puts "\t</tbody>"
+    to.puts "</table>"
+  end
 end
 
 #This class is used to calculate a guessed amount of memory the given object requires.

data/lib/knj/objects.rb

@@ -335,7 +335,7 @@ class Knj::Objects
     elsif data.is_a?(Hash) and data.key?(@args[:col_id].to_s)
       id = data[@args[:col_id].to_s].to_i
     elsif
-      raise ArgumentError, "Unknown data: '#{data.class.to_s}'."
+      raise ArgumentError, "Unknown data for class '#{classname}': '#{data.class.to_s}' (#{data})."
     end
     
     if @objects.key?(classname)
@@ -944,7 +944,7 @@ class Knj::Objects
     end
   end
   
-  #Erases the whole cache and regenerates is from ObjectSpace if not running weak-link-caching. If running weaklink-caching then only removes the dead links.
+  #Erases the whole cache and regenerates it from ObjectSpace if not running weak-link-caching. If running weaklink-caching then it will only removes the dead links.
   def clean_all
     self.clean(@objects.keys)
   end

data/lib/knj/strings.rb

@@ -1,6 +1,6 @@
 #encoding: utf-8
 
-require "php4r" if !Kernel.const_defined?(:Php4r)
+Knj.gem_require "php4r" if !Kernel.const_defined?(:Php4r)
 
 #This module contains various methods to escape, change or treat strings.
 module Knj::Strings
@@ -334,4 +334,9 @@ module Knj::Strings
     
     return false
   end
+  
+  #Takes a string and converts it to a safe string for filenames.
+  def self.sanitize_filename(filename)
+    return filename.gsub(/[^0-9A-z.\-]/, '_').gsub("\\", "_")
+  end
 end

data/lib/knj/web.rb

@@ -187,8 +187,8 @@ class Knj::Web
   
   #Redirects to another URL.
   #===Examples
-  #  _hb.redirect("someotherpage.rhtml")
-  #  _hb.redirect("newpage.rhtml", :perm => true)
+  #  Knj::Web.redirect("someotherpage.rhtml")
+  #  Knj::Web.redirect("newpage.rhtml", :perm => true)
   def self.redirect(url, args = {})
     #Header way
     begin
@@ -546,13 +546,13 @@ class Knj::Web
     
     agent = servervar["HTTP_USER_AGENT"].to_s.downcase
     
-    if agent.index("webkit") != nil
+    if agent.include?("webkit") != nil
       return "webkit"
-    elsif agent.index("gecko") != nil
+    elsif agent.include?("gecko") != nil
       return "gecko"
-    elsif agent.index("msie") != nil
+    elsif agent.include?("msie") != nil
       return "msie"
-    elsif agent.index("w3c") != nil or agent.index("baiduspider") != nil or agent.index("googlebot") != nil or agent.index("bot") != nil
+    elsif agent.include?("w3c") != nil or agent.include?("baiduspider") != nil or agent.include?("googlebot") != nil or agent.include?("bot") != nil
       return "bot"
     else
       #print "Unknown agent: #{agent}"
@@ -568,12 +568,12 @@ class Knj::Web
     
     agent = servervar["HTTP_USER_AGENT"].to_s.downcase
     
-    if agent.index("(windows;") != nil or agent.index("windows nt") != nil
+    if agent.include?("(windows;") != nil or agent.include?("windows nt") != nil
       return {
         "os" => "win",
         "title" => "Windows"
       }
-    elsif agent.index("linux") != nil
+    elsif agent.include?("linux") != nil
       return {
         "os" => "linux",
         "title" => "Linux"
@@ -583,12 +583,13 @@ class Knj::Web
     raise "Unknown OS: #{agent}"
   end
   
+  #Returns various information about the current browser. Currently only works with the Hayabusa-project.
   def self.browser(servervar = nil)
     servervar = _server if !servervar
     raise "Could not figure out meta data." if !servervar
     agent = servervar["HTTP_USER_AGENT"].to_s.downcase
     
-    if match = agent.index("knj:true") != nil
+    if match = agent.include?("knj:true")
       browser = "bot"
       title = "Bot"
       version = "KnjHttp"
@@ -600,6 +601,10 @@ class Knj::Web
       browser = "firefox"
       title = "Mozilla Firefox"
       version = match[1]
+    elsif servervar["HTTP_ACCEPT"] == "*/*" and servervar["HTTP_ACCEPT_LANGUAGE"] == "zh-cn,zh-hk,zh-tw,en-us" and servervar["HTTP_USER_AGENT"] == "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)" and (servervar["REMOTE_ADDR"][0,10] == "114.80.93." or servervar["HTTP_X_FORWARDED_FOR"][0,10] == "114.80.93.")
+      browser = "bot"
+      title = "bot"
+      version = "(unknown annoying bot from China)"
     elsif match = agent.match(/msie\s*(\d+\.\d+)/)
       browser = "ie"
       title = "Microsoft Internet Explorer"
@@ -612,15 +617,15 @@ class Knj::Web
       browser = "bot"
       title = "Bot"
       version = "Wget #{match[1]}"
-    elsif agent.index("baiduspider") != nil
+    elsif agent.include?("baiduspider")
       browser = "bot"
       title = "Bot"
       version = "Baiduspider"
-    elsif agent.index("googlebot") != nil
+    elsif agent.include?("googlebot")
       browser = "bot"
       title = "Bot"
       version = "Googlebot"
-    elsif agent.index("gidbot") != nil
+    elsif agent.include?("gidbot")
       browser = "bot"
       title = "Bot"
       version = "GIDBot"
@@ -632,47 +637,47 @@ class Knj::Web
       browser = "safari"
       title = "Safari"
       version = match[1]
-    elsif agent.index("iPad") != nil
+    elsif agent.include?("iPad")
       browser = "safari"
       title = "Safari (iPad)"
       version = "ipad"
-    elsif agent.index("bingbot") != nil
+    elsif agent.include?("bingbot")
       browser = "bot"
       title = "Bot"
       version = "Bingbot"
-    elsif agent.index("yahoo! slurp") != nil
+    elsif agent.include?("yahoo! slurp")
       browser = "bot"
       title = "Bot"
       version = "Yahoo! Slurp"
-    elsif agent.index("hostharvest") != nil
+    elsif agent.include?("hostharvest")
       browser = "bot"
       title = "Bot"
       version = "HostHarvest"
-    elsif agent.index("exabot") != nil
+    elsif agent.include?("exabot")
       browser = "bot"
       title = "Bot"
       version = "Exabot"
-    elsif agent.index("dotbot") != nil
+    elsif agent.include?("dotbot")
       browser = "bot"
       title = "Bot"
       version = "DotBot"
-    elsif agent.index("msnbot") != nil
+    elsif agent.include?("msnbot")
       browser = "bot"
       title = "Bot"
       version = "MSN bot"
-    elsif agent.index("yandexbot") != nil
+    elsif agent.include?("yandexbot")
       browser = "bot"
       title = "Bot"
       version = "Yandex Bot"
-    elsif agent.index("mj12bot") != nil
+    elsif agent.include?("mj12bot")
       browser = "bot"
       title = "Bot"
       version = "Majestic12 Bot"
-    elsif agent.index("facebookexternalhit") != nil
+    elsif agent.include?("facebookexternalhit")
       browser = "bot"
       title = "Bot"
       version = "Facebook Externalhit"
-    elsif agent.index("sitebot") != nil
+    elsif agent.include?("sitebot")
       browser = "bot"
       title = "Bot"
       version = "SiteBot"
@@ -688,7 +693,7 @@ class Knj::Web
       browser = "bot"
       title = "AhrefsBot"
       version = match[1]
-    elsif agent.index("sosospider") != nil
+    elsif agent.include?("sosospider")
       browser = "bot"
       title = "Bot"
       version = "Sosospider"
@@ -700,7 +705,7 @@ class Knj::Web
     
     os = nil
     os_version = nil
-    if agent.index("linux") != nil
+    if agent.include?("linux") != nil
       os = "linux"
     elsif match = agent.match(/mac\s+os\s+x\s+([\d_+])/)
       os = "mac"

data/lib/knj/webscripts/image.rhtml

@@ -39,7 +39,7 @@
     _get["path"] = Base64.decode64(_get["path64"])
   end
   
-  
+  require "digest/md5"
 	idstr = Digest::MD5.hexdigest("#{_get["path"]}_#{_get["smartsize"].to_i}_#{_get["width"].to_i}_#{_get["height"].to_i}_#{_get["maxwidth"].to_i}_#{_get["maxheight"].to_i}_#{_get["rounded_corners"].to_i}_#{_get["border"].to_i}_#{_get["border_color"]}")
 	
 	if !_get["path"] or !File.exists?(_get["path"])
@@ -87,25 +87,24 @@
   
 	if !tmp_use or tmp_write or force
     blob_cont = nil
-    Knj::Process_meta.new("debug_err" => true) do |subproc|
-      subproc.static("Object", "require", "rubygems")
-      subproc.static("Object", "require", "#{File.dirname(Knj::Os.realpath(__FILE__))}/../../knjrbfw.rb")
-      subproc.static("Object", "require", "knj/autoload")
-      subproc.static("Dir", "chdir", File.dirname(__FILE__))
+    Ruby_process::Cproxy.run do |data|
+      subproc = data[:subproc]
+      subproc.static(:Object, :require, "rubygems")
+      subproc.static(:Object, :require, "#{Knj.knjrbfw_path}/../knjrbfw.rb")
+      subproc.static(:Object, :require, "RMagick")
+      subproc.static(:Dir, :chdir, File.dirname(__FILE__))
       
-      list_proxy = subproc.proxy_from_static("Magick::Image", "read", _get["path"])
-      pic = subproc.proxy_from_call(list_proxy, "first")
-      #pic = Magick::Image.read(_get["path"]).first
+      pic = subproc.static("Magick::Image", :read, _get["path"]).first
       
       if !pic
         print "Could not open image from '#{_get["path"]}'."
         exit
       end
       
-      pic._pm_send_noret("format=", "png")
+      pic.format = "png"
       
-      pic_columns = pic.columns
-      pic_rows = pic.rows
+      pic_columns = pic.columns.__rp_marshal
+      pic_rows = pic.rows.__rp_marshal
       
       width = pic_columns
       height = pic_rows
@@ -147,8 +146,7 @@
       end
       
       if height != pic_rows or width != pic_columns
-        pic = subproc.proxy_from_call(pic, "resize_to_fit", width.to_i, height.to_i)
-        #pic = pic.resize_to_fit(width.to_i, height.to_i)
+        pic = pic.resize_to_fit(width.to_i, height.to_i)
       end
       
       if _get["rounded_corners"]
@@ -159,31 +157,15 @@
           args[:border_color] = _get["border_color"]
         end
         
-        #Spawn arguments-hash for Knj::Image.rounded_corners in subprocess.
-        proxy_hash = subproc.new("{}", args)
-        
         #Call rounded_corners with the proxy-hash.
-        subproc.static_noret("Knj::Image", "rounded_corners", proxy_hash)
-        #Knj::Image.rounded_corners(args)
+        subproc.static("Knj::Image", :rounded_corners, args)
       end
       
-      blob_cont = pic.to_blob
-    end
-	end
-	
-	if tmp_write and blob_cont
-    File.open(tmp_path, "w") do |fp|
-      fp.write(blob_cont)
+      pic.write(tmp_path) if tmp_write or force
     end
 	end
 	
-	if tmp_use and !force
-    appsrv.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
-		appsrv.header("Content-Type", "image/png")
-		_httpsession.force_content(File.read(tmp_path))
-	else
-    appsrv.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
-		appsrv.header("Content-Type", "image/png")
-		_httpsession.force_content(blob_cont)
-	end
+	appsrv.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
+  appsrv.header("Content-Type", "image/png")
+  _httpsession.force_fileread(tmp_path)
 %>

data/spec/strings_spec.rb

@@ -57,4 +57,9 @@ describe "Strings" do
     res = Knj::Strings.secs_to_human_short_time(120, :mins => false)
     raise "Expected '0.0t' but got '#{res}'." if res != "0.0t"
   end
+  
+  it "sanitize_filename" do
+    res = Knj::Strings.sanitize_filename('1\2 3/4')
+    res.should eql("1_2_3_4")
+  end
 end