lafcadio 0.6.4 → 0.6.5

data/lib/lafcadio.rb

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

data/lib/lafcadio.rb~

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

data/lib/lafcadio/domain.rb

@@ -278,6 +278,13 @@ 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
@@ -288,13 +295,15 @@ module Lafcadio
 				class_fields = [ @@pk_fields[self] ]
 				@@class_fields[self] = class_fields
 			end
-			att_hash['name'] = name
-			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 == name }
+				att_hash['name'] = name
+				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
+			end
 		end
 		
 		def self.dependent_classes #:nodoc:

data/lib/lafcadio/domain.rb~

@@ -278,6 +278,13 @@ 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
@@ -330,6 +337,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

data/lib/lafcadio/mock.rb

@@ -74,10 +74,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/mock.rb~

@@ -44,7 +44,7 @@ module Lafcadio
 				objects = objects.sort_by { |dobj| dobj.pk_id }
 			end
 			if (range = query.limit)
-				objects = objects[0..(range.last - range.first)]
+				objects = objects[range]
 			end
 			objects
 		end

data/lib/lafcadio/objectStore.rb

@@ -11,9 +11,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 +29,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 +131,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
 
@@ -540,9 +538,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.

data/lib/lafcadio/objectStore.rb~

@@ -129,12 +129,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
 
@@ -443,7 +439,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:

data/lib/lafcadio/query.rb~

@@ -273,15 +273,17 @@ module Lafcadio
 			AND = 1
 			OR  = 2
 		
-			def initialize(*conditions)
-				if( [ AND, OR ].index(conditions.last) )
-					@compoundType = conditions.last
-					conditions.pop
+			def initialize( *args )
+				if( [ AND, OR ].index( args.last) )
+					@compoundType = args.last
+					args.pop
 				else
 					@compoundType = 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 object_meets(anObj)

data/lib/lafcadio/util.rb

@@ -133,8 +133,12 @@ module Lafcadio
 			consonantYPattern = Regexp.new("([^aeiou])y$", Regexp::IGNORECASE)
 			if singular =~ consonantYPattern
 				singular.gsub consonantYPattern, '\1ies'
+			elsif singular =~ /^(.*)xis$/
+				$1 + 'xes'
 			elsif singular =~ /[xs]$/
 				singular + "es"
+			elsif singular =~ /(.*)tum$/
+				$1 + 'ta'
 			else
 				singular + "s"
 			end

data/lib/lafcadio/util.rb~

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'lafcadio/depend'
 require 'singleton'
 
 module Lafcadio
@@ -66,14 +67,16 @@ module Lafcadio
 	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

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.8.6
 specification_version: 1
 name: lafcadio
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
-date: 2005-03-01
+  version: 0.6.5
+date: 2005-07-17
 summary: Lafcadio is an object-relational mapping layer
 require_paths: 
   - lib
-author: Francis Hwang
 email: sera@fhwang.net
 homepage: http://lafcadio.rubyforge.org/
 rubyforge_project: 
@@ -29,6 +28,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+authors: 
+  - Francis Hwang
 files: 
   - lib/lafcadio
   - lib/lafcadio.rb