odba 1.1.2 → 1.1.7

data/lib/odba/stub.rb

@@ -10,7 +10,7 @@ module ODBA
 		def initialize(odba_id, odba_container, receiver)
 			@odba_id = odba_id
 			@odba_container = odba_container
-			@odba_class = receiver.class unless receiver.nil? 
+			@odba_class = receiver.class unless receiver.nil?
       @receiver_loaded = true
 		end
 		def class
@@ -50,16 +50,19 @@ module ODBA
         @receiver_loaded = true
 				if(@odba_container)
 					@odba_container.odba_replace_stubs(@odba_id, @receiver)
-        else 
+        else
           warn "Potential Memory-Leak: stub for #{@receiver.class}##{@odba_id} was saved without container"
 				end
 				@receiver
 			rescue OdbaError => e
-				warn "ODBA::Stub was unable to replace #{@odba_class}##{@odba_id} from #{@odba_container.class}:##{@odba_container.odba_id}"
+				puts "OdbaError"
+				puts caller[0..10].join("\n")
+				warn "ODBA::Stub was unable to replace #{@odba_class}##{@odba_id} from #{@odba_container.class}:##{@odba_container.odba_id}. raise OdbaError"
+        raise OdbaError
 			end
 		end
   alias :odba_instance :odba_receiver
-		# A stub always references a Persistable that has 
+		# A stub always references a Persistable that has
 		# already been saved.
 		def odba_unsaved?(snapshot_level=nil)
 			false
@@ -78,8 +81,8 @@ module ODBA
       end
 		end
 		no_override = [
-			"class", "is_a?", "__id__", "__send__", "inspect", 
-			"eql?", "nil?", "respond_to?", "object_id", 
+			"class", "is_a?", "__id__", "__send__", "inspect",
+			"eql?", "nil?", "respond_to?", "object_id",
 			"instance_variables", "instance_variable_get",
 			"instance_variable_set", "==",
 			## methods defined in persistable.rb:Object

data/lib/odba/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 class Odba
-    VERSION = '1.1.2'
+    VERSION = '1.1.7'
 end

data/odba.gemspec

@@ -1,7 +1,5 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'odba/version'
+require_relative 'lib/odba/version'
 
 Gem::Specification.new do |spec|
   spec.name        = "odba"
@@ -16,13 +14,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'ydbi',   '>=0.5.1'
-  spec.add_dependency 'ydbd-pg','>=0.5.1'
-  
+  spec.add_dependency 'ydbi',   '>=0.5.7'
+  spec.add_dependency 'ydbd-pg','>=0.5.7'
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "flexmock"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "minitest" if /^1\./.match(RUBY_VERSION)
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "debug_inspector"
 end
-

data/test/test_array.rb

@@ -5,6 +5,7 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
 require 'flexmock'
 require 'odba/persistable'
 require 'odba/stub'

data/test/test_cache.rb

@@ -6,6 +6,7 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib/', File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
 require 'flexmock'
 require 'odba/cache'
 require 'odba/cache_entry'
@@ -16,7 +17,7 @@ require 'odba/odba_error'
 require 'odba/odba'
 
 module ODBA
-	class Cache 
+	class Cache
 		CLEANING_INTERVAL = 0
 		MAIL_RECIPIENTS = []
 		MAIL_FROM = "test@testfirst.local"
@@ -216,7 +217,7 @@ module ODBA
 			@marshal.should_receive(:load).and_return {|dump|
 				receiver
 			}
-			@storage.should_receive(:restore_collection).and_return {|*args| 
+			@storage.should_receive(:restore_collection).and_return {|*args|
 				[]
 			}
 			receiver.instance_variable_set("@odba_id", 23)
@@ -233,7 +234,7 @@ module ODBA
 		def test_fetch_error
 			receiver = flexmock
 			@storage.should_receive(:restore).and_return  { |odba_id|
-				nil	
+				nil
 			}
 			assert_raises(OdbaError) {
 				@cache.load_object(23, receiver)
@@ -289,17 +290,17 @@ module ODBA
 				assert_equal(new_collection, col)
 			}
 
-      @storage.should_receive(:restore_collection).and_return  { 
+      @storage.should_receive(:restore_collection).and_return  {
         old_collection.collect { |key, val|
-          [Marshal.dump(key.odba_isolated_stub), 
+          [Marshal.dump(key.odba_isolated_stub),
             Marshal.dump(val.odba_isolated_stub)]
         }
       }
-			@storage.should_receive(:collection_remove).and_return  { |odba_id, key| 
+			@storage.should_receive(:collection_remove).and_return  { |odba_id, key|
 				assert_equal(54, odba_id)
 				assert_equal(Marshal.dump('key1'.odba_isolated_stub), key)
 			}
-			@storage.should_receive(:collection_store).and_return  { |odba_id, key, value| 
+			@storage.should_receive(:collection_store).and_return  { |odba_id, key, value|
 				assert_equal(54, odba_id)
 				assert_equal(Marshal.dump('key3'.odba_isolated_stub), key)
 				assert_equal(Marshal.dump('val3'.odba_isolated_stub), value)
@@ -308,7 +309,7 @@ module ODBA
 			@cache.fetched = {
 				54 => cache_entry
 			}
-			
+
 			obj = flexmock('Obj')
 			obj.should_receive(:odba_id).and_return  { 54 }
 			obj.should_receive(:odba_collection).and_return  { new_collection }
@@ -349,10 +350,10 @@ module ODBA
 		end
 		def test_fill_index
 			foo = flexmock("foo")
-			foo.should_receive(:fill).and_return  { |target| 
+			foo.should_receive(:fill).and_return  { |target|
 				assert_equal("baz", target)
 			}
-			@cache.indices = { 
+			@cache.indices = {
 				"foo" => foo
 			}
 			@cache.fill_index("foo", "baz")
@@ -436,9 +437,9 @@ module ODBA
 
 				@storage.should_receive(:restore_collection).and_return  { [] }
 				if(block)
-					@storage.should_receive(:store, &block).and_return  
+					@storage.should_receive(:store, &block).and_return
 				else
-					@storage.should_receive(:store).and_return  { 
+					@storage.should_receive(:store).and_return  {
 						assert(true)
 					}
 				end
@@ -453,39 +454,39 @@ module ODBA
 			origin_obj.odba_connection = delete_item
 			@cache.fetched.store(1, delete_item)
 			@storage.should_receive(:retrieve_connected_objects).and_return  { |id|
-				[[2]] 
+				[[2]]
 			}
 			prepare_fetch(2, origin_obj)
-			@storage.should_receive(:restore_collection).and_return  { |*args| 
+			@storage.should_receive(:restore_collection).and_return  { |*args|
 				[]
 			}
 			@storage.should_receive(:store).and_return  { |id, dump, name, prefetch, klass| }
-			@storage.should_receive(:ensure_object_connections).and_return  { } 
-			@storage.should_receive(:delete_persistable).and_return  { |id| } 
+			@storage.should_receive(:ensure_object_connections).and_return  { }
+			@storage.should_receive(:delete_persistable).and_return  { |id| }
 			@marshal.should_receive(:dump).and_return  { |ob| "foo"}
 			@cache.delete(delete_item)
 			assert_equal(1, @cache.fetched.size)
-			assert_equal(nil, origin_obj.odba_connection)
+			assert_nil(origin_obj.odba_connection)
 		end
 		def prepare_delete(mock, name, id)
 			mock.should_receive(:odba_id).and_return  { id }
 			mock.should_receive(:odba_name).and_return  { name }
 			mock.should_receive(:odba_notify_observers).and_return  { |key, id1, id2|
-        assert_equal(:delete, key) 
+        assert_equal(:delete, key)
       }
 			@storage.should_receive(:retrieve_connected_objects).and_return  { |id|
 				[]
 			}
 			mock.should_receive(:origin_class?).and_return  { true }
 			mock.should_receive(:odba_id).and_return  { id }
-			@storage.should_receive(:delete_persistable).and_return  { |id_arg| 
+			@storage.should_receive(:delete_persistable).and_return  { |id_arg|
 				assert_equal(id, id_arg)
 			}
 			@storage.should_receive(:delete_index_element).and_return  { }
 		end
 		def prepare_bulk_restore(rows)
 			rows.each { |odba_mock|
-        ## according to recent changes, objects are extended with 
+        ## according to recent changes, objects are extended with
         #  ODBA::Persistable after loading - this enables ad-hoc storing
         #  but messes up loads of tests
 				@marshal.should_receive(:load).and_return  { |dump|
@@ -591,7 +592,7 @@ module ODBA
       ## store o1
       @marshal.should_receive(:dump).times(3).and_return { |obj|
         "dump%i" % obj.odba_id
-      } 
+      }
       next_id = 1
       @storage.should_receive(:next_id).and_return { next_id += 1 }
       @storage.should_receive(:store).with(1,'dump1',nil,nil,Object)\
@@ -631,7 +632,7 @@ module ODBA
         .times(1).and_return(o4)
       @cache.fetched.store(1, ODBA::CacheEntry.new(o1))
       assert_raises(RuntimeError) {
-        ODBA.transaction { 
+        ODBA.transaction {
           o2.instance_variable_set('@other', o3)
           o1.instance_variable_set('@other', o2)
           o1.odba_store

data/test/test_cache_entry.rb

@@ -5,6 +5,7 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
 require 'flexmock'
 require 'odba/cache_entry'
 require 'odba/odba'

data/test/test_connection_pool.rb

@@ -4,6 +4,7 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
 require 'flexmock'
 require 'odba/connection_pool'
 ## connection_pool requires 'dbi', which unshifts the site_ruby dir

data/test/test_drbwrapper.rb

@@ -4,8 +4,9 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'minitest/autorun'
-require 'odba/drbwrapper'
+require 'flexmock/test_unit'
 require 'flexmock'
+require 'odba/drbwrapper'
 
 module ODBA
   class TestDRbWrapper < Minitest::Test

data/test/test_hash.rb

@@ -4,11 +4,12 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib/', File.dirname(__FILE__))
 
+require 'minitest/autorun'
+require 'flexmock/test_unit'
+require 'flexmock'
 require 'odba/persistable'
 require 'odba/stub'
 require 'odba/odba'
-require 'minitest/autorun'
-require 'flexmock'
 
 module ODBA
 	class TestHash < Minitest::Test

data/test/test_id_server.rb

@@ -5,6 +5,7 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
 require 'flexmock'
 require 'odba/id_server'
 require 'odba/odba'

data/test/test_index.rb

@@ -5,10 +5,11 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
+require 'flexmock'
 require 'odba/index'
 require 'odba/index_definition'
 require 'odba/odba'
-require 'flexmock'
 
 module ODBA
   class Origin
@@ -310,7 +311,6 @@ module ODBA
       ODBA.storage = @storage
       df = IndexDefinition.new
       df.index_name = 'index'
-      df.dictionary = 'german'
       df.origin_klass = :Origin
       df.target_klass = :Target
       df.resolve_origin = :origin
@@ -320,12 +320,12 @@ module ODBA
     def test_fetch_ids
       rows = [[1,3], [2,2], [3,1]]
       @storage.should_receive(:retrieve_from_fulltext_index)\
-        .with('index', 'search-term', 'german', false).and_return rows
+        .with('index', 'search-term', false).and_return rows
       assert_equal([1,2,3], @index.fetch_ids('search-term'))
     end
     def test_do_update_index
       @storage.should_receive(:update_fulltext_index)\
-        .with('index', 3, 'some full text', 4, 'german')
+        .with('index', 3, 'some full text', 4)
       @index.do_update_index(3, 'some full text', 4)
     end
     def test_update_target
@@ -334,9 +334,9 @@ module ODBA
       @storage.should_receive(:fulltext_index_delete)\
         .with('index', 4, 'target_id')
       @storage.should_receive(:update_fulltext_index)\
-        .with('index', 1, 'fulltext term', 4, 'german')
+        .with('index', 1, 'fulltext term', 4)
       @storage.should_receive(:update_fulltext_index)\
-        .with('index', 2, 'fulltext term', 4, 'german')
+        .with('index', 2, 'fulltext term', 4)
       target = Target.new
       target.odba_id = 4
       origin1 = Origin.new
@@ -356,9 +356,9 @@ module ODBA
       @storage.should_receive(:fulltext_index_delete)\
         .times(1).with('index', 1, 'origin_id')
       @storage.should_receive(:update_fulltext_index)\
-        .times(1).with('index', 1, 'fulltext term', 4, 'german')
+        .times(1).with('index', 1, 'fulltext term', 4)
       @storage.should_receive(:update_fulltext_index)\
-        .times(1).with('index', 1, 'fulltext term', 5, 'german')
+        .times(1).with('index', 1, 'fulltext term', 5)
       target = Target.new
       target.odba_id = 4
       origin1 = Origin.new

data/test/test_marshal.rb

@@ -3,6 +3,8 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
+require 'flexmock'
 require 'odba/marshal'
 
 module ODBA

data/test/test_persistable.rb

@@ -4,14 +4,15 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib/', File.dirname(__FILE__))
 
+require 'minitest/autorun'
+require 'flexmock/test_unit'
+require 'flexmock'
 require 'odba/persistable'
 require 'odba/stub'
 require 'odba/cache'
 require 'odba/odba'
 require 'odba/storage'
 require 'odba/marshal'
-require 'minitest/autorun'
-require 'flexmock'
 require 'yaml'
 
 module ODBA
@@ -30,7 +31,7 @@ module ODBA
 		class ODBAContainerInPersistable
 		 include ODBA::Persistable
 		 ODBA_SERIALIZABLE = ['@serializable']
-		 attr_accessor	:non_replaceable, :replaceable, :replaceable2, 
+		 attr_accessor	:non_replaceable, :replaceable, :replaceable2,
 			:array, :odba_persistent, :serializable
 		 attr_accessor	:odba_snapshot_level
 		end
@@ -181,11 +182,11 @@ module ODBA
 			level1.replaceable = level2
 
 			saved.odba_persistent = true
-			ODBA.cache.should_receive(:store).times(3).and_return { 
+			ODBA.cache.should_receive(:store).times(3).and_return {
         assert(true)
         2
       }
-			
+
 			@odba.odba_store_unsaved
 		end
 		def test_odba_store_unsaved_hash
@@ -196,12 +197,12 @@ module ODBA
 			level1.replaceable = hash
 			level1.non_replaceable = non_rep_hash
 			non_rep_hash.odba_persistent = true
-			
-			ODBA.cache.should_receive(:store).times(2).and_return { 
+
+			ODBA.cache.should_receive(:store).times(2).and_return {
         assert(true)
         2
       }
-			
+
 			level1.odba_store_unsaved
 		end
     def test_dup
@@ -225,8 +226,8 @@ module ODBA
 			odba_twin = @odba.odba_dup
 			odba_twin.replaceable.flexmock_verify
 			odba_twin.replaceable2.flexmock_verify
-			assert_equal(odba_twin, stub_container)	
-			assert_equal(odba_twin, stub_container2)	
+			assert_equal(odba_twin, stub_container)
+			assert_equal(odba_twin, stub_container2)
 		end
 		def test_odba_unsaved_true
 			@odba.instance_variable_set("@odba_persistent", false)
@@ -282,7 +283,7 @@ module ODBA
       ODBA.cache.should_receive(:next_id).and_return(1)
 			dump, hash = odba.odba_isolated_dump
 			obj = ODBA.marshaller.load(dump)
-			assert_equal(nil, obj.excluded)
+			assert_nil(obj.excluded)
 			assert_equal("baz", obj.included)
 			ODBA.marshaller = tmp
 		end
@@ -385,7 +386,7 @@ module ODBA
       }
       ODBA.cache.should_receive(:retrieve_from_index).with(name, args)\
         .times(1).and_return([result])
-      assert_equal([result], 
+      assert_equal([result],
                    IndexedStub.search_by_foo_and_bar('oof', 'rab'))
 
       ## exact search by multiple keys
@@ -393,11 +394,11 @@ module ODBA
       ODBA.cache.should_receive(:retrieve_from_index)\
         .with(name, args, Persistable::Exact)\
         .times(1).and_return([result])
-      assert_equal([result], 
+      assert_equal([result],
                    IndexedStub.search_by_exact_foo_and_bar('oof', 'rab'))
 
       ## find by multiple keys
-      args = {:foo => {'value' => 7,'condition' => '='}, 
+      args = {:foo => {'value' => 7,'condition' => '='},
               :bar => {'value' => 'rab','condition' => 'like'}}
       ODBA.cache.should_receive(:retrieve_from_index)\
         .with(name, args, Persistable::Find)\
@@ -497,7 +498,7 @@ module ODBA
 
       modified.instance_variable_set('@data', 'bar')
       assert_equal('bar', modified.instance_variable_get('@data'))
-      
+
       modified.odba_replace!(reloaded)
       assert_equal('foo', modified.instance_variable_get('@data'))
     end
@@ -553,5 +554,5 @@ module ODBA
       o = ODBAContainerInPersistable.new
       assert_equal([], o.odba_collection)
     end
-	end	
+	end
 end