knjrbfw 0.0.32 → 0.0.33

data/Gemfile

@@ -2,6 +2,8 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
+gem "wref"
+gem "tsafe"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -0,0 +1,38 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    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)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    sqlite3 (1.3.6)
+    tsafe (0.0.0)
+    wref (0.0.0)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  jeweler (~> 1.6.3)
+  rcov
+  rmagick
+  rspec (~> 2.3.0)
+  sqlite3
+  tsafe
+  wref

data/VERSION

@@ -1 +1 @@
-0.0.32
+0.0.33

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.32"
+  s.version = "0.0.33"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-05-06}
+  s.date = %q{2012-05-18}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Gemfile",
+    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -50,6 +51,7 @@ Gem::Specification.new do |s|
     "lib/knj/autoload/sqlite3.rb",
     "lib/knj/autoload/tmail.rb",
     "lib/knj/autoload/tzinfo.rb",
+    "lib/knj/autoload/wref.rb",
     "lib/knj/autoload/xmlsimple.rb",
     "lib/knj/autoload/zip.rb",
     "lib/knj/cmd_gen.rb",
@@ -242,7 +244,6 @@ Gem::Specification.new do |s|
     "lib/knj/win.rb",
     "lib/knj/win_registry.rb",
     "lib/knj/win_tightvnc.rb",
-    "lib/knj/wref.rb",
     "lib/knj/x11vnc.rb",
     "lib/knj/youtube.rb",
     "lib/knjrbfw.rb",
@@ -253,6 +254,7 @@ Gem::Specification.new do |s|
     "spec/db_spec_encoding_test_file.txt",
     "spec/http2_spec.rb",
     "spec/knjrbfw_spec.rb",
+    "spec/objects_spec.rb",
     "spec/php_spec.rb",
     "spec/process_meta_spec.rb",
     "spec/process_spec.rb",
@@ -260,7 +262,6 @@ Gem::Specification.new do |s|
     "spec/strings_spec.rb",
     "spec/threadsafe_spec.rb",
     "spec/web_spec.rb",
-    "spec/wref_spec.rb",
     "testfiles/image.jpg"
   ]
   s.homepage = %q{http://github.com/kaspernj/knjrbfw}
@@ -273,6 +274,8 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<wref>, [">= 0"])
+      s.add_runtime_dependency(%q<tsafe>, [">= 0"])
       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"])
@@ -280,6 +283,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rmagick>, [">= 0"])
     else
+      s.add_dependency(%q<wref>, [">= 0"])
+      s.add_dependency(%q<tsafe>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
@@ -288,6 +293,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rmagick>, [">= 0"])
     end
   else
+    s.add_dependency(%q<wref>, [">= 0"])
+    s.add_dependency(%q<tsafe>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.3"])

data/lib/knj/autoload/wref.rb

@@ -0,0 +1,6 @@
+begin
+  require "wref"
+rescue LoadError
+  require "rubygems"
+  require "wref"
+end

data/lib/knj/autoload.rb

@@ -6,7 +6,6 @@ module Knj
   autoload :Fs, $knjpath + "fs/fs"
   autoload :Php_parser, $knjpath + "php_parser/php_parser"
   autoload :SSHRobot, $knjpath + "sshrobot/sshrobot"
-  autoload :Wref_map, $knjpath + "wref"
 end
 
 #ruby objects.
@@ -85,6 +84,9 @@ end
 autoload :Dictionary, $knjpath + "autoload/facets_dictionary"
 
 #gems
-autoload :Facebooker, $knjpath + "autoload/facebooker"
-autoload :Cinch, $knjpath + "autoload/cinch"
 autoload :ActiveSupport, $knjpath + "autoload/activesupport"
+autoload :Cinch, $knjpath + "autoload/cinch"
+autoload :Facebooker, $knjpath + "autoload/facebooker"
+autoload :Tsafe, "tsafe"
+autoload :Wref, $knjpath + "autoload/wref"
+autoload :Wref_map, $knjpath + "autoload/wref"

data/lib/knj/datarow.rb

@@ -5,7 +5,10 @@
 # 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.
-  attr_reader :data
+  def data
+    self.reload if @should_reload
+    return @data
+  end
   
   #Returns the Knj::Objects which handels this model.
   attr_reader :ob
@@ -482,63 +485,92 @@ class Knj::Datarow
     @classname = newclassname
   end
   
-  #Initializes the object. This should be called from Knj::Objects.
-  def initialize(d)
-    @ob = d.ob
-    @db = d.ob.db
+  #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 d.data.is_a?(Hash)
-      @data = d.data
-    elsif d.data
-      @data = {:id => d.data}
-      self.reload
+    if data.is_a?(Hash) and data.key?(:id)
+      @data = data
+      @id = @data[:id].to_i
+    elsif data
+      @id = data.to_i
+      
+      classname = self.class.classname.to_sym
+      if @ob.ids_cache_should.key?(classname)
+        #ID caching is enabled for this model - dont reload until first use.
+        raise Knj::Errors::NotFound, "ID was not found in cache: '#{id}'." if !@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.
+        if !args or !args[:skip_reload]
+          self.reload
+        else
+          @should_reload = true
+        end
+      end
     else
-      raise Knj::Errors::InvalidData, "Could not figure out the data from '#{d.data.class.name}'."
+      raise Knj::Errors::InvalidData, "Could not figure out the data from '#{data.class.name}'."
     end
+    
+    raise "Invalid ID: '#{@id}'." if @id.to_i <= 0
   end
   
   #Reloads the data from the database.
+  #===Examples
   # old_username = user[:username]
   # user.reload
   # print "The username changed in the database!" if user[:username] != old_username
   def reload
-    data = @db.single(self.table, {:id => @data[:id]})
-    if !data
-      raise Knj::Errors::NotFound, "Could not find any data for the object with ID: '#{@data[:id]}' in the table '#{self.table}'."
-    end
-    
-    @data = data
+    @data = @db.single(self.table, {:id => @id})
+    raise Knj::Errors::NotFound, "Could not find any data for the object with ID: '#{@id}' in the table '#{self.table}'." if !@data
+    @should_reload = false
+  end
+  
+  #Tells the object that it should reloads its data because it has changed. It wont reload before it is required though, which may save you a couple of SQL-calls.
+  #===Examples
+  # obj = _ob.get(:User, 5)
+  # obj.should_reload
+  def should_reload
+    @should_reload = true
+    @data = nil
   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 => @data[:id]})
-    self.reload
-    
-    if @ob
-      @ob.call("object" => self, "signal" => "update")
-    end
+    @db.update(self.table, newdata, {:id => @id})
+    self.should_reload
+    @ob.call("object" => self, "signal" => "update") if @ob
   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
   
   #Returns true if that key exists on the object.
+  #===Examples
+  # print "Looks like the user has a name." if user.key?(:name)
   def key?(key)
+    self.reload if @should_reload
     return @data.key?(key.to_sym)
   end
   alias has_key? key?
   
   #Returns true if the object has been deleted.
+  #===Examples
+  # print "That user is deleted." if user.deleted?
   def deleted?
-    return true if !@ob and !@data
+    return true if !@ob and !@data and !@id
     return false
   end
   
@@ -548,9 +580,11 @@ class Knj::Datarow
   # print "ID again: #{user.id}\n"
   def [](key)
     raise "Key was not a symbol: '#{key.class.name}'." if !key.is_a?(Symbol)
-    raise "No data was loaded on the object? Maybe you are trying to call a deleted object?" if !@data
+    return @id if !@data and key == :id and @id
+    self.reload if @should_reload
+    raise "No data was loaded on the object? Maybe you are trying to call a deleted object? (#{self.class.classname}(#{@id}), #{@should_reload})" if !@data
     return @data[key] if @data.key?(key)
-    raise "No such key: '#{key}' on '#{self.class.name}'."
+    raise "No such key: '#{key}' on '#{self.class.name}' (#{@data.keys.join(", ")}) (#{@should_reload})."
   end
   
   #Writes/updates a keys value on the object.
@@ -558,21 +592,26 @@ class Knj::Datarow
   # user[:username] = 'New username'
   def []=(key, value)
     self.update(key.to_sym => value)
-    self.reload
+    self.should_reload
   end
   
   #Returns the objects ID.
   def id
     raise "This object has been deleted." if self.deleted?
-    raise "No data on object." if !@data
-    return @data[:id]
+    raise "No ID on object." if !@id
+    return @id
   end
   
-  #This enable Knj::Wref to not return the wrong object.
-  alias __object_unique_id__ id
+  #This enable Wref to not return the wrong object.
+  def __object_unique_id__
+    return 0 if self.deleted?
+    return self.id
+  end
   
   #Tries to figure out, and returns, the possible name or title for the object.
   def name
+    self.reload if @should_reload
+    
     if @data.key?(:title)
       return @data[:title]
     elsif @data.key?(:name)
@@ -590,10 +629,7 @@ class Knj::Datarow
   #Calls the name-method and returns a HTML-escaped value. Also "[no name]" if the name is empty.
   def name_html
     name_str = self.name.to_s
-    if name_str.length <= 0
-      name_str = "[no name]"
-    end
-    
+    name_str = "[no name]" if name_str.length <= 0
     return name_str
   end
   
@@ -605,8 +641,9 @@ class Knj::Datarow
   # user.each do |key, val|
   #   print "#{key}: #{val}\n" #=> username: John Doe
   # end
-  def each(&args)
-    return @data.each(&args)
+  def each(*args, &block)
+    self.reload if @should_reload
+    return @data.each(*args, &block)
   end
   
   private

data/lib/knj/errors.rb

@@ -34,8 +34,11 @@ module Knj::Errors
     str = ""
     
     if args[:html]
-      str << "<b>#{err.class.name}</b>: #{err.message}<br />\n<br />\n"
-      str << err.backtrace.join("<br />\n")
+      str << "<b>#{Knj::Web.html(err.class.name)}</b>: #{Knj::Web.html(err.message)}<br />\n<br />\n"
+      
+      err.backtrace.each do |bt|
+        str << "#{Knj::Web.html(bt)}<br />\n"
+      end
     else
       str << "#{err.class.name}: #{err.message}\n\n"
       str << err.backtrace.join("\n")

data/lib/knj/http2.rb

@@ -273,16 +273,22 @@ class Knj::Http2
           
           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.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].bytesize}#{@nl}"
           else
             praw << "Content-Disposition: form-data; name=\"#{key}\";#{@nl}"
+            praw << "Content-Length: #{val.bytesize}#{@nl}"
           end
           
           praw << "Content-Type: text/plain#{@nl}"
-          praw << "Content-Length: #{val.length}#{@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
           end
@@ -292,7 +298,7 @@ class Knj::Http2
         
         header_str = "POST /#{addr} HTTP/1.1#{@nl}"
         header_str << "Content-Type: multipart/form-data; boundary=#{boundary}#{@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-Length" => praw.bytesize), args)
         header_str << "#{@nl}"
         header_str << praw
         header_str << "--#{boundary}--"

data/lib/knj/knj.rb

@@ -6,8 +6,6 @@ module Knj
   def self.const_missing(name)
     if name == :Db
       filepath = "#{$knjpath}knjdb/libknjdb"
-    elsif name == :Wref_map
-      filepath = "#{$knjpath}wref"
     else
       filepath = "#{$knjpath}#{name.to_s.downcase}"
     end

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

@@ -263,15 +263,15 @@ class KnjDB_mysql
     case @subtype
       when "mysql"
         @mutex.synchronize do
-          return @conn.insert_id
+          return @conn.insert_id.to_i
         end
       when "mysql2"
         @mutex.synchronize do
-          return @conn.last_id
+          return @conn.last_id.to_i
         end
       when "java"
         data = self.query("SELECT LAST_INSERT_ID() AS id").fetch
-        return data[:id] if data.key?(:id)
+        return data[:id].to_i if data.key?(:id)
         raise "Could not figure out last inserted ID."
     end
   end
@@ -294,7 +294,8 @@ class KnjDB_mysql
     @port = nil
   end
   
-  def insert_multi(tablename, arr_hashes)
+  #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)}` ("
     
     first = true
@@ -329,6 +330,23 @@ class KnjDB_mysql
     sql << ")"
     
     self.query(sql)
+    
+    if args and args[:return_id]
+      first_id = self.lastID
+      raise "Invalid ID: #{first_id}" if first_id.to_i <= 0
+      ids = [first_id]
+      1.upto(arr_hashes.length - 1) do |count|
+        ids << first_id + count
+      end
+      
+      ids_length = ids.length
+      arr_hashes_length = arr_hashes.length
+      raise "Invalid length (#{ids_length}, #{arr_hashes_length})." if ids_length != arr_hashes_length
+      
+      return ids
+    else
+      return nil
+    end
   end
 end
 

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

@@ -1,5 +1,3 @@
-require "#{$knjpath}wref"
-
 class KnjDB_mysql::Tables
   attr_reader :db, :list
   
@@ -8,7 +6,7 @@ class KnjDB_mysql::Tables
     @db = @args[:db]
     @subtype = @db.opts[:subtype]
     @list_mutex = Mutex.new
-    @list = Knj::Wref_map.new
+    @list = Wref_map.new
     @list_should_be_reloaded = true
   end
   
@@ -22,7 +20,7 @@ class KnjDB_mysql::Tables
     
     begin
       return @list[table_name]
-    rescue Knj::Wref::Recycled
+    rescue Wref::Recycled
       #ignore.
     end
     
@@ -105,8 +103,8 @@ class KnjDB_mysql::Tables::Table
     @db = args[:db]
     @data = args[:data]
     @subtype = @db.opts[:subtype]
-    @list = Knj::Wref_map.new
-    @indexes_list = Knj::Wref_map.new
+    @list = Wref_map.new
+    @indexes_list = Wref_map.new
     
     raise "Could not figure out name from: '#{@data}'." if !@data[:Name]
   end
@@ -143,7 +141,7 @@ class KnjDB_mysql::Tables::Table
     
     begin
       return @list[name]
-    rescue Knj::Wref::Recycled
+    rescue Wref::Recycled
       #ignore.
     end
     
@@ -223,7 +221,7 @@ class KnjDB_mysql::Tables::Table
     
     begin
       return @indexes_list[name]
-    rescue Knj::Wref::Recycled
+    rescue Wref::Recycled
       #ignore.
     end
     

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

@@ -56,7 +56,7 @@ class KnjDB_sqlite3
       end
     rescue => e
       #Add SQL to the error message.
-      raise e.class, "#{e.message}\n\nSQL: #{string}"
+      raise e.class, "#{e.message} (SQL: #{string})"
     end
   end
   

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

@@ -1,5 +1,3 @@
-require "#{$knjpath}wref"
-
 class KnjDB_sqlite3::Tables
   attr_reader :db, :driver
   
@@ -8,7 +6,7 @@ class KnjDB_sqlite3::Tables
     @db = @args[:db]
     
     @list_mutex = Mutex.new
-    @list = Knj::Wref_map.new
+    @list = Wref_map.new
   end
   
   def [](table_name)
@@ -16,7 +14,7 @@ class KnjDB_sqlite3::Tables
     
     begin
       return @list[table_name]
-    rescue Knj::Wref::Recycled
+    rescue Wref::Recycled
       #ignore.
     end
     
@@ -83,8 +81,8 @@ class KnjDB_sqlite3::Tables::Table
     @db = args[:db]
     @data = args[:data]
     
-    @list = Knj::Wref_map.new
-    @indexes_list = Knj::Wref_map.new
+    @list = Wref_map.new
+    @indexes_list = Wref_map.new
   end
   
   def name
@@ -267,13 +265,13 @@ class KnjDB_sqlite3::Tables::Table
     
     begin
       return @indexes_list[name]
-    rescue Knj::Wref::Recycled
+    rescue Wref::Recycled
       if @db.opts[:index_append_table_name]
         tryname = "#{self.name}__#{name}"
         
         begin
           return @indexes_list[tryname]
-        rescue Knj::Wref::Recycled
+        rescue Wref::Recycled
           #ignore.
         end
       else

data/lib/knj/knjdb/libknjdb.rb

@@ -1,3 +1,6 @@
+require "rubygems"
+require "wref"
+
 #A wrapper of several possible database-types.
 #
 #===Examples
@@ -28,7 +31,8 @@ class Knj::Db
     @int_types = ["int", "bigint", "tinyint", "smallint", "mediumint"]
     
     if !@opts[:threadsafe]
-      @mutex = Mutex.new
+      require "monitor"
+      @mutex = Monitor.new
     end
     
     @debug = @opts[:debug]
@@ -209,7 +213,7 @@ class Knj::Db
   #===Examples
   # db.insert(:users, {:name => "John", :lastname => "Doe"})
   # id = db.insert(:users, {:name => "John", :lastname => "Doe"}, :return_id => true)
-  def insert(tablename, arr_insert, args = {})
+  def insert(tablename, arr_insert, args = nil)
     self.conn_exec do |driver|
       sql = "INSERT INTO #{driver.escape_table}#{tablename.to_s}#{driver.escape_table} ("
       
@@ -240,25 +244,37 @@ class Knj::Db
       sql << ")"
       
       driver.query(sql)
-      return driver.lastID if args[:return_id]
+      return driver.lastID if args and args[:return_id]
     end
   end
   
-  #Simply and optimal insert multiple rows into a table in a single query.
+  #Simply and optimal insert multiple rows into a table in a single query. Uses the drivers functionality if supported or inserts each row manually.
   #
   #===Examples
   # db.insert_multi(:users, [
   #   {:name => "John", :lastname => "Doe"},
   #   {:name => "Kasper", :lastname => "Johansen"}
   # ])
-  def insert_multi(tablename, arr_hashes)
+  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)
-        return false if arr_hashes.empty?
-        driver.insert_multi(tablename, arr_hashes)
+        return driver.insert_multi(tablename, arr_hashes, args)
       else
+        ids = [] if args and args[:return_id]
         arr_hashes.each do |hash|
-          self.insert(tablename, hash)
+          if ids
+            ids << self.insert(tablename, hash, args)
+          else
+            self.insert(tablename, hash)
+          end
+        end
+        
+        if ids
+          return ids
+        else
+          return nil
         end
       end
     end
@@ -416,18 +432,9 @@ class Knj::Db
         @conns.free(conn)
       end
     elsif @conn
-      begin
-        @mutex.synchronize do
-          yield(@conn)
-          return nil
-        end
-      rescue ThreadError => e
-        if e.message != "deadlock; recursive locking"
-          yield(@conn)
-          return nil
-        else
-          raise e
-        end
+      @mutex.synchronize do
+        yield(@conn)
+        return nil
       end
     end
     

data/lib/knj/knjdb/revision.rb

@@ -217,7 +217,7 @@ class Knj::Db::Revision
             end
           end
           
-          self.rows_init("db" => db, "table" => table_obj, "rows" => table_data["rows"]) if table_data and table_data["rows"]
+          rows_init("db" => db, "table" => table_obj, "rows" => table_data["rows"]) if table_data and table_data["rows"]
         rescue Knj::Errors::NotFound => e
           if table_data["renames"]
             table_data["renames"].each do |table_name_rename|