lafcadio 0.5.2 → 0.6.0

data/bin/lafcadio_schema

@@ -7,15 +7,23 @@ require 'lafcadio/util'
 require 'getoptlong'
 include Lafcadio
 
-opts = GetoptLong.new( [ '--config', '-c', GetoptLong::REQUIRED_ARGUMENT ] )
+opts = GetoptLong.new(
+	[ '--config', '-c', GetoptLong::REQUIRED_ARGUMENT ],
+	[ '--class',  '-C', GetoptLong::OPTIONAL_ARGUMENT ]
+)
 if ( ( optArray = opts.get ) && ARGV.size >= 1 )
 	configFile = optArray[1]
 	LafcadioConfig.set_filename( configFile )
+	class_opts = opts.get
 	ARGV.each { |fileName|
 		require "#{ fileName }"
-		fileName =~ /(\w*)\.rb/
-		className = $1
-		domainClass = Class.get_class( className )
+		if class_opts
+			className = class_opts.last
+		else
+			fileName =~ /(\w*)\.rb/
+			className = $1
+		end
+		domainClass = Class.by_name( className )
 		if domainClass
 			statement = CreateTableStatement.new( domainClass )
 			puts statement.to_sql

data/lib/lafcadio.rb

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

data/lib/lafcadio.rb~

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

data/lib/lafcadio/depend.rb

@@ -1,3 +1,5 @@
 require 'dbi'
+require 'extensions/all'
+require 'extensions/module'
 require 'log4r'
 require 'runit/testcase'

data/lib/lafcadio/domain.rb

@@ -13,12 +13,12 @@ module Lafcadio
 		def get_class_field( fieldElt )
 			className = fieldElt.attributes['class'].to_s
 			name = fieldElt.attributes['name']
-			begin
-				fieldClass = Class.get_class( 'Lafcadio::' + className )
+			if className != ''
+				fieldClass = Class.by_name( 'Lafcadio::' + className )
 				register_name( name )
 				field = fieldClass.instantiate_from_xml( @domain_class, fieldElt )
 				set_field_attributes( field, fieldElt )
-			rescue MissingError
+			else
 				msg = "Couldn't find field class '#{ className }' for field " +
 				      "'#{ name }'"
 				raise( MissingError, msg, caller )
@@ -122,14 +122,14 @@ module Lafcadio
 	module DomainComparable
 		include Comparable
 
-		# A DomainObject or DomainObjectProxy is compared by +object_type+ and by
+		# A DomainObject or DomainObjectProxy is compared by +domain_class+ and by
 		# +pk_id+. 
 		def <=>(anOther)
-			if anOther.respond_to?( 'object_type' )
-				if self.object_type == anOther.object_type
+			if anOther.respond_to?( 'domain_class' )
+				if self.domain_class == anOther.domain_class
 					self.pk_id <=> anOther.pk_id
 				else
-					self.object_type.name <=> anOther.object_type.name
+					self.domain_class.name <=> anOther.domain_class.name
 				end
 			else
 				nil
@@ -243,6 +243,13 @@ module Lafcadio
 	class DomainObject
 		@@subclassHash = {}
 		@@class_fields = {}
+		@@pk_fields =
+			Hash.new { |hash, key|
+				pk_field = PrimaryKeyField.new( key )
+				pk_field.db_field_name = @@sql_primary_keys[key]
+				hash[key] = pk_field
+			}
+		@@sql_primary_keys = Hash.new( 'pk_id' )
 
 		COMMIT_ADD = 1
 		COMMIT_EDIT = 2
@@ -277,7 +284,7 @@ module Lafcadio
 		def self.create_field( field_class, name, att_hash )
 			class_fields = @@class_fields[self]
 			if class_fields.nil?
-				class_fields = [ PrimaryKeyField.new( self ) ]
+				class_fields = [ @@pk_fields[self] ]
 				@@class_fields[self] = class_fields
 			end
 			att_hash['name'] = name
@@ -295,7 +302,8 @@ module Lafcadio
 				if aClass != DomainObjectProxy &&
 						(!DomainObject.abstract_subclasses.index(aClass))
 					aClass.class_fields.each { |field|
-						if field.class <= LinkField && field.linked_type == self.object_type
+						if ( field.is_a?( LinkField ) &&
+						     field.linked_type == self.domain_class )
 							dependent_classes[aClass] = field
 						end
 					}
@@ -320,7 +328,7 @@ module Lafcadio
 		# them from XML if necessary.
 		def self.get_class_fields
 			if self.methods( false ).include?( 'get_class_fields' )
-				[ PrimaryKeyField.new( self ) ]
+				[ @@pk_fields[ self ] ]
 			else
 				xmlParser = try_load_xml_parser
 				if xmlParser
@@ -334,13 +342,10 @@ module Lafcadio
 		end
 
 		def self.get_domain_dirs #:nodoc:
-			config = LafcadioConfig.new
-			classPath = config['classpath']
-			domainDirStr = config['domainDirs']
-			if domainDirStr
-				domainDirs = domainDirStr.split(',')
+			if ( domainDirStr = LafcadioConfig.new['domainDirs'] )
+				domainDirStr.split(',')
 			else
-				domainDirs = [ classPath + 'domain/' ]
+				[]
 			end
 		end
 		
@@ -360,20 +365,20 @@ module Lafcadio
 			end
 		end
 
-		def self.get_object_type_from_string(typeString) #:nodoc:
-			object_type = nil
+		def self.get_domain_class_from_string(typeString) #:nodoc:
+			domain_class = nil
 			require_domain_file( typeString )
 			subclasses.each { |subclass|
-				object_type = subclass if subclass.to_s == typeString
+				domain_class = subclass if subclass.to_s == typeString
 			}
-			if object_type
-				object_type
+			if domain_class
+				domain_class
 			else
-				raise CouldntMatchObjectTypeError,
-						"couldn't match object_type #{typeString}", caller
+				raise CouldntMatchDomainClassError,
+						"couldn't match domain_class #{typeString}", caller
 			end
 		end
-
+		
 		def self.inherited(subclass) #:nodoc:
 			@@subclassHash[subclass] = true
 		end
@@ -394,7 +399,7 @@ module Lafcadio
 			create_field( field_class, args[0], args[1] || {} )
 		end
 
-		def self.object_type #:nodoc:
+		def self.domain_class #:nodoc:
 			self
 		end
 
@@ -415,15 +420,25 @@ module Lafcadio
 
 		def self.self_and_concrete_superclasses # :nodoc:
 			classes = [ ]
-			anObjectType = self
-			until(anObjectType == DomainObject ||
-					abstract_subclasses.index(anObjectType) != nil)
-				classes << anObjectType
-				anObjectType = anObjectType.superclass
+			a_domain_class = self
+			until( a_domain_class == DomainObject ||
+					   abstract_subclasses.index( a_domain_class ) != nil )
+				classes << a_domain_class
+				a_domain_class = a_domain_class.superclass
 			end
 			classes
 		end
 
+		def self.singleton_method_added( symbol )
+			if symbol.id2name == 'sql_primary_key_name' && self < DomainObject
+				begin
+					get_field( 'pk_id' ).db_field_name = self.send( symbol )
+				rescue NameError
+					@@sql_primary_keys[self] = self.send( symbol )
+				end
+			end
+		end
+		
 		# Returns the name of the primary key in the database, retrieving it from
 		# the class definition XML if necessary.
 		def self.sql_primary_key_name( set_sql_primary_key_name = nil )
@@ -451,7 +466,7 @@ module Lafcadio
 				if (!xmlParser.nil? && table_name = xmlParser.table_name)
 					table_name
 				else
-					table_name = self.bare_name
+					table_name = self.basename
 					table_name[0] = table_name[0..0].downcase
 					English.plural table_name
 				end
@@ -461,7 +476,7 @@ module Lafcadio
 		def self.try_load_xml_parser
 			require 'lafcadio/domain'
 			dirName = LafcadioConfig.new['classDefinitionDir']
-			xmlFileName = self.bare_name + '.xml'
+			xmlFileName = self.basename + '.xml'
 			xmlPath = File.join( dirName, xmlFileName )
 			xml = ''
 			begin
@@ -565,8 +580,8 @@ module Lafcadio
 		# Returns the subclass of DomainObject that this instance represents.
 		# Because of the way that proxying works, clients should call this method
 		# instead of Object.class.
-		def object_type
-			self.class.object_type
+		def domain_class
+			self.class.domain_class
 		end
 
 		# This template method is called before every commit. Subclasses can 

data/lib/lafcadio/domain.rb~

@@ -13,12 +13,12 @@ module Lafcadio
 		def get_class_field( fieldElt )
 			className = fieldElt.attributes['class'].to_s
 			name = fieldElt.attributes['name']
-			begin
-				fieldClass = Class.get_class( 'Lafcadio::' + className )
+			if className != ''
+				fieldClass = Class.by_name( 'Lafcadio::' + className )
 				register_name( name )
 				field = fieldClass.instantiate_from_xml( @domain_class, fieldElt )
 				set_field_attributes( field, fieldElt )
-			rescue MissingError
+			else
 				msg = "Couldn't find field class '#{ className }' for field " +
 				      "'#{ name }'"
 				raise( MissingError, msg, caller )
@@ -122,14 +122,14 @@ module Lafcadio
 	module DomainComparable
 		include Comparable
 
-		# A DomainObject or DomainObjectProxy is compared by +object_type+ and by
+		# A DomainObject or DomainObjectProxy is compared by +domain_class+ and by
 		# +pk_id+. 
 		def <=>(anOther)
-			if anOther.respond_to?( 'object_type' )
-				if self.object_type == anOther.object_type
+			if anOther.respond_to?( 'domain_class' )
+				if self.domain_class == anOther.domain_class
 					self.pk_id <=> anOther.pk_id
 				else
-					self.object_type.name <=> anOther.object_type.name
+					self.domain_class.name <=> anOther.domain_class.name
 				end
 			else
 				nil
@@ -243,6 +243,13 @@ module Lafcadio
 	class DomainObject
 		@@subclassHash = {}
 		@@class_fields = {}
+		@@pk_fields =
+			Hash.new { |hash, key|
+				pk_field = PrimaryKeyField.new( key )
+				pk_field.db_field_name = @@sql_primary_keys[key]
+				hash[key] = pk_field
+			}
+		@@sql_primary_keys = Hash.new( 'pk_id' )
 
 		COMMIT_ADD = 1
 		COMMIT_EDIT = 2
@@ -277,7 +284,7 @@ module Lafcadio
 		def self.create_field( field_class, name, att_hash )
 			class_fields = @@class_fields[self]
 			if class_fields.nil?
-				class_fields = [ PrimaryKeyField.new( self ) ]
+				class_fields = [ @@pk_fields[self] ]
 				@@class_fields[self] = class_fields
 			end
 			att_hash['name'] = name
@@ -295,7 +302,8 @@ module Lafcadio
 				if aClass != DomainObjectProxy &&
 						(!DomainObject.abstract_subclasses.index(aClass))
 					aClass.class_fields.each { |field|
-						if field.class <= LinkField && field.linked_type == self.object_type
+						if ( field.is_a?( LinkField ) &&
+						     field.linked_type == self.domain_class )
 							dependent_classes[aClass] = field
 						end
 					}
@@ -320,7 +328,7 @@ module Lafcadio
 		# them from XML if necessary.
 		def self.get_class_fields
 			if self.methods( false ).include?( 'get_class_fields' )
-				[ PrimaryKeyField.new( self ) ]
+				[ @@pk_fields[ self ] ]
 			else
 				xmlParser = try_load_xml_parser
 				if xmlParser
@@ -360,20 +368,20 @@ module Lafcadio
 			end
 		end
 
-		def self.get_object_type_from_string(typeString) #:nodoc:
-			object_type = nil
+		def self.get_domain_class_from_string(typeString) #:nodoc:
+			domain_class = nil
 			require_domain_file( typeString )
 			subclasses.each { |subclass|
-				object_type = subclass if subclass.to_s == typeString
+				domain_class = subclass if subclass.to_s == typeString
 			}
-			if object_type
-				object_type
+			if domain_class
+				domain_class
 			else
-				raise CouldntMatchObjectTypeError,
-						"couldn't match object_type #{typeString}", caller
+				raise CouldntMatchDomainClassError,
+						"couldn't match domain_class #{typeString}", caller
 			end
 		end
-
+		
 		def self.inherited(subclass) #:nodoc:
 			@@subclassHash[subclass] = true
 		end
@@ -394,7 +402,7 @@ module Lafcadio
 			create_field( field_class, args[0], args[1] || {} )
 		end
 
-		def self.object_type #:nodoc:
+		def self.domain_class #:nodoc:
 			self
 		end
 
@@ -415,15 +423,25 @@ module Lafcadio
 
 		def self.self_and_concrete_superclasses # :nodoc:
 			classes = [ ]
-			anObjectType = self
-			until(anObjectType == DomainObject ||
-					abstract_subclasses.index(anObjectType) != nil)
-				classes << anObjectType
-				anObjectType = anObjectType.superclass
+			a_domain_class = self
+			until( a_domain_class == DomainObject ||
+					   abstract_subclasses.index( a_domain_class ) != nil )
+				classes << a_domain_class
+				a_domain_class = a_domain_class.superclass
 			end
 			classes
 		end
 
+		def self.singleton_method_added( symbol )
+			if symbol.id2name == 'sql_primary_key_name' && self < DomainObject
+				begin
+					get_field( 'pk_id' ).db_field_name = self.send( symbol )
+				rescue NameError
+					@@sql_primary_keys[self] = self.send( symbol )
+				end
+			end
+		end
+		
 		# Returns the name of the primary key in the database, retrieving it from
 		# the class definition XML if necessary.
 		def self.sql_primary_key_name( set_sql_primary_key_name = nil )
@@ -451,7 +469,7 @@ module Lafcadio
 				if (!xmlParser.nil? && table_name = xmlParser.table_name)
 					table_name
 				else
-					table_name = self.bare_name
+					table_name = self.basename
 					table_name[0] = table_name[0..0].downcase
 					English.plural table_name
 				end
@@ -461,7 +479,7 @@ module Lafcadio
 		def self.try_load_xml_parser
 			require 'lafcadio/domain'
 			dirName = LafcadioConfig.new['classDefinitionDir']
-			xmlFileName = self.bare_name + '.xml'
+			xmlFileName = self.basename + '.xml'
 			xmlPath = File.join( dirName, xmlFileName )
 			xml = ''
 			begin
@@ -553,6 +571,10 @@ module Lafcadio
 				set_field( field, args.first )
 			elsif ( field = get_getter_field( methId ) )
 				get_field( field )
+			elsif ( methId.to_s =~ /^get_/ and
+			        ObjectStore.get_object_store.respond_to?( methId ) )
+				args = [ self ].concat( args )
+				ObjectStore.get_object_store.send( methId, *args )
 			else
 				super( methId, *args )
 			end
@@ -561,8 +583,8 @@ module Lafcadio
 		# Returns the subclass of DomainObject that this instance represents.
 		# Because of the way that proxying works, clients should call this method
 		# instead of Object.class.
-		def object_type
-			self.class.object_type
+		def domain_class
+			self.class.domain_class
 		end
 
 		# This template method is called before every commit. Subclasses can 

data/lib/lafcadio/mock.rb

@@ -11,24 +11,26 @@ module Lafcadio
 		end
 
 		def commit(db_object)
-			objectsByObjectType = get_objects_by_domain_class( db_object.object_type )
+			objects_by_domain_class = get_objects_by_domain_class(
+				db_object.domain_class
+			)
 			if db_object.delete
-				objectsByObjectType.delete db_object.pk_id
+				objects_by_domain_class.delete( db_object.pk_id )
 			else
 				object_pk_id = get_pk_id_before_committing( db_object )
-				objectsByObjectType[object_pk_id] = db_object
+				objects_by_domain_class[object_pk_id] = db_object
 			end
 		end
 		
-		def _get_all(object_type)
-			@retrievals_by_type[object_type] = @retrievals_by_type[object_type] + 1
-			@objects[object_type] ? @objects[object_type].values : []
+		def _get_all( domain_class )
+			@retrievals_by_type[domain_class] = @retrievals_by_type[domain_class] + 1
+			@objects[domain_class] ? @objects[domain_class].values : []
 		end
 		
 		def get_collection_by_query(query)
 			@query_count[query] += 1
 			objects = []
-			_get_all( query.object_type ).each { |dbObj|
+			_get_all( query.domain_class ).each { |dbObj|
 				if query.condition
 					objects << dbObj if query.condition.object_meets(dbObj)
 				else
@@ -49,7 +51,8 @@ module Lafcadio
 			object_pk_id = db_object.pk_id
 			unless object_pk_id
 				maxpk_id = 0
-				get_objects_by_domain_class( db_object.object_type ).keys.each { |pk_id|
+				pk_ids = get_objects_by_domain_class( db_object.domain_class ).keys
+				pk_ids.each { |pk_id|
 					maxpk_id = pk_id if pk_id > maxpk_id
 				}
 				@last_pk_id_inserted = maxpk_id + 1
@@ -70,7 +73,7 @@ module Lafcadio
 		def group_query( query )
 			if query.class == Query::Max
 				if ( query.field_name == 'pk_id' || query.field_name == 'rate' )
-					query.collect( @objects[query.object_type].values )
+					query.collect( @objects[query.domain_class].values )
 				else
 					raise "Can't handle query with sql '#{ query.to_sql }'"
 				end