knjrbfw 0.0.66 → 0.0.67

data/Gemfile

@@ -13,7 +13,6 @@ group :development do
   gem "rspec", "~> 2.3.0"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.6.3"
-  gem "rcov", ">= 0"
   gem "sqlite3" if RUBY_ENGINE != "jruby"
   gem "rmagick" if RUBY_ENGINE != "jruby"
   gem "rmagick4j" if RUBY_ENGINE == "jruby"

data/Gemfile.lock

@@ -1,21 +1,15 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    datet (0.0.0)
+    datet (0.0.12)
     diff-lcs (1.1.3)
     git (1.2.5)
-    http2 (0.0.0)
-      knjrbfw
+    http2 (0.0.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    knjrbfw (0.0.55)
-      tsafe
-      wref
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rcov (0.9.11-java)
     rmagick (2.13.1)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -26,11 +20,10 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
     sqlite3 (1.3.6)
-    tsafe (0.0.0)
-    wref (0.0.0)
+    tsafe (0.0.1)
+    wref (0.0.5)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
@@ -38,7 +31,6 @@ DEPENDENCIES
   datet
   http2
   jeweler (~> 1.6.3)
-  rcov
   rmagick
   rspec (~> 2.3.0)
   sqlite3

data/VERSION

@@ -1 +1 @@
-0.0.66
+0.0.67

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.66"
+  s.version = "0.0.67"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-17}
+  s.date = %q{2012-07-24}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -287,7 +287,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.3"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rmagick>, [">= 0"])
     else
@@ -298,7 +297,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rmagick>, [">= 0"])
     end
@@ -310,7 +308,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rmagick>, [">= 0"])
   end

data/lib/knj/cmd_parser.rb

@@ -8,7 +8,7 @@ class Knj::Cmd_parser
     ret = []
     
     str.lines.each do |line|
-      next if line.match(/^total ([\d\.,]+)(M|k|G|)$/)
+      next if line.match(/^total([A-z]*)\s+([\d\.,]+)(M|k|G|)$/)
       match = line.match(/^(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)\s+(\d+)\s+(.+)\s+([^\W].+?)\s+([\d\.,]+)(M|k|G|K|)\s+((\d+)-(\d+)-(\d+)|(([A-z]{3})\s+(\d+)))\s+((\d+):(\d+)|(\d{4}))\s+(.+)$/)
       raise "Could not match: '#{line}'." if !match
       

data/lib/knj/datarow.rb

@@ -4,17 +4,27 @@
 # ob = Knj::Objects.new(:db => db, :datarow => true, :path => "path_of_model_class_files")
 # user = ob.get(:User, 1) #=> <Models::User> that extends <Knj::Datarow>
 class Knj::Datarow
-  #Returns the data-hash that contains all the data from the database.
-  def data
-    self.reload if @should_reload
-    return @data
-  end
+  @@refs = {}
   
   #Returns the Knj::Objects which handels this model.
-  attr_reader :ob
+  def ob
+    return self.class.ob
+  end
   
   #Returns the Knj::Db which handels this model.
-  attr_reader :db
+  def db
+    return self.class.db
+  end
+  
+  #Returns the 'Knj::Objects'-object that handels this class.
+  def self.ob
+    return @ob
+  end
+  
+  #Returns the 'Knj::Db'-object that handels this class.
+  def self.db
+    return @db
+  end
   
   #This is used by 'Knj::Objects' to find out what data is required for this class. Returns the array that tells about required data.
   #===Examples
@@ -44,7 +54,7 @@ class Knj::Datarow
   
   #Returns true if this class has been initialized.
   def self.initialized?
-    return false if !@ob or !@columns_sqlhelper_args
+    return false if !@columns_sqlhelper_args
     return true
   end
   
@@ -61,11 +71,6 @@ class Knj::Datarow
     return @autodelete_data
   end
   
-  #Get the 'Knj::Objects'-object that handels this class.
-  def self.ob
-    return @ob
-  end
-  
   #This helps various parts of the framework determine if this is a datarow class without requiring it.
   #===Examples
   # print "This is a knj-object." if obj.respond_to?("is_knj?")
@@ -152,7 +157,7 @@ class Knj::Datarow
         list_args.merge!(where_args) if where_args
         list_args[colname.to_s] = self.id
         
-        return @ob.list(classname, list_args, &block)
+        return self.class.ob.list(classname, list_args, &block)
       end
       
       define_method("#{methodname}_count".to_sym) do |*args|
@@ -161,12 +166,12 @@ class Knj::Datarow
         list_args[colname.to_s] = self.id
         list_args["count"] = true
         
-        return @ob.list(classname, list_args)
+        return self.class.ob.list(classname, list_args)
       end
       
       define_method("#{methodname}_last".to_sym) do |args|
         args = {} if !args
-        return @ob.list(classname, {"orderby" => [["id", "desc"]], "limit" => 1}.merge(args))
+        return self.class.ob.list(classname, {"orderby" => [["id", "desc"]], "limit" => 1}.merge(args))
       end
       
       self.joined_tables(
@@ -235,13 +240,13 @@ class Knj::Datarow
       colname = "#{classname.to_s.downcase}_id".to_sym if !colname
       
       define_method(methodname) do
-        return @ob.get_try(self, colname, classname)
+        return self.class.ob.get_try(self, colname, classname)
       end
       
       methodname_html = "#{methodname}_html".to_sym
       define_method(methodname_html) do |*args|
         obj = self.__send__(methodname)
-        return @ob.events.call(:no_html, classname) if !obj
+        return self.class.ob.events.call(:no_html, classname) if !obj
         
         raise "Class '#{classname}' does not have a 'html'-method." if !obj.respond_to?(:html)
         return obj.html(*args)
@@ -250,7 +255,7 @@ class Knj::Datarow
       methodname_name = "#{methodname}_name".to_sym
       define_method(methodname_name) do |*args|
         obj = self.__send__(methodname)
-        return @ob.events.call(:no_name, classname) if !obj
+        return self.class.ob.events.call(:no_name, classname) if !obj
         return obj.name(*args)
       end
       
@@ -313,34 +318,6 @@ class Knj::Datarow
     @columns_joined_tables.merge!(hash)
   end
   
-  #Returns the table-name that should be used for this datarow.
-  #===Examples
-  # db.query("SELECT * FROM `#{Models::User.table}` WHERE username = 'John Doe'") do |data|
-  #   print data[:id]
-  # end
-  def self.table
-    return @table if @table
-    return self.name.split("::").last
-  end
-  
-  #This can be used to manually set the table-name. Useful when meta-programming classes that extends the datarow-class.
-  #===Examples
-  # Models::User.table = "prefix_User"
-  def self.table=(newtable)
-    @table = newtable
-    @columns_sqlhelper_args[:table] = @table if @columns_sqlhelper_args.is_a?(Hash)
-  end
-  
-  #Returns the class-name but without having to call the class-table-method. To make code look shorter.
-  #===Examples
-  # user = ob.get_by(:User, {:username => 'John Doe'})
-  # db.query("SELECT * FROM `#{user.table}` WHERE username = 'John Doe'") do |data|
-  #   print data[:id]
-  # end
-  def table
-    return self.class.table
-  end
-  
   #Returns various data for the objects-sql-helper. This can be used to view various informations about the columns and more.
   def self.columns_sqlhelper_args
     raise "No SQLHelper arguments has been spawned yet." if !@columns_sqlhelper_args
@@ -349,17 +326,24 @@ class Knj::Datarow
   
   #Called by Knj::Objects to initialize the model and load column-data on-the-fly.
   def self.load_columns(d)
-    @ob = d.ob if !@ob
+    @ob = d.ob
+    @db = d.db
     
-    @classname = self.name.split("::").last if !@classname
+    @classname = self.name.split("::").last.to_sym if !@classname
+    @table = @classname if !@table
     @mutex = Monitor.new if !@mutex
     
+    #Cache these to avoid method-lookups.
+    @sep_col = @db.sep_col
+    @sep_table = @db.sep_table
+    @table_str = "#{@sep_table}#{@db.esc_table(@table)}#{@sep_table}"
+    
     @mutex.synchronize do
       inst_methods = self.instance_methods(false)
       
       sqlhelper_args = {
-        :db => d.db,
-        :table => table,
+        :db => @db,
+        :table => @table,
         :cols_bools => [],
         :cols_date => [],
         :cols_dbrows => [],
@@ -368,9 +352,9 @@ class Knj::Datarow
         :cols => {}
       }
       
-      sqlhelper_args[:table] = @table if @table
+      sqlhelper_args[:table] = @table
       
-      d.db.tables[table].columns do |col_obj|
+      @db.tables[table].columns do |col_obj|
         col_name = col_obj.name
         col_type = col_obj.type
         col_type = :int if col_type == :bigint or col_type == :tinyint or col_type == :mediumint or col_type == :smallint
@@ -407,7 +391,7 @@ class Knj::Datarow
       if @columns_joined_tables
         @columns_joined_tables.each do |table_name, table_data|
           table_data[:where].each do |key, val|
-            val[:table] = self.table.to_sym if val.is_a?(Hash) and !val.key?(:table) and val[:type].to_sym == :col
+            val[:table] = @table if val.is_a?(Hash) and !val.key?(:table) and val[:type].to_sym == :col
           end
           
           table_data[:datarow] = @ob.args[:module].const_get(table_name.to_sym) if !table_data.key?(:datarow)
@@ -431,32 +415,29 @@ class Knj::Datarow
   # array = ob.list(:User, {"id" => 1})
   # print array.length
   def self.list(d, &block)
-    ec_col = d.db.enc_col
-    ec_table = d.db.enc_table
-    
-    table_str = "#{ec_table}#{d.db.esc_table(self.table)}#{ec_table}"
+    args = d.args
     
-    if d.args["count"]
+    if args["count"]
       count = true
-      d.args.delete("count")
-      sql = "SELECT COUNT(#{table_str}.#{ec_col}id#{ec_col}) AS count"
-    elsif d.args["select_col_as_array"]
+      args.delete("count")
+      sql = "SELECT COUNT(#{@table_str}.#{@sep_col}id#{@sep_col}) AS count"
+    elsif args["select_col_as_array"]
       select_col_as_array = true
-      sql = "SELECT #{table_str}.#{ec_col}#{d.args["select_col_as_array"]}#{ec_col} AS id"
-      d.args.delete("select_col_as_array")
+      sql = "SELECT #{@table_str}.#{@sep_col}#{args["select_col_as_array"]}#{@sep_col} AS id"
+      args.delete("select_col_as_array")
     else
-      sql = "SELECT #{table_str}.*"
+      sql = "SELECT #{@table_str}.*"
     end
     
     qargs = nil
     ret = self.list_helper(d)
     
-    sql << " FROM #{table_str}"
+    sql << " FROM #{@table_str}"
     sql << ret[:sql_joins]
     sql << " WHERE 1=1"
     sql << ret[:sql_where]
     
-    d.args.each do |key, val|
+    args.each do |key, val|
       case key
         when "return_sql"
           #ignore
@@ -470,7 +451,7 @@ class Knj::Datarow
     #The count will bug if there is a group-by-statement.
     grp_shown = false
     if !count and !ret[:sql_groupby]
-      sql << " GROUP BY #{table_str}.#{ec_col}id#{ec_col}"
+      sql << " GROUP BY #{@table_str}.#{@sep_col}id#{@sep_col}"
       grp_shown = true
     end
     
@@ -487,11 +468,11 @@ class Knj::Datarow
     sql << ret[:sql_order]
     sql << ret[:sql_limit]
     
-    return sql.to_s if d.args["return_sql"]
+    return sql.to_s if args["return_sql"]
     
     if select_col_as_array
       enum = Enumerator.new do |yielder|
-        d.db.q(sql, qargs) do |data|
+        @db.q(sql, qargs) do |data|
           yielder << data[:id]
         end
       end
@@ -499,25 +480,25 @@ class Knj::Datarow
       if block
         enum.each(&block)
         return nil
-      elsif d.ob.args[:array_enum]
+      elsif @ob.args[:array_enum]
         return Array_enumerator.new(enum)
       else
         return enum.to_a
       end
     elsif count
-      ret = d.db.query(sql).fetch
+      ret = @db.query(sql).fetch
       return ret[:count].to_i if ret
       return 0
     end
     
-    return d.ob.list_bysql(self.classname, sql, qargs, &block)
+    return @ob.list_bysql(self.classname, sql, qargs, &block)
   end
   
   #Helps call 'sqlhelper' on Knj::Objects to generate SQL-strings.
   def self.list_helper(d)
     self.load_columns(d) if !@columns_sqlhelper_args
-    @columns_sqlhelper_args[:table] = @table if @table
-    return d.ob.sqlhelper(d.args, @columns_sqlhelper_args)
+    @columns_sqlhelper_args[:table] = @table
+    return @ob.sqlhelper(d.args, @columns_sqlhelper_args)
   end
   
   #Returns the classname of the object without any subclasses.
@@ -530,14 +511,37 @@ class Knj::Datarow
     @classname = newclassname
   end
   
+  #Returns the table-name that should be used for this datarow.
+  #===Examples
+  # db.query("SELECT * FROM `#{Models::User.table}` WHERE username = 'John Doe'") do |data|
+  #   print data[:id]
+  # end
+  def self.table
+    return @table
+  end
+  
+  #This can be used to manually set the table-name. Useful when meta-programming classes that extends the datarow-class.
+  #===Examples
+  # Models::User.table = "prefix_User"
+  def self.table=(newtable)
+    @table = newtable
+    @columns_sqlhelper_args[:table] = @table if @columns_sqlhelper_args.is_a?(Hash)
+  end
+  
+  #Returns the class-name but without having to call the class-table-method. To make code look shorter.
+  #===Examples
+  # user = ob.get_by(:User, {:username => 'John Doe'})
+  # db.query("SELECT * FROM `#{user.table}` WHERE username = 'John Doe'") do |data|
+  #   print data[:id]
+  # end
+  def table
+    return self.class.table
+  end
+  
   #Initializes the object. This should be called from 'Knj::Objects' and not manually.
   #===Examples
   # user = ob.get(:User, 3)
   def initialize(data, args = nil)
-    @ob = self.class.ob
-    raise "No ob given." if !@ob
-    @db = ob.db
-    
     if data.is_a?(Hash) and data.key?(:id)
       @data = data
       @id = @data[:id].to_i
@@ -545,9 +549,9 @@ class Knj::Datarow
       @id = data.to_i
       
       classname = self.class.classname.to_sym
-      if @ob.ids_cache_should.key?(classname)
+      if self.class.ob.ids_cache_should.key?(classname)
         #ID caching is enabled for this model - dont reload until first use.
-        raise Errno::ENOENT, "ID was not found in cache: '#{id}'." if !@ob.ids_cache[classname].key?(@id)
+        raise Errno::ENOENT, "ID was not found in cache: '#{id}'." if !self.class.ob.ids_cache[classname].key?(@id)
         @should_reload = true
       else
         #ID caching is not enabled - reload now to check if row exists. Else set 'should_reload'-variable if 'skip_reload' is set.
@@ -573,8 +577,8 @@ class Knj::Datarow
   # user.reload
   # print "The username changed in the database!" if user[:username] != old_username
   def reload
-    @data = @db.single(self.table, {:id => @id})
-    raise Errno::ENOENT, "Could not find any data for the object with ID: '#{@id}' in the table '#{self.table}'." if !@data
+    @data = self.class.db.single(self.class.table, {:id => @id})
+    raise Errno::ENOENT, "Could not find any data for the object with ID: '#{@id}' in the table '#{self.class.table}'." if !@data
     @should_reload = false
   end
   
@@ -587,20 +591,24 @@ class Knj::Datarow
     @data = nil
   end
   
+  #Returns the data-hash that contains all the data from the database.
+  def data
+    self.reload if @should_reload
+    return @data
+  end
+  
   #Writes/updates new data for the object.
   #===Examples
   # user.update(:username => 'New username', :date_changed => Time.now)
   def update(newdata)
-    @db.update(self.table, newdata, {:id => @id})
+    self.class.db.update(self.class.table, newdata, {:id => @id})
     self.should_reload
-    @ob.call("object" => self, "signal" => "update") if @ob
+    self.class.ob.call("object" => self, "signal" => "update")
   end
   
   #Forcefully destroys the object. This is done after deleting it and should not be called manually.
   def destroy
     @id = nil
-    @ob = nil
-    @db = nil
     @data = nil
     @should_reload = nil
   end
@@ -618,17 +626,25 @@ class Knj::Datarow
   #===Examples
   # print "That user is deleted." if user.deleted?
   def deleted?
-    return true if !@ob and !@data and !@id
+    return true if !@data and !@id
+    return false
+  end
+  
+  #Returns true if the given object no longer exists in the database. Also destroys the data on the object and sets it to deleted-status, if it no longer exists.
+  #===Examples
+  # print "That user is deleted." if user.deleted_from_db?
+  def deleted_from_db?
+    #Try to avoid db-query if object is already deleted.
+    return true if self.deleted?
     
     #Try to reload data. Destroy object and return true if the row is gone from the database.
     begin
       self.reload
+      return false
     rescue Errno::ENOENT
       self.destroy
       return true
     end
-    
-    return false
   end
   
   #Returns a specific data from the object by key.
@@ -746,7 +762,7 @@ class Knj::Datarow
     if args[:inst_methods].index(method_name) == nil
       define_method(method_name) do |*method_args|
         if Datet.is_nullstamp?(self[args[:col_name].to_sym])
-          return @ob.events.call(:no_date, self.class.name)
+          return self.class.ob.events.call(:no_date, self.class.name)
         end
         
         return Datet.in(self[args[:col_name].to_sym]).out(*method_args)
@@ -780,7 +796,7 @@ class Knj::Datarow
     method_name = "by_#{args[:col_name]}".to_sym
     if args[:inst_methods].index(method_name) == nil and RUBY_VERSION.to_s.slice(0, 3) != "1.8"
       define_singleton_method(method_name) do |arg|
-        return d.ob.get_by(self.table, {args[:col_name].to_s => arg})
+        return self.class.ob.get_by(self.class.table, {args[:col_name].to_s => arg})
       end
     end
   end

data/lib/knj/eruby.rb

@@ -7,7 +7,10 @@ class Knj::Eruby
     @args = args
     
     @tmpdir = "#{Knj::Os.tmpdir}/knj_erb"
-    Dir.mkdir(@tmpdir, 0777) if !File.exists?(@tmpdir)
+    if !File.exists?(@tmpdir)
+      Dir.mkdir(@tmpdir, 0777)
+      File.chmod(0777, @tmpdir)
+    end
     
     
     #This argument can be used if a shared cache should be used to speed up performance.

data/lib/knj/facebook_connect.rb

@@ -2,8 +2,7 @@ class Knj::Facebook_connect
   attr_reader :args
   
   def initialize(args)
-    require "#{$knjpath}http"
-    require "#{$knjpath}http2"
+    require "http2"
     
     @args = args
     

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

@@ -1,15 +1,13 @@
 class KnjDB_mysql
-  attr_reader :knjdb, :conn, :conns, :escape_table, :escape_col, :escape_val, :esc_table
+  attr_reader :knjdb, :conn, :conns, :sep_table, :sep_col, :sep_val
   attr_accessor :tables, :cols, :indexes
   
   def initialize(knjdb_ob)
     @knjdb = knjdb_ob
     @opts = @knjdb.opts
-    @escape_table = "`"
-    @escape_col = "`"
-    @escape_val = "'"
-    @esc_table = "`"
-    @esc_col = "`"
+    @sep_table = "`"
+    @sep_col = "`"
+    @sep_val = "'"
     
     require "monitor"
     @mutex = Monitor.new
@@ -252,7 +250,7 @@ class KnjDB_mysql
   #Escapes a string to be safe to use as a column in a query.
   def esc_col(string)
     string = string.to_s
-    raise "Invalid column-string: #{string}" if string.index(@escape_col) != nil
+    raise "Invalid column-string: #{string}" if string.index(@sep_col) != nil
     return string
   end
   

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

@@ -31,7 +31,7 @@ class KnjDB_mysql::Tables
       return table_obj if table_obj.name == table_name
     end
     
-    raise Errno::ENOENT.new("Table was not found: #{table_name}.")
+    raise Errno::ENOENT, "Table was not found: #{table_name}."
   end
   
   #Yields the tables of the current database.
@@ -160,7 +160,7 @@ class KnjDB_mysql::Tables::Table
       return col if col.name == name
     end
     
-    raise Errno::ENOENT.new("Column not found: '#{name}'.")
+    raise Errno::ENOENT, "Column not found: '#{name}'."
   end
   
   def columns(args = nil)
@@ -242,7 +242,7 @@ class KnjDB_mysql::Tables::Table
       return index if index.name.to_s == name
     end
     
-    raise Errno::ENOENT.new("Index not found: #{name}.")
+    raise Errno::ENOENT, "Index not found: #{name}."
   end
   
   def create_columns(col_arr)

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3.rb

@@ -1,15 +1,13 @@
 #This class handels SQLite3-specific behaviour.
 class KnjDB_sqlite3
-  attr_reader :knjdb, :conn, :escape_table, :escape_col, :escape_val, :esc_table, :esc_col, :symbolize
+  attr_reader :knjdb, :conn, :sep_table, :sep_col, :sep_val, :symbolize
   attr_accessor :tables, :cols, :indexes
   
   #Constructor. This should not be called manually.
   def initialize(knjdb_ob)
-    @escape_table = "`"
-    @escape_col = "`"
-    @escape_val = "'"
-    @esc_table = "`"
-    @esc_col = "`"
+    @sep_table = "`"
+    @sep_col = "`"
+    @sep_val = "'"
     
     @knjdb = knjdb_ob
     @path = @knjdb.opts[:path] if @knjdb.opts[:path]
@@ -76,7 +74,7 @@ class KnjDB_sqlite3
   #Escapes a string to be used as a column.
   def esc_col(string)
     string = string.to_s
-    raise "Invalid column-string: #{string}" if string.index(@escape_col) != nil
+    raise "Invalid column-string: #{string}" if string.index(@sep_col) != nil
     return string
   end
   

data/lib/knj/knjdb/libknjdb.rb

@@ -1,12 +1,6 @@
 require "rubygems"
-
-if !Kernel.const_defined?(:Wref)
-  require "wref"
-end
-
-if !Kernel.const_defined?(:Datet)
-  require "datet"
-end
+require "wref" if !Kernel.const_defined?(:Wref)
+require "datet" if !Kernel.const_defined?(:Datet)
 
 #A wrapper of several possible database-types.
 #
@@ -28,7 +22,7 @@ class Knj::Db
     return Knj::Db.const_get(name)
   end
   
-  attr_reader :opts, :conn, :conns, :int_types
+  attr_reader :sep_col, :sep_table, :sep_val, :opts, :conn, :conns, :int_types
   
   def initialize(opts)
     require "#{$knjpath}threadhandler"
@@ -43,6 +37,13 @@ class Knj::Db
     end
     
     @debug = @opts[:debug]
+    
+    self.conn_exec do |driver|
+      @sep_table = driver.sep_table
+      @sep_col = driver.sep_col
+      @sep_val = driver.sep_val
+      @esc_driver = driver
+    end
   end
   
   def args
@@ -239,43 +240,44 @@ class Knj::Db
   # id = db.insert(:users, {:name => "John", :lastname => "Doe"}, :return_id => true)
   # sql = db.insert(:users, {:name => "John", :lastname => "Doe"}, :return_sql => true) #=> "INSERT INTO `users` (`name`, `lastname`) VALUES ('John', 'Doe')"
   def insert(tablename, arr_insert, args = nil)
-    self.conn_exec do |driver|
-      sql = "INSERT INTO #{driver.escape_table}#{tablename.to_s}#{driver.escape_table}"
+    sql = "INSERT INTO #{@sep_table}#{tablename}#{@sep_table}"
+    
+    if !arr_insert or arr_insert.empty?
+      #This is the correct syntax for inserting a blank row in MySQL.
+      sql << " VALUES ()"
+    else
+      sql << " ("
       
-      if !arr_insert or arr_insert.empty?
-        #This is the correct syntax for inserting a blank row in MySQL.
-        sql << " VALUES ()"
-      else
-        sql << " ("
-        
-        first = true
-        arr_insert.each do |key, value|
-          if first
-            first = false
-          else
-            sql << ", "
-          end
-          
-          sql << "#{driver.escape_col}#{key.to_s}#{driver.escape_col}"
+      first = true
+      arr_insert.each do |key, value|
+        if first
+          first = false
+        else
+          sql << ", "
         end
         
-        sql << ")  VALUES ("
-        
-        first = true
-        arr_insert.each do |key, value|
-          if first
-            first = false
-          else
-            sql << ", "
-          end
-          
-          sql << "#{driver.escape_val}#{driver.escape(value.to_s)}#{driver.escape_val}"
+        sql << "#{@sep_col}#{key}#{@sep_col}"
+      end
+      
+      sql << ")  VALUES ("
+      
+      first = true
+      arr_insert.each do |key, value|
+        if first
+          first = false
+        else
+          sql << ", "
         end
         
-        sql << ")"
+        sql << "#{@sep_val}#{@esc_driver.escape(value)}#{@sep_val}"
       end
       
-      return sql if args and args[:return_sql]
+      sql << ")"
+    end
+    
+    return sql if args and args[:return_sql]
+    
+    self.conn_exec do |driver|
       driver.query(sql)
       return driver.lastID if args and args[:return_id]
       return nil
@@ -292,29 +294,29 @@ class Knj::Db
   def insert_multi(tablename, arr_hashes, args = nil)
     return false if arr_hashes.empty?
     
-    self.conn_exec do |driver|
-      if driver.respond_to?(:insert_multi)
-        if args and args[:return_sql]
-          return [driver.insert_multi(tablename, arr_hashes, args)]
-        else
-          return driver.insert_multi(tablename, arr_hashes, args)
-        end
-      else
-        ret = [] if args and (args[:return_id] or args[:return_sql])
-        arr_hashes.each do |hash|
-          if ret
-            ret << self.insert(tablename, hash, args)
-          else
-            self.insert(tablename, hash, args)
-          end
-        end
-        
+    if @esc_driver.respond_to?(:insert_multi)
+      if args and args[:return_sql]
+        return [@esc_driver.insert_multi(tablename, arr_hashes, args)]
+      end
+      
+      self.conn_exec do |driver|
+        return driver.insert_multi(tablename, arr_hashes, args)
+      end
+    else
+      ret = [] if args and (args[:return_id] or args[:return_sql])
+      arr_hashes.each do |hash|
         if ret
-          return ret
+          ret << self.insert(tablename, hash, args)
         else
-          return nil
+          self.insert(tablename, hash, args)
         end
       end
+      
+      if ret
+        return ret
+      else
+        return nil
+      end
     end
   end
   
@@ -325,30 +327,31 @@ class Knj::Db
   def update(tablename, arr_update, arr_terms = {}, args = nil)
     return false if arr_update.empty?
     
-    self.conn_exec do |driver|
-      sql = ""
-      sql << "UPDATE #{driver.escape_col}#{tablename.to_s}#{driver.escape_col} SET "
-      
-      first = true
-      arr_update.each do |key, value|
-        if first
-          first = false
-        else
-          sql << ", "
-        end
-        
-        #Convert dates to valid dbstr.
-        value = self.date_out(value) if value.is_a?(Datet) or value.is_a?(Time)
-        
-        sql << "#{driver.escape_col}#{key.to_s}#{driver.escape_col} = "
-        sql << "#{driver.escape_val}#{driver.escape(value.to_s)}#{driver.escape_val}"
+    sql = ""
+    sql << "UPDATE #{@sep_col}#{tablename}#{@sep_col} SET "
+    
+    first = true
+    arr_update.each do |key, value|
+      if first
+        first = false
+      else
+        sql << ", "
       end
       
-      if arr_terms and arr_terms.length > 0
-        sql << " WHERE #{self.makeWhere(arr_terms, driver)}"
-      end
+      #Convert dates to valid dbstr.
+      value = self.date_out(value) if value.is_a?(Datet) or value.is_a?(Time)
       
-      return sql if args and args[:return_sql]
+      sql << "#{@sep_col}#{key}#{@sep_col} = "
+      sql << "#{@sep_val}#{@esc_driver.escape(value)}#{@sep_val}"
+    end
+    
+    if arr_terms and arr_terms.length > 0
+      sql << " WHERE #{self.makeWhere(arr_terms)}"
+    end
+    
+    return sql if args and args[:return_sql]
+    
+    self.conn_exec do |driver|
       driver.query(sql)
     end
   end
@@ -376,28 +379,25 @@ class Knj::Db
       end
     end
     
-    #Get the driver and generate SQL.
-    self.conn_exec do |driver|
-      sql = "SELECT #{select_sql} FROM #{driver.escape_table}#{tablename.to_s}#{driver.escape_table}"
+    sql = "SELECT #{select_sql} FROM #{@sep_table}#{tablename}#{@sep_table}"
+    
+    if arr_terms != nil and !arr_terms.empty?
+      sql << " WHERE #{self.makeWhere(arr_terms)}"
+    end
+    
+    if args != nil
+      if args["orderby"]
+        sql << " ORDER BY #{args["orderby"]}"
+      end
       
-      if arr_terms != nil and !arr_terms.empty?
-        sql << " WHERE #{self.makeWhere(arr_terms, driver)}"
+      if args["limit"]
+        sql << " LIMIT #{args["limit"]}"
       end
       
-      if args != nil
-        if args["orderby"]
-          sql << " ORDER BY #{args["orderby"]}"
-        end
-        
-        if args["limit"]
-          sql << " LIMIT #{args["limit"]}"
-        end
-        
-        if args["limit_from"] and args["limit_to"]
-          raise "'limit_from' was not numeric: '#{args["limit_from"]}'." if !Knj::Php.is_numeric(args["limit_from"])
-          raise "'limit_to' was not numeric: '#{args["limit_to"]}'." if !Knj::Php.is_numeric(args["limit_to"])
-          sql << " LIMIT #{args["limit_from"]}, #{args["limit_to"]}"
-        end
+      if args["limit_from"] and args["limit_to"]
+        raise "'limit_from' was not numeric: '#{args["limit_from"]}'." if !Knj::Php.is_numeric(args["limit_from"])
+        raise "'limit_to' was not numeric: '#{args["limit_to"]}'." if !Knj::Php.is_numeric(args["limit_to"])
+        sql << " LIMIT #{args["limit_from"]}, #{args["limit_to"]}"
       end
     end
     
@@ -438,14 +438,15 @@ class Knj::Db
   #===Examples
   # db.delete(:users, {:lastname => "Doe"})
   def delete(tablename, arr_terms, args = nil)
+    sql = "DELETE FROM #{@sep_table}#{tablename}#{@sep_table}"
+    
+    if arr_terms != nil and !arr_terms.empty?
+      sql << " WHERE #{self.makeWhere(arr_terms)}"
+    end
+    
+    return sql if args and args[:return_sql]
+    
     self.conn_exec do |driver|
-      sql = "DELETE FROM #{driver.escape_table}#{tablename}#{driver.escape_table}"
-      
-      if arr_terms != nil and !arr_terms.empty?
-        sql << " WHERE #{self.makeWhere(arr_terms, driver)}"
-      end
-      
-      return sql if args and args[:return_sql]
       driver.query(sql)
     end
     
@@ -456,7 +457,7 @@ class Knj::Db
   #
   #===Examples
   # sql = db.makeWhere({:lastname => "Doe"}, driver_obj)
-  def makeWhere(arr_terms, driver)
+  def makeWhere(arr_terms, driver = nil)
     sql = ""
     
     first = true
@@ -469,11 +470,11 @@ class Knj::Db
       
       if value.is_a?(Array)
         raise "Array for column '#{key}' was empty." if value.empty?
-        sql << "#{driver.escape_col}#{key}#{driver.escape_col} IN (#{Knj::ArrayExt.join(:arr => value, :sep => ",", :surr => "'", :callback => proc{|ele| self.esc(ele)})})"
+        sql << "#{@sep_col}#{key}#{@sep_col} IN (#{Knj::ArrayExt.join(:arr => value, :sep => ",", :surr => "'", :callback => proc{|ele| self.esc(ele)})})"
       elsif value.is_a?(Hash)
         raise "Dont know how to handle hash."
       else
-        sql << "#{driver.escape_col}#{key}#{driver.escape_col} = #{driver.escape_val}#{driver.escape(value)}#{driver.escape_val}"
+        sql << "#{@sep_col}#{key}#{@sep_col} = #{@sep_val}#{@esc_driver.escape(value)}#{@sep_val}"
       end
     end
     
@@ -637,57 +638,27 @@ class Knj::Db
   #===Examples
   # db.q("INSERT INTO users (name) VALUES ('#{db.esc('John')}')")
   def escape(string)
-    self.conn_exec do |driver|
-      return driver.escape(string)
-    end
+    return @esc_driver.escape(string)
   end
   
   alias :esc :escape
   
   #Escapes the given string to be used as a column.
   def esc_col(str)
-    self.conn_exec do |driver|
-      return driver.esc_col(str)
-    end
+    return @esc_driver.esc_col(str)
   end
   
   #Escapes the given string to be used as a table.
   def esc_table(str)
-    self.conn_exec do |driver|
-      return driver.esc_table(str)
-    end
-  end
-  
-  #Returns the sign for surrounding the string that should be used as a table.
-  def enc_table
-    if !@enc_table
-      self.conn_exec do |driver|
-        @enc_table = driver.escape_table
-      end
-    end
-    
-    return @enc_table
-  end
-  
-  #Returns the sign for surrounding the string that should be used as a column.
-  def enc_col
-    if !@enc_col
-      self.conn_exec do |driver|
-        @enc_col = driver.escape_col
-      end
-    end
-    
-    return @enc_col
+    return @esc_driver.esc_table(str)
   end
   
   #Returns a string which can be used in SQL with the current driver.
   #===Examples
   # str = db.date_out(Time.now) #=> "2012-05-20 22:06:09"
   def date_out(date_obj = Datet.new, args = {})
-    conn_exec do |driver|
-      if driver.respond_to?(:date_out)
-        return driver.date_out(date_obj, args)
-      end
+    if @esc_driver.respond_to?(:date_out)
+      return @esc_driver.date_out(date_obj, args)
     end
     
     return Datet.in(date_obj).dbstr(args)
@@ -697,10 +668,8 @@ class Knj::Db
   #===Examples
   # db.date_in('2012-05-20 22:06:09') #=> 2012-05-20 22:06:09 +0200
   def date_in(date_obj)
-    conn_exec do |driver|
-      if driver.respond_to?(:date_in)
-        return driver.date_in(date_obj)
-      end
+    if @esc_driver.respond_to?(:date_in)
+      return @esc_driver.date_in(date_obj)
     end
     
     return Datet.in(date_obj)
@@ -708,16 +677,14 @@ class Knj::Db
   
   #Returns the table-module and spawns it if it isnt already spawned.
   def tables
-    conn_exec do |driver|
-      if !@tables
-        require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_tables" if (!@opts.key?(:require) or @opts[:require])
-        @tables = Kernel.const_get("KnjDB_#{@opts[:type]}".to_sym).const_get(:Tables).new(
-          :db => self
-        )
-      end
-      
-      return @tables
+    if !@tables
+      require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_tables" if (!@opts.key?(:require) or @opts[:require])
+      @tables = Kernel.const_get("KnjDB_#{@opts[:type]}".to_sym).const_get(:Tables).new(
+        :db => self
+      )
     end
+    
+    return @tables
   end
   
   #Returns the columns-module and spawns it if it isnt already spawned.
@@ -769,11 +736,6 @@ class Knj::Db
     end
   end
   
-  #Returns the sign to be used for surrounding tables.
-  def col_table
-    return "`"
-  end
-  
   #Optimizes all tables in the database.
   def optimize(args = nil)
     STDOUT.puts "Beginning optimization of database." if @debug or (args and args[:debug])

data/lib/knj/os.rb

@@ -98,10 +98,7 @@ module Knj::Os
   end
   
   def self.realpath(path)
-    if File.symlink?(path)
-      return self.realpath(File.readlink(path))
-    end
-    
+    return self.realpath(File.readlink(path)) if File.symlink?(path)
     return path
   end
   

data/lib/knj/php.rb

@@ -219,7 +219,7 @@ module Knj::Php
   end
   
   def ucwords(string)
-    return string.to_s.split(" ").select {|w| w.capitalize! || w }.join(" ")
+    return string.to_s.split(" ").select{|w| w.capitalize! or w }.join(" ")
   end
   
   def strtoupper(str)
@@ -703,7 +703,7 @@ module Knj::Php
     hour = cur_time.hour if hour == nil
     min = cur_time.min if min == nil
     sec = cur_time.sec if sec == nil
-    date = cur_time.date if date == nil
+    date = cur_time.day if date == nil
     month = cur_time.month if month == nil
     year = cur_time.year if year == nil
     

data/lib/knj/process_meta.rb

@@ -44,6 +44,7 @@ class Knj::Process_meta
     if RUBY_ENGINE == "jruby"
       pid, @stdin, @stdout, @stderr = IO.popen4("#{exec_path} --#{RUBY_VERSION[0, 3]} \"#{exec_file}\" \"#{id}\"")
     else
+      require "open3"
       @stdin, @stdout, @stderr = Open3.popen3(cmd)
     end
     

data/lib/knj/threadhandler.rb

@@ -65,8 +65,9 @@ class Knj::Threadhandler
   
   def check_inactive
     raise "Destroyed Knj::Threadhandler." if !@mutex
+    cur_time = Time.now.to_i - @args[:timeout]
+    
     @mutex.synchronize do
-      cur_time = Time.now.to_i - @args[:timeout]
       @objects.each do |data|
         if data[:free] and !data[:inactive] and data[:free] < cur_time
           @inactive_blocks.each do |block|
@@ -81,46 +82,48 @@ class Knj::Threadhandler
   def get_and_lock
     raise "Destroyed Knj::Threadhandler." if !@mutex
     newobj = nil
-    sleep_do = false
     
     begin
+      retdata = nil
+      
       @mutex.synchronize do
-        retdata = false
         @objects.each do |data|
           if data[:free]
             retdata = data
             break
           end
         end
+      end
+      
+      if retdata
+        #Test if object is still free - if not, try again - knj.
+        return get_and_lock if !retdata[:free]
+        retdata[:free] = false
         
-        if retdata
-          #Test if object is still free - if not, try again - knj.
-          return get_and_lock if !retdata[:free]
-          retdata[:free] = false
-          
-          if retdata[:inactive]
-            @activate_blocks.each do |block|
-              block.call(:obj => retdata[:object])
-            end
-            
-            retdata.delete(:inactive)
+        if retdata[:inactive]
+          @activate_blocks.each do |block|
+            block.call(:obj => retdata[:object])
           end
           
-          return retdata[:object]
+          retdata.delete(:inactive)
         end
         
-        if @objects.length >= @args[:max]
-          #The maximum amount of objects has already been spawned... Sleep 0.1 sec and try to lock an object again...
-          raise Knj::Errors::Retry
-        else
-          #No free objects, but we can spawn a new one and use that...
-          newobj = @spawn_new_block.call
+        return retdata[:object]
+      end
+      
+      if @objects.length >= @args[:max]
+        #The maximum amount of objects has already been spawned... Sleep 0.1 sec and try to lock an object again...
+        raise Knj::Errors::Retry
+      else
+        #No free objects, but we can spawn a new one and use that...
+        newobj = @spawn_new_block.call
+        @mutex.synchronize do
           @objects << Tsafe::MonHash.new.merge(
             :free => false,
             :object => newobj
           )
-          STDOUT.print "Spawned db and locked new.\n" if @args[:debug]
         end
+        STDOUT.print "Spawned db and locked new.\n" if @args[:debug]
       end
       
       return newobj

data/lib/knj/web.rb

@@ -389,11 +389,17 @@ class Knj::Web
       elsif args[:type] == :fckeditor
         args[:height] = 400 if !args[:height]
         
-        require "/usr/share/fckeditor/fckeditor.rb"
+        require "/usr/share/fckeditor/fckeditor.rb" if !Kernel.const_defined?(:FCKeditor)
         fck = FCKeditor.new(args[:name])
         fck.Height = args[:height].to_i
         fck.Value = value
         html << fck.CreateHtml
+      elsif args[:type] == :ckeditor
+        args[:height] = 400 if !args[:height]
+        require "ckeditor4ruby" if !Kernel.const_defined?(:CKEditor)
+        ck = CKEditor.new
+        ck.return_output = true
+        html << ck.editor(args[:name], value)
       elsif args[:type] == :select
         attr["multiple"] = "multiple" if args[:multiple]
         attr["size"] = args["size"] if args[:size]

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.66
+  version: 0.0.67
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-17 00:00:00 +02:00
+date: 2012-07-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,7 +91,7 @@ dependencies:
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: sqlite3
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,7 +102,7 @@ dependencies:
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: rmagick
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,17 +112,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rmagick
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id010
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -399,7 +388,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2724841403555632511
+      hash: 1657712883441742083
       segments: 
       - 0
       version: "0"