Rubernate 0.1.5 → 0.1.6

data/tests/rubernate/impl/dbi_generic_stub.rb

@@ -21,12 +21,14 @@ module DBI::GenericTests
     }
     @runtime = @factory.create
     Thread.current[:on_save] = Thread.current[:on_load] = nil
+    Rubernate.settings.clear
   end
   
   def teardown
     @runtime.dbh.disconnect if @runtime and @runtime.dbh
+    Rubernate.settings.clear
   end  
-      
+
   def test_connect
     assert @runtime
     assert @runtime.dbh
@@ -40,12 +42,12 @@ module DBI::GenericTests
   
   def test_create
     o = C1.new
-    o.peer = Peer.new
+    o.__peer = Peer.new
     @runtime.create o
     rows = @runtime.dbh.select_all 'select * from r_objects'
     assert_equal 1, rows.size
     assert_equal C1.name, rows[0][1]
-    assert o.peer.dirty?
+    assert o.__peer.dirty?
   end
   
   def test_save_objects
@@ -55,7 +57,7 @@ module DBI::GenericTests
     @runtime.save objects
     
     for object in objects
-      assert !object.peer.dirty?
+      assert !object.__peer.dirty?
     end        
     
     rows = @runtime.dbh.select_all 'select * from r_objects order by object_pk'
@@ -248,7 +250,7 @@ module DBI::GenericTests
       object = objects[i - 1]
       assert_equal C1, object.class
       assert_equal  i, object.p1
-      assert !object.peer.dirty?
+      assert !object.__peer.dirty?
     end
   end
   
@@ -263,7 +265,7 @@ module DBI::GenericTests
     
     o0 = @runtime.load_by_pk o0.primary_key
     assert o0
-    assert_equal 2, o0.peer.size
+    assert_equal 2, o0.__peer.size
     assert_equal 'o0.p1', o0.p1
     assert_equal o0.p2, o1
   end  
@@ -353,52 +355,63 @@ module DBI::GenericTests
   end
   
   def test_param_all_types
-    pk, time, date = nil, Time.now, Date.today
+    pk, rk, time, date = nil, nil, Time.now, Date.today
     Rubernate.session do
-      o = Full.new.attach
-      pk = o.primary_key
+      o, r = Full.new.attach, C1.new.attach
+      pk, rk = o.primary_key, r.primary_key
       o.p_nil   = nil
       o.p_int   = 123
       o.p_float = 77.5
       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,
-        1.23 => o,
-        'Str.Key' => o,
-        time => o,
+      o.p_ref   = r
+      o.p_array = [o, r, r]
+      o.p_hash  = {
+        nil  => o,
+        333  => o,
+        777  => r,
+        1.23 => r,
+        'Str.Key' => r,
+        time => r,
         date => o
       }
     end
     Rubernate.session do
       o = find_by_pk pk
+      r = find_by_pk rk
       assert_nil o.p_nil
       assert_equal 123, o.p_int
       assert_equal 77.5, o.p_float
       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
+      assert_equal date, o.p_date
+      assert_equal r, o.p_ref
+      assert_equal [o, r, r], o.p_array      
+      assert_equal 7, o.p_hash.size
       
       o.p_hash.each {|key, val|
-        assert_equal time.to_a[0..5], key.to_a[0..5] if key.is_a? Time
-        assert_equal date, key if key.is_a? Date          
+        if key.is_a? Time
+          assert_equal time.to_a[0..5], key.to_a[0..5] 
+          assert_equal r, val
+        end
+        if key.is_a? Date
+          assert_equal date, key
+          assert_equal o, val
+        end
       }
       o.p_hash.delete_if {|key, val| key.is_a? Time or key.is_a? Date}
       
-      assert_equal ({nil => o,
-          777  => o,
-          1.23 => o,
-          'Str.Key' => o
+      assert_equal ({
+          nil  => o,
+          333  => o,
+          777  => r,
+          1.23 => r,
+          'Str.Key' => r
         }), o.p_hash
     end
-  end
-end
+  end  
+end  
 
 module GenericRuntimeTests
   include Rubernate
@@ -415,8 +428,13 @@ module GenericRuntimeTests
     }
     Rubernate.configuration = @factory
     Thread.current[:on_save] = Thread.current[:on_load] = nil
+    Rubernate.settings.clear
   end
   
+  def teardown
+    Rubernate.settings.clear
+  end
+
   def test_session
     Rubernate.session {|runtime|
       assert runtime
@@ -496,14 +514,14 @@ module GenericRuntimeTests
     assert pk
     Rubernate.session { |runtime| 
       o = runtime.find_by_pk pk
-      assert !o.peer.dirty?
+      assert !o.__peer.dirty?
       assert_not_nil Thread.current[:on_load]
       o.p0 = 'o.p0'
     }
     assert_not_nil Thread.current[:on_save] 
     Rubernate.session { |runtime| 
       o = runtime.find_by_pk pk
-      assert !o.peer.dirty?
+      assert !o.__peer.dirty?
       assert_equal 'o.p0', o.p0 
     }    
   end
@@ -674,14 +692,63 @@ module GenericRuntimeTests
     o1, o1.p1, pk1 = C1.new, 'obj1'
     o2, o2.p1, pk2 = C2.new, o1
     o2.p2 = [o2]
-    Rubernate.session {o1.attach; pk1 = o1.primary_key; o2.attach; pk2 = o2.primary_key}
-    Rubernate.session do 
+    Rubernate.session do
+      o1.attach; pk1 = o1.primary_key
+      o2.attach; pk2 = o2.primary_key
+    end
+    Rubernate.session do
       o1 = find_by_pk pk1
       o2 = find_by_pk pk2
       assert_equal 'obj1', o1.p1
-      assert_equal o1, o2.p1
-      assert_equal [o2], o2.p2
+      assert_equal o1,     o2.p1
+      assert_equal [o2],   o2.p2
     end
-  end  
+  end
+
+  def test_lazy_load_strategies
+    o1, pk = nil
+    Rubernate.session do
+      o1 = C2.new.attach
+      pk = o1.primary_key
+      o1.p1 = C1.new.attach
+      o1.p1.p1 = 'zero'
+      o1.p2 = {}
+      o1.p2[1] = C1.new.attach
+      o1.p2[1].p1 = 'first'
+      o1.p2[2] = C1.new.attach      
+      o1.p2[2].p1 = 'second'
+    end
+           
+    Rubernate.session do
+      o1 = find_by_pk pk
+      assert_equal 'first', o1.p2[1].p1
+      assert o1.p1.__peer.is_a?(LazyLoader)
+      assert o1.p2[1].__peer.is_a?(Peer)
+      assert o1.p2[2].__peer.is_a?(LazyLoader)      
+    end
+
+    # Test bulk param lazy loading
+    Rubernate.session do |rt|
+      rt.settings[:lazy_load] = :collection
+      o1 = find_by_pk pk
+      assert o1.p2[1].__peer.is_a?(ParamLazyLoader)
+      assert o1.p2[2].__peer.is_a?(ParamLazyLoader)
+      assert_equal 'first', o1.p2[1].p1
+      assert o1.p1.__peer.is_a?(LazyLoader)
+      assert o1.p2[1].__peer.is_a?(Peer)
+      assert o1.p2[2].__peer.is_a?(Peer)
+    end
+    
+    Rubernate.settings[:lazy_load] = :holder
+    # Test host object lazy loading
+    Rubernate.session do |rt|
+      o1 = find_by_pk pk
+      assert o1.p2[1].__peer.is_a?(HolderLazyLoader)
+      assert o1.p2[2].__peer.is_a?(HolderLazyLoader)
+      assert_equal 'zero', o1.p1.p1
+      assert o1.p2[1].__peer.is_a?(Peer)
+      assert o1.p2[2].__peer.is_a?(Peer)
+    end
+  end
 end
 end

data/tests/rubernate/impl/dbi_oracle_test.rb

@@ -12,6 +12,26 @@ module DBI
     def setup
       init ORA_RUNTIME_CLASS, ORA_DB_URL, ORA_DB_USER, ORA_DB_PWD      
     end
+=begin
+    # This methods test bug appers when we try 
+    # to load or store more then 1000 objects
+    # it is commented because it works very slow.
+    def test_load_1010
+      Rubernate.session do
+        for i in 1..1010
+          o = C1.new.attach
+          o.p1 = 777
+        end
+      end
+      Rubernate.session do
+        objs = find_by_query "Select :o; Where o.klass == #{C1}" 
+        assert_equal 1010, objs.size
+        for o in objs
+          assert_equal 777, o.p1
+        end
+      end
+    end
+=end
   end
    
   class OracleRuntimeTest < Test::Unit::TestCase

data/tests/rubernate/impl/memory_test.rb

@@ -33,7 +33,7 @@ class Rubernate::Memory::RuntimeTest < Test::Unit::TestCase
   # Interface Tests
   def test_load_by_pk
     assert_nil @runtime.load_by_pk(1)
-    o, o.peer = C4.new(1), Peer.new
+    o, o.__peer = C4.new(1), Peer.new
     @runtime.save o
     o = @runtime.load_by_pk(1)
     assert_equal C4, o.class
@@ -42,8 +42,8 @@ class Rubernate::Memory::RuntimeTest < Test::Unit::TestCase
   end
   
   def test_load_by_query_all
-    o1, o1.peer, o1.p1 = C1.new, Peer.new, 'o1.p1'
-    o2, o2.peer, o2.p1, o2.p2 = C2.new, Peer.new, 'o2.p1', o1        
+    o1, o1.__peer, o1.p1 = C1.new, Peer.new, 'o1.p1'
+    o2, o2.__peer, o2.p1, o2.p2 = C2.new, Peer.new, 'o2.p1', o1        
     @runtime.create o1
     @runtime.create o2
     result = @runtime.load_by_query "all"
@@ -62,11 +62,11 @@ class Rubernate::Memory::RuntimeTest < Test::Unit::TestCase
   end
   
   def test_create
-    o, o.peer = C2.new, Peer.new
+    o, o.__peer = C2.new, Peer.new
     assert_nil o.primary_key
     @runtime.create o
     assert_not_nil o.primary_key
-    assert_not_nil o.peer
+    assert_not_nil o.__peer
   end
   
   def test_create_find
@@ -77,41 +77,40 @@ class Rubernate::Memory::RuntimeTest < Test::Unit::TestCase
   end
   
   def test_load_created
-    o, o.peer = C2.new, Peer.new
+    o, o.__peer = C2.new, Peer.new
     @runtime.create o
     o = @runtime.load_by_pk o.primary_key
     assert_not_nil o
-    assert !o.peer.dirty?
+    assert !o.__peer.dirty?
     assert !o.dirty?
   end
   
   def test_create_dirty
-    o1, o1.peer = C2.new, Peer.new
+    o1, o1.__peer = C2.new, Peer.new
     @runtime.create o1
-    assert_not_nil o1.peer
-    assert !o1.peer.dirty?
+    assert_not_nil o1.__peer
+    assert !o1.__peer.dirty?
   end
   
   def test_save
-    o,  o.peer = C4.new(1), Peer.new
+    o,  o.__peer = C4.new(1), Peer.new
     o.p1, o.p2 = C4.new(2), {'k1' => C4.new(3)}
     @runtime.save o
     o = @runtime.load_by_pk 1
     assert_not_nil o
-    assert_not_nil o.peer
-    assert_equal 2, o.peer.size
+    assert_not_nil o.__peer
+    assert_equal 2, o.__peer.size
     assert_equal 2, o.p1.primary_key
     assert_equal 3, o.p2['k1'].primary_key
   end
   
   def test_delete
-    o, o.peer = C1.new, Peer.new
+    o, o.__peer = C1.new, Peer.new
     @runtime.create o
     pk = o.primary_key
     @runtime.delete o
     assert_nil @runtime.load_by_pk(pk)        
-  end
-  
+  end  
   
   # Internal Tests
   def test_reference_eq
@@ -122,7 +121,7 @@ class Rubernate::Memory::RuntimeTest < Test::Unit::TestCase
   end
   
   def test_save_peer
-    obj, obj.peer = C4.new(1), Peer.new
+    obj, obj.__peer = C4.new(1), Peer.new
     obj.p1, obj.p2 = 2, [C4.new(2)]
     data = @runtime.save_peer obj
     assert_equal({:p1 => 2, :p2 => [ref(2, C4)]}, data)