rhubarb 0.2.3 → 0.2.4

data/CHANGES

@@ -1,4 +1,15 @@
-version 0.2.3
+version 0.2.4
+
+*  More aggressive use of prepared statements, which should result 
+   in more speedups.  (In particular, finding tuples by identity now
+   uses a prepared statement.)
+
+*  Persisting#to_hash method added.
+
+*  delete_where method added to persisting classes; it enables deleting 
+   many rows satisfying some criterion in a single query.
+
+version 0.2.3 (20bee926a142d505441716762a72a82cbfb87378)
 
 *  Rhubarb now uses prepared statements almost exclusively.  This
    should result in an appreciable speedup (I observed around 10% on

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/rhubarb/classmixins.rb

@@ -68,7 +68,19 @@ module Rhubarb
     end
 
     def delete_all
-      self.db.execute("DELETE from #{table_name}")
+      da_text = "DELETE from #{table_name}"
+      da_stmt = (db.stmts[da_text] ||= db.prepare(da_text))
+      da_stmt.execute!
+    end
+
+    def delete_where(arg_hash)
+      arg_hash = arg_hash.dup
+      valid_cols = self.colnames.intersection arg_hash.keys
+      select_criteria = valid_cols.map {|col| "#{col.to_s} = #{col.inspect}"}.join(" AND ")
+      arg_hash.each {|k,v| arg_hash[k] = v.row_id if v.respond_to? :row_id}
+      dw_text = "DELETE FROM #{table_name} WHERE #{select_criteria}"
+      dw_stmt = (db.stmts[dw_text] ||= db.prepare(dw_text))
+      dw_stmt.execute!(arg_hash)
     end
 
     # Declares a query method named +name+ and adds it to this class.  The query method returns a list of objects corresponding to the rows returned by executing "+SELECT * FROM+ _table_ +WHERE+ _query_" on the database.
@@ -109,7 +121,7 @@ module Rhubarb
 
       find_method_name = "find_by_#{cname}".to_sym
       find_first_method_name = "find_first_by_#{cname}".to_sym
-      find_query = "select * from #{table_name} where #{cname} = ?"
+      find_query = "select * from #{table_name} where #{cname} = ? order by row_id"
 
       get_method_name = "#{cname}".to_sym
       set_method_name = "#{cname}=".to_sym
@@ -124,13 +136,16 @@ module Rhubarb
       klass = (class << self; self end)
       klass.class_eval do 
         define_method find_method_name do |arg|
-          res = self.db.execute(find_query, arg)
+          fq_stmt = (self.db.stmts[find_query] ||= db.prepare(find_query))
+          res = fq_stmt.execute!(arg)
           res.map {|row| self.new(row)}
         end
 
         define_method find_first_method_name do |arg|
-          res = self.db.get_first_row(find_query, arg)
-          res ? self.new(res) : nil
+          fq_stmt = (self.db.stmts[find_query] ||= db.prepare(find_query))
+          result = nil
+          fq_stmt.execute!(arg) {|row| result = self.new(row) ; break }
+          result
         end
       end
 
@@ -281,7 +296,9 @@ module Rhubarb
     end
 
     def find_tuple(tid)
-      self.db.get_first_row("select * from #{table_name} where row_id = ?", tid)
+      ft_text = "select * from #{table_name} where row_id = ?"
+      ft_stmt = (self.db.stmts[ft_text] ||= db.prepare(ft_text))
+      return ft_stmt.execute!(tid)[0]
     end
     
     include FindFreshest

data/lib/rhubarb/persisting.rb

@@ -70,6 +70,14 @@ module Rhubarb
       @row_id = nil
     end
 
+    def to_hash
+      result = {}
+      @tuple.each_pair do |key, value|
+        result[key.to_sym] = value unless key.class == Fixnum
+      end
+      result
+    end
+
     ## Begin private methods
 
     private
@@ -132,6 +140,5 @@ module Rhubarb
         end
       end
     end
-
   end
 end

data/test/test_rhubarb.rb

@@ -171,6 +171,41 @@ class BackendBasicTests < Test::Unit::TestCase
       end
     end
   end
+  
+  def test_to_hash
+    (0..5).each do |foo|
+      ("A".."C").each do |bar|
+        TestClass.create(:foo=>foo, :bar=>bar)
+      end
+    end
+    
+    TestClass.find_all.each do |tc|
+      tch = tc.to_hash
+      [:foo,:bar,:created,:updated].each do |msg|
+        assert_equal(tch[msg], tc.send(msg))
+      end
+    end      
+  end
+  
+  def test_delete_where
+    (0..10).each do |foo|
+      ("A".."G").each do |bar|
+        TestClass.create(:foo=>foo, :bar=>bar)
+      end
+    end
+    
+    old_count = TestClass.count
+    
+    TestClass.delete_where(:foo=>1, :bar=>"B")
+    
+    assert_equal(old_count - 1, TestClass.count)
+    assert_equal([], TestClass.find_by(:foo=>1, :bar=>"B"))
+    
+    TestClass.delete_where(:bar=>"C")
+    assert_equal(old_count - 12, TestClass.count)
+    assert_equal([], TestClass.find_by(:bar=>"C"))
+    
+  end
 
   def test_instance_methods_dont_include_class_methods
     ["foo", "bar"].each do |prefix|

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rhubarb
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - William Benton
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 -06:00
+date: 2010-03-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 2
         version: 1.2.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Rhubarb is a simple object-graph persistence library implemented as a mixin.  It also works with the SPQR library for straightforward object publishing over QMF.
 email: willb@redhat.com
 executables: []
@@ -75,18 +88,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "Rhubarb:  object graph persistence, easy as pie"