Rubernate 0.1.4 → 0.1.5

data/lib/rubernate/runtime.rb

@@ -184,6 +184,24 @@ module Rubernate
         raise "method MUST be overiden in subclass"
       end
 
+      # Checks wether ref_obj has been deleted and calls on_lose_ref callback on obj if so.
+      def ref_lost? obj, ref_prop, ref_obj        
+        return true  unless ref_obj
+        return false unless ref_obj.removed?      
+        obj.on_lose_ref ref_prop, ref_obj
+        true
+      end
+
+      # Removes removed refs fom Hash 
+      def ref_lost_hash obj, name, hash
+        hash.delete_if {|key, ref| ref_lost? obj, name, ref}
+      end
+
+      # Removes removed refs fom Array 
+      def ref_lost_array obj, name, array
+        array.delete_if {|ref| !ref or ref_lost? obj, name, ref}
+      end
+      
       def post_load object
         for value in object.peer.values
           value.compact! if value.is_a? Array

data/lib/rubernate.rb

@@ -35,14 +35,8 @@ module Rubernate
   require 'rubernate/callbacks'
   require 'rubernate/persistent'
   require 'rubernate/peer'
-  require 'rubernate/runtime'
-  require 'rubernate/impl/dbi_generic'
+  require 'rubernate/runtime'  
   require 'rubernate/queries'
-  require 'rubernate/impl/memory'
-  require 'rubernate/impl/dbi_mysql'
-  require 'rubernate/impl/dbi_oracle'
-  require 'rubernate/init/init_mysql'
-  require 'rubernate/init/init_oracle'
 
   # Rubernate core singelton methods.
   class << self
@@ -60,13 +54,42 @@ module Rubernate
     #   * password - databases users password
     def config db, url, user, password
       impl, init = case db
-        when :mysql:  [DBI::MySqlRuntime, DBI::MySqlInit]
-        when :oracle: [DBI::OracleRuntime, DBI::OracleInit]
+        when :mysql : require_mysql
+        when :oracle: require_oracle
+        when :pg    : require_pg
+        when :memory: require_memory
         else raise "Database #{db} not supported" 
-      end     
+      end
       self.configuration = DBI::Configuration.new impl, init, url, user, password
     end
     
+    # Loads MySQL module
+    def require_mysql
+      require 'rubernate/impl/dbi_mysql'
+      require 'rubernate/init/init_mysql'
+      [DBI::MySqlRuntime, DBI::MySqlInit.new]
+    end
+
+    # Loads Oracle module
+    def require_oracle
+      require 'rubernate/impl/dbi_oracle'
+      require 'rubernate/init/init_oracle'    
+      [DBI::OracleRuntime, DBI::OracleInit.new]
+    end
+    
+    # Loads Postgres module
+    def require_pg
+      require 'rubernate/impl/dbi_pg'
+      require 'rubernate/init/init_pg'
+      [DBI::PgRuntime, DBI::PgInit.new]
+    end
+    
+    # Loads Memory module used only for testing
+    def require_memory
+      require 'rubernate/impl/memory'
+      Memory::Runtime
+    end
+        
     # Intializes database - creates necessary tables, sequences and indices.
     def init_db
       @factory.init_db

data/tests/all_tests.rb

@@ -18,3 +18,8 @@ if $run_mysql_tests
   require 'rubernate/impl/queries_mysql_test' 
   require 'rubernate/impl/dbi_mysql_test' 
 end
+
+if $run_pg_tests
+  require 'rubernate/impl/queries_pg_test'
+  require 'rubernate/impl/dbi_pg_test'
+end

data/tests/config.rb

@@ -1,19 +1,29 @@
-# Set to true to run tests or Oracle
-$run_oracle_tests  = true
+# Set to true to run tests on Oracle
+$run_oracle_tests   = false
 
-ORA_RUNTIME_CLASS = Rubernate::DBI::OracleRuntime
-ORA_DB_URL        = 'dbi:OCI8:dbg91'
-ORA_DB_USER       = 'netcracker65'
-ORA_DB_PWD        = 'netcracker65'
+ORA_RUNTIME_CLASS   = Rubernate.require_oracle[0]
+ORA_DB_URL          = 'dbi:OCI8:dbg91'
+ORA_DB_USER         = 'netcracker65'
+ORA_DB_PWD          = 'netcracker65'
 
 # Set to true to run tests on MySQL
-$run_mysql_tests     = true
+$run_mysql_tests    = false
 
-MYSQL_RUNTIME_CLASS = Rubernate::DBI::MySqlRuntime
+MYSQL_RUNTIME_CLASS = Rubernate.require_mysql[0]
 MYSQL_DB_URL        = 'dbi:Mysql:rubernate_db:localhost'
 MYSQL_DB_USER       = nil
 MYSQL_DB_PWD        = nil
 
+# Set to true to run tests on PostgreSQL
+$run_pg_tests       = false
+
+PG_RUNTIME_CLASS    = Rubernate.require_pg[0]
+PG_DB_URL           = 'dbi:Pg:rubernate_db'
+PG_DB_USER          = 'rn_test'
+PG_DB_PWD           = 'rn_password'
+
+Rubernate.require_memory
+
 # Log4r configuration
 Rubernate::Log.level = Log4r::DEBUG
 Rubernate::Log.add Log4r::FileOutputter.new('file', 

data/tests/rubernate/callbacks_test.rb

@@ -45,6 +45,11 @@ module Rubernate
         Callbacks.handlers << :on_modify
         Callbacks.events << Event.new(self, property, old_value, new_value)
       end
+      
+      def on_lose_ref property, ref_obj
+        Callbacks.handlers << :on_lose_ref
+        Callbacks.events << Event.new(self, property, ref_obj)
+      end      
     end
     
     # This module contains callback method and included in module Rubernate::Runtime
@@ -116,5 +121,20 @@ module Rubernate
         :on_modify, :on_modify, :before_flush, :on_save,
         :after_flush, :after_commit], Callbacks.handlers
     end
+    
+    def test_lose_ref_callbacks
+      pk1, pk2 = nil
+      Rubernate.session do
+        o1 = Full.new.attach; pk1 = o1.primary_key
+        o2 = C1.new.attach;   pk2 = o2.primary_key
+        o1.p_ref = o2
+        o1.p_array = [o2]
+        o1.p_hash = {'key' => o2}
+        o2.remove!
+        Callbacks.clear
+      end
+      assert_equal [:before_commit, :before_flush, :on_save, :on_lose_ref, 
+        :on_lose_ref, :on_lose_ref, :after_flush, :after_commit], Callbacks.handlers
+    end    
   end
 end

data/tests/rubernate/fixtures.rb

@@ -33,7 +33,7 @@ module FixtureClasses
     end
   end
   class Full
-    persistent :p_nil, :p_int, :p_float, :p_str, :p_date, :p_time, :p_array, :p_hash
+    persistent :p_nil, :p_int, :p_float, :p_str, :p_date, :p_time, :p_ref, :p_array, :p_hash
     def to_s
       "#{self.class}:#{primary_key}"
     end

data/tests/rubernate/impl/dbi_generic_stub.rb

@@ -74,12 +74,12 @@ module DBI::GenericTests
     @runtime.save o
     rows = @runtime.dbh.select_all 'select * from r_params' 
     assert_equal 1, rows.size
-    assert_equal o.primary_key, rows[0]['OBJECT_PK'].to_i
-    assert_equal PARAM_FLAG_STRING, rows[0]['FLAGS'].to_i
-    assert_nil rows[0]['INT_VALUE']
-    assert_equal 'test', rows[0]['STR_VALUE']
-    assert_nil rows[0]['DAT_VALUE']
-    assert_nil rows[0]['REF_VALUE']
+    assert_equal o.primary_key, rows[0][P_PK].to_i
+    assert_equal PARAM_FLAG_STRING, rows[0][P_FLAGS].to_i
+    assert_nil rows[0][P_INT]
+    assert_equal 'test', rows[0][P_STR]
+    assert_nil rows[0][P_TIME]
+    assert_nil rows[0][P_REF]
   end
   
   def test_save_param_int
@@ -88,12 +88,14 @@ module DBI::GenericTests
     @runtime.save o
     rows = @runtime.dbh.select_all 'select * from r_params'
     assert_equal  1, rows.size
-    assert_equal  o.primary_key, rows[0]['OBJECT_PK'].to_i
-    assert_equal PARAM_FLAG_INT, rows[0]['FLAGS'].to_i
-    assert_equal 777, rows[0]['INT_VALUE'].to_i
-    assert_nil rows[0]['STR_VALUE']
-    assert_nil rows[0]['DAT_VALUE']
-    assert_nil rows[0]['REF_VALUE']
+    assert_equal  o.primary_key, rows[0][P_PK].to_i
+    assert_equal PARAM_FLAG_INT, rows[0][P_FLAGS].to_i
+    assert_equal 'p1', rows[0][P_NAME]
+    assert_equal 777, rows[0][P_INT].to_i
+    assert_nil rows[0][P_FLT]
+    assert_nil rows[0][P_STR]
+    assert_nil rows[0][P_TIME]
+    assert_nil rows[0][P_REF]
   end
   
   def test_save_param_ref
@@ -105,12 +107,12 @@ module DBI::GenericTests
     
     rows = @runtime.dbh.select_all 'select * from r_params' 
     assert_equal 1, rows.size
-    assert_equal o1.primary_key, rows[0]['OBJECT_PK'].to_i
-    assert_equal PARAM_FLAG_REF, rows[0]['FLAGS'].to_i
-    assert_nil rows[0]['INT_VALUE']
-    assert_nil rows[0]['STR_VALUE']
-    assert_nil rows[0]['DAT_VALUE']
-    assert_equal o0.primary_key, rows[0]['REF_VALUE'].to_i
+    assert_equal o1.primary_key, rows[0][P_PK].to_i
+    assert_equal PARAM_FLAG_REF, rows[0][P_FLAGS].to_i
+    assert_nil rows[0][P_INT]
+    assert_nil rows[0][P_STR]
+    assert_nil rows[0][P_TIME]
+    assert_equal o0.primary_key, rows[0][P_REF].to_i
   end
       
   def test_save_param_int_hash
@@ -127,13 +129,13 @@ module DBI::GenericTests
     rows = @runtime.dbh.select_all 'select * from r_params order by int_value' 
     assert_equal 10, rows.size
     for row in rows
-      assert_equal o.primary_key, row['OBJECT_PK'].to_i
-      assert_equal PARAM_FLAG_INT | PARAM_FLAG_HASH, row['FLAGS'].to_i
-      assert hash.has_key?(row['INT_VALUE'].to_i)
+      assert_equal o.primary_key, row[P_PK].to_i
+      assert_equal PARAM_FLAG_INT | PARAM_FLAG_HASH, row[P_FLAGS].to_i
+      assert hash.has_key?(row[P_INT].to_i)
       assert_nil row['FLT_VALUE']
-      assert_nil row['STR_VALUE']
-      assert_nil row['DAT_VALUE']
-      assert_equal hash[row['INT_VALUE'].to_i].primary_key, row['REF_VALUE'].to_i
+      assert_nil row[P_STR]
+      assert_nil row[P_TIME]
+      assert_equal hash[row[P_INT].to_i].primary_key, row[P_REF].to_i
     end
   end
   
@@ -154,22 +156,22 @@ module DBI::GenericTests
     assert_equal 2, rows.size
     
     for row in rows
-      if row['FLAGS'].to_i == HASH_INT_REF
-        assert_equal o.primary_key, row['OBJECT_PK'].to_i
-        assert hash.has_key?(row['INT_VALUE'].to_i)
+      if row[P_FLAGS].to_i == HASH_INT_REF
+        assert_equal o.primary_key, row[P_PK].to_i
+        assert hash.has_key?(row[P_INT].to_i)
         assert_nil row['FLT_VALUE']
-        assert_nil row['STR_VALUE']
-        assert_nil row['DAT_VALUE']
-        assert_equal hash[row['INT_VALUE'].to_i].primary_key, row['REF_VALUE'].to_i
-      elsif row['FLAGS'].to_i == HASH_STRING_REF
-        assert_equal o.primary_key, row['OBJECT_PK'].to_i
-        assert_nil row['INT_VALUE']
+        assert_nil row[P_STR]
+        assert_nil row[P_TIME]
+        assert_equal hash[row[P_INT].to_i].primary_key, row[P_REF].to_i
+      elsif row[P_FLAGS].to_i == HASH_STRING_REF
+        assert_equal o.primary_key, row[P_PK].to_i
+        assert_nil row[P_INT]
         assert_nil row['FLT_VALUE']
-        assert hash.has_key?(row['STR_VALUE'])
-        assert_nil row['DAT_VALUE']
-        assert_equal hash[row['STR_VALUE']].primary_key, row['REF_VALUE'].to_i
+        assert hash.has_key?(row[P_STR])
+        assert_nil row[P_TIME]
+        assert_equal hash[row[P_STR]].primary_key, row[P_REF].to_i
       else 
-        flunk 'Invalid flags: ' + row['FLAGS'].to_i
+        flunk "Invalid flags: #{row[P_FLAGS]}"
       end
     end
   end
@@ -190,13 +192,13 @@ module DBI::GenericTests
     assert_equal 10, rows.size
     for i in 0..9
       row = rows[i]
-      assert_equal o.primary_key, row['OBJECT_PK'].to_i
-      assert_equal 'p1', row['NAME']
-      assert_equal ARRAY_INT_REF, row['FLAGS'].to_i
-      assert_equal i, row['INT_VALUE'].to_i
-      assert_nil row['STR_VALUE']
-      assert_nil row['DAT_VALUE']
-      assert_equal array[row['INT_VALUE'].to_i].primary_key, row['REF_VALUE'].to_i
+      assert_equal o.primary_key, row[P_PK].to_i
+      assert_equal 'p1', row[P_NAME]
+      assert_equal ARRAY_INT_REF, row[P_FLAGS].to_i
+      assert_equal i, row[P_INT].to_i
+      assert_nil row[P_STR]
+      assert_nil row[P_TIME]
+      assert_equal array[row[P_INT].to_i].primary_key, row[P_REF].to_i
     end
   end
   
@@ -361,6 +363,7 @@ module DBI::GenericTests
       o.p_str   = 'Test String'
       o.p_time  = time
       o.p_date  = date
+      o.p_ref   = o
       o.p_array = [o, o, o]
       o.p_hash  = {nil => o,
         777  => o,
@@ -378,6 +381,7 @@ module DBI::GenericTests
       assert_equal 'Test String', o.p_str
       assert_equal time.to_a[0..5], o.p_time.to_a[0..5] # Ignore time zone
       assert_equal date, o.p_date # Ignore time zone
+      assert_equal o, o.p_ref
       assert_equal [o, o, o], o.p_array      
       assert_equal 6, o.p_hash.size
       

data/tests/rubernate/impl/dbi_oracle_test.rb

@@ -4,16 +4,21 @@ $:.unshift(File.expand_path('../../..', __FILE__)) unless
 require 'rubernate/fixtures' 
 require 'rubernate/impl/dbi_generic_stub'
 
-class Rubernate::DBI::OracleTest < Test::Unit::TestCase
-  include Rubernate::DBI::GenericTests 
-  def setup
-    init ORA_RUNTIME_CLASS, ORA_DB_URL, ORA_DB_USER, ORA_DB_PWD      
+
+module Rubernate
+module DBI
+  class OracleTest < Test::Unit::TestCase
+    include Rubernate::DBI::GenericTests 
+    def setup
+      init ORA_RUNTIME_CLASS, ORA_DB_URL, ORA_DB_USER, ORA_DB_PWD      
+    end
   end
-end
- 
-class Rubernate::DBI::OracleRuntimeTest < Test::Unit::TestCase
-  include Rubernate::GenericRuntimeTests  
-  def setup
-    init ORA_RUNTIME_CLASS, ORA_DB_URL, ORA_DB_USER, ORA_DB_PWD
+   
+  class OracleRuntimeTest < Test::Unit::TestCase
+    include Rubernate::GenericRuntimeTests  
+    def setup
+      init ORA_RUNTIME_CLASS, ORA_DB_URL, ORA_DB_USER, ORA_DB_PWD
+    end
   end
 end
+end

data/tests/rubernate/impl/dbi_pg_test.rb

@@ -0,0 +1,23 @@
+$:.unshift(File.expand_path('../../..', __FILE__)) unless 
+  $:.include?(File.expand_path('../../..', __FILE__))
+
+require 'rubernate/fixtures' 
+require 'rubernate/impl/dbi_generic_stub'
+
+module Rubernate
+module DBI
+  class PgTest < Test::Unit::TestCase
+    include Rubernate::DBI::GenericTests 
+    def setup
+      init PG_RUNTIME_CLASS, PG_DB_URL, PG_DB_USER, PG_DB_PWD
+    end
+  end
+ 
+  class PgRuntimeTest < Test::Unit::TestCase
+    include Rubernate::GenericRuntimeTests  
+    def setup
+      init PG_RUNTIME_CLASS, PG_DB_URL, PG_DB_USER, PG_DB_PWD 
+    end
+  end
+end
+end

data/tests/rubernate/impl/memory_test.rb

@@ -124,35 +124,35 @@ class Rubernate::Memory::RuntimeTest < Test::Unit::TestCase
   def test_save_peer
     obj, obj.peer = C4.new(1), Peer.new
     obj.p1, obj.p2 = 2, [C4.new(2)]
-    data = @runtime.save_peer obj.peer
+    data = @runtime.save_peer obj
     assert_equal({:p1 => 2, :p2 => [ref(2, C4)]}, data)
   end
   
   def test_save_param_simple
-    p = @runtime.save_param "test"
+    p = @runtime.save_param nil, nil, "test"
     assert_equal "test", p
     
-    p = @runtime.save_param 1
+    p = @runtime.save_param nil, nil, 1
     assert_equal 1, p
     
-    p = @runtime.save_param C4.new(3)
+    p = @runtime.save_param nil, nil, C4.new(3)
     assert_equal Reference, p.class
     assert_equal 3, p.primary_key
     assert_equal C4, p.object_class
   end
   
   def test_save_param_array
-    p = @runtime.save_param [C4.new(1), C4.new(2)]
+    p = @runtime.save_param nil, nil, [C4.new(1), C4.new(2)]
     assert_equal [ref(1, C4), ref(2, C4)], p
-    p = @runtime.save_param []
+    p = @runtime.save_param nil, nil, []
     assert_equal [], p
   end
   
   def test_save_param_hash
-    p = @runtime.save_param('k1' => C4.new(1), 2 => C4.new(2))
+    p = @runtime.save_param nil, nil, 'k1' => C4.new(1), 2 => C4.new(2)
     assert_equal({'k1' => ref(1, C4), 2 => ref(2, C4)}, p)
     assert_not_equal({'k1' => ref(2, C4), 2 => ref(2, C4)}, p)
-    p = @runtime.save_param({})
+    p = @runtime.save_param nil, nil, ({})
     assert_equal({}, p)
   end
   

data/tests/rubernate/impl/queries_oracle_test.rb

@@ -1,4 +1,3 @@
-
 $:.unshift(File.expand_path('../../..', __FILE__)) unless 
   $:.include?(File.expand_path('../../..', __FILE__))
 

data/tests/rubernate/impl/queries_pg_test.rb

@@ -0,0 +1,14 @@
+$:.unshift(File.expand_path('../../..', __FILE__)) unless 
+  $:.include?(File.expand_path('../../..', __FILE__))
+
+require 'rubernate/fixtures' 
+require 'rubernate/impl/queries_stub'
+
+module Rubernate
+  class PgQueriesTest < Test::Unit::TestCase
+    include GenericQueriesTest
+    def setup
+      init :pg, PG_DB_URL, PG_DB_USER, PG_DB_PWD
+    end  
+  end
+end  

data/tests/rubernate/impl/queries_stub.rb

@@ -68,5 +68,23 @@ module GenericQueriesTest
       assert_equal [o1], res
     end
   end
+  
+  def test_or_and_not_nil
+    Rubernate.session do
+      o1, o2, o3 = C2.new.attach, C2.new.attach, C2.new.attach
+      o1.p1, o1.p2 = 1, 2
+      o2.p1, o2.p2 = 1, 3
+      o3.p2 = 4
+      
+      res = find_by_query 'Select :o; Where o.p1.int == 1; OrderBy o.p2.int'
+      assert_equal [o1, o2], res    
+      
+      # res = find_by_query 'Select :o; Where IsNil(o.p1)'  TODO: fix this!!!
+      # assert_equal [o3], res
+      
+      res = find_by_query 'Select :o; Where Or(o.p2.int == 3, o.p2.int == 4); OrderBy o.p2.int'
+      assert_equal [o2, o3], res
+    end
+  end
 end  
 end

data/tests/rubernate/queries_test.rb

@@ -169,8 +169,8 @@ module Rubernate
     end
     
     def test_eq_equivalence
-      q0 = query {Select :o; Where o.p1 == :ref}
-      q1 = query {Select :o; Where Eq(o.p1, :ref)}
+      q0 = query {Select :o; Where o.p1.ref == :ref}
+      q1 = query {Select :o; Where Eq(o.p1.ref, :ref)}
       assert_equal q0.to_sql, q1.to_sql
       assert_equal q0.markers, q1.markers
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: Rubernate
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2006-03-16 00:00:00 +03:00
+  version: 0.1.5
+date: 2006-03-20 00:00:00 +03:00
 summary: Object-oriented storage for Ruby objects based on relational database model
 require_paths: 
 - lib
@@ -41,9 +41,12 @@ files:
 - lib/rubernate/impl/dbi_generic.rb
 - lib/rubernate/impl/dbi_mysql.rb
 - lib/rubernate/impl/dbi_oracle.rb
+- lib/rubernate/impl/dbi_pg.rb
 - lib/rubernate/impl/memory.rb
+- lib/rubernate/init/init_generic.rb
 - lib/rubernate/init/init_mysql.rb
 - lib/rubernate/init/init_oracle.rb
+- lib/rubernate/init/init_pg.rb
 - tests/all_tests.rb
 - tests/config.rb
 - tests/README
@@ -57,9 +60,11 @@ files:
 - tests/rubernate/impl/dbi_generic_stub.rb
 - tests/rubernate/impl/dbi_mysql_test.rb
 - tests/rubernate/impl/dbi_oracle_test.rb
+- tests/rubernate/impl/dbi_pg_test.rb
 - tests/rubernate/impl/memory_test.rb
 - tests/rubernate/impl/queries_mysql_test.rb
 - tests/rubernate/impl/queries_oracle_test.rb
+- tests/rubernate/impl/queries_pg_test.rb
 - tests/rubernate/impl/queries_stub.rb
 - README
 test_files: