baza 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/baza.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "baza"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

data/include/db.rb

@@ -434,9 +434,9 @@ class Baza::Db
     end
   end
   
-  #Checks if a given selector exists. If it does, updates it to match data. If not inserts the row.
-  def upsert(table, selector, data, args = nil)
-    row = self.select(table, selector, "limit" => 1).fetch
+  #Checks if a given terms exists. If it does, updates it to match data. If not inserts the row.
+  def upsert(table, data, terms, args = nil)
+    row = self.select(table, terms, "limit" => 1).fetch
     
     if args and args[:buffer]
       obj = args[:buffer]
@@ -445,9 +445,9 @@ class Baza::Db
     end
     
     if row
-      obj.update(table, data, selector)
+      obj.update(table, data, terms)
     else
-      obj.insert(table, selector.merge(data))
+      obj.insert(table, terms.merge(data))
     end
   end
   

data/include/query_buffer.rb

@@ -34,9 +34,7 @@ class Baza::QueryBuffer
   
   #Delete as on a normal Baza::Db.
   #===Example
-  # db.q_buffer do |buffer|
-  #   buffer.delete(:users, {:id => 5})
-  # end
+  # buffer.delete(:users, {:id => 5})
   def delete(table, where)
     STDOUT.puts "Delete called on table #{table} with arguments: '#{where}'." if @debug
     self.query(@args[:db].delete(table, where, :return_sql => true))
@@ -45,19 +43,22 @@ class Baza::QueryBuffer
   
   #Update as on a normal Baza::Db.
   #===Example
-  # db.q_buffer do |buffer|
-  #   buffer.update(:users, {:name => "Kasper"}, {:id => 5})
-  # end
+  # buffer.update(:users, {:name => "Kasper"}, {:id => 5})
   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))
   end
   
+  #Shortcut to doing upsert through the buffer instead of through the db-object with the buffer as an argument.
+  #===Example
+  # buffer.upsert(:users, {:id => 5}, {:name => "Kasper"})
+  def upsert(table, data, terms)
+    @args[:db].upsert(table, data, terms, :buffer => self)
+  end
+  
   #Plans to inset a hash into a table. It will only be inserted when flush is called.
   #===Examples
-  # db.q_buffer do |buffer|
-  #   buffer.insert(:users, {:name => "John Doe"})
-  # end
+  # buffer.insert(:users, {:name => "John Doe"})
   def insert(table, data)
     @lock.synchronize do
       @inserts[table] = [] if !@inserts.key?(table)

data/spec/baza_spec.rb

@@ -116,14 +116,14 @@ describe "Baza" do
         table.reload
         rows_count = table.rows_count
         
-        db.upsert(:test_table, sel, data)
+        db.upsert(:test_table, data, sel)
         row = db.select(:test_table, sel).fetch
         row[:name].should eql("upsert - Kasper Johansen")
         
         table.reload
         table.rows_count.should eql(rows_count + 1)
         
-        db.upsert(:test_table, sel, data2)
+        db.upsert(:test_table, data2, sel)
         row = db.select(:test_table, sel).fetch
         row[:name].should eql("upsert - Kasper Nielsen Johansen")
         
@@ -301,20 +301,37 @@ describe "Baza" do
           ]
         })
         
+        upsert = false
         db.q_buffer do |buffer|
-          10000.times do |count|
-            buffer.insert(:test_table, {:name => "Kasper #{count}"})
+          2500.times do |count|
+            if upsert
+              buffer.upsert(:test_table, {:name => "Kasper #{count}"}, {:name => "Kasper #{count}"})
+              upsert = false
+            else
+              buffer.insert(:test_table, {:name => "Kasper #{count}"})
+              upsert = true
+            end
           end
         end
         
         test_table = db.tables[:test_table]
-        test_table.rows_count.should eql(10000)
+        test_table.rows_count.should eql(2500)
         
         db.q_buffer do |buffer|
           count = 0
+          upsert = false
+          
           db.select(:test_table, {}, :orderby => :id) do |row|
             row[:name].should eql("Kasper #{count}")
-            buffer.update(:test_table, {:name => "Kasper #{count}-#{count}"}, {:id => row[:id]})
+            
+            if upsert
+              buffer.upsert(:test_table, {:name => "Kasper #{count}-#{count}"}, {:id => row[:id]})
+              upsert = false
+            else
+              buffer.update(:test_table, {:name => "Kasper #{count}-#{count}"}, {:id => row[:id]})
+              upsert = true
+            end
+            
             count += 1
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2097963653998790721
+      hash: 3400246052753672673
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: