lafcadio 0.7.1 → 0.7.2

data/lib/lafcadio.rb

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

data/lib/lafcadio.rb~

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

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/dateTime.rb~

@@ -0,0 +1,93 @@
+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.
+	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.
+		def Month.month_names
+			[ "January", "February", "March", "April", "May", "June", "July",
+			  "August", "September", "October", "November", "December" ]
+		end
+
+		include Comparable
+
+		attr_reader :month, :year
+
+		# A new month can be set to a specific +month+ and +year+, or you can call 
+		# Month.new with no arguments to receive the current month.
+		def initialize( year = nil, month = nil )
+			require 'date'
+			if month.nil? || year.nil?
+				date = Date.today
+				month = date.mon unless month
+				year = date.year unless year
+			end
+			fail "invalid month" if month < 1 || month > 12
+			@month = month
+			@year = year
+		end
+
+		# Returns a new Month that is +amountToAdd+ months later.
+		def +( amountToAdd )
+			( fullYears, remainingMonths ) = amountToAdd.divmod( 12 )
+			resultYear = @year + fullYears
+			resultMonth = @month + remainingMonths
+			if resultMonth > 12
+				resultMonth -= 12
+				resultYear += 1
+			end
+			Month.new( resultYear, resultMonth )
+		end
+		
+		# Returns a new Month that is +amountToSubtract+ months earlier.
+		def -(amountToSubtract)
+			self + (-amountToSubtract)
+		end
+		
+		# Compare this Month to another Month.
+		def <=>(anOther)
+			if @year == anOther.year
+				@month <=> anOther.month
+			else
+				@year <=> anOther.year
+			end
+		end
+
+		# Returns the last Date of the month.
+		def end_date
+			self.next.start_date - 1
+		end
+
+		# Is this Month equal to +anOther+? +anOther+ must be another Month of the
+		# same value.
+		def eql?(anOther)
+			self == anOther
+		end
+		
+		# Calculate a hash value for this Month.
+		def hash
+			"#{@year}#{@month}".to_i
+		end
+
+		# Returns the next Month.
+		def next
+			self + 1
+		end
+		
+		# Returns the previous Month.
+		def prev
+			self - 1
+		end
+		
+		# Returns the first Date of the month.
+		def start_date
+			Date.new( @year, @month, 1 )
+		end
+		
+		# Returns a string of the format "January 2001".
+		def to_s
+			Month.month_names[@month-1][0..2] + " " + @year.to_s
+		end
+	end
+end

data/lib/lafcadio/domain.rb

@@ -258,11 +258,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
@@ -282,13 +286,21 @@ module Lafcadio
 			class_fields
 		end
 
-		def self.create_field( field_class, name, att_hash )
+		def self.create_field( field_class, *args )
 			class_fields = @@class_fields[self]
 			if class_fields.nil?
 				class_fields = [ @@pk_fields[self] ]
 				@@class_fields[self] = class_fields
 			end
-			att_hash['name'] = name
+			if field_class == LinkField
+				att_hash = args.last.is_a?( Hash ) ? args.last : {}
+				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 + '='
@@ -312,6 +324,8 @@ module Lafcadio
 			}
 			dependent_classes
 		end
+		
+		def self.first; all.first; end
 
 		def self.get_class_field(fieldName) #:nodoc:
 			field = nil
@@ -330,6 +344,8 @@ module Lafcadio
 		def self.get_class_fields
 			if self.methods( false ).include?( 'get_class_fields' )
 				[ @@pk_fields[ self ] ]
+			elsif abstract_subclasses.include?( self )
+				[]
 			else
 				xmlParser = try_load_xml_parser
 				if xmlParser
@@ -380,6 +396,12 @@ module Lafcadio
 			end
 		end
 		
+		def self.get_link_field( linked_domain_class ) # :nodoc:
+			class_fields.find { |field|
+				field.is_a? LinkField and field.linked_type == linked_domain_class
+			}
+		end
+		
 		def self.inherited(subclass) #:nodoc:
 			@@subclassHash[subclass] = true
 		end
@@ -392,12 +414,29 @@ 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
-			maybe_field_class_name = method_name.underscore_to_camel_case + 'Field'
-			field_class = Lafcadio.const_get( maybe_field_class_name )
-			create_field( field_class, args[0], args[1] || {} )
+			if method_name == 'get'
+				if block_given?
+					query = Query.infer( self ) { |dobj| yield( dobj ) }
+					ObjectStore.get_object_store.get_subset( query )
+				else
+					ObjectStore.get_object_store.get( self, *args )
+				end
+			else
+				maybe_field_class_name = method_name.underscore_to_camel_case + 'Field'
+				begin
+					field_class = Lafcadio.const_get( maybe_field_class_name )
+					create_field( field_class, *args )
+				rescue NameError
+					super
+				end
+			end
 		end
+		
+		def self.only; all.only; end
 
 		def self.domain_class #:nodoc:
 			self
@@ -411,10 +450,9 @@ module Lafcadio
 					require "#{ domainDir }#{ fileName }"
 				end
 			}
-			if (domainFilesStr = LafcadioConfig.new['domainFiles'])
-				domainFilesStr.split(',').each { |domainFile|
-					require domainFile
-				}
+			if (domainFiles = LafcadioConfig.new['domainFiles'])
+				domainFiles = domainFiles.split( ',' ) if domainFiles.is_a? String
+				domainFiles.each { |domainFile| require domainFile }
 			end
 		end
 
@@ -466,9 +504,7 @@ module Lafcadio
 				if (!xmlParser.nil? && table_name = xmlParser.table_name)
 					table_name
 				else
-					table_name = self.basename
-					table_name[0] = table_name[0..0].downcase
-					English.plural table_name
+					English.plural( self.basename.camel_case_to_underscore )
 				end
 			end
 		end
@@ -506,6 +542,15 @@ module Lafcadio
 		# If you're creating mock objects for unit tests, you can explicitly set 
 		# the +pk_id+ to represent objects that already exist in the database.
 		def initialize(fieldHash)
+			if fieldHash.respond_to? :keys
+				fieldHash.keys.each { |key|
+					begin
+						self.class.get_field( key )
+					rescue MissingError
+						raise ArgumentError, "Invalid field name #{ key }"
+					end
+				}
+			end
 			@fieldHash = fieldHash
 			@error_messages = []
 			@fields = {}
@@ -568,12 +613,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
 
@@ -611,9 +659,11 @@ module Lafcadio
 		end
 		
 		def verify
-			self.class.get_class_fields.each { |field|
-				field.verify( self.send( field.name ), self.pk_id )
-			}
+			if ObjectStore.get_object_store.mock?
+				self.class.get_class_fields.each { |field|
+					field.verify( self.send( field.name ), self.pk_id )
+				}
+			end
 		end
 	end
 

data/lib/lafcadio/domain.rb~

@@ -262,7 +262,7 @@ module Lafcadio
 			require 'lafcadio/domain'
 			[ MapObject ]
 		end
-
+		
 		# Returns an array of all fields defined for this class and all concrete
 		# superclasses.
 		def self.all_fields
@@ -282,13 +282,21 @@ module Lafcadio
 			class_fields
 		end
 
-		def self.create_field( field_class, name, att_hash )
+		def self.create_field( field_class, *args )
 			class_fields = @@class_fields[self]
 			if class_fields.nil?
 				class_fields = [ @@pk_fields[self] ]
 				@@class_fields[self] = class_fields
 			end
-			att_hash['name'] = name
+			if field_class == LinkField
+				att_hash = args.last.is_a?( Hash ) ? args.last : {}
+				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 + '='
@@ -330,6 +338,8 @@ module Lafcadio
 		def self.get_class_fields
 			if self.methods( false ).include?( 'get_class_fields' )
 				[ @@pk_fields[ self ] ]
+			elsif abstract_subclasses.include?( self )
+				[]
 			else
 				xmlParser = try_load_xml_parser
 				if xmlParser
@@ -380,6 +390,12 @@ module Lafcadio
 			end
 		end
 		
+		def self.get_link_field( linked_domain_class ) # :nodoc:
+			class_fields.find { |field|
+				field.is_a? LinkField and field.linked_type == linked_domain_class
+			}
+		end
+		
 		def self.inherited(subclass) #:nodoc:
 			@@subclassHash[subclass] = true
 		end
@@ -394,10 +410,22 @@ module Lafcadio
 		
 		def self.method_missing( methodId, *args ) #:nodoc:
 			method_name = methodId.id2name
-			maybe_field_class_name = ( method_name.gsub( /^(.)/ ) { $&.upcase } ) +
-			                         'Field'
-			field_class = Lafcadio.const_get( maybe_field_class_name )
-			create_field( field_class, args[0], args[1] || {} )
+			if method_name == 'get'
+				if block_given?
+					query = Query.infer( self ) { |dobj| yield( dobj ) }
+					ObjectStore.get_object_store.get_subset( query )
+				else
+					ObjectStore.get_object_store.get( self, *args )
+				end
+			else
+				maybe_field_class_name = method_name.underscore_to_camel_case + 'Field'
+				begin
+					field_class = Lafcadio.const_get( maybe_field_class_name )
+					create_field( field_class, *args )
+				rescue NameError
+					super
+				end
+			end
 		end
 
 		def self.domain_class #:nodoc:
@@ -412,10 +440,9 @@ module Lafcadio
 					require "#{ domainDir }#{ fileName }"
 				end
 			}
-			if (domainFilesStr = LafcadioConfig.new['domainFiles'])
-				domainFilesStr.split(',').each { |domainFile|
-					require domainFile
-				}
+			if (domainFiles = LafcadioConfig.new['domainFiles'])
+				domainFiles = domainFiles.split( ',' ) if domainFiles.is_a? String
+				domainFiles.each { |domainFile| require domainFile }
 			end
 		end
 
@@ -467,9 +494,7 @@ module Lafcadio
 				if (!xmlParser.nil? && table_name = xmlParser.table_name)
 					table_name
 				else
-					table_name = self.basename
-					table_name[0] = table_name[0..0].downcase
-					English.plural table_name
+					English.plural( self.basename.camel_case_to_underscore )
 				end
 			end
 		end
@@ -507,6 +532,15 @@ module Lafcadio
 		# If you're creating mock objects for unit tests, you can explicitly set 
 		# the +pk_id+ to represent objects that already exist in the database.
 		def initialize(fieldHash)
+			if fieldHash.respond_to? :keys
+				fieldHash.keys.each { |key|
+					begin
+						self.class.get_field( key )
+					rescue MissingError
+						raise ArgumentError, "Invalid field name #{ key }"
+					end
+				}
+			end
 			@fieldHash = fieldHash
 			@error_messages = []
 			@fields = {}
@@ -612,9 +646,11 @@ module Lafcadio
 		end
 		
 		def verify
-			self.class.get_class_fields.each { |field|
-				field.verify( self.send( field.name ), self.pk_id )
-			}
+			if ObjectStore.get_object_store.mock?
+				self.class.get_class_fields.each { |field|
+					field.verify( self.send( field.name ), self.pk_id )
+				}
+			end
 		end
 	end
 

data/lib/lafcadio/mock.rb

@@ -40,12 +40,14 @@ module Lafcadio
 					objects << dbObj
 				end
 			}
-			if (range = query.limit)
-				objects = objects[0..(range.last - range.first)]
-			end
 			if ( order_by = query.order_by )
 				objects = objects.sort_by { |dobj| dobj.send( order_by ) }
 				objects.reverse! if query.order_by_order == Query::DESC
+			else
+				objects = objects.sort_by { |dobj| dobj.pk_id }
+			end
+			if (range = query.limit)
+				objects = objects[0..(range.last - range.first)]
 			end
 			objects
 		end
@@ -94,5 +96,9 @@ module Lafcadio
 		def initialize # :nodoc:
 			super( MockDbBridge.new )
 		end
+		
+		def mock? # :nodoc:
+			true
+		end
 	end
 end

data/lib/lafcadio/mock.rb~

@@ -40,13 +40,13 @@ module Lafcadio
 					objects << dbObj
 				end
 			}
-			if (range = query.limit)
-				objects = objects[0..(range.last - range.first)]
-			end
 			if ( order_by = query.order_by )
 				objects = objects.sort_by { |dobj| dobj.send( order_by ) }
 				objects.reverse! if query.order_by_order == Query::DESC
 			end
+			if (range = query.limit)
+				objects = objects[0..(range.last - range.first)]
+			end
 			objects
 		end
 		
@@ -94,5 +94,9 @@ module Lafcadio
 		def initialize # :nodoc:
 			super( MockDbBridge.new )
 		end
+		
+		def mock? # :nodoc:
+			true
+		end
 	end
 end

data/lib/lafcadio/objectField.rb

@@ -390,9 +390,16 @@ module Lafcadio
 
 	# 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
+
 		def self.instantiate_with_parameters( domain_class, parameters ) #:nodoc:
+			linked_type = parameters['linked_type']
 			instance = self.new(
-				domain_class, parameters['linked_type'], parameters['name'],
+				domain_class, linked_type,
+				parameters['name'] || auto_name( linked_type ),
 				parameters['delete_cascade']
 			)
 			if parameters['db_field_name']
@@ -421,11 +428,7 @@ module Lafcadio
 		#                   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
+			name = self.class.auto_name( linked_type ) unless name
 			super( domain_class, name )
 			( @linked_type, @delete_cascade ) = linked_type, delete_cascade
 		end

data/lib/lafcadio/objectField.rb~

@@ -424,7 +424,7 @@ module Lafcadio
 			unless name
 				linked_type.name =~ /::/
 				name = $' || linked_type.name
-				name = name.decapitalize
+				name = name.camel_case_to_underscore
 			end
 			super( domain_class, name )
 			( @linked_type, @delete_cascade ) = linked_type, delete_cascade

data/lib/lafcadio/objectStore.rb

@@ -450,7 +450,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
 
@@ -522,6 +524,10 @@ module Lafcadio
 			dispatch = MethodDispatch.new( methodId, proc, *args )
 			self.send( dispatch.symbol, *dispatch.args )
 		end
+		
+		def mock? #:nodoc:
+			false
+		end
 
 		def respond_to?( symbol, include_private = false )
 			begin

data/lib/lafcadio/objectStore.rb~

@@ -443,7 +443,7 @@ module Lafcadio
 		def get_db_bridge; @dbBridge; end
 		
 		def get_field_name( domain_object )
-			domain_object.domain_class.basename.decapitalize
+			domain_object.domain_class.basename.camel_case_to_underscore
 		end
 
 		def get_filtered(domain_class_name, searchTerm, fieldName = nil) #:nodoc:
@@ -522,6 +522,10 @@ module Lafcadio
 			dispatch = MethodDispatch.new( methodId, proc, *args )
 			self.send( dispatch.symbol, *dispatch.args )
 		end
+		
+		def mock? #:nodoc:
+			false
+		end
 
 		def respond_to?( symbol, include_private = false )
 			begin

data/lib/lafcadio/query.rb

@@ -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 )

data/lib/lafcadio/query.rb~

@@ -147,7 +147,8 @@ module Lafcadio
 		
 		def order_clause
 			if @order_by
-				clause = "order by #{ @order_by } "
+				order_by_field = @domain_class.get_field( @order_by )
+				clause = "order by #{ order_by_field.db_field_name } "
 				clause += @order_by_order == ASC ? 'asc' : 'desc'
 				clause
 			end
@@ -234,21 +235,7 @@ module Lafcadio
 				other_cond.is_a?( Condition ) and other_cond.to_sql == to_sql
 			end
 			
-			def get_field
-				a_domain_class = @domain_class
-				field = nil
-				while ( a_domain_class < DomainObject ) && !field
-					field = a_domain_class.get_class_field( @fieldName )
-					a_domain_class = a_domain_class.superclass
-				end
-				if field
-					field
-				else
-					errStr = "Couldn't find field \"#{ @fieldName }\" in " +
-									 "#{ @domain_class } domain class"
-					raise( MissingError, errStr, caller )
-				end
-			end
+			def get_field; @domain_class.get_field( @fieldName ); end
 			
 			def query; Query.new( @domain_class, self ); end
 			

data/lib/lafcadio/test.rb

@@ -13,7 +13,12 @@ class LafcadioTestCase < Test::Unit::TestCase
   	context.flush
     @mockObjectStore = MockObjectStore.new
 		ObjectStore.set_object_store @mockObjectStore
-		LafcadioConfig.set_filename 'lafcadio/test/testConfig.dat'
+		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
 	
 	def default_test; end

data/lib/lafcadio/test.rb~

@@ -0,0 +1,20 @@
+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 = Context.instance
+  	context.flush
+    @mockObjectStore = MockObjectStore.new
+		ObjectStore.set_object_store @mockObjectStore
+		LafcadioConfig.set_filename 'lafcadio/test/testConfig.dat'
+  end
+	
+	def default_test; end
+end

data/lib/lafcadio/util.rb

@@ -22,28 +22,28 @@ module Lafcadio
 		include Singleton
 
 		def initialize
-			@resources = {}
+			flush
 			@init_procs = {}
 		end
 		
-		def create_instance( service_class ) #:nodoc:
+		def create_instance( service_class, *init_args ) #:nodoc:
 			if ( proc = @init_procs[service_class] )
-				proc.call
+				proc.call( *init_args )
 			else
-				service_class.new
+				service_class.new( *init_args )
 			end
 		end
 		
 		# Flushes all cached ContextualServices.
 		def flush
-			@resources = {}
+			@resources_by_class = Hash.new { |hash, key| hash[key] = {} }
 		end
 
-		def get_resource( service_class ) #:nodoc:
-			resource = @resources[service_class]
+		def get_resource( service_class, *init_args ) #:nodoc:
+			resource = @resources_by_class[service_class][init_args]
 			unless resource
-				resource = create_instance( service_class )
-				set_resource service_class, resource
+				resource = create_instance( service_class, *init_args )
+				set_resource( service_class, resource, *init_args )
 			end
 			resource
 		end
@@ -52,8 +52,8 @@ module Lafcadio
 			@init_procs[service_class] = proc
 		end
 		
-		def set_resource(service_class, resource) #:nodoc:
-			@resources[service_class] = resource
+		def set_resource( service_class, resource, *init_args ) #:nodoc:
+			@resources_by_class[service_class][init_args] = resource
 		end
 	end
 
@@ -65,15 +65,17 @@ module Lafcadio
 	# For example: ObjectStore.getObjectStore
 	class ContextualService
 		def self.flush; Context.instance.set_resource( self, nil ); end
-	
-		def self.method_missing( methodId, *args )
-			methodName = methodId.id2name
-			if methodName =~ /^get_(.*)/ || methodName =~ /^set_(.*)/
-				if methodName =~ /^get_(.*)/
-					Context.instance.get_resource( self )
-				else
-					Context.instance.set_resource( self, *args )
-				end
+
+		def self.method_missing( symbol, *args )
+			method_name = symbol.id2name
+			target = nil
+			if method_name =~ /^get_(.*)/
+				target = :get_resource if $1.underscore_to_camel_case == basename
+			elsif method_name =~ /^set_(.*)/
+				target = :set_resource if $1.underscore_to_camel_case == basename
+			end
+			if target
+				Context.instance.send( target, self, *args )
 			else
 				super
 			end

data/lib/lafcadio/util.rb~

@@ -65,15 +65,17 @@ module Lafcadio
 	# For example: ObjectStore.getObjectStore
 	class ContextualService
 		def self.flush; Context.instance.set_resource( self, nil ); end
-	
-		def self.method_missing( methodId, *args )
-			methodName = methodId.id2name
-			if methodName =~ /^get_(.*)/ || methodName =~ /^set_(.*)/
-				if methodName =~ /^get_(.*)/
-					Context.instance.get_resource( self )
-				else
-					Context.instance.set_resource( self, *args )
-				end
+
+		def self.method_missing( symbol, *args )
+			method_name = symbol.id2name
+			target = nil
+			if method_name =~ /^get_(.*)/
+				target = :get_resource if $1.underscore_to_camel_case == basename
+			elsif method_name =~ /^set_(.*)/
+				target = :set_resource if $1.underscore_to_camel_case == basename
+			end
+			if target
+				Context.instance.send( target, self, *args )
 			else
 				super
 			end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: lafcadio
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
-date: 2005-01-27
+  version: 0.7.2
+date: 2005-02-26
 summary: Lafcadio is an object-relational mapping layer
 require_paths: 
   - lib
@@ -34,6 +34,7 @@ files:
   - lib/lafcadio.rb
   - lib/lafcadio.rb~
   - lib/lafcadio/dateTime.rb
+  - lib/lafcadio/dateTime.rb~
   - lib/lafcadio/depend.rb
   - lib/lafcadio/domain.rb
   - lib/lafcadio/domain.rb~
@@ -49,6 +50,7 @@ files:
   - lib/lafcadio/schema.rb
   - lib/lafcadio/test
   - lib/lafcadio/test.rb
+  - lib/lafcadio/test.rb~
   - lib/lafcadio/util.rb
   - lib/lafcadio/util.rb~
   - lib/lafcadio/test/testconfig.dat