knjrbfw 0.0.23 → 0.0.24

data/lib/knj/locales.rb

@@ -40,8 +40,7 @@ module Knj::Locales
   #Returns a float from the formatted string according to the current locale.
   def self.number_in(num_str)
     lc = Knj::Locales.localeconv
-    num_str = num_str.to_s.gsub(lc["thousands_sep"], "").gsub(lc["decimal_point"], ".").to_f
-    return num_str
+    return num_str.to_s.gsub(lc["thousands_sep"], "").gsub(lc["decimal_point"], ".").to_f
   end
   
   #Returns the given number as a formatted string according to the current locale.
@@ -60,8 +59,6 @@ module Knj::Locales
     
     if Thread.current[:locale]
       return Thread.current[:locale]
-    elsif $locale
-      return $locale
     elsif ENV["LANGUAGE"]
       return ENV["LANGUAGE"]
     end

data/lib/knj/memory_analyzer.rb

@@ -0,0 +1,335 @@
+class Knj::Memory_analyzer
+  def initialize
+    @printed = {}
+  end
+  
+  def write(to = $stdout)
+    to.print "<div style=\"width: 600px;\">\n"
+    
+    self.garbage_collector(to)
+    GC.start
+    
+    self.arrays(to)
+    GC.start
+    
+    self.hashes(to)
+    GC.start
+    
+    self.constants(to)
+    GC.start
+    
+    self.global_vars(to)
+    GC.start
+    
+    to.print "</div>\n"
+  end
+  
+  def garbage_collector(to = $stdout)
+    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"
+    else
+      to.print "<div>Garbage collector was already enabled.</div>\n"
+    end
+    
+    GC.start
+  end
+  
+  def hashes(to = $stdout)
+    hashes = {}
+    
+    ObjectSpace.each_object(Hash) do |hash|
+      begin
+        keys_orig = hash.keys.sort
+      rescue ArgumentError
+        #When unable to sort regexps...
+        next
+      end
+      
+      keys = []
+      keys_orig.each do |key|
+        keys << key.to_s
+      end
+      
+      if keys.empty?
+        keystr = :empty
+      else
+        keystr = keys.join(":")
+      end
+      
+      if !hashes.key?(keystr)
+        hashes[keystr] = 1
+      else
+        hashes[keystr] += 1
+      end
+    end
+    
+    hashes.delete_if do |key, val|
+      val < 100
+    end
+    
+    hashes = Knj::ArrayExt.hash_sort(hashes) do |h1, h2|
+      h2[1] <=> h1[1]
+    end
+    
+    to.print "<h1>Hashes</h1>\n"
+    to.write "<table class=\"hashes list\">\n"
+    to.write "\t<thead>\n"
+    to.write "\t\t<tr>\n"
+    to.write "\t\t\t<th>Hash keys</th>\n"
+    to.write "\t\t\t<th>Instances</th>\n"
+    to.write "\t\t</tr>\n"
+    to.write "\t</thead>\n"
+    to.write"\t<tbody>\n"
+    
+    hashes.each do |key, val|
+      to.write "\t\t<tr>\n"
+      to.write "\t\t\t<td>#{Knj::Web.html(key)}</td>\n"
+      to.write "\t\t\t<td>#{Knj::Locales.number_out(val, 0)}</td>\n"
+      to.write "\t\t</tr>\n"
+    end
+    
+    to.write "\t</tbody>\n"
+    to.write "</table>\n"
+  end
+  
+  def arrays(to = $stdout)
+    arrays = {}
+    
+    ObjectSpace.each_object(Array) do |arr|
+      begin
+        arr = arr.sort
+      rescue ArgumentError
+        #When unable to sort regexps...
+        next
+      end
+      
+      keys = []
+      arr.each do |key|
+        keys << key.class.name.to_s
+      end
+      
+      if keys.empty?
+        keystr = :empty
+      else
+        keystr = keys.join(":")
+      end
+      
+      if !arrays.key?(keystr)
+        arrays[keystr] = 1
+      else
+        arrays[keystr] += 1
+      end
+    end
+    
+    arrays.delete_if do |key, val|
+      val < 100
+    end
+    
+    arrays = Knj::ArrayExt.hash_sort(arrays) do |h1, h2|
+      h2[1] <=> h1[1]
+    end
+    
+    to.write "<h1>Arrays</h1>\n"
+    to.write "<table class=\"arrays list\">\n"
+    to.write "\t<thead>\n"
+    to.write "\t\t<tr>\n"
+    to.write "\t\t\t<th>Array classes</th>\n"
+    to.write "\t\t\t<th>Instances</th>\n"
+    to.write "\t\t</tr>\n"
+    to.write "\t</thead>\n"
+    to.write"\t<tbody>\n"
+    
+    arrays.each do |key, val|
+      to.write "\t\t<tr>\n"
+      to.write "\t\t\t<td>#{Knj::Web.html(key)}</td>\n"
+      to.write "\t\t\t<td>#{Knj::Locales.number_out(val, 0)}</td>\n"
+      to.write "\t\t</tr>\n"
+    end
+    
+    to.write "\t</tbody>\n"
+    to.write "</table>\n"
+  end
+  
+  def global_vars(to = $stdout)
+    to.print "<h1>Global variables</h1>\n"
+    to.print "<table class=\"global_variables list\">\n"
+    to.print "\t<thead>\n"
+    to.print "\t\t<tr>\n"
+    to.print "\t\t\t<th>Name</th>\n"
+    to.print "\t\t</tr>\n"
+    to.print "\t</thead>\n"
+    to.print "\t<tbody>\n"
+    
+    count = 0
+    Kernel.global_variables.each do |name|
+      count += 1
+      
+      #begin
+      #  global_var_ref = eval(name.to_s)
+      #rescue => e
+      #  to.print "\t\t<tr>\n"
+      #  to.print "\t\t\t<td>Error: #{Knj::Web.html(e.message)}</td>\n"
+      #  to.print "\t\t</tr>\n"
+      #  
+      #  next
+      #end
+      
+      #size = 0
+      #size = Knj::Memory_analyzer::Object_size_counter.new(global_var_ref).calculate_size
+      #size = size.to_f / 1024.0
+      
+      to.print "\t\t<tr>\n"
+      to.print "\t\t\t<td>#{Knj::Web.html(name)}</td>\n"
+      to.print "\t\t</tr>\n"
+    end
+    
+    if count <= 0
+      to.print "\t\t<tr>\n"
+      to.print "\t\t\t<td colspan=\"2\" class=\"error\">No global variables has been defined.</td>\n"
+      to.print "\t\t</tr>\n"
+    end
+    
+    to.print "\t</tbody>\n"
+    to.print "</table>\n"
+  end
+  
+  def constants(to = $stdout)
+    to.print "<h1>Constants</h1>\n"
+    to.print "<table class=\"memory_analyzer list\">\n"
+    to.print "\t<thead>\n"
+    to.print "\t\t<tr>\n"
+    to.print "\t\t\t<th>Class</th>\n"
+    to.print "\t\t\t<th style=\"text-align: right;\">Instances</th>\n"
+    to.print "\t\t</tr>\n"
+    to.print "\t</thead>\n"
+    to.print "\t<tbody>\n"
+    
+    constants_m = Module.constants
+    constants_o = Object.constants
+    constants_k = Kernel.constants
+    constants = constants_m + constants_o + constants_k
+    
+    constants.sort.each do |mod|
+      self.write_constant(to, Kernel, mod)
+    end
+    
+    to.print "\t</tbody>\n"
+    to.print "</table>\n"
+  end
+  
+  def write_constant(to, mod, submod)
+    submod_s = submod.to_s
+    
+    #return false if mod.name.to_s == "Object" or mod.name.to_s == "Module"
+    return false if @printed.key?(submod_s)
+    return false if mod.autoload?(submod)
+    return false if !mod.const_defined?(submod)
+    
+    @printed[submod_s] = true
+    
+    instances = 0
+    
+    invalid_submod_size_names = ["BasicObject", "Kernel", "Object", "FALSE"]
+    
+    if invalid_submod_size_names.index(submod_s) != nil
+      size = "-"
+      calc_size = false
+    else
+      size = 0
+      calc_size = true
+    end
+    
+    classobj = mod.const_get(submod)
+    
+    begin
+      ObjectSpace.each_object(classobj) do |obj|
+        instances += 1
+      end
+    rescue Exception => e
+      emsg = e.message.to_s
+      if emsg.index("no such file to load") != nil or emsg.index("class or module required") != nil or emsg.index("uninitialized constant") != nil
+        #return false
+      else
+        raise e
+      end
+    end
+    
+    if mod.to_s == "Kernel" or mod.to_s == "Class" or mod.to_s == "Object"
+      mod_title = submod_s
+    else
+      mod_title = "#{mod.to_s}::#{submod_s}"
+    end
+    
+    if instances > 0
+      to.print "\t\t<tr>\n"
+      to.print "\t\t\t<td>#{mod_title.html}</td>\n"
+      to.print "\t\t\t<td style=\"text-align: right;\">#{Knj::Locales.number_out(instances, 0)}</td>\n"
+      to.print "\t\t</tr>\n"
+      GC.start
+    end
+    
+    if classobj.respond_to?("constants")
+      classobj.constants.sort.each do |subsubmod|
+        self.write_constant(to, classobj, subsubmod)
+      end
+    end
+  end
+end
+
+class Knj::Memory_analyzer::Object_size_counter
+  def initialize(obj)
+    @checked = {}
+    @object = obj
+  end
+  
+  def calculate_size
+    ret = self.var_size(@object)
+    @checked = nil
+    @object = nil
+    return ret
+  end
+  
+  def object_size(obj)
+    size = 0
+    
+    obj.instance_variables.each do |var_name|
+      var = obj.instance_variable_get(var_name)
+      next if @checked.key?(var.__id__)
+      @checked[var.__id__] = true
+      size += self.var_size(var)
+    end
+    
+    return size
+  end
+  
+  def var_size(var)
+    size = 0
+    
+    if var.is_a?(String)
+      size += var.length
+    elsif var.is_a?(Integer)
+      size += var.to_s.length
+    elsif var.is_a?(Symbol) or var.is_a?(Fixnum)
+      size += 4
+    elsif var.is_a?(Time)
+      size += var.to_f.to_s.length
+    elsif var.is_a?(Hash)
+      var.each do |key, val|
+        size += self.var_size(key)
+        size += self.var_size(val)
+      end
+    elsif var.is_a?(Array)
+      var.each do |val|
+        size += self.object_size(val)
+      end
+    elsif var.is_a?(TrueClass) or var.is_a?(FalseClass)
+      size += 1
+    else
+      size += self.object_size(var)
+    end
+    
+    return size
+  end
+end

data/lib/knj/objects/objects_sqlhelper.rb

@@ -347,9 +347,9 @@ class Knj::Objects
         found = true
       elsif args.key?(:cols_num) and match = key.match(/^(.+)_(from|to|above|below)$/) and args[:cols_num].index(match[1]) != nil
         if match[2] == "from"
-          sql_where << " AND #{table}`#{db.esc_col(match[1])}` <= '#{db.esc(val)}'"
-        elsif match[2] == "to"
           sql_where << " AND #{table}`#{db.esc_col(match[1])}` >= '#{db.esc(val)}'"
+        elsif match[2] == "to"
+          sql_where << " AND #{table}`#{db.esc_col(match[1])}` <= '#{db.esc(val)}'"
         elsif match[2] == "above"
           sql_where << " AND #{table}`#{db.esc_col(match[1])}` > '#{db.esc(val)}'"
         elsif match[2] == "below"

data/lib/knj/objects.rb

@@ -15,11 +15,9 @@ class Knj::Objects
     @objects = {}
     @locks = {}
     @data = {}
-    @mutex_require = Mutex.new
+    @lock_require = Monitor.new
     
-    if @args[:cache] == :weak
-      require "#{$knjpath}wref"
-    end
+    require "#{$knjpath}wref" if @args[:cache] == :weak
     
     @events = Knj::Event_handler.new
     @events.add_event(
@@ -34,6 +32,10 @@ class Knj::Objects
       :name => :missing_class,
       :connections_max => 1
     )
+    @events.add_event(
+      :name => :require_class,
+      :connections_max => 1
+    )
     
     raise "No DB given." if !@args[:db] and !@args[:custom]
     raise "No class path given." if !@args[:class_path] and (@args[:require] or !@args.key?(:require))
@@ -72,6 +74,11 @@ class Knj::Objects
     @locks[classname] = Mutex.new
   end
   
+  def uninit_class(classname)
+    @objects.delete(classname)
+    @locks.delete(classname)
+  end
+  
   #Returns a cloned version of the @objects variable. Cloned because iteration on it may crash some of the other methods in Ruby 1.9+
   def objects
     objs_cloned = {}
@@ -149,15 +156,31 @@ class Knj::Objects
     classname = classname.to_sym
     return false if @objects.key?(classname)
     
-    @mutex_require.synchronize do
+    @lock_require.synchronize do
       #Maybe the classname got required meanwhile the synchronized wait - check again.
       return false if @objects.key?(classname)
       
-      if (@args[:require] or !@args.key?(:require)) and (!args.key?(:require) or args[:require])
-        filename = "#{@args[:class_path]}/#{@args[:class_pre]}#{classname.to_s.downcase}.rb"
-        filename_req = "#{@args[:class_path]}/#{@args[:class_pre]}#{classname.to_s.downcase}"
-        raise "Class file could not be found: #{filename}." if !File.exists?(filename)
-        require filename_req
+      if @events.connected?(:require_class)
+        @events.call(:require_class, {
+          :class => classname
+        })
+      else
+        doreq = false
+        
+        if args[:require]
+          doreq = true
+        elsif args.key?(:require) and !args[:require]
+          doreq = false
+        elsif @args[:require] or !@args.key?(:require)
+          doreq = true
+        end
+        
+        if doreq
+          filename = "#{@args[:class_path]}/#{@args[:class_pre]}#{classname.to_s.downcase}.rb"
+          filename_req = "#{@args[:class_path]}/#{@args[:class_pre]}#{classname.to_s.downcase}"
+          raise "Class file could not be found: #{filename}." if !File.exists?(filename)
+          require filename_req
+        end
       end
       
       if args[:class]
@@ -227,7 +250,7 @@ class Knj::Objects
     
     @locks[classname].synchronize do
       #Maybe the object got spawned while we waited for the lock? If so we shouldnt spawn another instance.
-      if obj = @objects[classname].get!(id) and obj.id.to_i == id
+      if @args[:cache] == :weak and obj = @objects[classname].get!(id) and obj.id.to_i == id
         return obj
       end
       
@@ -261,6 +284,7 @@ class Knj::Objects
     end
   end
   
+  #Returns the first object found from the given arguments. Also automatically limits the results to 1.
   def get_by(classname, args = {})
     classname = classname.to_sym
     self.requireclass(classname)
@@ -344,6 +368,10 @@ class Knj::Objects
       html << "<option"
       html << " selected=\"selected\"" if !args[:selected]
       html << " value=\"\">#{_("Add new")}</option>"
+    elsif args[:none]
+      html << "<option"
+      html << " selected=\"selected\"" if !args[:selected]
+      html << " value=\"\">#{_("None")}</option>"
     end
     
     self.list(classname, args[:list_args]) do |object|
@@ -461,6 +489,7 @@ class Knj::Objects
   
   #Add a new object to the database and to the cache.
   def add(classname, data = {})
+    raise "data-variable was not a hash: '#{data.class.name}'." if !data.is_a?(Hash)
     classname = classname.to_sym
     self.requireclass(classname)
     
@@ -594,6 +623,9 @@ class Knj::Objects
   
   #Delete an object. Both from the database and from the cache.
   def delete(object)
+    #Return false if the object has already been deleted.
+    return false if object.deleted?
+    
     self.call("object" => object, "signal" => "delete_before")
     self.unset(object)
     obj_id = object.id
@@ -637,6 +669,7 @@ class Knj::Objects
       arr_ids = []
       ids = []
       objs.each do |obj|
+        next if obj.deleted?
         ids << obj.id
         if ids.length >= 1000
           arr_ids << ids

data/lib/knj/opts.rb

@@ -1,19 +1,19 @@
 module Knj::Opts
-  $knjoptions = {
+  CONFIG = {
     "table" => "options"
   }
   
   def self.init(arr_opts)
     arr_opts.each do |pair|
       if pair[0] == "knjdb" or pair[0] == "table"
-        $knjoptions[pair[0]] = pair[1]
+        Knj::Opts::CONFIG[pair[0]] = pair[1]
       end
     end
   end
   
   def self.get(title)
-    db = $knjoptions["knjdb"]
-    value = db.select($knjoptions["table"], {"title" => title}, {"limit" => 1}).fetch
+    db = Knj::Opts::CONFIG["knjdb"]
+    value = db.select(Knj::Opts::CONFIG["table"], {"title" => title}, {"limit" => 1}).fetch
     
     if !value
       return ""
@@ -25,11 +25,11 @@ module Knj::Opts
   end
   
   def self.set(title, value)
-    db = $knjoptions["knjdb"]
-    result = db.select($knjoptions["table"], {"title" => title}, {"limit" => 1}).fetch
+    db = Knj::Opts::CONFIG["knjdb"]
+    result = db.select(Knj::Opts::CONFIG["table"], {"title" => title}, {"limit" => 1}).fetch
     
     if !result
-      db.insert($knjoptions["table"], {
+      db.insert(Knj::Opts::CONFIG["table"], {
         "title" => title,
         "value" => value
       })
@@ -39,7 +39,7 @@ module Knj::Opts
       id = result[:id] if result.key?(:id)
       raise "Could not figure out of ID." if !id
       
-      db.update($knjoptions["table"], {"value" => value}, {"id" => id})
+      db.update(Knj::Opts::CONFIG["table"], {"value" => value}, {"id" => id})
     end
   end
 end

data/lib/knj/os.rb

@@ -13,6 +13,19 @@ module Knj::Os
     return homedir
   end
   
+  #This method was created to make up for the fact that Dir.tmpdir sometimes returns empty strings??
+  def self.tmpdir
+    require "tmpdir"
+    tmpdir = Dir.tmpdir.to_s.strip
+    
+    return tmpdir if tmpdir.length >= 3 and File.exists?(tmpdir)
+    return ENV["TEMP"] if ENV["TEMP"].to_s.strip.length > 0 and File.exists?(ENV["TMP"])
+    return ENV["TMP"] if ENV["TMP"].to_s.strip.length > 0 and File.exists?(ENV["TMP"])
+    return "/tmp" if File.exists?("/tmp")
+    
+    raise "Could not figure out temp-dir."
+  end
+  
   def self.whoami
     if ENV["USERNAME"]
       whoami = ENV["USERNAME"]

data/lib/knj/php.rb

@@ -294,16 +294,25 @@ module Knj::Php
   end
   
   def substr(string, from, to = nil)
+    #If 'to' is not given it should be the total length of the string.
     if to == nil
       to = string.length
     end
     
+    #The behaviour with a negative 'to' is not the same as in PHP. Hack it!
+    if to < 0
+      to = string.length + to
+    end
+    
+    #Cut the string.
     string = "#{string[from.to_i, to.to_i]}"
     
+    #Sometimes the encoding will no longer be valid. Fix that if that is the case.
     if !string.valid_encoding? and Knj::Php.class_exists("Iconv")
       string = Iconv.conv("UTF-8//IGNORE", "UTF-8", "#{string}  ")[0..-2]
     end
     
+    #Return the cut string.
     return string
   end
   
@@ -329,30 +338,8 @@ module Knj::Php
       end
     end
     
-    sent = false
-    
-    if Knj::Php.class_exists("Apache")
-      Apache.request.headers_out[key] = value
-      sent = true
-    end
-    
-    begin
-      _kas.header(key, value) #This is for knjAppServer - knj.
-      sent = true
-    rescue NameError => e
-      if $knj_eruby
-        $knj_eruby.header(key, value)
-        sent = true
-      elsif $cgi.class.name == "CGI"
-        sent = true
-        $cgi.header(key => value)
-      elsif $_CGI.class.name == "CGI"
-        sent = true
-        $_CGI.header(key => value)
-      end
-    end
-    
-    return sent
+    _kas.header(key, value) #This is for knjAppServer - knj.
+    return true
   end
   
   def nl2br(string)
@@ -631,14 +618,7 @@ module Knj::Php
     args["expires"] = Time.at(expire) if expire
     args["domain"] = domain if domain
     
-    begin
-      _kas.cookie(args)
-    rescue NameError
-      cookie = CGI::Cookie.new(args)
-      status = Knj::Php.header("Set-Cookie: #{cookie.to_s}")
-      $_COOKIE[cname] = cvalue if $_COOKIE
-    end
-    
+    _kas.cookie(args)
     return status
   end
   
@@ -757,7 +737,12 @@ module Knj::Php
   end
   
   def base64_encode(str)
-    return Base64.encode64(str.to_s)
+    #The strict-encode wont do corrupt newlines...
+    if Base64.respond_to?("strict_encode64")
+      return Base64.strict_encode64(str.to_s)
+    else
+      return Base64.encode64(str.to_s)
+    end
   end
   
   def base64_decode(str)

data/lib/knj/process.rb

@@ -376,6 +376,8 @@ class Knj::Process
     $stderr.print "Answer is block for #{id} #{block_res}\n" if @debug and block_res
     
     loop do
+      raise "Process destroyed." if !@out_answers
+      
       if block_res
         self.exec_block_results(id)
         break if block_res and block_res[:finished]
@@ -418,6 +420,7 @@ class Knj::Process
   def destroy
     self.kill_listen
     @err_thread.kill if @err_thread
+    @out_answers = nil
   end
 end
 

data/lib/knj/process_meta.rb

@@ -367,7 +367,7 @@ class Knj::Process_meta
       begin
         Process.kill(9, pid) if process_exists
       rescue Errno::ESRCH => e
-        raise e if e.message != "No such process"
+        raise e if e.message.index("No such process") == nil
       end
       
       retry

data/lib/knj/rhodes/mutex.rb

@@ -1,7 +1,8 @@
 class Mutex
   def synchronize
-    sleep 0.1 if @working
+    sleep 0.05 while @working
     @working = true
+    
     begin
       yield
     ensure

data/lib/knj/rhodes/rhodes.js

@@ -1,3 +1,7 @@
 function knj_rhodes_html_links(args){
-	$.ajax({type: "POST", data: {"url": args["url"]}, url: "/app/Knj/html_links"});
+	$.ajax({type: "POST", data: {"url": args.url}, url: "/app/Knj/html_links"})
+}
+
+function knj_rhodes_youtube_open_in_app(args){
+	$.ajax({type: "POST", data: {"youtube_id": args.youtube_id}, url: "/app/Knj/youtube_open_in_app"})
 }