lafcadio 0.7.3 → 0.7.4

data/lib/lafcadio/objectStore.rb

@@ -1,4 +1,5 @@
 require 'dbi'
+require 'lafcadio/depend'
 require 'lafcadio/domain'
 require 'lafcadio/query'
 require 'lafcadio/util'
@@ -11,9 +12,10 @@ module Lafcadio
 
 		attr_reader :commit_type, :db_object
 
-		def initialize(db_object, dbBridge)
+		def initialize(db_object, dbBridge, cache)
 			@db_object = db_object
 			@dbBridge = dbBridge
+			@cache = cache
 			@objectStore = ObjectStore.get_object_store
 			@commit_type = nil
 		end
@@ -28,6 +30,7 @@ module Lafcadio
 			unless @db_object.pk_id
 				@db_object.pk_id = @dbBridge.last_pk_id_inserted
 			end
+			@cache.update_after_commit self
 			@db_object.post_commit_trigger
 		end
 
@@ -129,12 +132,8 @@ module Lafcadio
 		
 		def group_query( query )
 			execute_select( query.to_sql )[0].collect { |val|
-				if query.field_name != query.domain_class.sql_primary_key_name
-					a_field = query.domain_class.get_field( query.field_name )
-					a_field.value_from_sql( val )
-				else
-					val.to_i
-				end
+				a_field = query.domain_class.get_field( query.field_name )
+				a_field.value_from_sql( val )
 			}
 		end
 
@@ -153,7 +152,7 @@ module Lafcadio
 		end
 	end
 
-	class DbConnection < ContextualService
+	class DbConnection < ContextualService::Service
 		@@connectionClass = DBI
 		@@db_name = nil
 		@@dbh = nil
@@ -206,7 +205,7 @@ module Lafcadio
 	end
 
 	# The DomainObjectProxy is used when retrieving domain objects that are 
-	# linked to other domain objects with LinkFields. In terms of +domain_class+
+	# linked to other domain objects with DomainObjectFields. In terms of +domain_class+
 	# and 
 	# +pk_id+, a DomainObjectProxy instance looks to the outside world like the 
 	# domain object it's supposed to represent. It only retrieves its domain 
@@ -405,7 +404,7 @@ module Lafcadio
 	# Domain classes can be set to fire triggers either before or after commits.
 	# Since these triggers are executed in Ruby, they're easy to test. See
 	# DomainObject#pre_commit_trigger and DomainObject#post_commit_trigger for more.
-	class ObjectStore < ContextualService
+	class ObjectStore < ContextualService::Service
 		def self.set_db_name(dbName) #:nodoc:
 			DbConnection.set_db_name dbName
 		end
@@ -546,9 +545,8 @@ module Lafcadio
 			end
 
 			def commit( db_object )
-				committer = Committer.new db_object, @dbBridge
+				committer = Committer.new db_object, @dbBridge, self
 				committer.execute
-				update_after_commit( committer )
 			end
 
 			# Flushes a domain object.
@@ -704,9 +702,7 @@ module Lafcadio
 				begin
 					dispatch_get_singular
 				rescue CouldntMatchDomainClassError
-					domain_class_name = English.singular(
-						camel_case_method_name_after_get
-					)
+					domain_class_name = camel_case_method_name_after_get.singular
 					begin
 						@domain_class =
 								DomainObject.get_domain_class_from_string( domain_class_name )

data/lib/lafcadio/objectStore.rb~

@@ -1,4 +1,5 @@
 require 'dbi'
+require 'lafcadio/depend'
 require 'lafcadio/domain'
 require 'lafcadio/query'
 require 'lafcadio/util'
@@ -11,9 +12,10 @@ module Lafcadio
 
 		attr_reader :commit_type, :db_object
 
-		def initialize(db_object, dbBridge)
+		def initialize(db_object, dbBridge, cache)
 			@db_object = db_object
 			@dbBridge = dbBridge
+			@cache = cache
 			@objectStore = ObjectStore.get_object_store
 			@commit_type = nil
 		end
@@ -28,6 +30,7 @@ module Lafcadio
 			unless @db_object.pk_id
 				@db_object.pk_id = @dbBridge.last_pk_id_inserted
 			end
+			@cache.update_after_commit self
 			@db_object.post_commit_trigger
 		end
 
@@ -129,12 +132,8 @@ module Lafcadio
 		
 		def group_query( query )
 			execute_select( query.to_sql )[0].collect { |val|
-				if query.field_name != query.domain_class.sql_primary_key_name
-					a_field = query.domain_class.get_field( query.field_name )
-					a_field.value_from_sql( val )
-				else
-					val.to_i
-				end
+				a_field = query.domain_class.get_field( query.field_name )
+				a_field.value_from_sql( val )
 			}
 		end
 
@@ -206,7 +205,7 @@ module Lafcadio
 	end
 
 	# The DomainObjectProxy is used when retrieving domain objects that are 
-	# linked to other domain objects with LinkFields. In terms of +domain_class+
+	# linked to other domain objects with DomainObjectFields. In terms of +domain_class+
 	# and 
 	# +pk_id+, a DomainObjectProxy instance looks to the outside world like the 
 	# domain object it's supposed to represent. It only retrieves its domain 
@@ -450,7 +449,9 @@ module Lafcadio
 			domain_class = DomainObject.get_domain_class_from_string(
 				domain_class_name
 			)
-			fieldName = get_field_name( searchTerm ) unless fieldName
+			unless fieldName
+				fieldName = domain_class.get_link_field( searchTerm.domain_class ).name
+			end
 			get_subset( Query::Equals.new( fieldName, searchTerm, domain_class ) )
 		end
 
@@ -544,9 +545,8 @@ module Lafcadio
 			end
 
 			def commit( db_object )
-				committer = Committer.new db_object, @dbBridge
+				committer = Committer.new db_object, @dbBridge, self
 				committer.execute
-				update_after_commit( committer )
 			end
 
 			# Flushes a domain object.
@@ -702,9 +702,7 @@ module Lafcadio
 				begin
 					dispatch_get_singular
 				rescue CouldntMatchDomainClassError
-					domain_class_name = English.singular(
-						camel_case_method_name_after_get
-					)
+					domain_class_name = camel_case_method_name_after_get.singular
 					begin
 						@domain_class =
 								DomainObject.get_domain_class_from_string( domain_class_name )

data/lib/lafcadio/query.rb

@@ -274,7 +274,7 @@ module Lafcadio
 			end
 
 			def to_sql
-				if ( get_field.kind_of?( LinkField ) &&
+				if ( get_field.kind_of?( DomainObjectField ) &&
 				     !@searchTerm.respond_to?( :pk_id ) )
 					search_val = @searchTerm.to_s
 				else
@@ -348,21 +348,39 @@ module Lafcadio
 			end
 		end
 
-		class DomainObjectImpostor #:nodoc:
-			attr_reader :domain_class
-		
-			def initialize( domain_class )
-				@domain_class = domain_class
-			end
+		module DomainObjectImpostor #:nodoc:
+			@@impostor_classes = {}
 			
-			def method_missing( methId, *args )
-				fieldName = methId.id2name
-				begin
-					classField = @domain_class.get_field( fieldName )
-					ObjectFieldImpostor.new( self, classField )
-				rescue MissingError
-					super( methId, *args )
+			def self.impostor( domain_class )
+				unless @@impostor_classes[domain_class]
+					i_class = Class.new
+					i_class.module_eval <<-CLASS_DEF
+						attr_reader :domain_class
+						
+						def initialize; @domain_class = #{ domain_class.name }; end
+						
+						def method_missing( methId, *args )
+							fieldName = methId.id2name
+							begin
+								classField = self.domain_class.get_field( fieldName )
+								ObjectFieldImpostor.new( self, classField )
+							rescue MissingError
+								super( methId, *args )
+							end
+						end
+						
+						#{ domain_class.name }.class_fields.each do |class_field|
+							begin
+								undef_method class_field.name.to_sym
+							rescue NameError
+								# not defined globally or in an included Module, skip it
+							end
+						end
+					CLASS_DEF
+					@@impostor_classes[domain_class] = i_class
 				end
+				i_class = @@impostor_classes[domain_class]
+				i_class.new
 			end
 		end
 		
@@ -416,7 +434,13 @@ module Lafcadio
 			end
 
 			def to_sql
-				"#{ db_field_name } in (#{ @searchTerm.join(', ') })"
+				if get_field.is_a?( StringField )
+					quoted = @searchTerm.map do |str| "'#{ str }'"; end
+					end_clause = quoted.join ', '
+				else
+					end_clause = @searchTerm.join ', '
+				end
+				"#{ db_field_name } in (#{ end_clause })"
 			end
 		end
 		
@@ -439,7 +463,7 @@ module Lafcadio
 			end
 			
 			def execute
-				impostor = DomainObjectImpostor.new( @domain_class )
+				impostor = DomainObjectImpostor.impostor( @domain_class )
 				condition = @action.call( impostor ).to_condition
 				query = Query.new( @domain_class, condition )
 			end
@@ -613,6 +637,8 @@ module Lafcadio
 											 @domainObjectImpostor.domain_class )
 			end
 			
+			def nil?; equals( nil ); end
+			
 			def to_condition
 				if @class_field.instance_of?( BooleanField )
 					Query::Equals.new( @field_name, true,

data/lib/lafcadio/query.rb~

@@ -274,7 +274,7 @@ module Lafcadio
 			end
 
 			def to_sql
-				if ( get_field.kind_of?( LinkField ) &&
+				if ( get_field.kind_of?( DomainObjectField ) &&
 				     !@searchTerm.respond_to?( :pk_id ) )
 					search_val = @searchTerm.to_s
 				else
@@ -298,17 +298,19 @@ module Lafcadio
 			AND = 1
 			OR  = 2
 			
-			def initialize(*conditions)
-				if( [ AND, OR ].index(conditions.last) )
-					@compound_type = conditions.last
-					conditions.pop
+			def initialize( *args )
+				if( [ AND, OR ].index( args.last) )
+					@compound_type = args.last
+					args.pop
 				else
 					@compound_type = AND
 				end
-				@conditions = conditions
-				@domain_class = conditions[0].domain_class
+				@conditions = args.map { |arg|
+					arg.respond_to?( :to_condition ) ? arg.to_condition : arg
+				}
+				@domain_class = @conditions[0].domain_class
 			end
-			
+
 			def implied_by?( other_condition )
 				@compound_type == OR && @conditions.any? { |cond|
 					cond.implies?( other_condition )
@@ -346,21 +348,32 @@ module Lafcadio
 			end
 		end
 
-		class DomainObjectImpostor #:nodoc:
-			attr_reader :domain_class
-		
-			def initialize( domain_class )
-				@domain_class = domain_class
-			end
+		module DomainObjectImpostor #:nodoc:
+			@@impostor_classes = {}
 			
-			def method_missing( methId, *args )
-				fieldName = methId.id2name
-				begin
-					classField = @domain_class.get_field( fieldName )
-					ObjectFieldImpostor.new( self, classField )
-				rescue MissingError
-					super( methId, *args )
+			def self.impostor( domain_class )
+				unless @@impostor_classes[domain_class]
+					i_class = Class.new
+					i_class.module_eval {
+						attr_reader :domain_class
+						
+						def initialize; @domain_class = domain_class; end
+						
+						def method_missing( methId, *args )
+							fieldName = methId.id2name
+							begin
+								classField = @@domain_class.get_field( fieldName )
+								ObjectFieldImpostor.new( self, classField )
+							rescue MissingError
+								super( methId, *args )
+							end
+						end
+					}
+					@@impostor_classes[domain_class] = i_class
 				end
+				i_class = @@impostor_classes[domain_class]
+puts i_class.new.domain_class.name
+				i_class.new
 			end
 		end
 		
@@ -414,7 +427,13 @@ module Lafcadio
 			end
 
 			def to_sql
-				"#{ db_field_name } in (#{ @searchTerm.join(', ') })"
+				if get_field.is_a?( StringField )
+					quoted = @searchTerm.map do |str| "'#{ str }'"; end
+					end_clause = quoted.join ', '
+				else
+					end_clause = @searchTerm.join ', '
+				end
+				"#{ db_field_name } in (#{ end_clause })"
 			end
 		end
 		
@@ -437,7 +456,7 @@ module Lafcadio
 			end
 			
 			def execute
-				impostor = DomainObjectImpostor.new( @domain_class )
+				impostor = DomainObjectImpostor.impostor( @domain_class )
 				condition = @action.call( impostor ).to_condition
 				query = Query.new( @domain_class, condition )
 			end
@@ -611,6 +630,8 @@ module Lafcadio
 											 @domainObjectImpostor.domain_class )
 			end
 			
+			def nil?; equals( nil ); end
+			
 			def to_condition
 				if @class_field.instance_of?( BooleanField )
 					Query::Equals.new( @field_name, true,

data/lib/lafcadio/schema.rb

@@ -3,7 +3,7 @@ require 'lafcadio/objectField'
 module Lafcadio
 	class CreateTableStatement #:nodoc:
 		@@simple_field_clauses = {
-			DecimalField => 'float', DateField => 'date', BooleanField => 'bool',
+			FloatField => 'float', DateField => 'date', BooleanField => 'bool',
 			TimeStampField => 'timestamp', DateTimeField => 'datetime'
 		}
 	
@@ -42,11 +42,11 @@ module Lafcadio
 					"'#{ enumValue }'"
 				}
 				"enum( #{ singleQuotedValues.join( ', ' ) } )"
-			elsif ( field.class <= TextField || field.class <= TextListField )
+			elsif ( field.class <= StringField || field.class <= TextListField )
 				'varchar(255)'
-			elsif ( field.class <= LinkField || field.class <= IntegerField )
+			elsif ( field.class <= DomainObjectField || field.class <= IntegerField )
 				'int'
-			elsif ( field.class <= DecimalField )
+			elsif ( field.class <= FloatField )
 				'float(10, 2)'
 			elsif ( field.class <= BlobField )
 				'blob'

data/lib/lafcadio/schema.rb~

@@ -0,0 +1,56 @@
+require 'lafcadio/objectField'
+
+module Lafcadio
+	class CreateTableStatement #:nodoc:
+		@@simple_field_clauses = {
+			FloatField => 'float', DateField => 'date', BooleanField => 'bool',
+			TimeStampField => 'timestamp', TimeField => 'datetime'
+		}
+	
+		def initialize( domain_class )
+			@domain_class = domain_class
+		end
+		
+		def definition_terms( field )
+			definitionTerms = []
+			definitionTerms << field.db_field_name
+			definitionTerms << type_clause( field )
+			definitionTerms << 'not null' if field.not_null
+			definitionTerms.join( ' ' )
+		end
+
+		def to_sql
+			createDefinitions = []
+			createDefinitions << "#{ @domain_class.sql_primary_key_name } " +
+													 "int not null auto_increment"
+			createDefinitions << "primary key (#{ @domain_class.sql_primary_key_name })"
+			@domain_class.class_fields.each { |field|
+				createDefinitions << definition_terms( field )
+			}
+			<<-SQL
+	create table #{ @domain_class.table_name } (
+		#{ createDefinitions.join(",\n  ") }
+	);
+			SQL
+		end
+		
+		def type_clause( field )
+			if ( type_clause = @@simple_field_clauses[field.class] )
+				type_clause
+			elsif ( field.class <= EnumField )
+				singleQuotedValues = field.enums.keys.collect! { |enumValue|
+					"'#{ enumValue }'"
+				}
+				"enum( #{ singleQuotedValues.join( ', ' ) } )"
+			elsif ( field.class <= StringField || field.class <= TextListField )
+				'varchar(255)'
+			elsif ( field.class <= DomainObjectField || field.class <= IntegerField )
+				'int'
+			elsif ( field.class <= FloatField )
+				'float(10, 2)'
+			elsif ( field.class <= BlobField )
+				'blob'
+			end
+		end
+	end
+end