lafcadio 0.9.2 → 0.9.3

data/bin/lafcadio_schema

@@ -1,36 +1,38 @@
 #!/usr/bin/env ruby
 
 require 'ubygems'
-require 'lafcadio/depend'
-require 'lafcadio/schema'
-require 'lafcadio/util'
 require 'getoptlong'
+require 'lafcadio'
 include Lafcadio
 
+$all_domain_classes = []
+module Lafcadio
+	def DomainObject.inherited( subclass )
+		$all_domain_classes << subclass
+	end
+end
+
+( config, dclass_name ) = [ nil, nil ]
 opts = GetoptLong.new(
-	[ '--config', '-c', GetoptLong::REQUIRED_ARGUMENT ],
+	[ '--config', '-c', GetoptLong::OPTIONAL_ARGUMENT ],
 	[ '--class',  '-C', GetoptLong::OPTIONAL_ARGUMENT ]
 )
-if ( ( optArray = opts.get ) && ARGV.size >= 1 )
-	configFile = optArray[1]
-	LafcadioConfig.set_filename( configFile )
-	class_opts = opts.get
-	ARGV.each { |fileName|
-		require "#{ fileName }"
-		if class_opts
-			className = class_opts.last
-		else
-			fileName =~ /(\w*)\.rb/
-			className = $1
-		end
-		domainClass = Class.by_name( className )
-		if domainClass
-			statement = CreateTableStatement.new( domainClass )
-			puts statement.to_sql
-		else
-			puts "No domain class in #{ fileName }"
-		end
-	}
+opts.each do |opt, arg|
+	config = arg if opt == '--config'
+	dclass_name = arg if opt == '--class'
+end
+if ARGV.size >= 1
+	LafcadioConfig.set_filename config if config
+	ARGV.each { |fileName| require fileName }
+	if dclass_name
+		domain_classes = [ Class.by_name( dclass_name ) ]
+	else
+		domain_classes = $all_domain_classes
+	end
+	sql = domain_classes.map { |domain_class|
+		CreateTableStatement.new( domain_class ).to_sql
+	}.join( "\n\n" )
+	puts sql
 else
-	puts "lafcadio_schema -c config domain1.rb {, domain2.rb, domain3.rb ... }"
-end
+	puts "lafcadio_schema [-C domain_class] file1.rb [file2.rb file3.rb ...]"
+end

data/lib/lafcadio.rb

@@ -1,5 +1,5 @@
-# Lafcadio is an object-relational mapping library for Ruby and MySQL. Its
-# design has a few aspects in mind:
+# Lafcadio is an object-relational mapping library for Ruby. It currently
+# supports MySQL and PostgreSQL. Its design has a few aspects in mind:
 # * The importance of unit-testing. Lafcadio includes a MockObjectStore which
 #   can take the place of the ObjectStore for unit tests, so you can test
 #   complex database-driven logic. Committing domain objects, running queries,
@@ -16,7 +16,7 @@
 # http://lafcadio.rubyforge.org/tutorial.html.
 
 module Lafcadio
-	Version = "0.9.2"
+	Version = "0.9.3"
 
 	require 'lafcadio/depend'
 	require 'lafcadio/domain'

data/lib/lafcadio.rb~

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

data/lib/lafcadio/domain.rb

@@ -1,6 +1,7 @@
 require 'extensions/module'
 require 'lafcadio/objectField'
 require 'lafcadio/util'
+require 'monitor'
 require 'rexml/document'
 
 module Lafcadio
@@ -42,15 +43,13 @@ module Lafcadio
 		
 		def possible_field_attributes
 			fieldAttr = []
-			fieldAttr << FieldAttribute.new( 'size', FieldAttribute::INTEGER )
-			fieldAttr << FieldAttribute.new( 'unique', FieldAttribute::BOOLEAN )
-			fieldAttr << FieldAttribute.new( 'not_nil', FieldAttribute::BOOLEAN )
-			fieldAttr << FieldAttribute.new( 'enum_type', FieldAttribute::ENUM,
-																			 BooleanField )
-			fieldAttr << FieldAttribute.new( 'enums', FieldAttribute::HASH )
-			fieldAttr << FieldAttribute.new( 'range', FieldAttribute::ENUM,
-																			 DateField )
-			fieldAttr << FieldAttribute.new( 'large', FieldAttribute::BOOLEAN )
+			fieldAttr << FieldAttribute.new( 'size', :integer )
+			fieldAttr << FieldAttribute.new( 'unique', :boolean )
+			fieldAttr << FieldAttribute.new( 'not_nil', :boolean )
+			fieldAttr << FieldAttribute.new( 'enum_type', :enum, BooleanField )
+			fieldAttr << FieldAttribute.new( 'enums', :hash )
+			fieldAttr << FieldAttribute.new( 'range', :enum, DateField )
+			fieldAttr << FieldAttribute.new( 'large', :boolean )
 		end
 
 		def register_name( name )
@@ -69,11 +68,6 @@ module Lafcadio
 		end
 		
 		class FieldAttribute
-			INTEGER = 1
-			BOOLEAN = 2
-			ENUM    = 3
-			HASH    = 4
-			
 			attr_reader :name, :value_class
 		
 			def initialize( name, value_class, objectFieldClass = nil )
@@ -84,7 +78,7 @@ module Lafcadio
 			def maybe_set_field_attr( field, fieldElt )
 				setterMethod = "#{ name }="
 				if field.respond_to?( setterMethod )
-					if value_class != FieldAttribute::HASH
+					if value_class != :hash
 						if ( attrStr = fieldElt.attributes[name] )
 							field.send( setterMethod, value_from_string( attrStr ) )
 						end
@@ -107,12 +101,12 @@ module Lafcadio
 			end
 			
 			def value_from_string( valueStr )
-				if @value_class == INTEGER
+				if @value_class == :integer
 					valueStr.to_i
-				elsif @value_class == BOOLEAN
+				elsif @value_class == :boolean
 					valueStr == 'y'
-				elsif @value_class == ENUM
-					eval "#{ @objectFieldClass.name }::#{ valueStr }"
+				elsif @value_class == :enum
+					eval ":#{ valueStr }"
 				end
 			end
 		end
@@ -165,11 +159,11 @@ module Lafcadio
 	#        email   'email'
 	#        date    'birthday'
 	#      end
-	#    The class methods you can use are +blob+, +boolean+, +date+,
+	#    The class methods you can use are +binary+, +boolean+, +date+,
 	#    +date_time+, +domain_object+, +email+, +enum+, +float+, +integer+,
-	#    +month+, +state+, +string+, +text_list+. These correspond to BlobField,
-	#    BooleanField, DateField, DateTimeField, DomainObjectField, EmailField,
-	#    EnumField, FloatField, IntegerField, MonthField, StateField,
+	#    +month+, +state+, +string+, +text_list+. These correspond to
+	#    BinaryField, BooleanField, DateField, DateTimeField, DomainObjectField,
+	#    EmailField, EnumField, FloatField, IntegerField, MonthField, StateField,
 	#    StringField, and TextListField, respectively. Consult their individual
 	#    RDoc entries for more on how to parameterize them through the class
 	#    methods.
@@ -284,10 +278,7 @@ module Lafcadio
 	# different levels.
 	class DomainObject
 		@@subclass_records = Hash.new do |h, k| h[k] = SubclassRecord.new( k ); end
-
-		COMMIT_ADD = 1
-		COMMIT_EDIT = 2
-		COMMIT_DELETE = 3
+		@@subclass_records.extend MonitorMixin
 
 		include DomainComparable
 		
@@ -307,7 +298,9 @@ module Lafcadio
 		# Returns every committed instance of the domain class.
 		#
 		#   User.all # => all users
-		def self.all; ObjectStore.get_object_store.all( self ); end
+		def self.all( opts = {} )
+			ObjectStore.get_object_store.all( self, opts )
+		end
 		
 		def self.all_fields # :nodoc:
 			self_and_concrete_superclasses.map { |a_class|
@@ -316,7 +309,7 @@ module Lafcadio
 		end
 
 		def self.class_field(fieldName) #:nodoc:
-			self.class_fields.find { |field| field.name == fieldName }
+			self.class_fields.find { |field| field.name == fieldName.to_s }
 		end
 		
 		def self.class_fields #:nodoc:
@@ -381,10 +374,7 @@ module Lafcadio
 		#
 		#   class LotsOfBooleans < Lafcadio::DomainObject
 		#     default_field_setup_hash(
-		#       Lafcadio::BooleanField,
-		#       {
-		#         'enum_type' => Lafcadio::BooleanField::ENUMS_CAPITAL_YES_NO
-		#       }
+		#       Lafcadio::BooleanField, { 'enum_type' => :capital_yes_no }
 		#     )
 		#     booleans 'this', 'that', 'the_other', 'and_another_one',
 		#              'this_one_too'
@@ -470,7 +460,7 @@ module Lafcadio
 				if arg.is_a? Fixnum
 					ObjectStore.get_object_store.get( self, *args )
 				else
-					qry = Query.new( self, nil, { :group_functions => [ :count ] } )
+					qry = Query.new( self, :group_functions => [ :count ] )
 					ObjectStore.get_object_store.group_query qry
 				end
 			else
@@ -557,6 +547,10 @@ module Lafcadio
 		#
 		#   the_one_user = User.only
 		def self.only; all.only; end
+		
+		def self.postgres_pk_id_seq
+			"#{ table_name }_#{ sql_primary_key_name }_seq"
+		end
 
 		def self.require_domain_file( typeString ) # :nodoc:
 			typeString =~ /([^\:]*)$/
@@ -611,7 +605,7 @@ module Lafcadio
 		end
 		
 		def self.subclass_record # :nodoc:
-			@@subclass_records[self]
+			@@subclass_records.synchronize { @@subclass_records[self] }
 		end
 
 		def self.subclasses #:nodoc:

data/lib/lafcadio/domain.rb~

@@ -42,15 +42,13 @@ module Lafcadio
 		
 		def possible_field_attributes
 			fieldAttr = []
-			fieldAttr << FieldAttribute.new( 'size', FieldAttribute::INTEGER )
-			fieldAttr << FieldAttribute.new( 'unique', FieldAttribute::BOOLEAN )
-			fieldAttr << FieldAttribute.new( 'not_nil', FieldAttribute::BOOLEAN )
-			fieldAttr << FieldAttribute.new( 'enum_type', FieldAttribute::ENUM,
-																			 BooleanField )
-			fieldAttr << FieldAttribute.new( 'enums', FieldAttribute::HASH )
-			fieldAttr << FieldAttribute.new( 'range', FieldAttribute::ENUM,
-																			 DateField )
-			fieldAttr << FieldAttribute.new( 'large', FieldAttribute::BOOLEAN )
+			fieldAttr << FieldAttribute.new( 'size', :integer )
+			fieldAttr << FieldAttribute.new( 'unique', :boolean )
+			fieldAttr << FieldAttribute.new( 'not_nil', :boolean )
+			fieldAttr << FieldAttribute.new( 'enum_type', :enum, BooleanField )
+			fieldAttr << FieldAttribute.new( 'enums', :hash )
+			fieldAttr << FieldAttribute.new( 'range', :enum, DateField )
+			fieldAttr << FieldAttribute.new( 'large', :boolean )
 		end
 
 		def register_name( name )
@@ -69,11 +67,6 @@ module Lafcadio
 		end
 		
 		class FieldAttribute
-			INTEGER = 1
-			BOOLEAN = 2
-			ENUM    = 3
-			HASH    = 4
-			
 			attr_reader :name, :value_class
 		
 			def initialize( name, value_class, objectFieldClass = nil )
@@ -84,7 +77,7 @@ module Lafcadio
 			def maybe_set_field_attr( field, fieldElt )
 				setterMethod = "#{ name }="
 				if field.respond_to?( setterMethod )
-					if value_class != FieldAttribute::HASH
+					if value_class != :hash
 						if ( attrStr = fieldElt.attributes[name] )
 							field.send( setterMethod, value_from_string( attrStr ) )
 						end
@@ -107,12 +100,12 @@ module Lafcadio
 			end
 			
 			def value_from_string( valueStr )
-				if @value_class == INTEGER
+				if @value_class == :integer
 					valueStr.to_i
-				elsif @value_class == BOOLEAN
+				elsif @value_class == :boolean
 					valueStr == 'y'
-				elsif @value_class == ENUM
-					eval "#{ @objectFieldClass.name }::#{ valueStr }"
+				elsif @value_class == :enum
+					eval ":#{ valueStr }"
 				end
 			end
 		end
@@ -165,11 +158,11 @@ module Lafcadio
 	#        email   'email'
 	#        date    'birthday'
 	#      end
-	#    The class methods you can use are +blob+, +boolean+, +date+,
+	#    The class methods you can use are +binary+, +boolean+, +date+,
 	#    +date_time+, +domain_object+, +email+, +enum+, +float+, +integer+,
-	#    +month+, +state+, +string+, +text_list+. These correspond to BlobField,
-	#    BooleanField, DateField, DateTimeField, DomainObjectField, EmailField,
-	#    EnumField, FloatField, IntegerField, MonthField, StateField,
+	#    +month+, +state+, +string+, +text_list+. These correspond to
+	#    BinaryField, BooleanField, DateField, DateTimeField, DomainObjectField,
+	#    EmailField, EnumField, FloatField, IntegerField, MonthField, StateField,
 	#    StringField, and TextListField, respectively. Consult their individual
 	#    RDoc entries for more on how to parameterize them through the class
 	#    methods.
@@ -285,10 +278,6 @@ module Lafcadio
 	class DomainObject
 		@@subclass_records = Hash.new do |h, k| h[k] = SubclassRecord.new( k ); end
 
-		COMMIT_ADD = 1
-		COMMIT_EDIT = 2
-		COMMIT_DELETE = 3
-
 		include DomainComparable
 		
 		# Shortcut method for retrieving one domain object.
@@ -307,7 +296,9 @@ module Lafcadio
 		# Returns every committed instance of the domain class.
 		#
 		#   User.all # => all users
-		def self.all; ObjectStore.get_object_store.all( self ); end
+		def self.all( opts = {} )
+			ObjectStore.get_object_store.all( self, opts )
+		end
 		
 		def self.all_fields # :nodoc:
 			self_and_concrete_superclasses.map { |a_class|
@@ -316,7 +307,7 @@ module Lafcadio
 		end
 
 		def self.class_field(fieldName) #:nodoc:
-			self.class_fields.find { |field| field.name == fieldName }
+			self.class_fields.find { |field| field.name == fieldName.to_s }
 		end
 		
 		def self.class_fields #:nodoc:
@@ -381,10 +372,7 @@ module Lafcadio
 		#
 		#   class LotsOfBooleans < Lafcadio::DomainObject
 		#     default_field_setup_hash(
-		#       Lafcadio::BooleanField,
-		#       {
-		#         'enum_type' => Lafcadio::BooleanField::ENUMS_CAPITAL_YES_NO
-		#       }
+		#       Lafcadio::BooleanField, { 'enum_type' => :capital_yes_no }
 		#     )
 		#     booleans 'this', 'that', 'the_other', 'and_another_one',
 		#              'this_one_too'
@@ -470,7 +458,7 @@ module Lafcadio
 				if arg.is_a? Fixnum
 					ObjectStore.get_object_store.get( self, *args )
 				else
-					qry = Query.new( self, nil, { :group_functions => [ :count ] } )
+					qry = Query.new( self, :group_functions => [ :count ] )
 					ObjectStore.get_object_store.group_query qry
 				end
 			else
@@ -557,6 +545,10 @@ module Lafcadio
 		#
 		#   the_one_user = User.only
 		def self.only; all.only; end
+		
+		def self.postgres_pk_id_seq
+			"#{ table_name }_#{ sql_primary_key_name }_seq"
+		end
 
 		def self.require_domain_file( typeString ) # :nodoc:
 			typeString =~ /([^\:]*)$/
@@ -652,14 +644,15 @@ module Lafcadio
 
 		def self.try_load_xml_parser # :nodoc:
 			require 'lafcadio/domain'
-			dirName = LafcadioConfig.new['classDefinitionDir']
-			xmlFileName = self.basename + '.xml'
-			xmlPath = File.join( dirName, xmlFileName )
-			begin
-				xml = File.open( xmlPath ) do |f| f.gets( nil ); end
-				ClassDefinitionXmlParser.new( self, xml )
-			rescue Errno::ENOENT
-				# no xml file, so no @xmlParser
+			if ( dirName = LafcadioConfig.new['classDefinitionDir'] )
+				xmlFileName = self.basename + '.xml'
+				xmlPath = File.join( dirName, xmlFileName )
+				begin
+					xml = File.open( xmlPath ) do |f| f.gets( nil ); end
+					ClassDefinitionXmlParser.new( self, xml )
+				rescue Errno::ENOENT
+					# no xml file, so no @xmlParser
+				end
 			end
 		end
 		

data/lib/lafcadio/mock.rb

@@ -9,32 +9,27 @@ module Lafcadio
 			@objects = {}
 			@next_pk_ids = {}
 			@queries = []
+			@transaction = nil
 		end
 
 		def all( domain_class )
 			@objects[domain_class] ? @objects[domain_class].values : []
 		end
 		
-		def select_dobjs(query)
-			@queries << query
-			domain_class = query.domain_class
-			objects = []
-			all( domain_class ).each { |dbObj|
-				objects << dbObj if query.dobj_satisfies?( dbObj )
-			}
-			query.order_and_limit_collection objects
-		end
-
 		def commit(db_object)
 			if db_object.pk_id and !db_object.pk_id.is_a?( Integer )
 				raise ArgumentError
 			end
-			objects_by_domain_class = objects_by_domain_class db_object.domain_class
-			if db_object.delete
-				objects_by_domain_class.delete( db_object.pk_id )
+			if @transaction
+				@transaction << db_object
 			else
-				object_pk_id = pre_commit_pk_id( db_object )
-				objects_by_domain_class[object_pk_id] = db_object
+				objects_by_domain_class = objects_by_domain_class db_object.domain_class
+				if db_object.delete
+					objects_by_domain_class.delete( db_object.pk_id )
+				else
+					object_pk_id = pre_commit_pk_id( db_object )
+					objects_by_domain_class[object_pk_id] = db_object
+				end
 			end
 		end
 				
@@ -79,10 +74,37 @@ module Lafcadio
 			@queries.select { |qry| qry.to_sql == sql }.size
 		end
 		
+		def select_dobjs(query)
+			@queries << query
+			domain_class = query.domain_class
+			objects = []
+			all( domain_class ).each { |dbObj|
+				objects << dbObj if query.dobj_satisfies?( dbObj )
+			}
+			query.order_and_limit_collection objects
+		end
+
 		def set_next_pk_id( domain_class, npi )
 			@next_pk_ids = {} unless @next_pk_ids
 			@next_pk_ids[ domain_class ] = npi
 		end
+		
+		def transaction( action )
+			tr = MockDbBridge::Transaction.new
+			@transaction = tr
+			begin
+				action.call tr
+				@transaction = nil
+				tr.each do |dobj_to_commit| commit( dobj_to_commit ); end
+			rescue RollbackError; end
+		end
+		
+		class Transaction < Array
+			def rollback; raise RollbackError; end
+		end
+		
+		class RollbackError < StandardError #:nodoc:
+		end
 	end
 
 	# Externally, the MockObjectStore looks and acts exactly like the ObjectStore,