lafcadio 0.7.3 → 0.7.4

data/lib/lafcadio.rb

@@ -16,9 +16,8 @@
 # http://lafcadio.rubyforge.org/tutorial.html.
 
 module Lafcadio
-	Version = "0.7.3"
+	Version = "0.7.4"
 
-	require 'lafcadio/dateTime'
 	require 'lafcadio/depend'
 	require 'lafcadio/domain'
 	require 'lafcadio/mock'

data/lib/lafcadio.rb~

@@ -16,9 +16,8 @@
 # http://lafcadio.rubyforge.org/tutorial.html.
 
 module Lafcadio
-	Version = "0.7.2"
+	Version = "0.7.3"
 
-	require 'lafcadio/dateTime'
 	require 'lafcadio/depend'
 	require 'lafcadio/domain'
 	require 'lafcadio/mock'

data/lib/lafcadio/dateTime.rb~

@@ -1,7 +1,7 @@
 module Lafcadio
-	# Represents a specific month in time. With the exception of Month.month_names
-	# (which returns a zero-based array), every usage of the month value assumes
-	# that 1 equals January and 12 equals December.
+	# Represents a specific month in time. With the exception of
+	# Month.month_names (which returns a zero-based array), every usage of the
+	# month value assumes that 1 equals January and 12 equals December.
 	class Month
 		# Returns an array of the full names of months (in English). Note that
 		# "January" is the 0th element, and "December" is the 11th element.

data/lib/lafcadio/depend.rb

@@ -1,5 +1,9 @@
+require 'contxtlservice'
 require 'dbi'
+require 'englishext'
 require 'extensions/all'
 require 'extensions/module'
 require 'log4r'
-require 'runit/testcase'
+require 'month'
+require 'queuehash'
+require 'uscommerce'

data/lib/lafcadio/depend.rb~

@@ -0,0 +1,8 @@
+require 'dbi'
+require 'englishext'
+require 'extensions/all'
+require 'extensions/module'
+require 'log4r'
+require 'month'
+require 'queuehash'
+require 'uscommerce'

data/lib/lafcadio/domain.rb

@@ -98,7 +98,7 @@ module Lafcadio
 
 			def value_from_elt( elt )
 				hash = {}
-				elt.elements.each( English.singular( @name ) ) { |subElt|
+				elt.elements.each( @name.singular ) { |subElt|
 					key = subElt.attributes['key'] == 'true'
 					value = subElt.text.to_s
 					hash[key] = value
@@ -155,9 +155,9 @@ module Lafcadio
 	#    2. Write one XML file per domain class. For example, a User.xml file
 	#       might look like:
 	#         <lafcadio_class_definition name="User">
-	#           <field name="lastName" class="TextField"/>
-	#           <field name="email" class="TextField"/>
-	#           <field name="password" class="TextField"/>
+	#           <field name="lastName" class="StringField"/>
+	#           <field name="email" class="StringField"/>
+	#           <field name="password" class="StringField"/>
 	#           <field name="birthday" class="DateField"/>
 	#         </lafcadio_class_definition>
 	# 2. Overriding DomainObject.get_class_fields. The method should return an Array
@@ -166,10 +166,10 @@ module Lafcadio
 	#      class User < DomainObject 
 	#        def User.get_class_fields 
 	#          fields = [] 
-	#          fields << TextField.new(self, 'firstName') 
-	#          fields << TextField.new(self, 'lastName') 
-	#          fields << TextField.new(self, 'email') 
-	#          fields << TextField.new(self, 'password') 
+	#          fields << StringField.new(self, 'firstName') 
+	#          fields << StringField.new(self, 'lastName') 
+	#          fields << StringField.new(self, 'email') 
+	#          fields << StringField.new(self, 'password') 
 	#          fields << DateField.new(self, 'birthday') 
 	#          fields 
 	#        end 
@@ -188,13 +188,13 @@ module Lafcadio
 	#   john.email = 'john.doe@mail.email.com'
 	#
 	# If your domain class has fields that refer to other domain classes, or even
-	# to another row in the same table, you can use a LinkField to express the
+	# to another row in the same table, you can use a DomainObjectField to express the
 	# relation.
 	#   <lafcadio_class_definition name="Message">
-	#     <field name="subject" class="TextField" />
-	#     <field name="body" class="TextField" />
-	#     <field name="author" class="LinkField" linked_type="User" />
-	#     <field name="recipient" class="LinkField" linked_type="User" />
+	#     <field name="subject" class="StringField" />
+	#     <field name="body" class="StringField" />
+	#     <field name="author" class="DomainObjectField" linked_type="User" />
+	#     <field name="recipient" class="DomainObjectField" linked_type="User" />
 	#     <field name="dateSent" class="DateField" />
 	#   </lafcadio_class_definition>
  	#
@@ -251,6 +251,9 @@ module Lafcadio
 				hash[key] = pk_field
 			}
 		@@sql_primary_keys = Hash.new( 'pk_id' )
+		@@default_field_setup_hashes = Hash.new { |hash, key|
+			hash[key] = Hash.new( {} )
+		}
 
 		COMMIT_ADD = 1
 		COMMIT_EDIT = 2
@@ -282,40 +285,56 @@ module Lafcadio
 			unless class_fields
 				@@class_fields[self] = self.get_class_fields
 				class_fields = @@class_fields[self]
+				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
 			end
 			class_fields
 		end
 
 		def self.create_field( field_class, *args )
 			class_fields = @@class_fields[self]
+			if args.last.is_a? Hash
+				att_hash = args.last
+			else
+				att_hash = @@default_field_setup_hashes[self][field_class].clone
+			end
 			if class_fields.nil?
 				class_fields = [ @@pk_fields[self] ]
 				@@class_fields[self] = class_fields
 			end
-			if field_class == LinkField
-				att_hash = args.last.is_a?( Hash ) ? args.last : {}
+			if field_class == DomainObjectField
 				att_hash['linked_type'] = args.first
 				att_hash['name'] = args[1] if args[1] and !args[1].is_a? Hash
 			else
-				att_hash = args[1] || {}
 				name = args.first
 				att_hash['name'] = name == String ? name : name.to_s
 			end
 			field = field_class.instantiate_with_parameters( self, att_hash )
-			att_hash.each { |field_name, value|
-				setter = field_name + '='
-				field.send( setter, value ) if field.respond_to?( setter )
-			}
-			class_fields << field
+			unless class_fields.any? { |cf| cf.name == field.name }
+				att_hash.each { |field_name, value|
+					setter = field_name + '='
+					field.send( setter, value ) if field.respond_to?( setter )
+				}
+				class_fields << field
+			end
 		end
 		
+		def self.default_field_setup_hash( field_class, hash )
+			@@default_field_setup_hashes[self][field_class] = hash
+		end
+
 		def self.dependent_classes #:nodoc:
 			dependent_classes = {}
 			DomainObject.subclasses.each { |aClass|
 				if aClass != DomainObjectProxy &&
 						(!DomainObject.abstract_subclasses.index(aClass))
 					aClass.class_fields.each { |field|
-						if ( field.is_a?( LinkField ) &&
+						if ( field.is_a?( DomainObjectField ) &&
 						     field.linked_type == self.domain_class )
 							dependent_classes[aClass] = field
 						end
@@ -325,6 +344,13 @@ module Lafcadio
 			dependent_classes
 		end
 		
+		def self.exist?( search_term, field_name = :pk_id )
+			query = Query.infer( self ) { |dobj|
+				dobj.send( field_name ).equals( search_term )
+			}
+			!ObjectStore.get_object_store.get_subset( query ).empty?
+		end
+		
 		def self.first; all.first; end
 
 		def self.get_class_field(fieldName) #:nodoc:
@@ -398,7 +424,7 @@ module Lafcadio
 		
 		def self.get_link_field( linked_domain_class ) # :nodoc:
 			class_fields.find { |field|
-				field.is_a? LinkField and field.linked_type == linked_domain_class
+				field.is_a? DomainObjectField and field.linked_type == linked_domain_class
 			}
 		end
 		
@@ -422,8 +448,10 @@ module Lafcadio
 				if block_given?
 					query = Query.infer( self ) { |dobj| yield( dobj ) }
 					ObjectStore.get_object_store.get_subset( query )
-				else
+				elsif args.size == 1
 					ObjectStore.get_object_store.get( self, *args )
+				else
+					ObjectStore.get_object_store.get_filtered( self.name, *args )
 				end
 			else
 				maybe_field_class_name = method_name.underscore_to_camel_case + 'Field'
@@ -431,7 +459,29 @@ module Lafcadio
 					field_class = Lafcadio.const_get( maybe_field_class_name )
 					create_field( field_class, *args )
 				rescue NameError
-					super
+					singular = method_name.singular
+					if singular
+						maybe_field_class_name = singular.underscore_to_camel_case + 'Field'
+						begin
+							field_class = Lafcadio.const_get( maybe_field_class_name )
+							arg = args.shift
+							until args.empty?
+								next_arg = args.shift
+								if next_arg.is_a? String or next_arg.is_a? Symbol
+									create_field( field_class, arg )
+									arg = next_arg
+								else
+									create_field( field_class, arg, next_arg )
+									arg = args.shift
+								end
+							end
+							create_field( field_class, arg ) unless arg.nil?
+						rescue NameError
+							super
+						end
+					else
+						super
+					end
 				end
 			end
 		end
@@ -504,7 +554,7 @@ module Lafcadio
 				if (!xmlParser.nil? && table_name = xmlParser.table_name)
 					table_name
 				else
-					English.plural( self.basename.camel_case_to_underscore )
+					self.basename.camel_case_to_underscore.plural
 				end
 			end
 		end
@@ -555,6 +605,7 @@ module Lafcadio
 			@error_messages = []
 			@fields = {}
 			@fields_set = []
+			@original_values = OriginalValuesHash.new( @fieldHash )
 			check_fields = LafcadioConfig.new()['checkFields']
 			verify if %w( onInstantiate onAllStates ).include?( check_fields )
 		end
@@ -580,6 +631,11 @@ module Lafcadio
 			end
 			@delete = value
 		end
+		
+		def delete!
+			self.delete = true
+			commit
+		end
 
 		def get_field( field ) #:nodoc:
 			unless @fields_set.include?( field )
@@ -645,7 +701,7 @@ module Lafcadio
 		end
 
 		def set_field( field, value ) #:nodoc:
-			if field.class <= LinkField
+			if field.class <= DomainObjectField
 				if value.class != DomainObjectProxy && value
 					value = DomainObjectProxy.new(value)
 				end
@@ -658,6 +714,11 @@ module Lafcadio
 			@fields_set << field
 		end
 		
+		def update!( changes )
+			changes.each do |sym, value| self.send( sym.to_s + '=', value ); end
+			commit
+		end
+		
 		def verify
 			if ObjectStore.get_object_store.mock?
 				self.class.get_class_fields.each { |field|
@@ -665,6 +726,10 @@ module Lafcadio
 				}
 			end
 		end
+		
+		class OriginalValuesHash < DelegateClass( Hash )
+			def []=( key, val ); raise NoMethodError; end
+		end
 	end
 
 	# Any domain class that is used mostly to map between two other domain 

data/lib/lafcadio/domain.rb~

@@ -98,7 +98,7 @@ module Lafcadio
 
 			def value_from_elt( elt )
 				hash = {}
-				elt.elements.each( English.singular( @name ) ) { |subElt|
+				elt.elements.each( @name.singular ) { |subElt|
 					key = subElt.attributes['key'] == 'true'
 					value = subElt.text.to_s
 					hash[key] = value
@@ -155,9 +155,9 @@ module Lafcadio
 	#    2. Write one XML file per domain class. For example, a User.xml file
 	#       might look like:
 	#         <lafcadio_class_definition name="User">
-	#           <field name="lastName" class="TextField"/>
-	#           <field name="email" class="TextField"/>
-	#           <field name="password" class="TextField"/>
+	#           <field name="lastName" class="StringField"/>
+	#           <field name="email" class="StringField"/>
+	#           <field name="password" class="StringField"/>
 	#           <field name="birthday" class="DateField"/>
 	#         </lafcadio_class_definition>
 	# 2. Overriding DomainObject.get_class_fields. The method should return an Array
@@ -166,10 +166,10 @@ module Lafcadio
 	#      class User < DomainObject 
 	#        def User.get_class_fields 
 	#          fields = [] 
-	#          fields << TextField.new(self, 'firstName') 
-	#          fields << TextField.new(self, 'lastName') 
-	#          fields << TextField.new(self, 'email') 
-	#          fields << TextField.new(self, 'password') 
+	#          fields << StringField.new(self, 'firstName') 
+	#          fields << StringField.new(self, 'lastName') 
+	#          fields << StringField.new(self, 'email') 
+	#          fields << StringField.new(self, 'password') 
 	#          fields << DateField.new(self, 'birthday') 
 	#          fields 
 	#        end 
@@ -188,13 +188,13 @@ module Lafcadio
 	#   john.email = 'john.doe@mail.email.com'
 	#
 	# If your domain class has fields that refer to other domain classes, or even
-	# to another row in the same table, you can use a LinkField to express the
+	# to another row in the same table, you can use a DomainObjectField to express the
 	# relation.
 	#   <lafcadio_class_definition name="Message">
-	#     <field name="subject" class="TextField" />
-	#     <field name="body" class="TextField" />
-	#     <field name="author" class="LinkField" linked_type="User" />
-	#     <field name="recipient" class="LinkField" linked_type="User" />
+	#     <field name="subject" class="StringField" />
+	#     <field name="body" class="StringField" />
+	#     <field name="author" class="DomainObjectField" linked_type="User" />
+	#     <field name="recipient" class="DomainObjectField" linked_type="User" />
 	#     <field name="dateSent" class="DateField" />
 	#   </lafcadio_class_definition>
  	#
@@ -251,6 +251,9 @@ module Lafcadio
 				hash[key] = pk_field
 			}
 		@@sql_primary_keys = Hash.new( 'pk_id' )
+		@@default_field_setup_hashes = Hash.new { |hash, key|
+			hash[key] = Hash.new( {} )
+		}
 
 		COMMIT_ADD = 1
 		COMMIT_EDIT = 2
@@ -258,11 +261,15 @@ module Lafcadio
 
 		include DomainComparable
 		
+		def self.[]( pk_id ); get( pk_id ); end
+		
 		def self.abstract_subclasses #:nodoc:
 			require 'lafcadio/domain'
 			[ MapObject ]
 		end
 		
+		def self.all; ObjectStore.get_object_store.get_all( self ); end
+		
 		# Returns an array of all fields defined for this class and all concrete
 		# superclasses.
 		def self.all_fields
@@ -278,22 +285,32 @@ module Lafcadio
 			unless class_fields
 				@@class_fields[self] = self.get_class_fields
 				class_fields = @@class_fields[self]
+				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
 			end
 			class_fields
 		end
 
 		def self.create_field( field_class, *args )
 			class_fields = @@class_fields[self]
+			if args.last.is_a? Hash
+				att_hash = args.last
+			else
+				att_hash = @@default_field_setup_hashes[self][field_class].clone
+			end
 			if class_fields.nil?
 				class_fields = [ @@pk_fields[self] ]
 				@@class_fields[self] = class_fields
 			end
-			if field_class == LinkField
-				att_hash = args.last.is_a?( Hash ) ? args.last : {}
+			if field_class == DomainObjectField
 				att_hash['linked_type'] = args.first
 				att_hash['name'] = args[1] if args[1] and !args[1].is_a? Hash
 			else
-				att_hash = args[1] || {}
 				name = args.first
 				att_hash['name'] = name == String ? name : name.to_s
 			end
@@ -305,13 +322,17 @@ module Lafcadio
 			class_fields << field
 		end
 		
+		def self.default_field_setup_hash( field_class, hash )
+			@@default_field_setup_hashes[self][field_class] = hash
+		end
+
 		def self.dependent_classes #:nodoc:
 			dependent_classes = {}
 			DomainObject.subclasses.each { |aClass|
 				if aClass != DomainObjectProxy &&
 						(!DomainObject.abstract_subclasses.index(aClass))
 					aClass.class_fields.each { |field|
-						if ( field.is_a?( LinkField ) &&
+						if ( field.is_a?( DomainObjectField ) &&
 						     field.linked_type == self.domain_class )
 							dependent_classes[aClass] = field
 						end
@@ -320,6 +341,15 @@ module Lafcadio
 			}
 			dependent_classes
 		end
+		
+		def self.exist?( search_term, field_name = :pk_id )
+			query = Query.infer( self ) { |dobj|
+				dobj.send( field_name ).equals( search_term )
+			}
+			!ObjectStore.get_object_store.get_subset( query ).empty?
+		end
+		
+		def self.first; all.first; end
 
 		def self.get_class_field(fieldName) #:nodoc:
 			field = nil
@@ -392,7 +422,7 @@ module Lafcadio
 		
 		def self.get_link_field( linked_domain_class ) # :nodoc:
 			class_fields.find { |field|
-				field.is_a? LinkField and field.linked_type == linked_domain_class
+				field.is_a? DomainObjectField and field.linked_type == linked_domain_class
 			}
 		end
 		
@@ -408,14 +438,18 @@ module Lafcadio
 		  (self != DomainObject && abstract_subclasses.index(self).nil?)
 		end
 		
+		def self.last; all.last; end
+		
 		def self.method_missing( methodId, *args ) #:nodoc:
 			method_name = methodId.id2name
 			if method_name == 'get'
 				if block_given?
 					query = Query.infer( self ) { |dobj| yield( dobj ) }
 					ObjectStore.get_object_store.get_subset( query )
-				else
+				elsif args.size == 1
 					ObjectStore.get_object_store.get( self, *args )
+				else
+					ObjectStore.get_object_store.get_filtered( self.name, *args )
 				end
 			else
 				maybe_field_class_name = method_name.underscore_to_camel_case + 'Field'
@@ -423,10 +457,34 @@ module Lafcadio
 					field_class = Lafcadio.const_get( maybe_field_class_name )
 					create_field( field_class, *args )
 				rescue NameError
-					super
+					singular = method_name.singular
+					if singular
+						maybe_field_class_name = singular.underscore_to_camel_case + 'Field'
+						begin
+							field_class = Lafcadio.const_get( maybe_field_class_name )
+							arg = args.shift
+							until args.empty?
+								next_arg = args.shift
+								if next_arg.is_a? String or next_arg.is_a? Symbol
+									create_field( field_class, arg )
+									arg = next_arg
+								else
+									create_field( field_class, arg, next_arg )
+									arg = args.shift
+								end
+							end
+							create_field( field_class, arg ) unless arg.nil?
+						rescue NameError
+							super
+						end
+					else
+						super
+					end
 				end
 			end
 		end
+		
+		def self.only; all.only; end
 
 		def self.domain_class #:nodoc:
 			self
@@ -494,7 +552,7 @@ module Lafcadio
 				if (!xmlParser.nil? && table_name = xmlParser.table_name)
 					table_name
 				else
-					English.plural( self.basename.camel_case_to_underscore )
+					self.basename.camel_case_to_underscore.plural
 				end
 			end
 		end
@@ -545,6 +603,7 @@ module Lafcadio
 			@error_messages = []
 			@fields = {}
 			@fields_set = []
+			@original_values = OriginalValuesHash.new( @fieldHash )
 			check_fields = LafcadioConfig.new()['checkFields']
 			verify if %w( onInstantiate onAllStates ).include?( check_fields )
 		end
@@ -570,6 +629,11 @@ module Lafcadio
 			end
 			@delete = value
 		end
+		
+		def delete!
+			self.delete = true
+			commit
+		end
 
 		def get_field( field ) #:nodoc:
 			unless @fields_set.include?( field )
@@ -603,12 +667,15 @@ 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 )
+				new_symbol = ( 'get_' + methId.id2name ).to_sym
+				object_store = ObjectStore.get_object_store
+				if object_store.respond_to? new_symbol
+					args = [ self ].concat args
+					object_store.send( 'get_' + methId.id2name, *args )
+				else
+					super( methId, *args )
+				end
 			end
 		end
 
@@ -632,7 +699,7 @@ module Lafcadio
 		end
 
 		def set_field( field, value ) #:nodoc:
-			if field.class <= LinkField
+			if field.class <= DomainObjectField
 				if value.class != DomainObjectProxy && value
 					value = DomainObjectProxy.new(value)
 				end
@@ -645,6 +712,11 @@ module Lafcadio
 			@fields_set << field
 		end
 		
+		def update!( changes )
+			changes.each do |sym, value| self.send( sym.to_s + '=', value ); end
+			commit
+		end
+		
 		def verify
 			if ObjectStore.get_object_store.mock?
 				self.class.get_class_fields.each { |field|
@@ -652,6 +724,10 @@ module Lafcadio
 				}
 			end
 		end
+		
+		class OriginalValuesHash < DelegateClass( Hash )
+			def []=( key, val ); raise NoMethodError; end
+		end
 	end
 
 	# Any domain class that is used mostly to map between two other domain