knjrbfw 0.0.39 → 0.0.40

data/VERSION

@@ -1 +1 @@
-0.0.39
+0.0.40

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.39"
+  s.version = "0.0.40"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-05-21}
+  s.date = %q{2012-05-25}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -173,10 +173,13 @@ Gem::Specification.new do |s|
     "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_indexes.rb",
     "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_sqlspecs.rb",
     "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_tables.rb",
+    "lib/knj/knjdb/dump.rb",
+    "lib/knj/knjdb/idquery.rb",
     "lib/knj/knjdb/libknjdb.rb",
     "lib/knj/knjdb/libknjdb_java_sqlite3.rb",
     "lib/knj/knjdb/libknjdb_row.rb",
     "lib/knj/knjdb/libknjdb_sqlite3_ironruby.rb",
+    "lib/knj/knjdb/query_buffer.rb",
     "lib/knj/knjdb/revision.rb",
     "lib/knj/knjdb/sqlspecs.rb",
     "lib/knj/kvm.rb",

data/lib/knj/datarow.rb

@@ -150,7 +150,7 @@ class Knj::Datarow
       self.joined_tables(
         classname => {
           :where => {
-            colname.to_s => {:type => "col", :name => :id}
+            colname.to_s => {:type => :col, :name => :id}
           }
         }
       )
@@ -220,7 +220,7 @@ class Knj::Datarow
       self.joined_tables(
         classname => {
           :where => {
-            "id" => {:type => "col", :name => colname}
+            "id" => {:type => :col, :name => colname}
           }
         }
       )
@@ -251,7 +251,7 @@ class Knj::Datarow
         table_name => {
           :where => {
             "object_class" => self.name,
-            "object_id" => {:type => "col", :name => "id"},
+            "object_id" => {:type => :col, :name => "id"},
             "key" => val.to_s,
             "locale" => proc{|d| _session[:locale]}
           },
@@ -335,33 +335,33 @@ class Knj::Datarow
       d.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"
+        col_type = :int if col_type == :bigint or col_type == :tinyint or col_type == :mediumint or col_type == :smallint
         sqlhelper_args[:cols][col_name] = true
         
         self.define_bool_methods(:inst_methods => inst_methods, :col_name => col_name)
         
-        if col_type == "enum" and col_obj.maxlength == "'0','1'"
+        if col_type == :enum and col_obj.maxlength == "'0','1'"
           sqlhelper_args[:cols_bools] << col_name
-        elsif col_type == "int" and col_name.slice(-3, 3) == "_id"
+        elsif col_type == :int and col_name.slice(-3, 3) == "_id"
           sqlhelper_args[:cols_dbrows] << col_name
-        elsif col_type == "int" or col_type == "bigint" or col_type == "decimal"
+        elsif col_type == :int or col_type == :decimal
           sqlhelper_args[:cols_num] << col_name
-        elsif col_type == "varchar" or col_type == "text" or col_type == "enum"
+        elsif col_type == :varchar or col_type == :text or col_type == :enum
           sqlhelper_args[:cols_str] << col_name
-        elsif col_type == "date" or col_type == "datetime"
+        elsif col_type == :date or col_type == :datetime
           sqlhelper_args[:cols_date] << col_name
           self.define_date_methods(:inst_methods => inst_methods, :col_name => col_name)
         end
         
-        if col_type == "int" or col_type == "decimal"
+        if col_type == :int or col_type == :decimal
           self.define_numeric_methods(:inst_methods => inst_methods, :col_name => col_name)
         end
         
-        if col_type == "int" or col_type == "varchar"
+        if col_type == :int or col_type == :varchar
           self.define_text_methods(:inst_methods => inst_methods, :col_name => col_name)
         end
         
-        if col_type == "time"
+        if col_type == :time
           self.define_time_methods(:inst_methods => inst_methods, :col_name => col_name)
         end
       end
@@ -369,7 +369,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] == "col"
+            val[:table] = self.table.to_sym 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)
@@ -425,7 +425,7 @@ class Knj::Datarow
         when :cloned_ubuf
           qargs = {:cloned_ubuf => true}
         else
-          raise "Invalid key: '#{key}' for '#{self.name}'. Valid keys are: '#{@columns_sqlhelper_args[:cols].keys.sort}'."
+          raise "Invalid key: '#{key}' for '#{self.name}'. Valid keys are: '#{@columns_sqlhelper_args[:cols].keys.sort}'. Date-keys: '#{@columns_sqlhelper_args[:cols_date]}'."
       end
     end
     
@@ -523,7 +523,10 @@ class Knj::Datarow
       raise Knj::Errors::InvalidData, "Could not figure out the data from '#{data.class.name}'."
     end
     
-    raise "Invalid ID: '#{@id}'." if @id.to_i <= 0
+    if @id.to_i <= 0
+      raise "Invalid ID: '#{@id}' from '#{@data}'."if @data
+      raise "Invalid ID: '#{@id}'."
+    end
   end
   
   #Reloads the data from the database.

data/lib/knj/errors.rb

@@ -39,9 +39,12 @@ module Knj::Errors
       err.backtrace.each do |bt|
         str << "#{Knj::Web.html(bt)}<br />\n"
       end
+      
+      str << "<br />\n<br />\n"
     else
       str << "#{err.class.name}: #{err.message}\n\n"
       str << err.backtrace.join("\n")
+      str << "\n\n"
     end
     
     return str

data/lib/knj/http2.rb

@@ -165,6 +165,7 @@ class Knj::Http2
       header_str << "#{@nl}"
       
       print "Http2: Writing headers.\n" if @debug
+      print "Header str: #{header_str}\n" if @debug
       self.write(header_str)
       
       print "Http2: Reading response.\n" if @debug
@@ -209,25 +210,46 @@ class Knj::Http2
     if !@args.key?(:encoding_gzip) or @args[:encoding_gzip]
       headers["Accept-Encoding"] = "gzip"
     else
-      headers["Accept-Encoding"] = "none"
+      #headers["Accept-Encoding"] = "none"
     end
     
     return headers
   end
   
-  def self.post_convert_data(pdata)
+  #This is used to convert a hash to valid post-data recursivly.
+  def self.post_convert_data(pdata, args = nil)
     praw = ""
     
     if pdata.is_a?(Hash)
       pdata.each do |key, val|
         praw << "&" if praw != ""
-        praw << "#{Knj::Web.urlenc(Knj::Http2.post_convert_data(key))}=#{Knj::Web.urlenc(Knj::Http2.post_convert_data(val))}"
+        
+        if args and args[:orig_key]
+          key = "#{args[:orig_key]}[#{key}]"
+        end
+        
+        if val.is_a?(Hash) or val.is_a?(Array)
+          praw << self.post_convert_data(val, {:orig_key => key})
+        else
+          praw << "#{Knj::Web.urlenc(key)}=#{Knj::Web.urlenc(Knj::Http2.post_convert_data(val))}"
+        end
       end
     elsif pdata.is_a?(Array)
       count = 0
       pdata.each do |val|
+        if args and args[:orig_key]
+          key = "#{args[:orig_key]}[#{count}]"
+        else
+          key = count
+        end
+        
+        if val.is_a?(Hash) or val.is_a?(Array)
+          praw << self.post_convert_data(val, {:orig_key => key})
+        else
+          praw << "#{Knj::Web.urlenc(key)}=#{Knj::Web.urlenc(Knj::Http2.post_convert_data(val))}"
+        end
+        
         count += 1
-        praw << "#{count}=#{Knj::Web.urlenc(Knj::Http2.post_convert_data(val))}"
       end
     else
       return pdata.to_s
@@ -246,7 +268,7 @@ class Knj::Http2
       praw = Knj::Http2.post_convert_data(pdata)
       
       header_str = "POST /#{addr} HTTP/1.1#{@nl}"
-      header_str << self.header_str(self.default_headers(args).merge("Content-Length" => praw.length), args)
+      header_str << self.header_str(self.default_headers(args).merge("Content-Type" => "application/x-www-form-urlencoded", "Content-Length" => praw.length), args)
       header_str << "#{@nl}"
       header_str << praw
       
@@ -266,45 +288,89 @@ class Knj::Http2
     @mutex.synchronize do
       boundary = Digest::MD5.hexdigest(Time.now.to_f.to_s)
       
-      praw = ""
-      pdata.each do |key, val|
-        praw << "--#{boundary}#{@nl}"
-        
-        if val.class.name == "Tempfile" and val.respond_to?("original_filename")
-          praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val.original_filename}\";#{@nl}"
-          praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
-        elsif val.is_a?(Hash) and val[:filename]
-          praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val[:filename]}\";#{@nl}"
-          praw << "Content-Length: #{val[:content].to_s.bytesize}#{@nl}"
-        else
-          praw << "Content-Disposition: form-data; name=\"#{key}\";#{@nl}"
-          praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
+      #Generate 'praw'-variable with post-content.
+      tmp_path = "#{Knj::Os.tmpdir}/knj_http2_post_multiepart_tmp_#{boundary}"
+      
+      begin
+        File.open(tmp_path, "w") do |praw|
+          pdata.each do |key, val|
+            praw << "--#{boundary}#{@nl}"
+            
+            if val.class.name == "Tempfile" and val.respond_to?("original_filename")
+              praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val.original_filename}\";#{@nl}"
+              praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
+            elsif val.is_a?(Hash) and val[:filename]
+              praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val[:filename]}\";#{@nl}"
+              
+              if val[:content]
+                praw << "Content-Length: #{val[:content].to_s.bytesize}#{@nl}"
+              elsif val[:fpath]
+                praw << "Content-Length: #{File.size(val[:fpath])}#{@nl}"
+              else
+                raise "Could not figure out where to get content from."
+              end
+            else
+              praw << "Content-Disposition: form-data; name=\"#{key}\";#{@nl}"
+              praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
+            end
+            
+            praw << "Content-Type: text/plain#{@nl}"
+            praw << @nl
+            
+            if val.is_a?(StringIO)
+              praw << val.read
+            elsif val.is_a?(Hash) and val[:content]
+              praw << val[:content].to_s
+            elsif val.is_a?(Hash) and val[:fpath]
+              File.open(val[:fpath], "r") do |fp|
+                begin
+                  while data = fp.sysread(4096)
+                    praw << data
+                  end
+                rescue EOFError
+                  #ignore.
+                end
+              end
+            else
+              praw << val.to_s
+            end
+            
+            praw << @nl
+          end
+          
+          praw << "--#{boundary}--"
         end
         
-        praw << "Content-Type: text/plain#{@nl}"
-        praw << @nl
         
-        if val.is_a?(StringIO)
-          praw << val.read
-        elsif val.is_a?(Hash) and val[:content]
-          praw << val[:content].to_s
-        else
-          praw << val.to_s
+        #Generate header-string containing 'praw'-variable.
+        header_str = "POST /#{addr} HTTP/1.1#{@nl}"
+        header_str << self.header_str(self.default_headers(args).merge(
+          "Content-Type" => "multipart/form-data; boundary=#{boundary}",
+          "Content-Length" => File.size(tmp_path)
+        ), args)
+        header_str << @nl
+        
+        
+        #Debug.
+        print "Headerstr: #{header_str}\n" if @debug
+        
+        
+        #Write and return.
+        self.write(header_str)
+        File.open(tmp_path, "r") do |fp|
+          begin
+            while data = fp.sysread(4096)
+              @sock.write(data)
+            end
+          rescue EOFError
+            #ignore.
+          end
         end
         
-        praw << @nl
+        return self.read_response(args)
+      ensure
+        File.unlink(tmp_path) if File.exists?(tmp_path)
       end
-      
-      header_str = "POST /#{addr} HTTP/1.1#{@nl}"
-      header_str << self.header_str(self.default_headers(args).merge("Content-Type" => "multipart/form-data; boundary=#{boundary}", "Content-Length" => praw.bytesize), args)
-      header_str << "#{@nl}"
-      header_str << praw
-      header_str << "--#{boundary}--"
-      
-      print "Headerstr: #{header_str}\n" if @debug
-      
-      self.write(header_str)
-      return self.read_response(args)
     end
   end
   

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

@@ -40,10 +40,12 @@ class KnjDB_mysql
     @java_rs_data.delete(id)
   end
   
+  #Cleans the wref-map holding the tables.
   def clean
     self.tables.clean if self.tables
   end
   
+  #Respawns the connection to the MySQL-database.
   def reconnect
     case @subtype
       when "mysql"
@@ -243,7 +245,7 @@ class KnjDB_mysql
         when "\n" then "\\n"
         when "\r" then "\\r"
         when "\032" then "\\Z"
-        else "\\" + $1
+        else "\\#{$1}"
       end
     end
   end
@@ -296,10 +298,18 @@ class KnjDB_mysql
   
   #Inserts multiple rows in a table. Can return the inserted IDs if asked to in arguments.
   def insert_multi(tablename, arr_hashes, args = nil)
-    sql = "INSERT INTO `#{self.esc_table(tablename)}` ("
+    sql = "INSERT INTO `#{tablename}` ("
     
     first = true
-    arr_hashes.first.keys.each do |col_name|
+    if args and args[:keys]
+      keys = args[:keys]
+    elsif arr_hashes.first.is_a?(Hash)
+      keys = arr_hashes.first.keys
+    else
+      raise "Could not figure out keys."
+    end
+    
+    keys.each do |col_name|
       sql << "," if !first
       first = false if first
       sql << "`#{self.esc_col(col_name)}`"
@@ -316,19 +326,33 @@ class KnjDB_mysql
       end
       
       first_key = true
-      hash.each do |key, val|
-        if first_key
-          first_key = false
-        else
-          sql << ","
+      if hash.is_a?(Array)
+        hash.each do |val|
+          if first_key
+            first_key = false
+          else
+            sql << ","
+          end
+          
+          sql << "'#{self.escape(val)}'"
+        end
+      else
+        hash.each do |key, val|
+          if first_key
+            first_key = false
+          else
+            sql << ","
+          end
+          
+          sql << "'#{self.escape(val)}'"
         end
-        
-        sql << "'#{self.escape(val)}'"
       end
     end
     
     sql << ")"
     
+    return sql if args and args[:return_sql]
+    
     self.query(sql)
     
     if args and args[:return_id]
@@ -348,9 +372,22 @@ class KnjDB_mysql
       return nil
     end
   end
+  
+  #Starts a transaction, yields the database and commits at the end.
+  def transaction
+    @knjdb.q("START TRANSACTION")
+    
+    begin
+      yield(@knjdb)
+    ensure
+      @knjdb.q("COMMIT")
+    end
+  end
 end
 
+#This class controls the results for the normal MySQL-driver.
 class KnjDB_mysql_result
+  #Constructor. This should not be called manually.
   def initialize(driver, result)
     @driver = driver
     @result = result
@@ -365,17 +402,20 @@ class KnjDB_mysql_result
     end
   end
   
+  #Returns a single result.
   def fetch
     return self.fetch_hash_symbols if @driver.knjdb.opts[:return_keys] == "symbols"
     return self.fetch_hash_strings
   end
   
+  #Returns a single result as a hash with strings as keys.
   def fetch_hash_strings
     @mutex.synchronize do
       return @result.fetch_hash
     end
   end
   
+  #Returns a single result as a hash with symbols as keys.
   def fetch_hash_symbols
     fetched = nil
     @mutex.synchronize do
@@ -394,6 +434,7 @@ class KnjDB_mysql_result
     return ret
   end
   
+  #Loops over every result yielding it.
   def each
     while data = self.fetch_hash_symbols
       yield(data)
@@ -401,7 +442,9 @@ class KnjDB_mysql_result
   end
 end
 
+#This class controls the unbuffered result for the normal MySQL-driver.
 class KnjDB_mysql_unbuffered_result
+  #Constructor. This should not be called manually.
   def initialize(conn, opts, result)
     @conn = conn
     @result = result
@@ -415,6 +458,7 @@ class KnjDB_mysql_unbuffered_result
     end
   end
   
+  #Lods the keys for the object.
   def load_keys
     @keys = []
     keys = @res.fetch_fields
@@ -423,6 +467,7 @@ class KnjDB_mysql_unbuffered_result
     end
   end
   
+  #Returns a single result.
   def fetch
     if @enum
       begin
@@ -462,6 +507,7 @@ class KnjDB_mysql_unbuffered_result
     end
   end
   
+  #Loops over every single result yielding it.
   def each
     while data = self.fetch
       yield(data)
@@ -469,11 +515,14 @@ class KnjDB_mysql_unbuffered_result
   end
 end
 
+#This class controls the result for the MySQL2 driver.
 class KnjDB_mysql2_result
+  #Constructor. This should not be called manually.
   def initialize(result)
     @result = result
   end
   
+  #Returns a single result.
   def fetch
     @enum = @result.to_enum if !@enum
     
@@ -484,17 +533,19 @@ class KnjDB_mysql2_result
     end
   end
   
+  #Loops over every single result yielding it.
   def each
     @result.each do |res|
       #This sometimes happens when streaming results...
       next if !res
-      
       yield(res)
     end
   end
 end
 
+#This class controls the result for the Java-MySQL-driver.
 class KnjDB_java_mysql_result
+  #Constructor. This should not be called manually.
   def initialize(knjdb, opts, result)
     @knjdb = knjdb
     @result = result

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

@@ -1,10 +1,11 @@
+#This class handels various MySQL-column-specific operations.
 class KnjDB_mysql::Columns
-  attr_reader :db
-  
+  #Constructor. Should not be called manually.
   def initialize(args)
     @args = args
   end
   
+  #Returns the SQL for this column.
   def data_sql(data)
     raise "No type given." if !data["type"]
     
@@ -30,9 +31,11 @@ class KnjDB_mysql::Columns
   end
 end
 
+#This class handels every MySQL-column, that can be returned from a table-object.
 class KnjDB_mysql::Columns::Column
   attr_reader :args
   
+  #Constructor. Should not be called manually.
   def initialize(args)
     @args = args
   end
@@ -42,14 +45,17 @@ class KnjDB_mysql::Columns::Column
     return @args[:data][:Field]
   end
   
+  #Returns the name of the column.
   def name
     return @args[:data][:Field]
   end
   
+  #Returns the table-object that this column belongs to.
   def table
     return @args[:db].tables[@args[:table_name]]
   end
   
+  #Returns all data of the column in the knjdb-format.
   def data
     return {
       "type" => self.type,
@@ -62,37 +68,43 @@ class KnjDB_mysql::Columns::Column
     }
   end
   
+  #Returns the type of the column (integer, varchar etc.).
   def type
     if !@type
       if match = @args[:data][:Type].match(/^([A-z]+)$/)
         @maxlength = false
-        @type = match[0]
+        @type = match[0].to_sym
       elsif match = @args[:data][:Type].match(/^decimal\((\d+),(\d+)\)$/)
         @maxlength = "#{match[1]},#{match[2]}"
-        @type = "decimal"
+        @type = :decimal
       elsif match = @args[:data][:Type].match(/^enum\((.+)\)$/)
         @maxlength = match[1]
-        @type = "enum"
-      elsif match = @args[:data][:Type].match(/^(.+)\((\d+)\)$/)
-        @maxlength = match[2]
-        @type = match[1]
+        @type = :enum
+      elsif match = @args[:data][:Type].match(/^(.+)\((\d+)\)/)
+        @maxlength = match[2].to_i
+        @type = match[1].to_sym
       end
+      
+      raise "Still not type from: '#{@args[:data][:Type]}'." if @type.to_s.strip.length <= 0
     end
     
     return @type
   end
   
+  #Return true if the columns allows null. Otherwise false.
   def null?
     return false if @args[:data][:Null] == "NO"
     return true
   end
   
+  #Returns the maxlength.
   def maxlength
-    self.type
+    self.type if !@maxlength
     return @maxlength if @maxlength
     return false
   end
   
+  #Returns the default value for the column.
   def default
     return false if (self.type == "datetime" or self.type == "date") and @args[:data][:Default].to_s.strip.length <= 0
     return false if (self.type == "int" or self.type == "bigint") and @args[:data][:Default].to_s.strip.length <= 0
@@ -100,24 +112,30 @@ class KnjDB_mysql::Columns::Column
     return @args[:data][:Default]
   end
   
+  #Returns true if the column is the primary key. Otherwise false.
   def primarykey?
-    return false if @args[:data][:pk].to_i == 0
-    return true
+    return true if @args[:data][:Key] == "PRI"
+    return false
   end
   
+  #Returns true if the column is auto-increasing. Otherwise false.
   def autoincr?
     return true if @args[:data][:Extra].index("auto_increment") != nil
     return false
   end
   
+  #Returns the comment for the column.
   def comment
     return @args[:data][:Comment]
   end
   
+  #Drops the column from the table.
   def drop
     @args[:db].query("ALTER TABLE `#{@args[:table_name]}` DROP COLUMN `#{self.name}`")
+    return nil
   end
   
+  #Changes the column properties by the given hash.
   def change(data)
     col_escaped = "#{@args[:db].enc_col}#{@args[:db].esc_col(self.name)}#{@args[:db].enc_col}"
     table_escape = "#{@args[:db].enc_table}#{@args[:db].esc_table(self.table.name)}#{@args[:db].enc_table}"