lafcadio 0.4.3 → 0.5.2

data/lib/lafcadio/objectStore/SqlValueConverter.rb

@@ -1,30 +0,0 @@
-module Lafcadio
-	class SqlValueConverter #:nodoc:
-		attr_reader :objectType, :rowHash
-
-		def initialize(objectType, rowHash)
-			@objectType = objectType
-			@rowHash = rowHash
-		end
-
-		def []( key )
-			if key == 'pkId'
-				if ( field_val = @rowHash[@objectType.sqlPrimaryKeyName] ).nil?
-					error_msg = "The field \"" + @objectType.sqlPrimaryKeyName +
-					            "\" can\'t be found in the table \"" + 
-					            @objectType.tableName + "\"."
-					raise FieldMatchError, error_msg, caller
-				else
-					field_val.to_i
-				end
-			else
-				begin
-					field = @objectType.getField( key )
-					field.valueFromSQL( @rowHash[ field.dbFieldName ] )
-				rescue MissingError
-					nil
-				end
-			end
-		end
-	end
-end

data/lib/lafcadio/objectStore/SqlValueConverter.rb~

@@ -1,30 +0,0 @@
-module Lafcadio
-	class SqlValueConverter #:nodoc:
-		attr_reader :objectType, :rowHash
-
-		def initialize(objectType, rowHash)
-			@objectType = objectType
-			@rowHash = rowHash
-		end
-
-		def []( key )
-			if key == 'pkId'
-				if ( field_val = @rowHash[@objectType.sqlPrimaryKeyName] ).nil?
-					error_msg = "The field \"" + @objectType.sqlPrimaryKeyName +
-					            "\" can\'t be found in the table \"" + 
-					            @objectType.tableName + "\"."
-					raise FieldMatchError, error_msg, caller
-				else
-					field_val.to_i
-				end
-			else
-				begin
-					field = @objectType.getField( key )
-					field.valueFromSQL( @rowHash[ key ] )
-				rescue MissingError
-					nil
-				end
-			end
-		end
-	end
-end

data/lib/lafcadio/query/Compare.rb

@@ -1,55 +0,0 @@
-require 'lafcadio/query/Condition'
-
-module Lafcadio
-	class Query
-		class Compare < Condition #:nodoc:
-			LESS_THAN							= 1
-			LESS_THAN_OR_EQUAL		= 2
-			GREATER_THAN_OR_EQUAL = 3
-			GREATER_THAN					= 4
-
-			@@comparators = {
-				LESS_THAN => '<',
-				LESS_THAN_OR_EQUAL => '<=',
-				GREATER_THAN_OR_EQUAL => '>=',
-				GREATER_THAN => '>'
-			}
-
-			def initialize(fieldName, searchTerm, objectType, compareType)
-				super fieldName, searchTerm, objectType
-				@compareType = compareType
-			end
-
-			def toSql
-				useFieldForSqlValue = false
-				if @fieldName != @objectType.sqlPrimaryKeyName
-					field = getField
-					useFieldForSqlValue = true unless field.class <= LinkField
-				end
-				if useFieldForSqlValue
-					"#{ dbFieldName } #{ @@comparators[@compareType] } " +
-							field.valueForSQL(@searchTerm).to_s
-				else
-					"#{ dbFieldName } #{ @@comparators[@compareType] } #{ @searchTerm }"
-				end
-			end
-
-			@@mockComparators = {
-				LESS_THAN => Proc.new { |d1, d2| d1 < d2 },
-				LESS_THAN_OR_EQUAL => Proc.new { |d1, d2| d1 <= d2 },
-				GREATER_THAN_OR_EQUAL => Proc.new { |d1, d2| d1 >= d2 },
-				GREATER_THAN => Proc.new { |d1, d2| d1 > d2 }
-			}
-
-			def objectMeets(anObj)
-				value = anObj.send @fieldName
-				value = value.pkId if value.class <= DomainObject
-				if value
-					@@mockComparators[@compareType].call(value, @searchTerm)
-				else
-					false
-				end
-			end
-		end
-	end
-end

data/lib/lafcadio/query/CompoundCondition.rb

@@ -1,39 +0,0 @@
-require 'lafcadio/query/Condition'
-
-module Lafcadio
-	class Query
-		class CompoundCondition < Condition #:nodoc:
-			AND = 1
-			OR  = 2
-		
-			def initialize(*conditions)
-				if( [ AND, OR ].index(conditions.last) )
-					@compoundType = conditions.last
-					conditions.pop
-				else
-					@compoundType = AND
-				end
-				@conditions = conditions
-				@objectType = conditions[0].objectType
-			end
-
-			def toSql
-				booleanString = @compoundType == AND ? 'and' : 'or'
-				subSqlStrings = @conditions.collect { |cond| cond.toSql }
-				"(#{ subSqlStrings.join(" #{ booleanString } ") })"
-			end
-
-			def objectMeets(anObj)
-				if @compoundType == AND
-					om = true
-					@conditions.each { |cond| om = om && cond.objectMeets(anObj) }
-					om
-				else
-					om = false
-					@conditions.each { |cond| om = om || cond.objectMeets(anObj) }
-					om
-				end
-			end
-		end
-	end
-end

data/lib/lafcadio/query/Condition.rb

@@ -1,66 +0,0 @@
-require 'lafcadio/util'
-
-module Lafcadio
-	class Query
-		class Condition #:nodoc:
-			def Condition.searchTermType
-				Object
-			end
-
-			attr_reader :objectType
-
-			def initialize(fieldName, searchTerm, objectType)
-				require 'lafcadio/domain/DomainObject'
-
-				@fieldName = fieldName
-				@searchTerm = searchTerm
-				unless @searchTerm.class <= self.class.searchTermType
-					raise "Incorrect searchTerm type #{ searchTerm.class }"
-				end
-				@objectType = objectType
-				if @objectType
-					unless @objectType <= DomainObject
-						raise "Incorrect object type #{ @objectType.to_s }"
-					end
-				end
-			end
-			
-			def primaryKeyField?
-				[ @objectType.sqlPrimaryKeyName, 'pkId' ].include?( @fieldName )
-			end
-			
-			def dbFieldName
-				if primaryKeyField?
-					db_table = @objectType.tableName
-					db_field_name = @objectType.sqlPrimaryKeyName
-					"#{ db_table }.#{ db_field_name }"
-				else
-					getField.db_table_and_field_name
-				end
-			end
-			
-			def getField
-				anObjectType = @objectType
-				field = nil
-				while (anObjectType < DomainObject || anObjectType < DomainObject) &&
-							!field
-					field = anObjectType.getClassField( @fieldName ) ||
-					        anObjectType.getClassFieldByDbFieldName( @fieldName )
-					anObjectType = anObjectType.superclass
-				end
-				if field
-					field
-				else
-					errStr = "Couldn't find field \"#{ @fieldName }\" in " +
-									 "#{ @objectType } domain class"
-					raise( MissingError, errStr, caller )
-				end
-			end
-			
-			def not
-				require 'lafcadio/query/Not'
-				Query::Not.new( self )
-			end
-		end
-	end
-end

data/lib/lafcadio/query/Condition.rb~

@@ -1,66 +0,0 @@
-require 'lafcadio/util'
-
-module Lafcadio
-	class Query
-		class Condition #:nodoc:
-			def Condition.searchTermType
-				Object
-			end
-
-			attr_reader :objectType
-
-			def initialize(fieldName, searchTerm, objectType)
-				require 'lafcadio/domain/DomainObject'
-
-				@fieldName = fieldName
-				@searchTerm = searchTerm
-				unless @searchTerm.class <= self.class.searchTermType
-					raise "Incorrect searchTerm type #{ searchTerm.class }"
-				end
-				@objectType = objectType
-				if @objectType
-					unless @objectType <= DomainObject
-						raise "Incorrect object type #{ @objectType.to_s }"
-					end
-				end
-			end
-			
-			def primaryKeyField?
-				[ @objectType.sqlPrimaryKeyName, 'pkId' ].include?( @fieldName )
-			end
-			
-			def dbFieldName
-				if primaryKeyField?
-					db_table = @objectType.tableName
-					db_field_name = @objectType.sqlPrimaryKeyName
-					"#{ db_table }.#{ db_field_name }"
-				else
-					getField.db_table_and_field_name
-				end
-			end
-			
-			def getField
-				anObjectType = @objectType
-				field = nil
-				while (anObjectType < DomainObject || anObjectType < DomainObject) &&
-							!field
-					field = anObjectType.getClassField( @fieldName ) ||
-					        anObjectType.getClassFieldByDbFieldName( @fieldName )
-					anObjectType = anObjectType.superclass
-				end
-				if field
-					field
-				else
-					errStr = "Couldn't find field \"#{ @fieldName }\" in " +
-									 "#{ @objectType } domain class"
-					raise( MissingError, errStr, caller )
-				end
-			end
-			
-			def not
-				require 'lafcadio/query/Not'
-				Query::Not.new( self )
-			end
-		end
-	end
-end

data/lib/lafcadio/query/Equals.rb

@@ -1,45 +0,0 @@
-require 'lafcadio/query/Condition'
-
-module Lafcadio
-	class Query
-		class Equals < Condition #:nodoc:
-			def toSql
-				sql = "#{ dbFieldName } "
-				unless @searchTerm.nil?
-					sql += "= " + r_val_string
-				else
-					sql += "is null"
-				end
-				sql
-			end
-
-			def r_val_string
-				if primaryKeyField?
-					@searchTerm.to_s
-				else
-					field = getField
-					if @searchTerm.class <= ObjectField
-						@searchTerm.db_table_and_field_name
-					else
-						field.valueForSQL(@searchTerm).to_s
-					end
-				end
-			end
-
-			def objectMeets(anObj)
-				if @fieldName == @objectType.sqlPrimaryKeyName
-					object_value = anObj.pkId
-				else
-					object_value = anObj.send @fieldName
-				end
-				compare_value =
-				if @searchTerm.class <= ObjectField
-					compare_value = anObj.send( @searchTerm.name )
-				else
-					compare_value = @searchTerm
-				end
-				compare_value == object_value
-			end
-		end
-	end
-end

data/lib/lafcadio/query/In.rb

@@ -1,20 +0,0 @@
-require 'lafcadio/query/Condition'
-
-module Lafcadio
-	class Query
-		class In < Condition #:nodoc:
-			def In.searchTermType
-				Array
-			end
-
-			def toSql
-				"#{ dbFieldName } in (#{ @searchTerm.join(', ') })"
-			end
-
-			def objectMeets(anObj)
-				value = anObj.send @fieldName
-				@searchTerm.index(value) != nil
-			end
-		end
-	end
-end

data/lib/lafcadio/query/Like.rb

@@ -1,48 +0,0 @@
-require 'lafcadio/query/Condition'
-
-module Lafcadio
-	class Query
-		class Like < Condition #:nodoc:
-			PRE_AND_POST	= 1
-			PRE_ONLY			= 2
-			POST_ONLY			= 3
-
-			def initialize(
-					fieldName, searchTerm, objectType, matchType = PRE_AND_POST)
-				super fieldName, searchTerm, objectType
-				@matchType = matchType
-			end
-
-			def toSql
-				withWildcards = @searchTerm
-				if @matchType == PRE_AND_POST
-					withWildcards = "%" + withWildcards + "%"
-				elsif @matchType == PRE_ONLY
-					withWildcards = "%" + withWildcards
-				elsif @matchType == POST_ONLY
-					withWildcards += "%"
-				end
-				"#{ dbFieldName } like '#{ withWildcards }'"
-			end
-
-			def objectMeets(anObj)
-				value = anObj.send @fieldName
-				if value.class <= DomainObject || value.class == DomainObjectProxy
-					value = value.pkId.to_s
-				end
-				if value.class <= Array
-					(value.index(@searchTerm) != nil)
-				else
-					if @matchType == PRE_AND_POST
-						regexp = Regexp.new(@searchTerm)
-					elsif @matchType == PRE_ONLY
-						regexp = Regexp.new(@searchTerm.to_s + "$")
-					elsif @matchType == POST_ONLY
-						regexp = Regexp.new("^" + @searchTerm)
-					end
-					regexp.match(value) != nil
-				end
-			end
-		end
-	end
-end

data/lib/lafcadio/query/Link.rb

@@ -1,20 +0,0 @@
-require 'lafcadio/query/Condition'
-
-module Lafcadio
-	class Query
-		class Link < Condition #:nodoc:
-			def Link.searchTermType
-				DomainObject
-			end
-
-			def toSql
-				"#{ dbFieldName } = #{ @searchTerm.pkId }"
-			end
-
-			def objectMeets(anObj)
-				value = anObj.send @fieldName
-				value ? value.pkId == @searchTerm.pkId : false
-			end
-		end
-	end
-end

data/lib/lafcadio/query/Max.rb

@@ -1,32 +0,0 @@
-module Lafcadio
-	class Query
-		class Max < Query #:nodoc:
-			attr_reader :field_name
-		
-			def initialize( objectType, field_name = nil )
-				super( objectType )
-				if field_name
-					@field_name = field_name
-					@pk = false
-				else
-					@field_name = objectType.sqlPrimaryKeyName
-					@pk = true
-				end
-			end
-		
-			def collect( coll )
-				max = nil
-				fn = @pk ? 'pkId': @field_name
-				coll.each { |d_obj|
-					a_value = d_obj.send( fn )
-					max = a_value if max.nil? || a_value > max
-				}
-				[ max ]
-			end
-		
-			def fields
-				"max(#{ @field_name })"
-			end
-		end
-	end
-end