og 0.17.0 → 0.18.0

data/CHANGELOG

@@ -1,5 +1,86 @@
+29-05-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/og/relation/has_many.rb: takes :order into account.
+	
+	* lib/og/entity.rb (#find/#all): take find_options into account,
+	(#find_options): implemented.
+	(#order): implemented.
+
+24-05-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/og/store/kirby.rb (#og_insert): implemented,
+	(#destroy): implemented,
+	save files in a custom directory.
+	
+	* test/*: some changes to make them pass again.
+
+	* lib/og/mixin/orderable.rb: use facet/macro instead of dinclude.
+
+	* lib/og/mixin/hierarchical.rb: use facet/macro instead of dinclude.
+	
+23-05-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/og.rb: added thread_safe mode.
+	
+	* lib/og/manager.rb: re-added support for threads,
+	use thread code only in thread safe mode.
+
+20-05-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/og/store/psql.rb (#initialize) min_messages, encoding,
+	schema_order options.
+	
+	* lib/og/store/kirbybase/*: copied files from kirby distribution.
+	
+	* lib/og/store/kirby.rb: introduced,
+	(#create_table): works.
+	(#create_column_map): implemented.
+	
+	* lib/og/store/*: converted all stores to better handle nil
+	values [mneumann],
+	don't use the term 'column', use 'field' instead to make
+	more SQL agnostic.
+	
+	* lib/og/store/sql.rb (#parse_float): added,
+	(#parse_int): added,
+	(#read_prop): handle nil values. [mneumann]
+	
+	* lib/og/store/sqlite.rb (#blank?): alias eof? [jperrot]
+	
+	--- THE REVENGE OF SITH --- 
+
+19-05-2005  George Moschovitis <gm@navel.gr>
+
+	* resolved a posted bug [mneumann].
+	
+	* lib/og/relation/has_many.rb: added 'dummy' remove support.
+	
+	* lib/og/collection.rb: improved Julien's patch.
+
+18-05-2005	Julien Perrot <jperrot@exosec.fr>
+
+	* lib/og/collection.rb (#remove): implemented.
+	
+	* lib/og/relation/joins_many.rb (#remove_xxx): implemented.
+	
+	* lib/og/store/sql.rb (#unjoin): implemented.
+	
+	* lib/og/manager.rb (#==): fixed when other == nil.
+	
+18-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/og/store/sqlite.rb (#db_filename): overridable db file name [slewis].
+	
+	* README: added warning about sqlite3 version [slewis].
+
+17-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/og.rb: keep active manager.
+
 16-05-2005  George Moschovitis  <gm@navel.gr>
 
+	* --- VERSION 0.17.0 ---
+
 	* doc/RELEASES: updated.
 
 	* README: updated.

data/README

@@ -90,6 +90,7 @@ Og requires the following applications or libraries:
 
 * SQLite
 	http://www.sqlite.org/download.html
+	WARNING: you need sqlite3-ruby > 1.1.0
 
 Please install the required applications and libraries before continuing
 with the installation of Og. Only install the libraries needed for

data/doc/AUTHORS

@@ -1,19 +1,22 @@
 MAIN DEVELOPER:
 
-* George Moschovitis  <gm@navel.gr>
+* George Moschovitis <gm@navel.gr>
 	Project leader, architecture and design, main coder, 
 	documentation, maintainer.
 	
 IDEAS, ADDITIONAL CODING, SUPPORT:
 
-* Michael Neumann  <mneumann@ntecs.de>
+* Michael Neumann <mneumann@ntecs.de>
 	Design, additional coding and bug reports.
 
-*	Matt Bowen  <matt.bowen@farweststeel.com>
+* Anastasios Koutoumanos <ak@navel.gr>
+	Design, additional coding.
+
+*	Matt Bowen <matt.bowen@farweststeel.com>
 	Additional code and documentation.
 
-* Anastasios Koutoumanos  <ak@navel.gr>
-	Design, additional coding.
+*	Julien Perrot <jperrot@exosec.fr>
+	Bug reports and patches.
 
-* Thomas Quas  <tquas@yahoo.com>
+* Thomas Quas <tquas@yahoo.com>
 	Ideas, bug reports, unit tests.

data/doc/RELEASES

@@ -1,4 +1,27 @@
-== Version 0.17.0
+== Version 0.18.0
+
+Mainly a bug fix release. Many small improvements were 
+implemented. All reported bugs were fixed, as well as bugs found 
+during the deployment of a live application. For more information
+consult the detailed changelog. Thanks to Julien Perrot for small
+patches.
+
+Some notable changes:
+
+* Thread safe mode was added again in Og. This works nice with
+	the Webrick server.
+	
+* New order macro in Og to set default ordering for each
+	entity. The has_many collections respect the order setting.
+
+* Fixes in the SQLite adapter.
+
+* No warnings in the Posrgres adapter.
+	
+* Cleaned up some source files.
+
+
+== Version 0.17.0 was released on 16/05/2005.
 
 Og Reloaded!! A totally new, clean and elegant implementation 
 that supports tons of new advanced features. This version should

data/lib/og.rb

@@ -15,7 +15,6 @@ require 'glue/array'
 require 'glue/hash'
 require 'glue/time'
 require 'glue/pool'
-require 'glue/inflector'
 require 'glue/validation'
 require 'glue/aspects'
 
@@ -74,7 +73,7 @@ module Og
 
 	# The version.
 
-	Version = '0.17.0'
+	Version = '0.18.0'
 
 	# Library path.
 
@@ -122,11 +121,18 @@ module Og
 
 	mattr_accessor :raise_store_exceptions, true
 	
+	# Enable/dissable thread safe mode.
+	
+	mattr_accessor :thread_safe, true
+	
 	# Marker module. If included in a class, the Og automanager
 	# ignores this class.
 
 	module Unmanageable; end
 
+	# The active manager
+	
+	mattr_accessor :manager
 end
 
 # gmosx: leave this here.

data/lib/og/collection.rb

@@ -18,12 +18,16 @@ class Collection
 	# A method used to add insert objects in the collection.
 	 
 	attr_accessor :insert_proc
+
+	# A method used to remove objects from the collection.
+	
+	attr_accessor :remove_proc
 	
 	# A method used to find the objects that belong to the
 	# collection.
 	
 	attr_accessor :find_proc
-
+	
 	# The default find options.
 	
 	attr_accessor :find_options
@@ -38,9 +42,10 @@ class Collection
 
 	# Initialize the collection.
 		
-	def initialize(owner = nil, insert_proc = nil, find_proc = nil, find_options = {})
+	def initialize(owner = nil, insert_proc = nil, remove_proc = nil, find_proc = nil, find_options = {})
 		@owner = owner
 		@insert_proc = insert_proc
+		@remove_proc = remove_proc
 		@find_proc = find_proc
 		@find_options = find_options
 		@members = []
@@ -97,7 +102,24 @@ class Collection
 	alias_method :<<, :push
 	alias_method :add, :push
 
-	# Delete a member from the collection.
+	# Remove a member from the collection, the actual object
+	# is not deleted.
+	
+	def remove(*objects)
+		objects = objects.flatten
+
+		objects.reject! { |obj| @members.delete(obj) if obj.unsaved? }
+		return if objects.empty?
+
+		@owner.transaction do
+			objects.each do |obj| 
+				@owner.send(@remove_proc, obj)
+				@members.delete(obj) 
+			end
+		end
+	end
+
+	# Delete a member from the collection AND the store.
 	
 	def delete(*objects)
 		objects = objects.flatten
@@ -113,9 +135,20 @@ class Collection
 		end
 	end
 
-	# Delete all members of the collection.
+	# Remove all members from the collection.
+	
+	def remove_all
+		@owner.transaction do
+			@members.each { |obj| @owner.send(@remove_proc, obj) }
+		end
+		@members.clear
+	end
+	alias_method :clear, :remove_all
+
+	# Delete all members of the collection. Also delete from the
+	# store.
 	
-	def clear
+	def delete_all
 		@owner.transaction do
 			@members.each { |obj| obj.delete }
 		end
@@ -137,20 +170,3 @@ private
 end
 
 end
-
-__END__
-
-=== Examples
-
-article.comments.to_ary
-
-for article in article.comments
-end
-
-blog = Blog.new
-blog.categories << Category.new
-blog.categories << Category.new
-blog.enties << Entry.new
-blog.save
-
-blog.categories.unlink(1)

data/lib/og/entity.rb

@@ -71,6 +71,9 @@ module EntityMixin
 		alias_method :batch_update, :update_properties
 		
 		def find(options = {})
+			if find_options = self.__meta[:find_options]
+				options = find_options.first.update(options)
+			end
 			options[:class] = self
 			ogmanager.store.find(options)
 		end
@@ -107,6 +110,18 @@ module EntityMixin
 		def const_missing(sym)
 			return sym
 		end
+		
+		# Set the default find options for this entity.
+		
+		def find_options(options)
+			meta :find_options, options
+		end
+		
+		# Set the default order option for this entity.
+		
+		def order(order_str)
+			meta :find_options, :order => order_str
+		end
 	end
 
 end

data/lib/og/manager.rb

@@ -13,8 +13,7 @@ class Manager
 	class EntityInfo
 		attr_accessor :klass
 		attr_accessor :enchanted
-		attr_accessor :options
-		
+		attr_accessor :options		
 
 		def initialize(klass = nil)
 			@klass = klass
@@ -27,8 +26,9 @@ class Manager
 
 	attr_accessor :options
 
-	# The store used for persistence.
-
+	# The store used for persistence. This is a virtual field
+	# when running in thread_safe mode.
+	
 	attr_accessor :store
 
 	# The collection of Entities managed by this manager.
@@ -38,7 +38,50 @@ class Manager
 	def initialize(options)
 		@options = options
 		@entities = {}
+		@pool = Glue::Pool.new
+				
+		store_class = Store.for_name(options[:store])
+		store_class.destroy(options) if options[:destroy]
+
+		if Og.thread_safe
+			(options[:connection_count] || 5).times do
+				@pool << store_class.new(options)
+			end		
+		else
+			@store = store_class.new(options)
+		end
+	end
+
+	# Get a store from the pool.
+	
+	def get_store
+		if Og.thread_safe
+			thread = Thread.current
+			
+			unless conn = thread[:og_store]
+				conn = @pool.pop()
+				thread[:og_store] = conn
+			end
+			
+			return conn
+		else
+			return @store
+		end
 	end
+	alias_method :store, :get_store
+
+	# Return a store to the pool.
+	
+	def put_store
+		if Og.thread_safe
+			thread = Thread.current
+			
+			if conn = thread[:og_store]
+				thread[:og_store] = nil
+				return @pool.push(conn)
+			end
+		end
+	end	
 
 	# Manage a class. Converts the class to an Entity.
 
@@ -49,7 +92,7 @@ class Manager
 
 		klass.module_eval %{
 			def ==(other)
-				@#{klass.primary_key.first} == other.#{klass.primary_key.first}
+				other ? @#{klass.primary_key.first} == other.#{klass.primary_key.first} : false
 			end
 		}
 
@@ -57,7 +100,9 @@ class Manager
 		klass.class.send(:attr_accessor, :ogmanager)
 
 		Relation.enchant(klass)		
-		@store.enchant(klass, self)
+		
+		# FIXME: uggly!
+		store.enchant(klass, self); put_store
 		
 		@entities[klass] = info
 	end
@@ -101,10 +146,7 @@ class << self
 # Helper method, useful to initialize Og.
 
 def setup(options = {})
-	m = Manager.new(options)
-	store = Store.for_name(options[:store])
-	store.destroy(options) if options[:destroy]
-	m.store = store.new(options)
+	m = @@manager = Manager.new(options)
 	m.manage_classes
 	return m
 end

data/lib/og/mixin/hierarchical.rb

@@ -2,15 +2,14 @@ require 'facet/string/plural'
 require 'facet/string/singular'
 require 'facet/string/demodulize'
 require 'facet/string/underscore'
-
-require 'glue/dynamic_include'
+require 'facet/macro'
 
 module Og
 
 # Implements the Nested Sets pattern for hierarchical 
 # SQL queries.
 #--
-# TODO: use actice collections.
+# TODO: use active collections.
 #++
 
 module NestedSets
@@ -137,4 +136,4 @@ end
 
 end 
 
-__END__
+# * George Moschovitis <gm@navel.gr>

data/lib/og/mixin/orderable.rb

@@ -1,4 +1,4 @@
-require 'glue/dynamic_include'
+require 'facet/macro'
 
 module Og
 
@@ -154,7 +154,8 @@ module Orderable
 		base.module_eval(code)
 	end
 	
-
 end
 
 end 
+
+# * George Moschovitis <gm@navel.gr>