knjrbfw 0.0.27 → 0.0.28

data/VERSION

@@ -1 +1 @@
-0.0.27
+0.0.28

data/knjrbfw.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.27"
+  s.version = "0.0.28"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

data/lib/knj/datarow.rb

@@ -1,21 +1,29 @@
 class Knj::Datarow
   attr_reader :data, :ob, :db
   
+  #This is used by 'Knj::Objects' to find out what data is required for this class. Returns the array that tells about required data.
   def self.required_data
     @required_data = [] if !@required_data
     return @required_data
   end
   
+  #This is used by 'Knj::Objects' to find out what other objects this class depends on. Returns the array that tells about depending data.
   def self.depending_data
     @depending_data = [] if !@depending_data
     return @depending_data
   end
   
+  #This is used by 'Knj::Objects' to find out which other objects should be deleted when an object of this class is deleted automatically. Returns the array that tells about autodelete data.
   def self.autodelete_data
     @autodelete_data = [] if !@autodelete_data
     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.
   def is_knj?
     return true
@@ -191,16 +199,19 @@ class Knj::Datarow
     @columns_joined_tables.merge!(hash)
   end
   
+  #Returns the table-name that should be used for this datarow.
   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.
   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.
   def table
     return self.class.table
   end
@@ -365,6 +376,7 @@ class Knj::Datarow
     end
   end
   
+  #This method helps returning objects and supports various arguments. It should be called by Object#list.
   def self.list(d, &block)
     ec_col = d.db.enc_col
     ec_table = d.db.enc_table

data/lib/knj/datarow_custom.rb

@@ -1,6 +1,7 @@
 require "#{$knjpath}event_handler"
 
 class Knj::Datarow_custom
+  #Used to determine if this is a knj-datarow-object.
   def is_knj?
     return true
   end
@@ -71,17 +72,25 @@ class Knj::Datarow_custom
     
     if data.is_a?(Hash)
       @data = Knj::ArrayExt.hash_sym(data)
+      @id = self.id
     else
-      raise "No 'data_from_id'-event connected to class." if !self.class.events.connected?(:data_from_id)
-      data = self.class.events.call(:data_from_id, Knj::Hash_methods.new(:id => data))
-      raise "No data was received from the event: 'data_from_id'." if !data
-      raise "Data expected to be a hash but wasnt: '#{data.class.name}'." if !data.is_a?(Hash)
-      @data = Knj::ArrayExt.hash_sym(data)
+      @id = data
+      self.reload
     end
   end
   
+  def reload
+    raise "No 'data_from_id'-event connected to class." if !self.class.events.connected?(:data_from_id)
+    data = self.class.events.call(:data_from_id, Knj::Hash_methods.new(:id => @id))
+    raise "No data was received from the event: 'data_from_id'." if !data
+    raise "Data expected to be a hash but wasnt: '#{data.class.name}'." if !data.is_a?(Hash)
+    @data = Knj::ArrayExt.hash_sym(data)
+  end
+  
   def update(data)
-    return self.class.events.call(:update, Knj::Hash_methods.new(:object => self, :data => data))
+    ret = self.class.events.call(:update, Knj::Hash_methods.new(:object => self, :data => data))
+    self.reload
+    return ret
   end
   
   #Returns a key from the hash that this object is holding or raises an error if it doesnt exist.

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

@@ -6,7 +6,6 @@ class KnjDB_sqlite3::Tables
   def initialize(args)
     @args = args
     @db = @args[:db]
-    @driver = @args[:driver]
     
     @list_mutex = Mutex.new
     @list = Knj::Wref_map.new
@@ -38,7 +37,6 @@ class KnjDB_sqlite3::Tables
         if !obj
           obj = KnjDB_sqlite3::Tables::Table.new(
             :db => @db,
-            :driver => @driver,
             :data => d_tables
           )
           @list[d_tables[:name]] = obj
@@ -83,7 +81,6 @@ end
 class KnjDB_sqlite3::Tables::Table
   def initialize(args)
     @db = args[:db]
-    @driver = args[:driver]
     @data = args[:data]
     
     @list = Knj::Wref_map.new
@@ -117,14 +114,13 @@ class KnjDB_sqlite3::Tables::Table
     @db.cols
     ret = {}
     
-    @db.q("PRAGMA table_info(`#{@driver.esc_table(self.name)}`)") do |d_cols|
+    @db.q("PRAGMA table_info(`#{@db.esc_table(self.name)}`)") do |d_cols|
       obj = @list.get!(d_cols[:name])
       
       if !obj
         obj = KnjDB_sqlite3::Columns::Column.new(
           :table_name => self.name,
           :db => @db,
-          :driver => @driver,
           :data => d_cols
         )
         @list[d_cols[:name]] = obj
@@ -294,9 +290,9 @@ class KnjDB_sqlite3::Tables::Table
   
   def indexes
     @db.indexes
-    ret = {}
+    ret = {} unless block_given?
     
-    @db.q("PRAGMA index_list(`#{@driver.esc_table(self.name)}`)") do |d_indexes|
+    @db.q("PRAGMA index_list(`#{@db.esc_table(self.name)}`)") do |d_indexes|
       next if d_indexes[:Key_name] == "PRIMARY"
       
       obj = @indexes_list.get!(d_indexes[:name])
@@ -317,7 +313,6 @@ class KnjDB_sqlite3::Tables::Table
         obj = KnjDB_sqlite3::Indexes::Index.new(
           :table_name => self.name,
           :db => @db,
-          :driver => @driver,
           :data => d_indexes
         )
         obj.columns << name
@@ -379,4 +374,8 @@ class KnjDB_sqlite3::Tables::Table
     
     return ret
   end
+  
+  def insert(data)
+    @db.insert(self.name, data)
+  end
 end

data/lib/knj/knjdb/revision.rb

@@ -8,6 +8,9 @@ class Knj::Db::Revision
     db = args["db"]
     table = args["table"]
     
+    raise "No db given." if !db
+    raise "No table given." if !table
+    
     args["rows"].each do |row_data|
       if row_data["find_by"]
         find_by = row_data["find_by"]
@@ -256,7 +259,7 @@ class Knj::Db::Revision
             table_data["on_create_after"].call("db" => db, "table_name" => table_name, "table_data" => table_data)
           end
           
-          self.rows_init("table" => table_obj, "rows" => table_data["rows"]) if table_data["rows"]
+          self.rows_init("db" => db, "table" => table_obj, "rows" => table_data["rows"]) if table_data["rows"]
         end
       rescue Knj::Errors::Retry
         retry

data/lib/knj/objects.rb

@@ -2,6 +2,7 @@ class Knj::Objects
   attr_reader :args, :events, :data
   
   def initialize(args)
+    require "monitor"
     require "#{$knjpath}arrayext"
     require "#{$knjpath}event_handler"
     require "#{$knjpath}hash_methods"

data/lib/knjrbfw.rb

@@ -2,4 +2,6 @@ module Knj
 end
 
 $knjpath = "knj/" if !$knjpath
-$: << File.dirname(__FILE__)
+$: << File.dirname(__FILE__)
+
+require "#{$knjpath}knj"

data/spec/datet_spec.rb

@@ -25,6 +25,6 @@ describe "Datet" do
     time = Time.at(Time.now.to_i - 48 * 3600)
     datet = Knj::Datet.in(time)
     res = datet.ago_str
-    raise "Expected '48 hours ago' but got: '#{res}'." if res != "48 hours ago"
+    raise "Expected '2 days ago' but got: '#{res}'." if res != "2 days ago"
   end
 end

data/spec/db_spec.rb

@@ -7,10 +7,11 @@ describe "Db" do
     #I never got this test to actually fail... :-(
     
     require "knj/db"
-    require "tmpdir"
-    require "sqlite3"
+    require "knj/os"
+    require "sqlite3" if !Kernel.const_defined?("SQLite3")
     
-    db_path = "#{Dir.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
+    db_path = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
+    File.unlink(db_path) if File.exists?(db_path)
     
     db = Knj::Db.new(
       :type => "sqlite3",
@@ -26,6 +27,26 @@ describe "Db" do
       ]
     })
     
+    schema = {
+      "tables" => {
+        "test_table" => {
+          "columns" => [
+            {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
+            {"name" => "name", "type" => "varchar"}
+          ],
+          "rows" => [
+            {
+              "find_by" => {"id" => 1},
+              "data" => {"id" => 1, "name" => "trala"}
+            }
+          ]
+        }
+      }
+    }
+    
+    rev = Knj::Db::Revision.new
+    rev.init_db("schema" => schema, "db" => db)
+    
     begin
       cont = File.read("#{File.dirname(__FILE__)}/db_spec_encoding_test_file.txt")
       cont.force_encoding("ASCII-8BIT")

data/spec/knjrbfw_spec.rb

@@ -3,10 +3,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Knjrbfw" do
   it "should be able to generate a sample SQLite database and add a sample table, with sample columns and with a sample index to it" do
     require "knjrbfw"
-    require "knj/autoload"
-    require "tmpdir"
+    require "sqlite3"
     
-    db_path = "#{Dir.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
+    db_path = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
     
     begin
       db = Knj::Db.new(
@@ -49,7 +48,7 @@ describe "Knjrbfw" do
       table = db.tables["Project"]
       
       indexes = table.indexes
-      raise "Could not find the sample-index 'category_id' that should have been created." if !indexes["category_id"]
+      raise "Could not find the sample-index 'category_id' that should have been created." if !indexes["Project__category_id"]
       
       
       #If we insert a row the ID should increase and the name should be the same as inserted (or something is very very wrong)...
@@ -297,6 +296,8 @@ describe "Knjrbfw" do
   end
   
   it "should be able to draw rounded transparent corners on images." do
+    require "rmagick"
+    
     pic = Magick::Image.read("#{File.dirname(__FILE__)}/../testfiles/image.jpg").first
     pic.format = "png"
     

data/spec/process_meta_spec.rb

@@ -121,7 +121,7 @@ describe "Process_meta" do
   it "should be able to do slow block-results in JRuby." do
     $process_meta.str_eval("
       class Kaspertest
-        def kaspertest
+        def self.kaspertest
           8.upto(12) do |i|
             yield(i)
             sleep 0.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11346340 !ruby/object:Gem::Requirement
+  requirement: &15665000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *11346340
+  version_requirements: *15665000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11345260 !ruby/object:Gem::Requirement
+  requirement: &15664000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11345260
+  version_requirements: *15664000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11344540 !ruby/object:Gem::Requirement
+  requirement: &15663060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *11344540
+  version_requirements: *15663060
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &11343600 !ruby/object:Gem::Requirement
+  requirement: &15656020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11343600
+  version_requirements: *15656020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &11342860 !ruby/object:Gem::Requirement
+  requirement: &15655380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11342860
+  version_requirements: *15655380
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &11338380 !ruby/object:Gem::Requirement
+  requirement: &15654840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11338380
+  version_requirements: *15654840
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -343,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -881354161211484324
+      hash: 894302943033086074
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: