og 0.19.0 → 0.20.0

data/CHANGELOG

@@ -1,5 +1,68 @@
+11-07-2005  George Moschovitis <gm@navel.gr>
+
+	* doc/RELEASES: updated.
+	
+	* lib/og/store/sql.rb: escape all condition interpolations [miika].
+	
+	* vendor/kirbybase.rb: copied here, cleaned up store dir.
+	
+	* lib/og/store/mysql.rb: check if reconnect exists,
+	verified that the fallback adapter works.
+	
+11-07-2005  Aleksi Niemela <Aleksi.Niemela@cs.helsinki.fi>
+
+	* lib/og/mixin/hierarchical.rb (#parent): added.
+
+07-07-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/vendor/mysql.rb: added as a fallback [james_b].
+
+05-07-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/og/entity.rb (##find): fixed NASTY bug!
+	
+	* lib/og/store.rb: introduced :uniq keyword.
+
+03-07-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/og/store/sql.rb (#find_one): should not limit by default.
+	
+	* added more comments to various classes.
+
+01-07-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/og/store/sql.rb (#join_table): fix for self join case [petr].
+
+30-06-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/og/relations/has_many.rb (#resolve_polymorphic): made
+	more fault tolerant.
+
+24-06-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/og.rb: added various settings.
+
+	* doc/AUTHORS: updated.	
+
+21-06-2005  Aleksi Niemela <Aleksi.Niemela@cs.helsinki.fi>
+
+	* lib/og/relation.rb (#resolve_target): fixed infinite loop
+	bug.
+	
+20-06-2005  George Moschovitis <gm@navel.gr>
+
+	* README: facet/redcloth pointers [bcandler]
+	
+	* INSTALL: facet/redcloth pointers [bcandler]
+
+18-06-2005  George Moschovitis <gm@navel.gr>
+	
+	* lib/og/store/sql.rb (#find_by_sql): alias for select.
+
 17-06-2005  George Moschovitis <gm@navel.gr>
 
+	* --- VERSION 0.19.0 ---
+
 	* examples/run.rb: fixes to make it run again.
 	
 	* README: updated.

data/INSTALL

@@ -45,6 +45,10 @@ a standard installation script is provided.
 This installation script also installs some vendor libraries
 that you possibly have allready installed. Use with caution.
 
+You also have to manualy install the following libraries:
+
+* Facets
+* RedCloth
 
 = Manual installation.
 

data/README

@@ -1,4 +1,4 @@
-= Og 0.17.0 README
+= Og 0.19.0 README
 
 Og (ObjectGraph) is a powerfull object-relational mapping library. Og provides 
 transparent serialization of object graphs to a RDBMS 
@@ -18,30 +18,31 @@ PostgreSQL, MySQL and SQLite are included.
 
 Og is part of the Nitro project, released as a stand-alone library
 due to popular demand. You can find the ChangeLog in the Nitro 
-distribution (http://nitro.rubyforge.org).
+distribution (http://www.nitrohq.com).
 
 
 == Features
 
 The library provides the following features:
 
-+ Object-Relational mapping.
-+ Absolutely no configuration files.
-+ Multiple stores (PostgreSQL, MySQL, SQLite, Oraclei, SqlServer, ..).
-+ Supports non SQL stores.
-+ ActiveRecord-style meta language and db aware methods.
-+ Deserialize to Ruby Objects.
-+ Deserialize sql join queries to Ruby Objects.
-+ Eager associations.
-+ Serialize arbitrary ruby object graphs through YAML.
-+ Connection pooling.
-+ Thread safety (temporarily dissabled).
-+ SQL transactions.
-+ Aspect oriented constructs allow interception of lifecycle callbacks.
-+ Transparent support for cascading deletes for all backends.
-+ Hierarchical structures (nested sets)
-+ Works safely as part of distributed application.
-+ Simple implementation.
+* Object-Relational mapping.
+* Absolutely no configuration files.
+* Multiple stores (PostgreSQL, MySQL, SQLite, Oraclei, SqlServer, ..).
+* Supports non SQL stores.
+* ActiveRecord-style meta language and db aware methods.
+* Deserialize to Ruby Objects.
+* Deserialize sql join queries to Ruby Objects.
+* Eager associations.
+* Serialize arbitrary ruby object graphs through YAML.
+* Connection pooling.
+* Thread safety (temporarily dissabled).
+* SQL transactions.
+* Aspect oriented constructs allow interception of lifecycle callbacks.
+* Transparent support for cascading deletes for all backends.
+* Hierarchical structures (nested sets)
+* Works safely as part of distributed application.
+* Optimistic locking.
+* Simple implementation.
 
 
 == What's new
@@ -56,13 +57,13 @@ doc/RELEASES
 
 The latest version of Og can be found at
 
-* http://nitro.rubyforge.org
+* http://www.nitrohq.com
 
 == Documentation
 
 Documentation for Og can be found at
 
-* http://nitro.rubyforge.org
+* http://www.nitrohq.com
 
 Don't forget to read the file doc/RELEASES for usefull
 documentation bits. Also, have a look at the test cases in
@@ -151,7 +152,7 @@ http://rubyforge.org/mailman/listinfo/nitro-general
 Copyright (c) 2004-2005, George 'tml' Moschovitis.
 Copyright (c) 2004-2005, Navel Ltd (http://www.navel.gr)
 
-Og (http://www.rubyforge.com/projects/nitro) is copyrighted free 
+Og (http://www.nitrohq.com) is copyrighted free 
 software created and maintained by George Moschovitis (mailto:gm@navel.gr)
 and released under the standard BSD Licence. For details consult
 the file LICENCE.

data/doc/AUTHORS

@@ -15,6 +15,9 @@ IDEAS, ADDITIONAL CODING, SUPPORT:
 *	Matt Bowen <matt.bowen@farweststeel.com>
 	Oracle dirver, documentation.
 
+* Aleksi Niemela <Aleksi.Niemela@cs.helsinki.fi>
+	Bug reports and patches.
+
 *	Julien Perrot <jperrot@exosec.fr>
 	Bug reports and patches.
 

data/doc/RELEASES

@@ -1,4 +1,27 @@
-== Version 0.19.0
+== Version 0.20.0
+
+A bug fix release.
+
+Some notable changes:
+
+* Added better sql injection protection in Og sql stores.
+
+* Fixed Mysql store reconnect bug.
+
+* Og falls back to pure ruby adapters for Mysql and Postgres, to 
+	make it easier to run out of the box. Please, don't forget to 
+	switch to the natively compiled adapters for production sites.
+
+* :uniq keyword
+
+* fix for self join.
+
+* Many, many, many bug fixes and small improvements. This release
+	fixes all reported bugs in the spirit of out zero-bug tolerance
+	philosophy.	
+
+
+== Version 0.19.0 was released on 31/05/2005.
 
 Og reloaded part 2: Another superb release introducing a balanced 
 mix of innovative new features, common but useful stuff and bug 

data/lib/og.rb

@@ -17,6 +17,7 @@ require 'glue/time'
 require 'glue/pool'
 require 'glue/validation'
 require 'glue/aspects'
+require 'glue/configuration'
 
 # Og (ObjectGraph) manages Ruby objects and their relations and
 # provides transparent and efficient object-relational mapping
@@ -73,7 +74,7 @@ module Og
 
 	# The version.
 
-	Version = '0.19.0'
+	Version = '0.20.0'
 
 	# Library path.
 
@@ -84,13 +85,13 @@ module Og
 	# the object might be removed from his previous parent.
 	# In this case Og emmits a warning.
 
-	mattr_accessor :check_implicit_graph_changes, false
+	setting :check_implicit_graph_changes, :default => false, :doc => 'If true, check for implicit changes in the object graph'
 	
 	# If true, only allow reading from the database. Usefull
 	# for maintainance.
 	# WARNING: not implemented yet.
 	
-	mattr_accessor :read_only_mode, false
+	setting :read_only_mode, :default => false, :doc => 'If true, only allow reading from the database'
 
 	# Prepend the following prefix to all generated SQL table names.
 	# Usefull on hosting scenarios where you have to run multiple
@@ -105,7 +106,7 @@ module Og
 	# TODO: move this to the sql store.
 	#++
 	
-	mattr_accessor :table_prefix, 'og'
+	setting :table_prefix, :default => 'og', :doc => 'Prepend the prefix to all generated SQL table names'
 
 	# If true, Og tries to create/update the schema in the
 	# data store. For production/live environments set this to 
@@ -113,18 +114,18 @@ module Og
 	# upadated. For debug/development environments this should 
 	# stay true for convienience.
 	
-	mattr_accessor :create_schema, true
+	setting :create_schema, :default => true, :doc => 'If true, Og tries to create/update the schema in the data store'
 
 	# If true raises exceptions on store errors, usefull when
 	# debugging. For production environments it should probably be 
 	# set to false to make the application more fault tolerant.
 
-	mattr_accessor :raise_store_exceptions, true
+	setting :raise_store_exceptions, :default => true, :doc => 'If true raises exceptions on store errors'
 	
 	# Enable/dissable thread safe mode.
 	
-	mattr_accessor :thread_safe, true
-	
+	setting :thread_safe, :default => true, :doc => 'Enable/dissable thread safe mode'
+		
 	# Marker module. If included in a class, the Og automanager
 	# ignores this class.
 

data/lib/og/collection.rb

@@ -11,7 +11,7 @@ class Collection
 	attr_accessor :owner
 	
 	# The members of this collection. Keeps the objects
-	# tha belong to this collection.
+	# that belong to this collection.
 	
 	attr_accessor :members
 
@@ -66,8 +66,9 @@ class Collection
 	# Reload the collection.
 	
 	def reload(options)
-		@find_options = options
-		@members = @owner.send(@find_proc, @find_options)
+# gmosx, NOOO: this was a bug! it corrupts the default options.
+#		@find_options = options
+		@members = @owner.send(@find_proc, options)
 	end
 
 	# Convert the collection to an array.

data/lib/og/entity.rb

@@ -31,11 +31,15 @@ module EntityMixin
 				self.class.ogmanager.store.update_properties(self, set)
 			end
 			
+			# Reload this entity instance from the store.
+			
 			def reload
 				self.class.ogmanager.store.reload(self, self.pk)
 			end
 			alias_method :reload!, :reload
 
+			# Delete this entity instance from the store.
+			
 			def delete
 				self.class.ogmanager.store.delete(self)
 			end
@@ -56,7 +60,10 @@ module EntityMixin
 			ogmanager.store.save(obj)
 			return obj
 		end
-				
+
+		# Load an instance of this Entity class using the primary
+		# key.
+						
 		def load(pk)
 			ogmanager.store.load(pk, self)
 		end
@@ -71,8 +78,11 @@ module EntityMixin
 		alias_method :batch_update, :update_properties
 		
 		def find(options = {})
+			# gmosx, FIXME: this code seems too complex, 
+			# improve this!
+			
 			if find_options = self.__meta[:find_options]
-				options = find_options.first.update(options)
+				options = find_options.first.dup.update(options)
 			end
 			options[:class] = self
 			if self.metadata.superclass
@@ -102,6 +112,9 @@ module EntityMixin
 			ogmanager.store.count(options)
 		end
 
+		# Delete an instance of this Entity class using the actual
+		# instance or the primary key.
+		
 		def delete(obj_or_pk)
 			ogmanager.store.delete(obj_or_pk, self)
 		end
@@ -118,10 +131,6 @@ module EntityMixin
 			@__meta[:primary_key].flatten
 		end
 		
-		def const_missing(sym)
-			return sym
-		end
-		
 		# Set the default find options for this entity.
 		
 		def find_options(options)
@@ -133,7 +142,10 @@ module EntityMixin
 		def order(order_str)
 			meta :find_options, :order => order_str
 		end
-		
+
+		# Enable schema inheritance for this Entity class.
+		# The Single Table Inheritance pattern is used.
+				
 		def schema_inheritance
 			meta :schema_inheritance
 		end
@@ -143,6 +155,13 @@ module EntityMixin
 		def polymorphic_parent?
 			self.to_s == self.metadata.polymorphic.to_s
 		end
+
+		# :nodoc:
+		# Used internally to fix the forward reference problem.
+				
+		def const_missing(sym)
+			return sym
+		end		
 	end
 end
 

data/lib/og/manager.rb

@@ -8,7 +8,7 @@ module Og
 
 class Manager
 
-	# Information about an Entity class
+	# Information about an Entity class.
 
 	class EntityInfo
 		attr_accessor :klass

data/lib/og/mixin/hierarchical.rb

@@ -59,6 +59,14 @@ module NestedSets
 			def child?
 				(@#{parent} &&  @#{parent} != 0) && (@#{left} > 1) && (@#{right} > @#{left})			
 			end
+
+			def parent
+				if root?
+					nil
+				else
+					#{base}[@#{parent}]
+				end
+			end
                                    
 			def #{children}_count
 				return (@#{right} - @#{left} - 1)/2
@@ -137,3 +145,4 @@ end
 end 
 
 # * George Moschovitis <gm@navel.gr>
+# * Aleksi Niemela <Aleksi.Niemela@cs.helsinki.fi>

data/lib/og/relation.rb

@@ -100,7 +100,7 @@ class Relation
 	#--
 	# FIXME: do something more elegant here.
 	#++
-	
+
 	def resolve_target
 		if target_class.is_a?(Symbol)
 			c = owner_class.name.dup
@@ -110,8 +110,10 @@ class Relation
 			begin
 				klass = constant(c)
 			rescue
-				c = target_class
-				retry
+				unless c == target_class
+					c = target_class
+					retry
+				end
 			end
 			@options[:target_class] = klass
 		end				

data/lib/og/relation/has_many.rb

@@ -31,8 +31,10 @@ class HasMany < Relation
 	end
 =end
 	def resolve_polymorphic
-		unless target_class.relations.find { |r| r.is_a?(BelongsTo) and	r.target_class == owner_class }
-			target_class.belongs_to(owner_class)			
+		if target_class.relations
+			unless target_class.relations.find { |r| r.is_a?(BelongsTo) and	r.target_class == owner_class }
+				target_class.belongs_to(owner_class)			
+			end
 		end
 	end
 
@@ -82,3 +84,5 @@ class HasMany < Relation
 end
 
 end
+
+__END__

data/lib/og/store.rb

@@ -81,7 +81,9 @@ class Store
 		code = ''
 		
 		for p in klass.properties
-			finder = p.meta[:unique] ? 'find_one' : 'find'
+			# gmosx: :uniq does NOT set a unique constrain in the
+			# database.
+			finder = p.meta[:uniq] || p.meta[:unique] ? 'find_one' : 'find'
 			
 			code << %{
 				def self.find_by_#{p.symbol}(val, operator = '=', options = {})