lafcadio 0.7.3 → 0.7.4

data/lib/lafcadio/mock.rb

@@ -8,6 +8,7 @@ module Lafcadio
 			@objects = {}
 			@retrievals_by_type = Hash.new 0
 			@query_count = Hash.new( 0 )
+			@next_pk_ids = {}
 		end
 
 		def commit(db_object)
@@ -53,17 +54,23 @@ module Lafcadio
 		end
 		
 		def get_pk_id_before_committing( db_object )
-			object_pk_id = db_object.pk_id
-			unless object_pk_id
-				maxpk_id = 0
-				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
-				object_pk_id = @last_pk_id_inserted
+			if db_object.pk_id
+				db_object.pk_id
+			else
+				if ( next_pk_id = @next_pk_ids[db_object.domain_class] )
+					@last_pk_id_inserted = next_pk_id
+					@next_pk_ids[db_object.domain_class] = nil
+					next_pk_id
+				else
+					maxpk_id = 0
+					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
+					@last_pk_id_inserted
+				end
 			end
-			object_pk_id
 		end
 		
 		def get_objects_by_domain_class( domain_class )
@@ -77,13 +84,21 @@ 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.domain_class].values )
+				dobjs_by_pk_id = @objects[query.domain_class]
+				if dobjs_by_pk_id
+					dobjs = dobjs_by_pk_id.values.sort_by { |dobj|
+						dobj.send( query.field_name )
+					}
+					[ dobjs.last.send( query.field_name ) ]
 				else
-					raise "Can't handle query with sql '#{ query.to_sql }'"
+					[ nil ]
 				end
 			end
 		end
+		
+		def set_next_pk_id( domain_class, npi )
+			@next_pk_ids[ domain_class ] = npi
+		end
 	end
 
 	# Externally, the MockObjectStore looks and acts exactly like the ObjectStore,

data/lib/lafcadio/mock.rb~

@@ -47,7 +47,7 @@ module Lafcadio
 				objects = objects.sort_by { |dobj| dobj.pk_id }
 			end
 			if (range = query.limit)
-				objects = objects[range.first..(range.last - range.first)]
+				objects = objects[range]
 			end
 			objects
 		end
@@ -77,10 +77,14 @@ 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.domain_class].values )
+				dobjs_by_pk_id = @objects[query.domain_class]
+				if dobjs_by_pk_id
+					dobjs = dobjs_by_pk_id.values.sort_by { |dobj|
+						dobj.send( query.field_name )
+					}
+					[ dobjs.last.send( query.field_name ) ]
 				else
-					raise "Can't handle query with sql '#{ query.to_sql }'"
+					[ nil ]
 				end
 			end
 		end

data/lib/lafcadio/objectField.rb

@@ -1,5 +1,5 @@
 require 'date'
-require 'lafcadio/dateTime'
+require 'lafcadio/depend'
 require 'lafcadio/util'
 
 module Lafcadio
@@ -113,16 +113,8 @@ module Lafcadio
 		end
 	end
 
-	# IntegerField represents an integer.
-	class IntegerField < ObjectField
-		def value_from_sql(string) #:nodoc:
-			value = super
-			value ? value.to_i : nil
-		end
-	end
-
-	# A TextField is expected to contain a string value.
-	class TextField < ObjectField
+	# A StringField is expected to contain a string value.
+	class StringField < ObjectField
 		def value_for_sql(value) #:nodoc:
 			if value
 				value = value.gsub(/(\\?')/) { |m| m.length == 1 ? "''" : m }
@@ -134,6 +126,14 @@ module Lafcadio
 		end
 	end
 
+	# IntegerField represents an integer.
+	class IntegerField < ObjectField
+		def value_from_sql(string) #:nodoc:
+			value = super
+			value ? value.to_i : nil
+		end
+	end
+
 	# BlobField stores a string value and expects to store its value in a BLOB
 	# field in the database.
 	class BlobField < ObjectField
@@ -269,30 +269,97 @@ module Lafcadio
 			dbi_value ? dbi_value.to_time : nil
 		end
 	end
-	
-	# DecimalField represents a decimal value.
-	class DecimalField < ObjectField
+
+	# A DomainObjectField is used to link from one domain class to another.
+	class DomainObjectField < ObjectField
+		def self.auto_name( linked_type )
+			linked_type.name =~ /::/
+			( $' || linked_type.name ).camel_case_to_underscore
+		end
+
 		def self.instantiate_with_parameters( domain_class, parameters ) #:nodoc:
-			self.new( domain_class, parameters['name'] )
+			linked_type = parameters['linked_type']
+			instance = self.new(
+				domain_class, linked_type,
+				parameters['name'] || auto_name( linked_type ),
+				parameters['delete_cascade']
+			)
+			if parameters['db_field_name']
+				instance.db_field_name = parameters['db_field_name']
+			end
+			instance
 		end
 
-		def self.value_type #:nodoc:
-			Numeric
+		def self.instantiation_parameters( fieldElt ) #:nodoc:
+			parameters = super( fieldElt )
+			linked_typeStr = fieldElt.attributes['linked_type']
+			linked_type = DomainObject.get_domain_class_from_string( linked_typeStr )
+			parameters['linked_type'] = linked_type
+			parameters['delete_cascade'] = fieldElt.attributes['delete_cascade'] == 'y'
+			parameters
 		end
 
-		def process_before_verify(value) #:nodoc:
-			value = super value
-			value != nil && value != '' ? value.to_f : nil
+		attr_reader :linked_type
+		attr_accessor :delete_cascade
+
+		# [domain_class]    The domain class that this field belongs to.
+		# [linked_type]     The domain class that this field points to.
+		# [name]            The name of this field.
+		# [delete_cascade]  If this is true, deleting the domain object that is
+		#                   linked to will cause this domain object to be deleted
+		#                   as well.
+		def initialize( domain_class, linked_type, name = nil,
+		                delete_cascade = false )
+			name = self.class.auto_name( linked_type ) unless name
+			super( domain_class, name )
+			( @linked_type, @delete_cascade ) = linked_type, delete_cascade
 		end
 
-		def value_from_sql(string, lookupLink = true) #:nodoc:
-			string != nil ? string.to_f : nil
+		def value_from_sql(string) #:nodoc:
+			string != nil ? DomainObjectProxy.new(@linked_type, string.to_i) : nil
+		end
+
+		def value_for_sql(value) #:nodoc:
+			if !value
+				"null"
+			elsif value.pk_id
+				value.pk_id
+			else
+				raise( DomainObjectInitError, "Can't commit #{name} without pk_id", 
+				       caller )
+			end
+		end
+
+		def verify_non_nil(value, pk_id) #:nodoc:
+			super
+			if @linked_type != @domain_class && pk_id
+				subsetDomainObjectField = @linked_type.class_fields.find { |field|
+					field.class == SubsetDomainObjectField && field.subset_field == @name
+				}
+				if subsetDomainObjectField
+					verify_subset_link_field( subsetDomainObjectField, pk_id )
+				end
+			end
+		end
+
+		def verify_subset_link_field( subsetDomainObjectField, pk_id )
+			begin
+				prevObj = ObjectStore.get_object_store.get( domain_class, pk_id )
+				prevObjLinkedTo = prevObj.send(name)
+				possiblyMyObj = prevObjLinkedTo.send(subsetDomainObjectField.name)
+				if possiblyMyObj && possiblyMyObj.pk_id == pk_id
+					cantChangeMsg = "You can't change that."
+					raise FieldValueError, cantChangeMsg, caller
+				end
+			rescue DomainObjectNotFoundError
+				# no previous value, so nothing to check for
+			end
 		end
 	end
 
 	# EmailField takes a text value that is expected to be formatted as a single
 	# valid email address.
-	class EmailField < TextField
+	class EmailField < StringField
 		# Is +address+ a valid email address?
 		def self.valid_address(address)
 			address =~ /^[^ @]+@[^ \.]+\.[^ ,]+$/
@@ -327,7 +394,7 @@ module Lafcadio
 	# If you're defining the field in Ruby, you can simply pass in an array of
 	# enums as the +enums+ argument.
 	#
-	class EnumField < TextField
+	class EnumField < StringField
 		def self.instantiate_with_parameters( domain_class, parameters ) #:nodoc:
 			self.new( domain_class, parameters['name'], parameters['enums'] )
 		end
@@ -388,90 +455,23 @@ module Lafcadio
 	class FieldValueError < RuntimeError #:nodoc:
 	end
 
-	# A LinkField is used to link from one domain class to another.
-	class LinkField < ObjectField
-		def self.auto_name( linked_type )
-			linked_type.name =~ /::/
-			( $' || linked_type.name ).camel_case_to_underscore
-		end
-
+	# FloatField represents a decimal value.
+	class FloatField < ObjectField
 		def self.instantiate_with_parameters( domain_class, parameters ) #:nodoc:
-			linked_type = parameters['linked_type']
-			instance = self.new(
-				domain_class, linked_type,
-				parameters['name'] || auto_name( linked_type ),
-				parameters['delete_cascade']
-			)
-			if parameters['db_field_name']
-				instance.db_field_name = parameters['db_field_name']
-			end
-			instance
-		end
-
-		def self.instantiation_parameters( fieldElt ) #:nodoc:
-			parameters = super( fieldElt )
-			linked_typeStr = fieldElt.attributes['linked_type']
-			linked_type = DomainObject.get_domain_class_from_string( linked_typeStr )
-			parameters['linked_type'] = linked_type
-			parameters['delete_cascade'] = fieldElt.attributes['delete_cascade'] == 'y'
-			parameters
-		end
-
-		attr_reader :linked_type
-		attr_accessor :delete_cascade
-
-		# [domain_class]    The domain class that this field belongs to.
-		# [linked_type]     The domain class that this field points to.
-		# [name]            The name of this field.
-		# [delete_cascade]  If this is true, deleting the domain object that is
-		#                   linked to will cause this domain object to be deleted
-		#                   as well.
-		def initialize( domain_class, linked_type, name = nil,
-		                delete_cascade = false )
-			name = self.class.auto_name( linked_type ) unless name
-			super( domain_class, name )
-			( @linked_type, @delete_cascade ) = linked_type, delete_cascade
-		end
-
-		def value_from_sql(string) #:nodoc:
-			string != nil ? DomainObjectProxy.new(@linked_type, string.to_i) : nil
+			self.new( domain_class, parameters['name'] )
 		end
 
-		def value_for_sql(value) #:nodoc:
-			if !value
-				"null"
-			elsif value.pk_id
-				value.pk_id
-			else
-				raise( DomainObjectInitError, "Can't commit #{name} without pk_id", 
-				       caller )
-			end
+		def self.value_type #:nodoc:
+			Numeric
 		end
 
-		def verify_non_nil(value, pk_id) #:nodoc:
-			super
-			if @linked_type != @domain_class && pk_id
-				subsetLinkField = @linked_type.class_fields.find { |field|
-					field.class == SubsetLinkField && field.subset_field == @name
-				}
-				if subsetLinkField
-					verify_subset_link_field( subsetLinkField, pk_id )
-				end
-			end
+		def process_before_verify(value) #:nodoc:
+			value = super value
+			value != nil && value != '' ? value.to_f : nil
 		end
 
-		def verify_subset_link_field( subsetLinkField, pk_id )
-			begin
-				prevObj = ObjectStore.get_object_store.get( domain_class, pk_id )
-				prevObjLinkedTo = prevObj.send(name)
-				possiblyMyObj = prevObjLinkedTo.send(subsetLinkField.name)
-				if possiblyMyObj && possiblyMyObj.pk_id == pk_id
-					cantChangeMsg = "You can't change that."
-					raise FieldValueError, cantChangeMsg, caller
-				end
-			rescue DomainObjectNotFoundError
-				# no previous value, so nothing to check for
-			end
+		def value_from_sql(string, lookupLink = true) #:nodoc:
+			string != nil ? string.to_f : nil
 		end
 	end
 
@@ -499,11 +499,11 @@ module Lafcadio
 	# postal code.
 	class StateField < EnumField
 		def initialize( domain_class, name = "state" )
-			super( domain_class, name, UsStates.states )
+			super( domain_class, name, UsCommerce::UsStates.states )
 		end
 	end
 
-	class SubsetLinkField < LinkField #:nodoc:
+	class SubsetDomainObjectField < DomainObjectField #:nodoc:
 		def self.instantiate_with_parameters( domain_class, parameters )
 			self.new( domain_class, parameters['linked_type'],
 			          parameters['subset_field'], parameters['name'] )

data/lib/lafcadio/objectField.rb~

@@ -1,5 +1,5 @@
 require 'date'
-require 'lafcadio/dateTime'
+require 'lafcadio/depend'
 require 'lafcadio/util'
 
 module Lafcadio
@@ -113,16 +113,8 @@ module Lafcadio
 		end
 	end
 
-	# IntegerField represents an integer.
-	class IntegerField < ObjectField
-		def value_from_sql(string) #:nodoc:
-			value = super
-			value ? value.to_i : nil
-		end
-	end
-
-	# A TextField is expected to contain a string value.
-	class TextField < ObjectField
+	# A StringField is expected to contain a string value.
+	class StringField < ObjectField
 		def value_for_sql(value) #:nodoc:
 			if value
 				value = value.gsub(/(\\?')/) { |m| m.length == 1 ? "''" : m }
@@ -134,6 +126,14 @@ module Lafcadio
 		end
 	end
 
+	# IntegerField represents an integer.
+	class IntegerField < ObjectField
+		def value_from_sql(string) #:nodoc:
+			value = super
+			value ? value.to_i : nil
+		end
+	end
+
 	# BlobField stores a string value and expects to store its value in a BLOB
 	# field in the database.
 	class BlobField < ObjectField
@@ -269,30 +269,97 @@ module Lafcadio
 			dbi_value ? dbi_value.to_time : nil
 		end
 	end
-	
-	# DecimalField represents a decimal value.
-	class DecimalField < ObjectField
+
+	# A DomainObjectField is used to link from one domain class to another.
+	class DomainObjectField < ObjectField
+		def self.auto_name( linked_type )
+			linked_type.name =~ /::/
+			( $' || linked_type.name ).camel_case_to_underscore
+		end
+
 		def self.instantiate_with_parameters( domain_class, parameters ) #:nodoc:
-			self.new( domain_class, parameters['name'] )
+			linked_type = parameters['linked_type']
+			instance = self.new(
+				domain_class, linked_type,
+				parameters['name'] || auto_name( linked_type ),
+				parameters['delete_cascade']
+			)
+			if parameters['db_field_name']
+				instance.db_field_name = parameters['db_field_name']
+			end
+			instance
 		end
 
-		def self.value_type #:nodoc:
-			Numeric
+		def self.instantiation_parameters( fieldElt ) #:nodoc:
+			parameters = super( fieldElt )
+			linked_typeStr = fieldElt.attributes['linked_type']
+			linked_type = DomainObject.get_domain_class_from_string( linked_typeStr )
+			parameters['linked_type'] = linked_type
+			parameters['delete_cascade'] = fieldElt.attributes['delete_cascade'] == 'y'
+			parameters
 		end
 
-		def process_before_verify(value) #:nodoc:
-			value = super value
-			value != nil && value != '' ? value.to_f : nil
+		attr_reader :linked_type
+		attr_accessor :delete_cascade
+
+		# [domain_class]    The domain class that this field belongs to.
+		# [linked_type]     The domain class that this field points to.
+		# [name]            The name of this field.
+		# [delete_cascade]  If this is true, deleting the domain object that is
+		#                   linked to will cause this domain object to be deleted
+		#                   as well.
+		def initialize( domain_class, linked_type, name = nil,
+		                delete_cascade = false )
+			name = self.class.auto_name( linked_type ) unless name
+			super( domain_class, name )
+			( @linked_type, @delete_cascade ) = linked_type, delete_cascade
 		end
 
-		def value_from_sql(string, lookupLink = true) #:nodoc:
-			string != nil ? string.to_f : nil
+		def value_from_sql(string) #:nodoc:
+			string != nil ? DomainObjectProxy.new(@linked_type, string.to_i) : nil
+		end
+
+		def value_for_sql(value) #:nodoc:
+			if !value
+				"null"
+			elsif value.pk_id
+				value.pk_id
+			else
+				raise( DomainObjectInitError, "Can't commit #{name} without pk_id", 
+				       caller )
+			end
+		end
+
+		def verify_non_nil(value, pk_id) #:nodoc:
+			super
+			if @linked_type != @domain_class && pk_id
+				subsetDomainObjectField = @linked_type.class_fields.find { |field|
+					field.class == SubsetDomainObjectField && field.subset_field == @name
+				}
+				if subsetDomainObjectField
+					verify_subset_link_field( subsetDomainObjectField, pk_id )
+				end
+			end
+		end
+
+		def verify_subset_link_field( subsetDomainObjectField, pk_id )
+			begin
+				prevObj = ObjectStore.get_object_store.get( domain_class, pk_id )
+				prevObjLinkedTo = prevObj.send(name)
+				possiblyMyObj = prevObjLinkedTo.send(subsetDomainObjectField.name)
+				if possiblyMyObj && possiblyMyObj.pk_id == pk_id
+					cantChangeMsg = "You can't change that."
+					raise FieldValueError, cantChangeMsg, caller
+				end
+			rescue DomainObjectNotFoundError
+				# no previous value, so nothing to check for
+			end
 		end
 	end
 
 	# EmailField takes a text value that is expected to be formatted as a single
 	# valid email address.
-	class EmailField < TextField
+	class EmailField < StringField
 		# Is +address+ a valid email address?
 		def self.valid_address(address)
 			address =~ /^[^ @]+@[^ \.]+\.[^ ,]+$/
@@ -327,7 +394,7 @@ module Lafcadio
 	# If you're defining the field in Ruby, you can simply pass in an array of
 	# enums as the +enums+ argument.
 	#
-	class EnumField < TextField
+	class EnumField < StringField
 		def self.instantiate_with_parameters( domain_class, parameters ) #:nodoc:
 			self.new( domain_class, parameters['name'], parameters['enums'] )
 		end
@@ -388,87 +455,23 @@ module Lafcadio
 	class FieldValueError < RuntimeError #:nodoc:
 	end
 
-	# A LinkField is used to link from one domain class to another.
-	class LinkField < ObjectField
+	# FloatField represents a decimal value.
+	class FloatField < ObjectField
 		def self.instantiate_with_parameters( domain_class, parameters ) #:nodoc:
-			instance = self.new(
-				domain_class, parameters['linked_type'], parameters['name'],
-				parameters['delete_cascade']
-			)
-			if parameters['db_field_name']
-				instance.db_field_name = parameters['db_field_name']
-			end
-			instance
-		end
-
-		def self.instantiation_parameters( fieldElt ) #:nodoc:
-			parameters = super( fieldElt )
-			linked_typeStr = fieldElt.attributes['linked_type']
-			linked_type = DomainObject.get_domain_class_from_string( linked_typeStr )
-			parameters['linked_type'] = linked_type
-			parameters['delete_cascade'] = fieldElt.attributes['delete_cascade'] == 'y'
-			parameters
-		end
-
-		attr_reader :linked_type
-		attr_accessor :delete_cascade
-
-		# [domain_class]    The domain class that this field belongs to.
-		# [linked_type]     The domain class that this field points to.
-		# [name]            The name of this field.
-		# [delete_cascade]  If this is true, deleting the domain object that is
-		#                   linked to will cause this domain object to be deleted
-		#                   as well.
-		def initialize( domain_class, linked_type, name = nil,
-		                delete_cascade = false )
-			unless name
-				linked_type.name =~ /::/
-				name = $' || linked_type.name
-				name = name.camel_case_to_underscore
-			end
-			super( domain_class, name )
-			( @linked_type, @delete_cascade ) = linked_type, delete_cascade
-		end
-
-		def value_from_sql(string) #:nodoc:
-			string != nil ? DomainObjectProxy.new(@linked_type, string.to_i) : nil
+			self.new( domain_class, parameters['name'] )
 		end
 
-		def value_for_sql(value) #:nodoc:
-			if !value
-				"null"
-			elsif value.pk_id
-				value.pk_id
-			else
-				raise( DomainObjectInitError, "Can't commit #{name} without pk_id", 
-				       caller )
-			end
+		def self.value_type #:nodoc:
+			Numeric
 		end
 
-		def verify_non_nil(value, pk_id) #:nodoc:
-			super
-			if @linked_type != @domain_class && pk_id
-				subsetLinkField = @linked_type.class_fields.find { |field|
-					field.class == SubsetLinkField && field.subset_field == @name
-				}
-				if subsetLinkField
-					verify_subset_link_field( subsetLinkField, pk_id )
-				end
-			end
+		def process_before_verify(value) #:nodoc:
+			value = super value
+			value != nil && value != '' ? value.to_f : nil
 		end
 
-		def verify_subset_link_field( subsetLinkField, pk_id )
-			begin
-				prevObj = ObjectStore.get_object_store.get( domain_class, pk_id )
-				prevObjLinkedTo = prevObj.send(name)
-				possiblyMyObj = prevObjLinkedTo.send(subsetLinkField.name)
-				if possiblyMyObj && possiblyMyObj.pk_id == pk_id
-					cantChangeMsg = "You can't change that."
-					raise FieldValueError, cantChangeMsg, caller
-				end
-			rescue DomainObjectNotFoundError
-				# no previous value, so nothing to check for
-			end
+		def value_from_sql(string, lookupLink = true) #:nodoc:
+			string != nil ? string.to_f : nil
 		end
 	end
 
@@ -500,7 +503,7 @@ module Lafcadio
 		end
 	end
 
-	class SubsetLinkField < LinkField #:nodoc:
+	class SubsetDomainObjectField < DomainObjectField #:nodoc:
 		def self.instantiate_with_parameters( domain_class, parameters )
 			self.new( domain_class, parameters['linked_type'],
 			          parameters['subset_field'], parameters['name'] )