knjrbfw 0.0.52 → 0.0.53

data/VERSION

@@ -1 +1 @@
-0.0.52
+0.0.53

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.52"
+  s.version = "0.0.53"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-06-29}
+  s.date = %q{2012-07-04}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [

data/lib/knj/datarow.rb

@@ -452,19 +452,19 @@ class Knj::Datarow
     return sql.to_s if d.args["return_sql"]
     
     if select_col_as_array
-      ids = [] if !block
-      d.db.q(sql, qargs) do |data|
-        if block
-          block.call(data[:id])
-        else
-          ids << data[:id]
+      enum = Enumerator.new do |yielder|
+        d.db.q(sql, qargs) do |data|
+          yielder << data[:id]
         end
       end
       
-      if !block
-        return ids
-      else
+      if block
+        enum.each(&block)
         return nil
+      elsif d.ob.args[:array_enum]
+        return Array_enumerator.new(enum)
+      else
+        return enum.to_a
       end
     elsif count
       ret = d.db.query(sql).fetch

data/lib/knj/datarow_custom.rb

@@ -6,6 +6,12 @@ class Knj::Datarow_custom
     return true
   end
   
+  #Initializes variables on the class from objects.
+  def self.datarow_init(d)
+    @@ob = d.ob
+    @@db = d.db
+  end
+  
   def self.has_one(arr)
     arr.each do |val|
       methodname = nil
@@ -28,13 +34,13 @@ class Knj::Datarow_custom
       colname = "#{classname.to_s.downcase}_id".to_sym if !colname
       
       define_method(methodname) do
-        return @ob.get_try(self, colname, classname)
+        return @@ob.get_try(self, colname, classname)
       end
       
       methodname_html = "#{methodname.to_s}_html".to_sym
       define_method(methodname_html) do |*args|
         obj = self.send(methodname)
-        return @ob.events.call(:no_html, classname) if !obj
+        return @@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)
@@ -63,13 +69,10 @@ class Knj::Datarow_custom
   end
   
   def table
-    return self.class.name.split("::").last
+    return self.class.table
   end
   
-  def initialize(d)
-    @ob = d.ob
-    data = d.data
-    
+  def initialize(data, args)
     if data.is_a?(Hash)
       @data = Knj::ArrayExt.hash_sym(data)
       @id = self.id
@@ -95,14 +98,8 @@ class Knj::Datarow_custom
   
   #Returns a key from the hash that this object is holding or raises an error if it doesnt exist.
   def [](key)
-    if !@data
-      raise "No data spawned on object."
-    end
-    
-    if !@data.key?(key)
-      raise "No such key: '#{key}'. Available keys are: '#{@data.keys.sort.join(", ")}'."
-    end
-    
+    raise "No data spawned on object." if !@data
+    raise "No such key: '#{key}'. Available keys are: '#{@data.keys.sort.join(", ")}'." if !@data.key?(key)
     return @data[key]
   end
   

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

@@ -39,9 +39,7 @@ class KnjDB_mysql::Tables
     ret = {} unless block_given?
     
     sql = "SHOW TABLE STATUS"
-    if args[:name]
-      sql << " WHERE `Name` = '#{@db.esc(args[:name])}'"
-    end
+    sql << " WHERE `Name` = '#{@db.esc(args[:name])}'" if args[:name]
     
     @list_mutex.synchronize do
       @db.q(sql) do |d_tables|
@@ -154,26 +152,25 @@ class KnjDB_mysql::Tables::Table
   def column(name)
     name = name.to_s
     
-    begin
+    if col = @list.get!(name)
       return @list[name]
-    rescue Wref::Recycled
-      #ignore.
     end
     
-    self.columns do |col|
+    self.columns(:name => name) do |col|
       return col if col.name == name
     end
     
     raise Knj::Errors::NotFound.new("Column not found: '#{name}'.")
   end
   
-  def columns
+  def columns(args = nil)
     @db.cols
     ret = {}
     sql = "SHOW FULL COLUMNS FROM `#{self.name}`"
+    sql << " WHERE `Field` = '#{@db.esc(args[:name])}'" if args and args.key?(:name)
     
     @db.q(sql) do |d_cols|
-      obj = @list.get!(d_cols[:Field])
+      obj = @list.get!(d_cols[:Field].to_s)
       
       if !obj
         obj = KnjDB_mysql::Columns::Column.new(
@@ -181,13 +178,13 @@ class KnjDB_mysql::Tables::Table
           :db => @db,
           :data => d_cols
         )
-        @list[d_cols[:Field]] = obj
+        @list[d_cols[:Field].to_s] = obj
       end
       
       if block_given?
         yield(obj)
       else
-        ret[d_cols[:Field]] = obj
+        ret[d_cols[:Field].to_s] = obj
       end
     end
     
@@ -198,14 +195,17 @@ class KnjDB_mysql::Tables::Table
     end
   end
   
-  def indexes
+  def indexes(args = nil)
     @db.indexes
     ret = {}
     
-    @db.q("SHOW INDEX FROM `#{self.name}`") do |d_indexes|
+    sql = "SHOW INDEX FROM `#{self.name}`"
+    sql << " WHERE `Key_name` = '#{@db.esc(args[:name])}'" if args and args.key?(:name)
+    
+    @db.q(sql) do |d_indexes|
       next if d_indexes[:Key_name] == "PRIMARY"
       
-      obj = @indexes_list.get!(d_indexes[:Key_name])
+      obj = @indexes_list.get!(d_indexes[:Key_name].to_s)
       
       if !obj
         obj = KnjDB_mysql::Indexes::Index.new(
@@ -214,13 +214,13 @@ class KnjDB_mysql::Tables::Table
           :data => d_indexes
         )
         obj.columns << d_indexes[:Column_name]
-        @indexes_list[d_indexes[:Key_name]] = obj
+        @indexes_list[d_indexes[:Key_name].to_s] = obj
       end
       
       if block_given?
         yield(obj)
       else
-        ret[d_indexes[:Key_name]] = obj
+        ret[d_indexes[:Key_name].to_s] = obj
       end
     end
     
@@ -234,14 +234,12 @@ class KnjDB_mysql::Tables::Table
   def index(name)
     name = name.to_s
     
-    begin
-      return @indexes_list[name]
-    rescue Wref::Recycled
-      #ignore.
+    if index = @indexes_list.get!(name)
+      return index
     end
     
-    self.indexes do |index|
-      return index if index.name == name
+    self.indexes(:name => name) do |index|
+      return index if index.name.to_s == name
     end
     
     raise Knj::Errors::NotFound.new("Index not found: #{name}.")

data/lib/knj/knjdb/libknjdb.rb

@@ -235,34 +235,38 @@ class Knj::Db
   # 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 #{driver.escape_table}#{tablename.to_s}#{driver.escape_table}"
       
-      first = true
-      arr_insert.each do |key, value|
-        if first
-          first = false
-        else
-          sql << ", "
+      if arr_insert and !arr_insert.empty?
+        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}"
         end
         
-        sql << "#{driver.escape_col}#{key.to_s}#{driver.escape_col}"
-      end
-      
-      sql << ") VALUES ("
-      
-      first = true
-      arr_insert.each do |key, value|
-        if first
-          first = false
-        else
-          sql << ", "
+        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}"
         end
         
-        sql << "#{driver.escape_val}#{driver.escape(value.to_s)}#{driver.escape_val}"
+        sql << ")"
       end
       
-      sql << ")"
-      
       return sql if args and args[:return_sql]
       driver.query(sql)
       return driver.lastID if args and args[:return_id]
@@ -473,11 +477,11 @@ class Knj::Db
   #   str = driver.escape('something̈́')
   # end
   def conn_exec
-    if Thread.current[:knjdb]
+    if tcur = Thread.current and tcur[:knjdb]
       tid = self.__id__
       
-      if Thread.current[:knjdb].key?(tid)
-        yield(Thread.current[:knjdb][tid])
+      if tcur[:knjdb].key?(tid)
+        yield(tcur[:knjdb][tid])
         return nil
       end
     end
@@ -603,6 +607,7 @@ class Knj::Db
   #Yields a query-buffer and flushes at the end of the block given.
   def q_buffer(&block)
     Knj::Db::Query_buffer.new(:db => self, &block)
+    return nil
   end
   
   #Returns the last inserted ID.

data/lib/knj/knjdb/query_buffer.rb

@@ -12,7 +12,7 @@ class Knj::Db::Query_buffer
     begin
       yield(self)
     ensure
-      self.flush if @queries_count > 0 or !@queries.empty? or !@inserts.empty?
+      self.flush
     end
   end
   
@@ -24,7 +24,7 @@ class Knj::Db::Query_buffer
       @queries_count += 1
     end
     
-    self.flush if @queries_count > 1000
+    self.flush if @queries_count >= 1000
     return nil
   end
   
@@ -50,15 +50,15 @@ class Knj::Db::Query_buffer
       @queries_count += 1
     end
     
-    self.flush if @queries_count > 1000
+    self.flush if @queries_count >= 1000
     return nil
   end
   
   #Flushes all queries out in a transaction. This will automatically be called for every 1000 queries.
   def flush
+    return nil if @queries_count <= 0
+    
     @lock.synchronize do
-      return nil if @queries_count <= 0 and @queries.empty? and @inserts.empty?
-      
       @args[:db].transaction do
         @queries.shift(1000).each do |str|
           STDOUT.print "Executing via buffer: #{str}\n" if @debug
@@ -75,7 +75,8 @@ class Knj::Db::Query_buffer
       
       @inserts.clear
       @queries_count = 0
-      return nil
     end
+    
+    return nil
   end
 end

data/lib/knj/knjdb/revision.rb

@@ -42,7 +42,12 @@ class Knj::Db::Revision
     raise "No tables given." if !schema.has_key?("tables")
     
     #Cache tables to avoid constant reloading.
-    tables = db.tables.list
+    if !args["tables_cache"] or args["tables_cache"]
+      print "Caching tables-list.\n" if args["debug"]
+      tables = db.tables.list
+    else
+      print "Skipping tables-cache.\n" if args["debug"]
+    end
     
     schema["tables"].each do |table_name, table_data|
       begin
@@ -75,7 +80,7 @@ class Knj::Db::Revision
                   
                   actual_after = nil
                   set_next = false
-                  table_obj.columns do |col_iter|
+                  cols.each do |col_name, col_iter|
                     if col_iter.name == col_obj.name
                       break
                     else
@@ -138,7 +143,13 @@ class Knj::Db::Revision
                   end
                 end
                 
-                col_obj.change(col_data) if dochange
+                if dochange
+                  col_obj.change(col_data)
+                  
+                  #Change has been made - update cache.
+                  cols = table_obj.columns
+                end
+                
                 first_col = false
               rescue Knj::Errors::NotFound => e
                 print "Column not found: #{table_obj.name}.#{col_data["name"]}.\n" if args["debug"]
@@ -161,6 +172,9 @@ class Knj::Db::Revision
                     
                     col_rename.change(col_data)
                     
+                    #Change has been made - update cache.
+                    cols = table_obj.columns
+                    
                     if col_data.is_a?(Hash) and col_data["on_after_rename"]
                       col_data["on_after_rename"].call("db" => db, "table" => table_obj, "col" => col_rename, "col_data" => col_data)
                     end
@@ -175,6 +189,10 @@ class Knj::Db::Revision
                 oncreated = col_data["on_created"]
                 col_data.delete("on_created") if col_data["oncreated"]
                 col_obj = table_obj.create_columns([col_data])
+                
+                #Change has been made - update cache.
+                cols = table_obj.columns
+                
                 oncreated.call("db" => db, "table" => table_obj) if oncreated
               end
             end
@@ -236,7 +254,7 @@ class Knj::Db::Revision
           if table_data.key?("renames")
             table_data["renames"].each do |table_name_rename|
               begin
-                table_rename = db.tables[table_name_rename]
+                table_rename = db.tables[table_name_rename.to_sym]
                 table_rename.rename(table_name)
                 raise Knj::Errors::Retry
               rescue Knj::Errors::NotFound
@@ -255,7 +273,7 @@ class Knj::Db::Revision
           end
           
           db.tables.create(table_name, table_data)
-          table_obj = db.tables[table_name]
+          table_obj = db.tables[table_name.to_sym]
           
           if table_data["on_create_after"]
             table_data["on_create_after"].call("db" => db, "table_name" => table_name, "table_data" => table_data)
@@ -282,7 +300,7 @@ class Knj::Db::Revision
     
     
     #Free cache.
-    tables.clear
+    tables.clear if tables
     tables = nil
   end
   

data/lib/knj/objects.rb

@@ -19,6 +19,7 @@ class Knj::Objects
     @lock_require = Monitor.new
     
     require "wref" if @args[:cache] == :weak and !Kernel.const_defined?(:Wref)
+    require "#{@args[:array_enumerator_path]}array_enumerator" if @args[:array_enum] and !Kernel.const_defined?(:Array_enumerator)
     
     #Set up various events.
     @events = Knj::Event_handler.new
@@ -562,18 +563,33 @@ class Knj::Objects
       end
     end
     
-    @args[:db].q(sql, qargs) do |d_obs|
+    if @args[:array_enum]
+      enum = Enumerator.new do |yielder|
+        @args[:db].q(sql, qargs) do |d_obs|
+          yielder << self.get(classname, d_obs)
+        end
+      end
+      
       if block
-        block.call(self.get(classname, d_obs))
+        enum.each(&block)
+        return nil
       else
-        ret << self.get(classname, d_obs)
+        return Array_enumerator.new(enum)
       end
-    end
-    
-    if !block
-      return ret
     else
-      return nil
+      @args[:db].q(sql, qargs) do |d_obs|
+        if block
+          block.call(self.get(classname, d_obs))
+        else
+          ret << self.get(classname, d_obs)
+        end
+      end
+      
+      if !block
+        return ret
+      else
+        return nil
+      end
     end
   end
   
@@ -725,7 +741,7 @@ class Knj::Objects
   #===Examples
   # user = ob.get(:User, 1)
   # ob.delete(user)
-  def delete(object)
+  def delete(object, args = nil)
     #Return false if the object has already been deleted.
     return false if object.deleted?
     classname = object.class.classname.to_sym
@@ -739,7 +755,7 @@ class Knj::Objects
       #If autodelete is set by 'has_many'-method, go through it and delete the various objects first.
       object.class.autodelete_data.each do |adel_data|
         self.list(adel_data[:classname], {adel_data[:colname].to_s => object.id}) do |obj_del|
-          self.delete(obj_del)
+          self.delete(obj_del, args)
         end
       end
       
@@ -756,12 +772,18 @@ class Knj::Objects
         _kas.trans_del(object)
       end
       
-      @args[:db].delete(object.table, {:id => obj_id})
+      #If a buffer is given in arguments, then use that to delete the object.
+      if args and buffer = args[:db_buffer]
+        buffer.delete(object.table, {:id => obj_id})
+      else
+        @args[:db].delete(object.table, {:id => obj_id})
+      end
     end
     
     @ids_cache[classname].delete(obj_id.to_i) if @ids_cache_should.key?(classname)
     self.call("object" => object, "signal" => "delete")
     object.destroy
+    return nil
   end
   
   #Deletes several objects as one. If running datarow-mode it checks all objects before it starts to actually delete them. Its faster than deleting every single object by itself...

data/lib/knj/thread.rb

@@ -9,9 +9,9 @@ class Knj::Thread < Thread
     super(*args) do
       begin
         yield(*args)
-      rescue SystemExit
-        exit
-      rescue => e
+      rescue SystemExit, Interrupt
+        raise
+      rescue Exception => e
         print "#{Knj::Errors.error_str(e)}\n\n"
       end
     end

data/lib/knj/web.rb

@@ -481,7 +481,6 @@ class Knj::Web
     if opthash.is_a?(Hash) or opthash.class.to_s == "Dictionary"
       opthash.each do |key, value|
         html << "<option"
-        
         sel = false
         
         if curvalue.is_a?(Array) and curvalue.index(key) != nil
@@ -499,8 +498,8 @@ class Knj::Web
       opthash.each_index do |key|
         if opthash[key.to_i] != nil
           html << "<option"
-          html << " selected=\"selected\"" if curvalue.to_i == key.to_i
-          html << " value=\"#{key.to_s}\">#{opthash[key].to_s}</option>"
+          html << " selected=\"selected\"" if curvalue.to_s == key.to_s
+          html << " value=\"#{Knj::Web.html(key)}\">#{Knj::Web.html(opthash[key])}</option>"
         end
       end
     end

data/spec/objects_spec.rb

@@ -2,11 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Objects" do
   it "should be able to cache rows" do
+    require "~/Dev/Ruby/array_enumerator/lib/array_enumerator"
     require "sqlite3" if RUBY_ENGINE != "jruby"
     
     $db_path = "#{Knj::Os.tmpdir}/knjrbfw_objects_cache_test.sqlite3"
     File.unlink($db_path) if File.exists?($db_path)
-    $db = Knj::Db.new(:type => :sqlite3, :path => $db_path, :return_keys => "symbols")
+    $db = Knj::Db.new(:type => :sqlite3, :path => $db_path, :return_keys => "symbols", :debug => false)
     
     schema = {
       "tables" => {
@@ -32,6 +33,7 @@ describe "Objects" do
       :db => $db,
       :datarow => true,
       :require => false,
+      :array_enum => true,
       :models => {
         :User => {
           :cache_ids => true
@@ -50,6 +52,7 @@ describe "Objects" do
     raise "Expected user-ID-cache to be 5 but it wasnt: #{$ob.ids_cache[:User].length}" if $ob.ids_cache[:User].length != 5
     
     user = $ob.get(:User, 4)
+    raise "No user returned." if !user
     $ob.delete(user)
     raise "Expected user-ID-cache to be 4 but it wasnt: #{$ob.ids_cache[:User].length} #{$ob.ids_cache}" if $ob.ids_cache[:User].length != 4
     
@@ -57,6 +60,11 @@ describe "Objects" do
     raise "Expected user-ID-cache to be 2 but it wasnt: #{$ob.ids_cache[:User].length} #{$ob.ids_cache}" if $ob.ids_cache[:User].length != 2
   end
   
+  it "should be able to do 'select_col_as_array'" do
+    res = $ob.list(:User, {"select_col_as_array" => "id"}).to_a
+    raise "Expected length of 2 but got: #{res.length}" if res.length != 2
+  end
+  
   it "should work even though stressed by threads (thread-safe)." do
     userd = []
     10.upto(25) do |i|
@@ -64,7 +72,7 @@ describe "Objects" do
     end
     
     $ob.adds(:User, userd)
-    users = $ob.list(:User)
+    users = $ob.list(:User).to_a
     
     #Stress it to test threadsafety...
     threads = []
@@ -72,16 +80,23 @@ describe "Objects" do
       threads << Knj::Thread.new do
         0.upto(10) do |ic|
           user = $ob.add(:User, {:username => "User #{tc}-#{ic}"})
+          raise "No user returned." if !user
           $ob.delete(user)
           
           user1 = $ob.add(:User, {:username => "User #{tc}-#{ic}-1"})
           user2 = $ob.add(:User, {:username => "User #{tc}-#{ic}-2"})
           user3 = $ob.add(:User, {:username => "User #{tc}-#{ic}-3"})
+          
+          raise "Missing user?" if !user1 or !user2 or !user3 or user1.deleted? or user2.deleted? or user3.deleted?
           $ob.deletes([user1, user2, user3])
           
+          count = 0
           users.each do |user|
+            count += 1
             user[:username] = "#{user[:username]}." if !user.deleted?
           end
+          
+          raise "Expected at least 15 users but got #{count}." if count != 18
         end
       end
     end
@@ -104,7 +119,8 @@ describe "Objects" do
     0.upto(10) do
       threads << Knj::Thread.new do
         0.upto(15) do
-          $ob2.add(:Group, {:groupname => "User 1"}, {:skip_ret => true})
+          ret = $ob2.add(:Group, {:groupname => "User 1"}, {:skip_ret => true})
+          raise "Expected empty return but got something: #{ret}" if ret
         end
       end
     end
@@ -169,10 +185,14 @@ describe "Objects" do
       "name" => "Test project"
     })
     
+    count = 0
     $db.q("SELECT * FROM Project") do |d|
       raise "Somehow name was not 'Test project'" if d[:name] != "Test project"
       raise "ID was not set?" if d[:id].to_i <= 0
+      count += 1
     end
+    
+    raise "Expected count of 1 but it wasnt: #{count}" if count != 1
   end
   
   it "should be able to automatic generate methods on datarow-classes (has_many, has_one)." do
@@ -267,6 +287,31 @@ describe "Objects" do
     raise "Unexpected person_html from task (should have been '[no person]')." if task.person_html != "[no person]"
   end
   
+  it "should be able to to multiple additions and delete objects through a buffer" do
+    objs = []
+    0.upto(10000) do
+      objs << {:name => :Kasper}
+    end
+    
+    $ob.adds(:Person, objs)
+    pers_length = $ob.list(:Person, "count" => true)
+    
+    count = 0
+    $db.q_buffer do |buffer|
+      $ob.list(:Person) do |person|
+        count += 1
+        $ob.delete(person, :db_buffer => buffer)
+      end
+      
+      buffer.flush
+    end
+    
+    raise "Expected count to be #{pers_length} but it wasnt: #{count}" if count != pers_length
+    
+    persons = $ob.list(:Person).to_a
+    raise "Expected persons count to be 0 but it wasnt: #{persons.map{|e| e.data} }" if persons.length > 0
+  end
+  
   it "should delete the temp database again." do
     db_path = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
     File.unlink(db_path) if File.exists?(db_path)

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.52
+  version: 0.0.53
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-29 00:00:00 +02:00
+date: 2012-07-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -379,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -865176145479195506
+      hash: -3998058168416114798
       segments: 
       - 0
       version: "0"