lafcadio 0.9.4 → 0.9.5

data/lib/lafcadio.rb

@@ -16,7 +16,7 @@
 # http://lafcadio.rubyforge.org/tutorial.html.
 
 module Lafcadio
-	Version = "0.9.4"
+	Version = "0.9.5"
 
 	require 'lafcadio/depend'
 	require 'lafcadio/domain'

data/lib/lafcadio.rb~

@@ -16,7 +16,7 @@
 # http://lafcadio.rubyforge.org/tutorial.html.
 
 module Lafcadio
-	Version = "0.9.3"
+	Version = "0.9.4"
 
 	require 'lafcadio/depend'
 	require 'lafcadio/domain'

data/lib/lafcadio/mock.rb

@@ -2,115 +2,127 @@ require 'lafcadio/objectStore'
 require 'lafcadio/util'
 
 module Lafcadio
-	class MockDbBridge #:nodoc:
-		attr_reader :last_pk_id_inserted
-
-		def initialize
-			@objects = {}
-			@next_pk_ids = {}
-			@queries = []
-			@transaction = nil
-		end
-
-		def all( domain_class )
-			@objects[domain_class] ? @objects[domain_class].values : []
-		end
-		
-		def commit(db_object)
-			if db_object.pk_id and !db_object.pk_id.is_a?( Integer )
-				raise ArgumentError
+	class ObjectStore
+		class MockDbBridge #:nodoc:
+			attr_reader   :last_pk_id_inserted
+			attr_accessor :objects, :next_pk_ids, :queries
+	
+			def initialize
+				@objects = {}
+				@next_pk_ids = {}
+				@queries = []
+				@transaction = nil
 			end
-			if @transaction
-				@transaction << db_object
-			else
-				objects_by_domain_class = objects_by_domain_class db_object.domain_class
-				if db_object.delete
-					objects_by_domain_class.delete( db_object.pk_id )
+	
+			def all( domain_class )
+				@objects[domain_class] ? @objects[domain_class].values : []
+			end
+			
+			def commit(db_object)
+				if db_object.pk_id and !db_object.pk_id.is_a?( Integer )
+					raise ArgumentError
+				end
+				if @transaction
+					@transaction << db_object
 				else
-					object_pk_id = pre_commit_pk_id( db_object )
-					objects_by_domain_class[object_pk_id] = db_object
+					objects_by_domain_class = objects_by_domain_class(
+						db_object.domain_class
+					)
+					if db_object.delete
+						objects_by_domain_class.delete( db_object.pk_id )
+					else
+						object_pk_id = pre_commit_pk_id( db_object )
+						objects_by_domain_class[object_pk_id] = db_object
+					end
 				end
 			end
-		end
-				
-		def group_query( query )
-			query.collect objects_by_domain_class( query.domain_class ).values
-		end
-		
-		def next_pk_id( domain_class )
-			dobjs = objects_by_domain_class( domain_class ).values
-			dobjs.inject( 0 ) { |memo, obj| memo > obj.pk_id ? memo : obj.pk_id } + 1
-		end
-
-		def objects_by_domain_class( domain_class )
-			@objects[domain_class] = {} unless @objects[domain_class]
-			@objects[domain_class]
-		end
-
-		def pre_commit_pk_id( domain_object )
-			@next_pk_ids = {} unless @next_pk_ids
-			if (next_pk_id = @next_pk_ids[domain_object.domain_class])
-				@next_pk_ids[domain_object.domain_class] = nil
-				@last_pk_id_inserted = next_pk_id
-			elsif domain_object.pk_id
-				domain_object.pk_id
-			elsif ( next_pk_id = @next_pk_ids[domain_object.domain_class] )
-				@last_pk_id_inserted = next_pk_id
-				@next_pk_ids[domain_object.domain_class] = nil
-				next_pk_id
-			else
-				pk_ids = objects_by_domain_class( domain_object.domain_class ).keys
-				@last_pk_id_inserted = pk_ids.max ? pk_ids.max + 1 : 1
+					
+			def group_query( query )
+				query.collect objects_by_domain_class( query.domain_class ).values
 			end
-		end
-
-		def queries( domain_class = nil )
-			@queries.select { |qry|
-				domain_class ? qry.domain_class == domain_class : true
-			}
-		end
-		
-		def query_count( sql )
-			@queries.select { |qry| qry.to_sql == sql }.size
-		end
-		
-		def select_dobjs(query)
-			@queries << query
-			domain_class = query.domain_class
-			objects = []
-			all( domain_class ).each { |dbObj|
-				objects << dbObj if query.dobj_satisfies?( dbObj )
-			}
-			query.order_and_limit_collection objects
-		end
-
-		def set_next_pk_id( domain_class, npi )
-			@next_pk_ids = {} unless @next_pk_ids
-			@next_pk_ids[ domain_class ] = npi
-		end
-		
-		def transaction( action )
-			tr = MockDbBridge::Transaction.new
-			@transaction = tr
-			begin
+			
+			def next_pk_id( domain_class )
+				dobjs = objects_by_domain_class( domain_class ).values
+				dobjs.inject( 0 ) { |memo, obj|
+					memo > obj.pk_id ? memo : obj.pk_id
+				} + 1
+			end
+	
+			def objects_by_domain_class( domain_class )
+				@objects[domain_class] = {} unless @objects[domain_class]
+				@objects[domain_class]
+			end
+	
+			def pre_commit_pk_id( domain_object )
+				@next_pk_ids = {} unless @next_pk_ids
+				if (next_pk_id = @next_pk_ids[domain_object.domain_class])
+					@next_pk_ids[domain_object.domain_class] = nil
+					@last_pk_id_inserted = next_pk_id
+				elsif domain_object.pk_id
+					domain_object.pk_id
+				else
+					pk_ids = objects_by_domain_class( domain_object.domain_class ).keys
+					@last_pk_id_inserted = pk_ids.max ? pk_ids.max + 1 : 1
+				end
+			end
+	
+			def queries( domain_class = nil )
+				@queries.select { |qry|
+					domain_class ? qry.domain_class == domain_class : true
+				}
+			end
+			
+			def query_count( sql )
+				@queries.select { |qry| qry.to_sql == sql }.size
+			end
+			
+			def rollback; end
+			
+			def select_dobjs( query )
+				@queries << query
+				domain_class = query.domain_class
+				all = all domain_class
+				if @transaction
+					from_tr = @transaction.select { |dobj|
+						dobj.domain_class == query.domain_class
+					}
+					all = all.concat from_tr
+				end
+				objects = all.select { |dobj| query.dobj_satisfies?( dobj ) }
+				query.order_and_limit_collection objects
+			end
+	
+			def set_next_pk_id( domain_class, npi )
+				@next_pk_ids = {} unless @next_pk_ids
+				@next_pk_ids[ domain_class ] = npi
+			end
+			
+			def transaction( action )
+				tr = MockDbBridge::Transaction.new
+				@transaction = tr
 				action.call tr
 				@transaction = nil
+				tr.uniq!
 				tr.each do |dobj_to_commit| commit( dobj_to_commit ); end
-			rescue RollbackError; end
-		end
-		
-		class Transaction < Array
-			def rollback; raise RollbackError; end
-		end
-		
-		class RollbackError < StandardError #:nodoc:
+			end
+			
+			def transactional_clone
+				tc = clone
+				tc.objects = objects.clone
+				tc.next_pk_ids = next_pk_ids.clone
+				tc.queries = queries.clone
+				tc
+			end
+			
+			class Transaction < Array
+				def rollback; raise RollbackError; end
+			end
 		end
 	end
 
 	# Externally, the MockObjectStore looks and acts exactly like the ObjectStore,
 	# but stores all its data in memory. This makes it very useful for unit
-	# testing, and in fact LafcadioTestCase#setup creates a new instance of
-	# MockObjectStore for each test case. For example:
+	# testing. For example:
 	#
 	#   class SomeTestCase < Test::Unit::TestCase
 	#     def setup

data/lib/lafcadio/mock.rb~

@@ -2,115 +2,130 @@ require 'lafcadio/objectStore'
 require 'lafcadio/util'
 
 module Lafcadio
-	class MockDbBridge #:nodoc:
-		attr_reader :last_pk_id_inserted
-
-		def initialize
-			@objects = {}
-			@next_pk_ids = {}
-			@queries = []
-			@transaction = nil
-		end
-
-		def all( domain_class )
-			@objects[domain_class] ? @objects[domain_class].values : []
-		end
-		
-		def select_dobjs(query)
-			@queries << query
-			domain_class = query.domain_class
-			objects = []
-			all( domain_class ).each { |dbObj|
-				objects << dbObj if query.dobj_satisfies?( dbObj )
-			}
-			query.order_and_limit_collection objects
-		end
-
-		def commit(db_object)
-			if db_object.pk_id and !db_object.pk_id.is_a?( Integer )
-				raise ArgumentError
+	class ObjectStore
+		class MockDbBridge #:nodoc:
+			attr_reader   :last_pk_id_inserted
+			attr_accessor :objects, :next_pk_ids, :queries
+	
+			def initialize
+				@objects = {}
+				@next_pk_ids = {}
+				@queries = []
+				@transaction = nil
+			end
+	
+			def all( domain_class )
+				@objects[domain_class] ? @objects[domain_class].values : []
 			end
-			if @transaction
-				@transaction << db_object
-			else
-				objects_by_domain_class = objects_by_domain_class db_object.domain_class
-				if db_object.delete
-					objects_by_domain_class.delete( db_object.pk_id )
+			
+			def commit(db_object)
+				if db_object.pk_id and !db_object.pk_id.is_a?( Integer )
+					raise ArgumentError
+				end
+				if @transaction
+					@transaction << db_object
 				else
-					object_pk_id = pre_commit_pk_id( db_object )
-					objects_by_domain_class[object_pk_id] = db_object
+					objects_by_domain_class = objects_by_domain_class(
+						db_object.domain_class
+					)
+					if db_object.delete
+						objects_by_domain_class.delete( db_object.pk_id )
+					else
+						object_pk_id = pre_commit_pk_id( db_object )
+						objects_by_domain_class[object_pk_id] = db_object
+					end
 				end
 			end
-		end
-				
-		def group_query( query )
-			query.collect objects_by_domain_class( query.domain_class ).values
-		end
-		
-		def next_pk_id( domain_class )
-			dobjs = objects_by_domain_class( domain_class ).values
-			dobjs.inject( 0 ) { |memo, obj| memo > obj.pk_id ? memo : obj.pk_id } + 1
-		end
-
-		def objects_by_domain_class( domain_class )
-			@objects[domain_class] = {} unless @objects[domain_class]
-			@objects[domain_class]
-		end
-
-		def pre_commit_pk_id( domain_object )
-			@next_pk_ids = {} unless @next_pk_ids
-			if (next_pk_id = @next_pk_ids[domain_object.domain_class])
-				@next_pk_ids[domain_object.domain_class] = nil
-				@last_pk_id_inserted = next_pk_id
-			elsif domain_object.pk_id
-				domain_object.pk_id
-			elsif ( next_pk_id = @next_pk_ids[domain_object.domain_class] )
-				@last_pk_id_inserted = next_pk_id
-				@next_pk_ids[domain_object.domain_class] = nil
-				next_pk_id
-			else
-				pk_ids = objects_by_domain_class( domain_object.domain_class ).keys
-				@last_pk_id_inserted = pk_ids.max ? pk_ids.max + 1 : 1
+					
+			def group_query( query )
+				query.collect objects_by_domain_class( query.domain_class ).values
 			end
-		end
-
-		def queries( domain_class = nil )
-			@queries.select { |qry|
-				domain_class ? qry.domain_class == domain_class : true
-			}
-		end
-		
-		def query_count( sql )
-			@queries.select { |qry| qry.to_sql == sql }.size
-		end
-		
-		def set_next_pk_id( domain_class, npi )
-			@next_pk_ids = {} unless @next_pk_ids
-			@next_pk_ids[ domain_class ] = npi
-		end
-		
-		def transaction( action )
-			tr = MockDbBridge::Transaction.new
-			@transaction = tr
-			begin
+			
+			def next_pk_id( domain_class )
+				dobjs = objects_by_domain_class( domain_class ).values
+				dobjs.inject( 0 ) { |memo, obj|
+					memo > obj.pk_id ? memo : obj.pk_id
+				} + 1
+			end
+	
+			def objects_by_domain_class( domain_class )
+				@objects[domain_class] = {} unless @objects[domain_class]
+				@objects[domain_class]
+			end
+	
+			def pre_commit_pk_id( domain_object )
+				@next_pk_ids = {} unless @next_pk_ids
+				if (next_pk_id = @next_pk_ids[domain_object.domain_class])
+					@next_pk_ids[domain_object.domain_class] = nil
+					@last_pk_id_inserted = next_pk_id
+				elsif domain_object.pk_id
+					domain_object.pk_id
+				elsif ( next_pk_id = @next_pk_ids[domain_object.domain_class] )
+					@last_pk_id_inserted = next_pk_id
+					@next_pk_ids[domain_object.domain_class] = nil
+					next_pk_id
+				else
+					pk_ids = objects_by_domain_class( domain_object.domain_class ).keys
+					@last_pk_id_inserted = pk_ids.max ? pk_ids.max + 1 : 1
+				end
+			end
+	
+			def queries( domain_class = nil )
+				@queries.select { |qry|
+					domain_class ? qry.domain_class == domain_class : true
+				}
+			end
+			
+			def query_count( sql )
+				@queries.select { |qry| qry.to_sql == sql }.size
+			end
+			
+			def rollback; end
+			
+			def select_dobjs( query )
+				@queries << query
+				domain_class = query.domain_class
+				all = all domain_class
+				if @transaction
+					from_tr = @transaction.select { |dobj|
+						dobj.domain_class == query.domain_class
+					}
+					all = all.concat from_tr
+				end
+				objects = all.select { |dobj| query.dobj_satisfies?( dobj ) }
+				query.order_and_limit_collection objects
+			end
+	
+			def set_next_pk_id( domain_class, npi )
+				@next_pk_ids = {} unless @next_pk_ids
+				@next_pk_ids[ domain_class ] = npi
+			end
+			
+			def transaction( action )
+				tr = MockDbBridge::Transaction.new
+				@transaction = tr
 				action.call tr
 				@transaction = nil
 				tr.each do |dobj_to_commit| commit( dobj_to_commit ); end
-			rescue RollbackError; end
-		end
-		
-		class Transaction < Array
-			def rollback; raise RollbackError; end
-		end
-		
-		class RollbackError < StandardError #:nodoc:
+			end
+			
+			def transactional_clone
+				tc = clone
+				tc.objects = objects.clone
+				tc.next_pk_ids = next_pk_ids.clone
+				tc.queries = queries.clone
+				tc
+			end
+			
+			class Transaction < Array
+				def rollback; raise RollbackError; end
+			end
 		end
 	end
 
 	# Externally, the MockObjectStore looks and acts exactly like the ObjectStore,
 	# but stores all its data in memory. This makes it very useful for unit
-	# testing, and in fact LafcadioTestCase#setup creates a new instance of
-	# MockObjectStore for each test case. For example:
+	# testing. For example:
 	#
 	#   class SomeTestCase < Test::Unit::TestCase
 	#     def setup

data/lib/lafcadio/objectStore.rb

@@ -265,12 +265,24 @@ module Lafcadio
 		#     Client.new( 'name' => 'Big Co.' ).commit
 		#     tr.rollback
 		#   end   # the client will not be saved to the DB
-		def transaction( &action ); @cache.transaction( action ); end
+		def transaction( &action )
+			old_cache = @cache
+			@cache = @cache.transactional_clone
+			begin
+				@cache.transaction action
+			rescue
+				err_to_raise = $!
+				@cache.rollback unless $!.is_a? RollbackError
+				@cache = old_cache
+				raise err_to_raise unless $!.is_a? RollbackError
+			end
+		end
 		
 		class Cache #:nodoc:
 			include MonitorMixin
 		
-			attr_reader :db_bridge
+			attr_reader   :db_bridge
+			attr_accessor :domain_class_caches
 			
 			def initialize( db_bridge = DbBridge.new )
 				super()
@@ -315,7 +327,9 @@ module Lafcadio
 					if !collected and main_cache.queries.values
 						newObjects = @db_bridge.select_dobjs query
 						newObjects.each { |dbObj| main_cache.save dbObj }
-						main_cache.queries[query] = newObjects.collect { |dobj| dobj.pk_id }
+						main_cache.queries[query] = newObjects.collect { |dobj|
+							dobj.pk_id
+						}
 					end
 				end
 				main_cache.queries[query].map { |pk_id| main_cache[pk_id] }.compact
@@ -333,17 +347,29 @@ module Lafcadio
 
 			def method_missing( meth, *args )
 				simple_dispatch = [
-					:queries, :save, :set_commit_time, :update_after_commit
+					:flush, :queries, :save, :set_commit_time, :update_after_commit
 				]
 				if simple_dispatch.include?( meth )
 					cache( args.first.domain_class ).send( meth, *args )
 				elsif [ :[], :last_commit_time ].include?( meth )
 					cache( args.first ).send( meth, *args[1..-1] )
-				elsif [ :group_query, :transaction ].include?( meth )
+				elsif [ :group_query, :rollback, :transaction ].include?( meth )
 					@db_bridge.send( meth, *args )
+				else
+					super
 				end
 			end
 
+			def transactional_clone
+				tc = Cache.new @db_bridge.transactional_clone
+				dcc_clones = {}
+				@domain_class_caches.each do |domain_class, dcc|
+					dcc_clones[domain_class] = dcc.transactional_clone
+				end
+				tc.domain_class_caches = dcc_clones
+				tc
+			end
+
 			def update_dependent_domain_class( db_object, aClass, field )
 				object_store = ObjectStore.get_object_store
 				collection = aClass.get( db_object, field.name )
@@ -367,7 +393,8 @@ module Lafcadio
 			end
 			
 			class DomainClassCache < Hash #:nodoc:
-				attr_reader :commit_times, :domain_class, :queries
+				attr_reader   :domain_class
+				attr_accessor :commit_times, :queries
 				
 				def initialize( domain_class, db_bridge )
 					super()
@@ -423,6 +450,13 @@ module Lafcadio
 				end
 			
 				def set_commit_time( d_obj ); commit_times[d_obj.pk_id] = Time.now; end
+				
+				def transactional_clone
+					tc = clone
+					tc.commit_times = commit_times.clone
+					tc.queries = queries.clone
+					tc
+				end
 
 				def update_after_commit( db_object ) #:nodoc:
 					if [ :update, :insert ].include?(
@@ -547,9 +581,6 @@ module Lafcadio
 			def initialize
 				@db_conn = DbConnection.get_db_connection
 				@transaction = nil
-				ObjectSpace.define_finalizer( self, proc { |id|
-					DbConnection.get_db_connection.disconnect
-				} )
 			end
 	
 			def _dump(aDepth)
@@ -610,6 +641,8 @@ module Lafcadio
 				end
 			end
 			
+			def rollback; @transaction.rollback( false ) if @transaction; end
+			
 			def select_all(sql)
 				maybe_log sql
 				begin
@@ -646,8 +679,6 @@ module Lafcadio
 				begin
 					action.call @transaction
 					@transaction.commit
-				rescue RollbackError
-					# rollback handled by Transaction
 				rescue
 					err_to_raise = $!
 					@transaction.rollback false
@@ -656,6 +687,8 @@ module Lafcadio
 				@transaction = nil
 			end
 			
+			def transactional_clone; clone; end
+			
 			class Transaction #:nodoc:
 				def initialize( db_conn ); @db_conn = db_conn; end
 				
@@ -666,9 +699,6 @@ module Lafcadio
 					raise RollbackError if raise_error
 				end
 			end
-			
-			class RollbackError < StandardError #:nodoc:
-			end
 		end
 
 		class DbConnection < ContextualService::Service #:nodoc:
@@ -679,7 +709,10 @@ module Lafcadio
 	
 			def self.db_name=( db_name ); @@db_name = db_name; end
 	
-			def initialize; @dbh = load_new_dbh; end
+			def initialize
+				@dbh = load_new_dbh
+				ObjectSpace.define_finalizer( self, proc { |id| disconnect } )
+			end
 		
 			def disconnect; @dbh.disconnect; end
 			
@@ -812,6 +845,9 @@ module Lafcadio
 				)
 			end
 		end
+		
+		class RollbackError < StandardError #:nodoc:
+		end
 
 		class SqlToRubyValues #:nodoc:
 			attr_reader :domain_class, :row_hash

data/lib/lafcadio/objectStore.rb~

@@ -265,12 +265,20 @@ module Lafcadio
 		#     Client.new( 'name' => 'Big Co.' ).commit
 		#     tr.rollback
 		#   end   # the client will not be saved to the DB
-		def transaction( &action ); @cache.transaction( action ); end
+		def transaction( &action )
+			transactional_cache = @cache.transactional_clone
+			begin
+				transactional_cache.transaction action
+				@cache = transactional_cache
+			rescue RollbackError
+			end
+		end
 		
 		class Cache #:nodoc:
 			include MonitorMixin
 		
-			attr_reader :db_bridge
+			attr_reader   :db_bridge
+			attr_accessor :domain_class_caches
 			
 			def initialize( db_bridge = DbBridge.new )
 				super()
@@ -305,17 +313,27 @@ module Lafcadio
 			end
 			
 			def get_by_query( query )
+			puts "get_by_query #{ query.to_sql }"
+puts 1
 				main_cache = cache query.domain_class
 				unless main_cache.queries[query]
+puts 2
 					if query.one_pk_id?
 						collected = false
+puts 3
 					else
 						collected = main_cache.collect_from_superset query
+puts 4
 					end
 					if !collected and main_cache.queries.values
+puts 5
 						newObjects = @db_bridge.select_dobjs query
 						newObjects.each { |dbObj| main_cache.save dbObj }
-						main_cache.queries[query] = newObjects.collect { |dobj| dobj.pk_id }
+puts 6
+						main_cache.queries[query] = newObjects.collect { |dobj|
+							dobj.pk_id
+						}
+puts 8
 					end
 				end
 				main_cache.queries[query].map { |pk_id| main_cache[pk_id] }.compact
@@ -341,8 +359,20 @@ module Lafcadio
 					cache( args.first ).send( meth, *args[1..-1] )
 				elsif [ :group_query, :transaction ].include?( meth )
 					@db_bridge.send( meth, *args )
+				else
+					super
 				end
 			end
+			
+			def transactional_clone
+				tc = Cache.new @db_bridge.transactional_clone
+				dcc_clones = {}
+				@domain_class_caches.each do |dcc|
+					dcc_clones[dcc.domain_class] = dcc.transactional_clone
+				end
+				tc.domain_class_caches = dcc_clones
+				tc
+			end
 
 			def update_dependent_domain_class( db_object, aClass, field )
 				object_store = ObjectStore.get_object_store
@@ -367,7 +397,8 @@ module Lafcadio
 			end
 			
 			class DomainClassCache < Hash #:nodoc:
-				attr_reader :commit_times, :domain_class, :queries
+				attr_reader   :domain_class
+				attr_accessor :commit_times, :queries
 				
 				def initialize( domain_class, db_bridge )
 					super()
@@ -423,6 +454,13 @@ module Lafcadio
 				end
 			
 				def set_commit_time( d_obj ); commit_times[d_obj.pk_id] = Time.now; end
+				
+				def transactional_clone
+					tc = clone
+					tc.commit_times = commit_times.clone
+					tc.queries = queries.clone
+					tc
+				end
 
 				def update_after_commit( db_object ) #:nodoc:
 					if [ :update, :insert ].include?(
@@ -562,6 +600,7 @@ module Lafcadio
 					db_object
 				)
 				statements_and_binds.each do |sql, binds|
+					maybe_log sql
 					@db_conn.do( sql, *binds )
 				end
 				if statements_and_binds[0].first =~ /insert/
@@ -596,13 +635,15 @@ module Lafcadio
 				config = LafcadioConfig.new
 				if config['logSql'] == 'y'
 					sqllog = Log4r::Logger['sql'] || Log4r::Logger.new( 'sql' )
-					filename = File.join(
-						config['logdir'], config['sqlLogFile'] || 'sql'
-					)
-					outputter = Log4r::FileOutputter.new(
-						'outputter', { :filename => filename }
-					)
-					sqllog.outputters = outputter
+					if sqllog.outputters.empty?
+						filename = File.join(
+							config['logdir'], config['sqlLogFile'] || 'sql'
+						)
+						outputter = Log4r::FileOutputter.new(
+							'outputter', { :filename => filename }
+						)
+						sqllog.outputters = outputter
+					end
 					sqllog.info sql
 				end
 			end
@@ -643,8 +684,6 @@ module Lafcadio
 				begin
 					action.call @transaction
 					@transaction.commit
-				rescue RollbackError
-					# rollback handled by Transaction
 				rescue
 					err_to_raise = $!
 					@transaction.rollback false
@@ -653,6 +692,8 @@ module Lafcadio
 				@transaction = nil
 			end
 			
+			def transactional_clone; clone; end
+			
 			class Transaction #:nodoc:
 				def initialize( db_conn ); @db_conn = db_conn; end
 				
@@ -663,9 +704,6 @@ module Lafcadio
 					raise RollbackError if raise_error
 				end
 			end
-			
-			class RollbackError < StandardError #:nodoc:
-			end
 		end
 
 		class DbConnection < ContextualService::Service #:nodoc:
@@ -809,6 +847,9 @@ module Lafcadio
 				)
 			end
 		end
+		
+		class RollbackError < StandardError #:nodoc:
+		end
 
 		class SqlToRubyValues #:nodoc:
 			attr_reader :domain_class, :row_hash

data/lib/lafcadio/test.rb

@@ -1,39 +1,6 @@
 require 'lafcadio/depend'
 require 'lafcadio/mock'
 require 'lafcadio/util'
-require 'test/unit'
-
-# A test case that sets up a number of mock services. In writing an application 
-# that uses Lafcadio you may find it convenient to inherit from this class.
-class LafcadioTestCase < Test::Unit::TestCase
-	include Lafcadio
-
-  def setup
-  	context = ContextualService::Context.instance
-  	context.flush
-    @mockObjectStore = MockObjectStore.new
-		ObjectStore.set_object_store @mockObjectStore
-		LafcadioConfig.set_values(
-			'classDefinitionDir' => '../test/testData', 'dbhost' => 'localhost',
-			'dbname' => 'test', 'dbpassword' => 'password', 'dbuser' => 'test',
-			'domainFiles' => %w( ../test/mock/domain ),
-			'logdir' => '../test/testOutput/', 'logSql' => 'n'
-		)
-  end
-	
-	# Asserts that for each key-value pair in +att_values+, sending the key to
-	# +object+ will return the value.
-	#   u = User.new( 'fname' => 'Francis', 'lname' => 'Hwang' )
-	#   assert_attributes( u, { 'fname' => 'Francis', 'lname' => 'Hwang' } )
-	def assert_attributes( object, att_values )
-		att_values.each { |method, expected|
-			assert_equal( expected, object.send( method ), method.to_s )
-		}
-	end
-	
-	def default_test #:nodoc:
-	end
-end
 
 module Lafcadio
 	def BooleanField.mock_value #:nodoc:

data/lib/lafcadio/test.rb~

@@ -48,9 +48,35 @@ module Lafcadio
 		Time.now
 	end
 	
-	module DomainMock #:nodoc:
-		Version = '0.1.0'
-		
+	# A convenience module for test-cases of Lafcadio-dependent applications.
+	# Include this module in a test-case, and you automatically get the
+	# class-level method <tt>setup_mock_dobjs</tt>. This calls
+	# DomainObject.default_mock, and assigns the result to an instance variable 
+	# named after the domain class. Note that if your test case also defines a 
+	# <tt>setup</tt>, you should make sure to call <tt>super</tt> in that setup 
+	# method to make <tt>setup_mock_dobjs</tt> work.
+	#
+	#   class User < Lafcadio::DomainObject
+	#     strings :fname, :lname, :email
+	#   end
+	#
+	#   class TestSendMessage < Test::Unit::TestCase
+	#     include Lafcadio::DomainMock
+	#     setup_mock_dobjs User
+	#     def test_send_to_self
+	#       SendMessage.new( 'sender' => @user, 'recipient' => @user )
+	#       assert_equal( 1, Message.all.size )
+	#     end
+	#   end
+	#
+	# <tt>setup_mock_dobjs</tt> can handle plural domain classes:
+	#
+	#   setup_mock_dobjs User, Message
+	#
+	# It can also handle assignments to different instance variables:
+	#
+	#   setup_mock_dobjs User, '@sender'
+	module DomainMock
 		def self.included( includer )
 			def includer.setup_mock_dobjs( *domain_classes_or_symbol_names )
 				domain_classes = DomainClassSymbolMapper.new
@@ -158,7 +184,7 @@ module Lafcadio
 		# <tt>lafcadio/test.rb</tt>.
 		#
 		#   class User < Lafcadio::DomainObject
-		#     string :fname, :lname, :email
+		#     strings :fname, :lname, :email
 		#   end
 		#   u1 = User.custom_mock
 		#   u1.fname # => 'test text'
@@ -225,7 +251,7 @@ module Lafcadio
 		# <tt>lafcadio/test.rb</tt>.
 		#
 		#   class User < Lafcadio::DomainObject
-		#     string :fname, :lname, :email
+		#     strings :fname, :lname, :email
 		#   end
 		#   u1 = User.default_mock
 		#   u1.fname # => 'test text'
@@ -269,7 +295,7 @@ module Lafcadio
 		# <tt>lafcadio/test.rb</tt>.
 		#
 		#   class User < Lafcadio::DomainObject
-		#     string :fname, :lname, :email
+		#     strings :fname, :lname, :email
 		#   end
 		#   User.mock_value :fname, 'Bill'
 		#   User.mock_value :lname, 'Smith'
@@ -289,7 +315,7 @@ module Lafcadio
 		# <tt>lafcadio/test.rb</tt>.
 		#
 		#   class User < Lafcadio::DomainObject
-		#     string :fname, :lname, :email
+		#     strings :fname, :lname, :email
 		#   end
 		#   User.mock_values { :fname => 'Bill', :lname => 'Smith' }
 		#   u1 = User.default_mock

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: lafcadio
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
-date: 2006-05-01 00:00:00 -04:00
+  version: 0.9.5
+date: 2006-07-03 00:00:00 -04:00
 summary: Lafcadio is an object-relational mapping layer
 require_paths: 
 - lib