knjrbfw 0.0.19 → 0.0.20

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.20

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.19"
+  s.version = "0.0.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-03-03}
+  s.date = %q{2012-03-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

@@ -390,7 +390,7 @@ class Knj::Datarow
         when "return_sql"
           #ignore
         else
-          raise "Invalid key: '#{key}' for '#{self.name}'."
+          raise "Invalid key: '#{key}' for '#{self.name}'. Valid keys are: '#{@columns_sqlhelper_args[:cols].keys.sort}'."
       end
     end
     
@@ -440,6 +440,12 @@ class Knj::Datarow
     return d.ob.list_bysql(self.classname, sql, &block)
   end
   
+  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)
+  end
+  
   def self.classname
     return @classname
   end
@@ -448,12 +454,6 @@ class Knj::Datarow
     @classname = newclassname
   end
   
-  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)
-  end
-  
   def initialize(d)
     @ob = d.ob
     @db = d.ob.db

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

@@ -162,7 +162,11 @@ class KnjDB_mysql::Tables::Table
       end
     end
     
-    return ret
+    if block_given?
+      return nil
+    else
+      return ret
+    end
   end
   
   def indexes
@@ -192,7 +196,11 @@ class KnjDB_mysql::Tables::Table
       end
     end
     
-    return ret
+    if block_given?
+      return nil
+    else
+      return ret
+    end
   end
   
   def index(name)

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

@@ -48,7 +48,7 @@ class KnjDB_sqlite3::Columns::Column
   end
   
   def table
-    return @args[:table]
+    return @db.tables[@args[:table_name]]
   end
   
   def data

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

@@ -1,3 +1,5 @@
+require "#{$knjpath}wref"
+
 class KnjDB_sqlite3::Tables
   attr_reader :db, :driver
   
@@ -5,26 +7,56 @@ class KnjDB_sqlite3::Tables
     @args = args
     @db = @args[:db]
     @driver = @args[:driver]
+    
+    @list_mutex = Mutex.new
+    @list = Knj::Wref_map.new
   end
   
   def [](table_name)
-    list = self.list
-    return list[table_name.to_s] if list[table_name.to_s]
+    table_name = table_name.to_s
+    
+    begin
+      return @list[table_name]
+    rescue WeakRef::RefError
+      #ignore.
+    end
+    
+    self.list do |table_obj|
+      return table_obj if table_obj.name.to_s == table_name
+    end
+    
     raise Knj::Errors::NotFound.new("Table was not found: #{table_name}.")
   end
   
   def list
-    list = {}
-    q_tables = @db.select("sqlite_master", {"type" => "table"}, {"orderby" => "name"})
-    while d_tables = q_tables.fetch
-      list[d_tables[:name]] = KnjDB_sqlite3::Tables::Table.new(
-        :db => @db,
-        :driver => @driver,
-        :data => d_tables
-      )
+    ret = {} unless block_given?
+    
+    @list_mutex.synchronize do
+      q_tables = @db.select("sqlite_master", {"type" => "table"}, {"orderby" => "name"}) do |d_tables|
+        obj = @list.get!(d_tables[:name])
+        
+        if !obj
+          obj = KnjDB_sqlite3::Tables::Table.new(
+            :db => @db,
+            :driver => @driver,
+            :data => d_tables
+          )
+          @list[d_tables[:name]] = obj
+        end
+        
+        if block_given?
+          yield(obj)
+        else
+          ret[d_tables[:Name]] = obj
+        end
+      end
     end
     
-    return list
+    if block_given?
+      return nil
+    else
+      return ret
+    end
   end
   
   def create(name, data)
@@ -54,6 +86,9 @@ class KnjDB_sqlite3::Tables::Table
     @db = args[:db]
     @driver = args[:driver]
     @data = args[:data]
+    
+    @list = Knj::Wref_map.new
+    @indexes_list = Knj::Wref_map.new
   end
   
   def name
@@ -69,6 +104,10 @@ class KnjDB_sqlite3::Tables::Table
     raise "stub!"
   end
   
+  def table
+    return @db.tables[@table_name]
+  end
+  
   def column(name)
     list = self.columns
     return list[name] if list[name]
@@ -76,22 +115,34 @@ class KnjDB_sqlite3::Tables::Table
   end
   
   def columns
-    if !@list
-      @db.cols
-      @list = {}
+    @db.cols
+    ret = {}
+    
+    @db.q("PRAGMA table_info(`#{@driver.esc_table(self.name)}`)") do |d_cols|
+      obj = @list.get!(d_cols[:name])
       
-      q_cols = @db.query("PRAGMA table_info(`#{@driver.esc_table(self.name)}`)")
-      while d_cols = q_cols.fetch
-        @list[d_cols[:name]] = KnjDB_sqlite3::Columns::Column.new(
-          :table => self,
+      if !obj
+        obj = KnjDB_sqlite3::Columns::Column.new(
+          :table_name => self.name,
           :db => @db,
           :driver => @driver,
           :data => d_cols
         )
+        @list[d_cols[:name]] = obj
+      end
+      
+      if block_given?
+        yield(obj)
+      else
+        ret[d_cols[:name]] = obj
       end
     end
     
-    return @list
+    if block_given?
+      return nil
+    else
+      return ret
+    end
   end
   
   def create_columns(col_arr)
@@ -217,18 +268,41 @@ class KnjDB_sqlite3::Tables::Table
   end
   
   def index(name)
-    list = self.indexes
-    return list[name] if list[name]
+    name = name.to_s
+    
+    begin
+      return @indexes_list[name]
+    rescue WeakRef::RefError
+      if @db.opts[:index_append_table_name]
+        tryname = "#{self.name}__#{name}"
+        
+        begin
+          return @indexes_list[tryname]
+        rescue WeakRef::RefError
+          #ignore.
+        end
+      else
+        #ignore
+      end
+    end
+    
+    self.indexes do |index|
+      return index if index.name.to_s == name
+    end
+    
     raise Knj::Errors::NotFound.new("Index not found: #{name}.")
   end
   
   def indexes
-    if !@indexes_list
-      @db.indexes
-      @indexes_list = {}
+    @db.indexes
+    ret = {}
+    
+    @db.q("PRAGMA index_list(`#{@driver.esc_table(self.name)}`)") do |d_indexes|
+      next if d_indexes[:Key_name] == "PRIMARY"
+      
+      obj = @indexes_list.get!(d_indexes[:name])
       
-      q_indexes = @db.query("PRAGMA index_list(`#{@driver.esc_table(self.name)}`)")
-      while d_indexes = q_indexes.fetch
+      if !obj
         if @db.opts[:index_append_table_name]
           match_name = d_indexes[:name].match(/__(.+)$/)
           
@@ -241,18 +315,28 @@ class KnjDB_sqlite3::Tables::Table
           name = d_indexes[:name]
         end
         
-        @indexes_list[name] = KnjDB_sqlite3::Indexes::Index.new(
-          :table => self,
+        obj = KnjDB_sqlite3::Indexes::Index.new(
+          :table_name => self.name,
           :db => @db,
           :driver => @driver,
           :data => d_indexes
         )
-        
-        @indexes_list[name].columns << name
+        obj.columns << name
+        @indexes_list[d_indexes[:name]] = obj
+      end
+      
+      if block_given?
+        yield(obj)
+      else
+        ret[d_indexes[:name]] = obj
       end
     end
     
-    return @indexes_list
+    if block_given?
+      return nil
+    else
+      return ret
+    end
   end
   
   def create_indexes(index_arr)
@@ -276,7 +360,6 @@ class KnjDB_sqlite3::Tables::Table
       sql << ")"
       
       @db.query(sql)
-      @indexes_list = nil
     end
   end
   

data/lib/knj/knjdb/libknjdb.rb

@@ -252,6 +252,7 @@ class Knj::Db
     end
   end
   
+  #Makes a select from the given arguments: table-name, where-terms and other arguments as limits and orders. Also takes a block to avoid raping of memory.
   def select(tablename, arr_terms = nil, args = nil, &block)
     sql = ""
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-03 00:00:00.000000000 +01:00
+date: 2012-03-04 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18696600 !ruby/object:Gem::Requirement
+  requirement: &12904920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *18696600
+  version_requirements: *12904920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18672900 !ruby/object:Gem::Requirement
+  requirement: &12875260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18672900
+  version_requirements: *12875260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18626780 !ruby/object:Gem::Requirement
+  requirement: &12868880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *18626780
+  version_requirements: *12868880
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &18624480 !ruby/object:Gem::Requirement
+  requirement: &12838540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18624480
+  version_requirements: *12838540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &18622160 !ruby/object:Gem::Requirement
+  requirement: &12835900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18622160
+  version_requirements: *12835900
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &18602320 !ruby/object:Gem::Requirement
+  requirement: &12833760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18602320
+  version_requirements: *12833760
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -340,7 +340,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2766455061602575387
+      hash: 2086432028938814395
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: