baza 0.0.4 → 0.0.5

data/Gemfile

@@ -6,6 +6,7 @@ source "http://rubygems.org"
 gem "datet"
 gem "wref"
 gem "knjrbfw"
+gem "array_enumerator"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    array_enumerator (0.0.3)
     datet (0.0.25)
     diff-lcs (1.1.3)
     git (1.2.5)
@@ -46,6 +47,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  array_enumerator
   bundler (>= 1.0.0)
   datet
   jeweler (~> 1.8.4)

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/baza.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "baza"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
     "spec/db_spec_encoding_test_file.txt",
     "spec/info_mysql_example.rb",
     "spec/info_sqlite3.rb",
+    "spec/model_handler_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/kaspernj/baza"
@@ -71,6 +72,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<datet>, [">= 0"])
       s.add_runtime_dependency(%q<wref>, [">= 0"])
       s.add_runtime_dependency(%q<knjrbfw>, [">= 0"])
+      s.add_runtime_dependency(%q<array_enumerator>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
@@ -81,6 +83,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<datet>, [">= 0"])
       s.add_dependency(%q<wref>, [">= 0"])
       s.add_dependency(%q<knjrbfw>, [">= 0"])
+      s.add_dependency(%q<array_enumerator>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -92,6 +95,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<datet>, [">= 0"])
     s.add_dependency(%q<wref>, [">= 0"])
     s.add_dependency(%q<knjrbfw>, [">= 0"])
+    s.add_dependency(%q<array_enumerator>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/include/drivers/sqlite3/sqlite3_tables.rb

@@ -421,11 +421,11 @@ class Baza::Driver::Sqlite3::Tables::Table
     end
     
     index_arr.each do |index_data|
-      if index_data.is_a?(String)
+      if index_data.is_a?(String) or index_data.is_a?(Symbol)
         index_data = {:name => index_data, :columns => [index_data]}
       end
       
-      raise "No name was given in data: '#{index_data}'." if !index_data.key?(:name) or index_data[:name].strip.empty?
+      raise "No name was given in data: '#{index_data}'." if !index_data.key?(:name) or index_data[:name].to_s.strip.empty?
       raise "No columns was given on index #{index_data[:name]}." if index_data[:columns].empty?
       
       name = index_data[:name]

data/include/model_handler.rb

@@ -1,3 +1,5 @@
+require "#{File.dirname(__FILE__)}/model_handler_sqlhelper.rb"
+
 class Baza::ModelHandler
   attr_reader :args, :events, :data, :ids_cache, :ids_cache_should
   

data/include/query_buffer.rb

@@ -47,6 +47,8 @@ class Baza::QueryBuffer
   def update(table, update, terms)
     STDOUT.puts "Update called on table #{table}." if @debug
     self.query(@args[:db].update(table, update, terms, :return_sql => true))
+    self.flush if @queries_count >= 1000
+    return nil
   end
   
   #Shortcut to doing upsert through the buffer instead of through the db-object with the buffer as an argument.
@@ -54,18 +56,15 @@ class Baza::QueryBuffer
   # buffer.upsert(:users, {:id => 5}, {:name => "Kasper"})
   def upsert(table, data, terms)
     @args[:db].upsert(table, data, terms, :buffer => self)
+    self.flush if @queries_count >= 1000
+    return nil
   end
   
   #Plans to inset a hash into a table. It will only be inserted when flush is called.
   #===Examples
   # buffer.insert(:users, {:name => "John Doe"})
   def insert(table, data)
-    @lock.synchronize do
-      @inserts[table] = [] if !@inserts.key?(table)
-      @inserts[table] << data
-      @queries_count += 1
-    end
-    
+    self.query(@args[:db].insert(table, data, :return_sql => true))
     self.flush if @queries_count >= 1000
     return nil
   end

data/spec/model_handler_spec.rb

@@ -0,0 +1,394 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "tmpdir"
+
+describe "Objects" do
+  it "should be able to cache rows" do
+    begin
+      require "#{File.dirname(__FILE__)}/../../array_enumerator/lib/array_enumerator"
+    rescue LoadError
+      require "array_enumerator"
+    end
+    
+    require "sqlite3" if RUBY_ENGINE != "jruby"
+    
+    $db_path = "#{Dir.tmpdir}/knjrbfw_objects_cache_test.sqlite3"
+    File.unlink($db_path) if File.exists?($db_path)
+    $db = Baza::Db.new(:type => :sqlite3, :path => $db_path, :return_keys => "symbols", :debug => false)
+    
+    schema = {
+      :tables => {
+        "Group" => {
+          :columns => [
+            {:name => :id, :type => :int, :autoincr => true, :primarykey => true},
+            {:name => :groupname, :type => :varchar}
+          ]
+        },
+        "User" => {
+          :columns => [
+            {:name => :id, :type => :int, :autoincr => true, :primarykey => true},
+            {:name => :username, :type => :varchar}
+          ]
+        }
+      }
+    }
+    Baza::Revision.new.init_db(:schema => schema, :db => $db)
+    
+    class User < Baza::Model; end
+    
+    $ob = Baza::ModelHandler.new(
+      :db => $db,
+      :datarow => true,
+      :require => false,
+      :array_enum => true,
+      :models => {
+        :User => {
+          :cache_ids => true
+        }
+      }
+    )
+    
+    $ob.adds(:User, [
+      {:username => "User 1"},
+      {:username => "User 2"},
+      {:username => "User 3"},
+      {:username => "User 4"},
+      {:username => "User 5"}
+    ])
+    
+    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
+    
+    $ob.deletes([$ob.get(:User, 1), $ob.get(:User, 2)])
+    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|
+      userd << {:username => "User #{i}"}
+    end
+    
+    $ob.adds(:User, userd)
+    users = $ob.list(:User).to_a
+    
+    #Stress it to test threadsafety...
+    threads = []
+    0.upto(5) do |tc|
+      threads << Knj::Thread.new do
+        0.upto(5) 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
+    
+    threads.each do |thread|
+      thread.join
+    end
+  end
+  
+  it "should be able to skip queries when adding" do
+    class Group < Baza::Model; end
+    
+    $ob2 = Baza::ModelHandler.new(
+      :db => $db,
+      :datarow => true,
+      :require => false
+    )
+    
+    threads = []
+    0.upto(5) do
+      threads << Knj::Thread.new do
+        0.upto(5) do
+          ret = $ob2.add(:Group, {:groupname => "User 1"}, {:skip_ret => true})
+          raise "Expected empty return but got something: #{ret}" if ret
+        end
+      end
+    end
+    
+    threads.each do |thread|
+      thread.join
+    end
+  end
+  
+  it "should delete the temporary database." do
+    File.unlink($db_path) if File.exists?($db_path)
+  end
+  
+  #Moved from "knjrbfw_spec.rb"
+  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
+    $db_path = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
+    $db = Baza::Db.new(
+      :type => :sqlite3,
+      :path => $db_path,
+      :index_append_table_name => true
+    )
+    
+    $db.tables.create("Project", {
+      :columns => [
+        {:name => :id, :type => :int, :autoincr => true, :primarykey => true},
+        {:name => :category_id, :type => :int},
+        {:name => :name, :type => :varchar}
+      ],
+      :indexes => [
+        {:name => :category_id, :columns => [:category_id]}
+      ]
+    })
+    
+    $db.tables.create("Task", {
+      :columns => [
+        {:name => :id, :type => :int, :autoincr => true, :primarykey => true},
+        {:name => :project_id, :type => :int},
+        {:name => :person_id, :type => :int},
+        {:name => :name, :type => :varchar}
+      ],
+      :indexes => [
+        {:name => :project_id, :columns => [:project_id]}
+      ]
+    })
+    
+    $db.tables.create("Person", {
+      :columns => [
+        {:name => :id, :type => :int, :autoincr => true, :primarykey => true},
+        {:name => :name, :type => :varchar}
+      ]
+    })
+    
+    $db.tables.create("Timelog", {
+      :columns => [
+        {:name => :id, :type => :int, :autoincr => true, :primarykey => true},
+        {:name => :person_id, :type => :int}
+      ],
+      :indexes => [
+        :person_id
+      ]
+    })
+    
+    table = $db.tables[:Project]
+    
+    indexes = table.indexes
+    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)...
+    $db.insert("Project", {
+      "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
+    class Project < Baza::Model
+      has_many [
+        {:class => :Task, :col => :project_id, :depends => true}
+      ]
+    end
+    
+    class Task < Baza::Model
+      has_one [
+        {:class => :Person, :required => true},
+        :Project
+      ]
+    end
+    
+    class Person < Baza::Model
+      has_one [:Project]
+      
+      has_many [
+        {:class => :Timelog, :autozero => true}
+      ]
+      
+      def html
+        return self[:name]
+      end
+    end
+    
+    class Timelog < Baza::Model
+      
+    end
+    
+    $ob = Baza::ModelHandler.new(:db => $db, :datarow => true, :require => false)
+    
+    $ob.add(:Person, {
+      :name => "Kasper"
+    })
+    $ob.add(:Task, {
+      :name => "Test task",
+      :person_id => 1,
+      :project_id => 1
+    })
+    
+    begin
+      $obb.add(:Task, {:name => "Test task"})
+      raise "Method should fail but didnt."
+    rescue
+      #ignore.
+    end
+    
+    
+    #Test 'list_invalid_required'.
+    $db.insert(:Task, :name => "Invalid require")
+    id = $db.last_id
+    found = false
+    
+    $ob.list_invalid_required(:class => :Task) do |d|
+      raise "Expected object ID to be #{id} but it wasnt: #{d[:obj].id}" if d[:obj].id.to_i != id.to_i
+      $ob.delete(d[:obj])
+      found = true
+    end
+    
+    raise "Expected to find a task but didnt." if !found
+    
+    
+    ret_proc = []
+    $ob.list(:Task) do |task|
+      ret_proc << task
+    end
+    
+    raise "list with proc should return one task but didnt." if ret_proc.length != 1
+    
+    
+    project = $ob.get(:Project, 1)
+    
+    tasks = project.tasks
+    raise "No tasks were found on project?" if tasks.empty?
+    
+    
+    ret_proc = []
+    ret_test = project.tasks do |task|
+      ret_proc << task
+    end
+    
+    raise "When given a block the return should be nil so it doesnt hold weak-ref-objects in memory but it didnt return nil." if ret_test != nil
+    raise "list for project with proc should return one task but didnt (#{ret_proc.length})." if ret_proc.length != 1
+    
+    person = tasks.first.person
+    project_second = tasks.first.project
+    
+    raise "Returned object was not a person on task." if !person.is_a?(Person)
+    raise "Returned object was not a project on task." if !project_second.is_a?(Project)
+    
+    
+    #Check that has_many-depending is actually working.
+    begin
+      $ob.delete(project)
+      raise "It was possible to delete project 1 even though task 1 depended on it!"
+    rescue
+      #this should happen - it should not possible to delete project 1 because task 1 depends on it."
+    end
+  end
+  
+  it "should be able to generate lists for inputs" do
+    Knj::Web.inputs([{
+      :title => "Test 3",
+      :name => :seltest3,
+      :type => :select,
+      :default => 1,
+      :opts => $ob.list_optshash(:Task)
+    }])
+  end
+  
+  it "should be able to connect to objects 'no-html' callback and test it." do
+    task = $ob.get(:Task, 1)
+    $ob.events.connect(:no_html) do |event, classname|
+      "[no #{classname.to_s.downcase}]"
+    end
+    
+    raise "Unexpected person_html from task (should have been 'Kasper'): '#{task.person_html}'." if task.person_html != "Kasper"
+    task.update(:person_id => 0)
+    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(500) 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 do autozero when deleting objects" do
+    person1 = $ob.add(:Person, {
+      :name => "Kasper"
+    })
+    person2 = $ob.add(:Person, {
+      :name => "Charlotte"
+    })
+    
+    timelog1 = $ob.add(:Timelog, {
+      :person_id => person1.id
+    })
+    timelog2 = $ob.add(:Timelog, {
+      :person_id => person2.id
+    })
+    
+    $ob.delete(person1)
+    
+    raise "Expected timelog1's person-ID to be zero but it wasnt: '#{timelog1[:person_id]}'." if timelog1[:person_id].to_i != 0
+    raise "Expected timelog2's person-ID to be #{person2.id} but it wasnt: '#{timelog2[:person_id]}'." if timelog2[:person_id].to_i != person2.id.to_i
+  end
+  
+  it "should be able to do multiple deletes from ids" do
+    ids = []
+    1.upto(10) do |count|
+      ids << $ob.add(:Person).id
+    end
+    
+    $ob.delete_ids(:class => :Person, :ids => ids)
+  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)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: array_enumerator
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +218,7 @@ files:
 - spec/db_spec_encoding_test_file.txt
 - spec/info_mysql_example.rb
 - spec/info_sqlite3.rb
+- spec/model_handler_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/kaspernj/baza
 licenses:
@@ -218,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3400246052753672673
+      hash: -3065201151015911898
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: