rhubarb 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/rhubarb/classmixins.rb

@@ -13,10 +13,19 @@
 require 'rhubarb/mixins/freshness'
 
 module Rhubarb
+  # Forward declaration
+  module Persistence; end
+
   # Methods mixed in to the class object of a persisting class
-  module PersistingClassMixins 
-    PCM_INPUT_TRANSFORMERS = {:blob=>Util.blobify_proc, :zblob=>Util.zblobify_proc, :object=>Util.swizzle_object_proc}
-    PCM_OUTPUT_TRANSFORMERS = {:object=>Util.deswizzle_object_proc, :zblob=>Util.dezblobify_proc, }
+  module PersistingClassMixins
+    if ::Rhubarb::Persistence::sqlite_13
+      PCM_INPUT_TRANSFORMERS = {:blob=>Util.blobify_proc, :zblob=>Util.zblobify_proc, :object=>Util.swizzle_object_proc, :boolean=>Util.truthify_proc}
+      PCM_OUTPUT_TRANSFORMERS = {:object=>Util.deswizzle_object_proc, :zblob=>Util.dezblobify_proc, :string=>Proc.new {|v| v.to_s}}
+    else
+      PCM_INPUT_TRANSFORMERS = {:blob=>Util.blobify_proc, :zblob=>Util.zblobify_proc, :object=>Util.swizzle_object_proc}
+      PCM_OUTPUT_TRANSFORMERS = {:object=>Util.deswizzle_object_proc, :zblob=>Util.dezblobify_proc}
+    end
+      
     # Returns the name of the database table modeled by this class.
     # Defaults to the name of the class (sans module names)
     def table_name(quoted=false)
@@ -56,16 +65,38 @@ module Rhubarb
     
     alias find_by_id find
 
-    def find_by(arg_hash)
+    def find_by_sqlite13(arg_hash)
       results = []
       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 {|key,val| arg_hash[key] = val.row_id if val.respond_to? :row_id}
+      arg_hash.each do |key,val| 
+        arg_hash[key] = val.row_id if val.respond_to? :row_id
+        xform = PCM_INPUT_TRANSFORMERS[colkinds[key]]
+        arg_hash[key] = xform.call(val) if xform
+      end
+      db.do_query("select * from #{quoted_table_name} where #{select_criteria} order by row_id", arg_hash) {|tup| results << self.new(tup) }
+      results
+    end
+
+    def find_by_sqlite12(arg_hash)
+      results = []
+      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 do |key,val| 
+        arg_hash[key] = val.row_id if val.respond_to? :row_id
+      end
       db.do_query("select * from #{quoted_table_name} where #{select_criteria} order by row_id", arg_hash) {|tup| results << self.new(tup) }
       results
     end
 
+    if ::Rhubarb::Persistence::sqlite_13
+      alias find_by find_by_sqlite13
+    else
+      alias find_by find_by_sqlite12
+    end
+
     # Does what it says on the tin.  Since this will allocate an object for each row, it isn't recomended for huge tables.
     def find_all
       results = []
@@ -147,16 +178,32 @@ module Rhubarb
       # add a find for this column (a class method)
       klass = (class << self; self end)
       klass.class_eval do 
-        define_method find_method_name do |arg|
-          results = []
-          db.do_query(find_query, arg) {|row| results << self.new(row)}
-          results
-        end
-
-        define_method find_first_method_name do |arg|
-          result = nil
-          db.do_query(find_query, arg) {|row| result = self.new(row) ; break }
-          result
+        if ::Rhubarb::Persistence::sqlite_13
+          define_method find_method_name do |arg|
+            results = []
+            arg = Util.rhubarb_fk_identity(arg)
+            db.do_query(find_query, arg) {|row| results << self.new(row)}
+            results
+          end
+          
+          define_method find_first_method_name do |arg|
+            result = nil
+            arg = Util.rhubarb_fk_identity(arg)
+            db.do_query(find_query, arg) {|row| result = self.new(row) ; break }
+            result
+          end
+        else
+          define_method find_method_name do |arg|
+            results = []
+            db.do_query(find_query, arg) {|row| results << self.new(row)}
+            results
+          end
+          
+          define_method find_first_method_name do |arg|
+            result = nil
+            db.do_query(find_query, arg) {|row| result = self.new(row) ; break }
+            result
+          end
         end
       end
 

data/lib/rhubarb/persistence.rb

@@ -51,7 +51,7 @@ module Rhubarb
           end
         end
         
-        if @use_prepared_stmts
+        if @use_prepared_stmts && Rhubarb::Persistence::prepared_ok
           class << db
             include UsePreparedStatements
           end
@@ -65,6 +65,15 @@ module Rhubarb
     
     @dbs = DbCollection.new
     
+    def self.prepared_ok
+      !!sqlite_13
+    end
+
+    def self.sqlite_13
+      result = SQLite3.constants.include?("VERSION") && SQLite3::VERSION =~ /1\.3\.[0-9]+/
+      !!result
+    end
+
     def self.open(filename, which=:default, usePrepared=true)
       dbs.use_prepared_stmts = usePrepared
       dbs[which] = SQLite3::Database.new(filename)
@@ -91,4 +100,4 @@ module Rhubarb
       @dbs
     end
   end
-end
+end

data/lib/rhubarb/persisting.rb

@@ -55,6 +55,11 @@ module Rhubarb
       @backed = true
       @tuple = tup
       mark_fresh
+      
+      unless @tuple.is_a?(Hash)
+        @tuple = Hash[*self.class.columns.map{|c| c.name}.zip(tup).flatten]
+      end
+      
       @row_id = @tuple["row_id"]
       @created = @tuple["created"]
       @updated = @tuple["updated"]

data/lib/rhubarb/util.rb

@@ -24,7 +24,11 @@ module Rhubarb
 
     # Identity for objects that may be used as foreign keys
     def self.rhubarb_fk_identity(object)
-      (object.row_id if object.class.ancestors.include? Persisting) || object
+      (object.class.ancestors.include?(Persisting) || object.class.ancestors.include?(Rhubarb::Persisting)) ? object.row_id : object
+    end
+
+    def self.truthify_proc
+      @truthify_proc ||= Proc.new {|obj| !!(obj) ? "true" : "false"}
     end
     
     def self.blobify_proc
@@ -37,8 +41,11 @@ module Rhubarb
     
     def self.dezblobify_proc
       @dezblobify_proc ||= Proc.new do |obj| 
-        return nil if obj.nil? || obj == ""
-        Zlib::Inflate.inflate(obj)
+        if obj.nil? || obj == ""
+          nil
+        else
+          Zlib::Inflate.inflate(obj)
+        end
       end
     end
     
@@ -51,11 +58,13 @@ module Rhubarb
 
     def self.deswizzle_object_proc
       @deswizzle_object_proc ||= Proc.new do |zy_obj|
-        return nil if zy_obj.nil? || zy_obj == ""
-        
-        obj = YAML.load(Zlib::Inflate.inflate(zy_obj))
-        obj.freeze
+        if zy_obj.nil? || zy_obj == ""
+          nil
+        else
+          obj = YAML.load(Zlib::Inflate.inflate(zy_obj))
+          obj.freeze
+        end
       end
     end
   end
-end
+end

data/rhubarb.gemspec

@@ -0,0 +1,66 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rhubarb}
+  s.version = "0.4.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["William Benton"]
+  s.date = %q{2011-07-06}
+  s.description = %q{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.}
+  s.email = %q{willb@redhat.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc",
+    "TODO"
+  ]
+  s.files = [
+    ".document",
+    "CHANGES",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "VERSION",
+    "lib/rhubarb/classmixins.rb",
+    "lib/rhubarb/column.rb",
+    "lib/rhubarb/mixins/freshness.rb",
+    "lib/rhubarb/persistence.rb",
+    "lib/rhubarb/persisting.rb",
+    "lib/rhubarb/reference.rb",
+    "lib/rhubarb/rhubarb.rb",
+    "lib/rhubarb/util.rb",
+    "rhubarb.gemspec",
+    "ruby-rhubarb.spec.in",
+    "test/helper.rb",
+    "test/test_rhubarb.rb"
+  ]
+  s.homepage = %q{http://git.fedorahosted.org/git/grid/rhubarb.git}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Rhubarb:  object graph persistence, easy as pie}
+  s.test_files = [
+    "test/helper.rb",
+    "test/test_rhubarb.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.2.2"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.2"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.2"])
+  end
+end
+

data/ruby-rhubarb.spec.in

@@ -1,5 +1,5 @@
 %{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
-%define rel 1
+%define rel 3
 
 Summary: Simple versioned object-graph persistence layer
 Name: ruby-rhubarb
@@ -29,8 +29,8 @@ instances of specially-declared Ruby classes in a SQLite3 database
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/%{ruby_sitelib}/rhubarb
 mkdir -p %{buildroot}/%{ruby_sitelib}/rhubarb/mixins
-cp -f lib/rhubarb/mixins/*.rb %{buildroot}/%{ruby_sitelib}/rhubarb/mixins
-cp -f lib/rhubarb/*.rb %{buildroot}/%{ruby_sitelib}/rhubarb
+cp -p -f lib/rhubarb/mixins/*.rb %{buildroot}/%{ruby_sitelib}/rhubarb/mixins
+cp -p -f lib/rhubarb/*.rb %{buildroot}/%{ruby_sitelib}/rhubarb
 
 %clean
 rm -rf %{buildroot}
@@ -48,6 +48,15 @@ rm -rf %{buildroot}
 %{ruby_sitelib}/rhubarb/persistence.rb
 
 %changelog
+* Mon Jun 6 2011 willb <willb@redhat> - 0.3.0-3
+- installation now preserves file modification times
+
+* Mon Mar 14 2011 willb <willb@redhat> - 0.3.0-2
+- fix for object output transformers
+
+* Tue Feb 15 2011 willb <willb@redhat> - 0.3.0-1
+- fixed bzs 674432, 674433, 677807
+
 * Wed Sep 15 2010 willb <willb@redhat> - 0.2.7-1
 - Updated to version 0.2.7
 - fixed problems with hash-valued params in custom queries

data/test/test_rhubarb.rb

@@ -15,7 +15,16 @@ require 'helper'
 require 'fileutils'
 
 Customer = Struct.new(:name, :address)
+SQLITE_13 = ::Rhubarb::Persistence::sqlite_13
+CONSTRAINT_EXCEPTION = SQLITE_13 ? SQLite3::ConstraintException : SQLite3::SQLException
 
+BFB_MAX = 512
+
+class ParityTest
+  include Rhubarb::Persisting
+  declare_column :number, :integer
+  declare_column :parity, :boolean
+end
 
 class TestClass 
   include Rhubarb::Persisting  
@@ -138,13 +147,13 @@ class Order
   declare_column :group, :int
 end
 
-class PreparedStmtBackendTests < Test::Unit::TestCase  
+class NoPreparedStmtBackendTests < Test::Unit::TestCase  
   def dbfile
     ENV['RHUBARB_TEST_DB'] || ":memory:"
   end
   
   def use_prepared
-    true
+    false
   end
 
   def setup
@@ -168,7 +177,7 @@ class PreparedStmtBackendTests < Test::Unit::TestCase
     klasses << ObjectTestTable
     klasses << RhubarbNamespace::NMTC
     klasses << RhubarbNamespace::NMTC2
-
+    klasses << ParityTest
     klasses.each { |klass| klass.create_table }
 
     @flist = []
@@ -178,6 +187,34 @@ class PreparedStmtBackendTests < Test::Unit::TestCase
     Rhubarb::Persistence::close()
   end
 
+  def test_boolean_find_by
+    # believe me, I chuckled while writing this
+    bit_parity = Proc.new do |k|
+      k.to_s(2).split("0").join.size.even?
+    end
+    
+    expected_numbers = Set.new
+
+    BFB_MAX.times do |i|
+      ParityTest.create(:number=>i, :parity=>bit_parity.call(i))
+      expected_numbers << i
+    end
+    
+    even = ParityTest.find_by(:parity=>true)
+    odd = ParityTest.find_by(:parity=>false)
+
+    assert_equal(BFB_MAX, even.size+odd.size)
+    {even=>true, odd=>false}.each do |collection, par|
+      collection.each do |pt|
+        assert_equal(bit_parity.call(pt.number), pt.parity)
+        assert_equal(par, pt.parity)
+        expected_numbers.delete(pt.number)
+      end
+    end
+
+    assert_equal(0, expected_numbers.size)
+  end
+
   def test_reserved_word_table
     assert_nothing_raised do
       Create.create_table
@@ -514,9 +551,9 @@ class PreparedStmtBackendTests < Test::Unit::TestCase
     
     result = TestClass.find_by_foo(2)
     tc = result[0]
-    assert(result.size == 1, "TestClass.find_by_foo(2) should return exactly one result")
-    assert(tc.foo == 2, "tc.foo (found by foo) should have the value 2")
-    assert(tc.bar == "argh", "tc.bar (found by foo) should have the value \"argh\"")
+    assert_equal(1, result.size, "TestClass.find_by_foo(2) should return exactly one result")
+    assert_equal(2, tc.foo, "tc.foo (found by foo) should have the value 2")
+    assert_equal("argh", tc.bar, "tc.bar (found by foo) should have the value \"argh\"")
   end
 
   def test_create_and_find_first_by_foo
@@ -653,7 +690,7 @@ class PreparedStmtBackendTests < Test::Unit::TestCase
   end
 
   def test_referential_integrity
-    assert_raise SQLite3::SQLException do 
+    assert_raise CONSTRAINT_EXCEPTION do
       FromRef.create(:t => 42)
     end
     
@@ -981,8 +1018,10 @@ class PreparedStmtBackendTests < Test::Unit::TestCase
   end
 end
 
-class NoPreparedStmtBackendTests < PreparedStmtBackendTests  
-  def use_prepared
-    false
+unless SQLITE_13
+  class PreparedStmtBackendTests < NoPreparedStmtBackendTests  
+    def use_prepared
+      true
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhubarb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - William Benton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -06:00
+date: 2011-07-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,6 @@ extra_rdoc_files:
 - TODO
 files: 
 - .document
-- .gitignore
 - CHANGES
 - LICENSE
 - README.rdoc
@@ -77,6 +76,7 @@ files:
 - lib/rhubarb/reference.rb
 - lib/rhubarb/rhubarb.rb
 - lib/rhubarb/util.rb
+- rhubarb.gemspec
 - ruby-rhubarb.spec.in
 - test/helper.rb
 - test/test_rhubarb.rb
@@ -85,8 +85,8 @@ homepage: http://git.fedorahosted.org/git/grid/rhubarb.git
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC