og 0.12.0 → 0.13.0

data/examples/{og/README → README}

@@ -1,4 +1,4 @@
-= Og Example
+= Og Examples
 
 == run.rb
 

data/examples/{og/mock_example.rb → mock_example.rb}

@@ -5,7 +5,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 185 2004-12-10 13:29:09Z gmosx $
+# $Id: mock_example.rb 280 2005-03-10 11:39:23Z gmosx $
 
 require 'rubygems'
 require 'flexmock'

data/examples/{og/mysql_to_psql.rb → mysql_to_psql.rb}

@@ -9,7 +9,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: mysql_to_psql.rb 280 2005-03-10 11:39:23Z gmosx $
 
 raise 'WARNING, this example does not work yet, for the moment ' + 
 			'just have a look at the source code.'

data/examples/{og/run.rb → run.rb}

@@ -2,7 +2,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004 Navel, all rights reserved.
-# $Id: run.rb 263 2005-02-23 13:45:08Z gmosx $
+# $Id: run.rb 280 2005-03-10 11:39:23Z gmosx $
 
 require 'og'
 

data/install.rb

@@ -29,16 +29,19 @@ puts %{
 
 
 ---
-Congratulations, you have successfully installed Nitro + Og!
+Congratulations, you have successfully installed Og!
 The libraries where installed in '#{dst_dir}'. 
 
-To verify that everything works correctly, try to run the tiny 
+You probably need to install the Glue library 
+as well. (http://nitro.rubyforge.org)
+
+To verify that everything works correctly, try to run an 
 example by issuing:
 
-$ cd exampes/tiny
-$ ruby ctl
+$ cd examples
+$ ruby run.rb
 
 at the command line.
 
-Enjoy the magic of Nitro!
+Enjoy the magic of Og!
 }

data/lib/og.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: og.rb 270 2005-03-07 17:52:16Z gmosx $
+# $Id: og.rb 300 2005-03-16 13:23:10Z gmosx $
 
 require 'glue'
 require 'glue/logger'
@@ -21,7 +21,7 @@ require 'glue/validation'
 #
 # + Object-Relational mapping.
 # + Absolutely no configuration files.
-# + Multiple backends (PostgreSQL, MySQL, SQLite).
+# + Multiple backends (PostgreSQL, MySQL, SQLite, Oracle).
 # + ActiveRecord-style meta language and db aware methods.
 # + Deserialize to Ruby Objects.
 # + Deserialize sql join queries to Ruby Objects (temporarily dissabled).
@@ -105,20 +105,24 @@ require 'glue/validation'
 
 module Og
 
-	# The name.
-
-	Name = 'ObjectGraph'
-
 	# The version.
 
-	Version = '0.12.0'
+	Version = '0.13.0'
 
 	# Library path.
 
 	LibPath = File.dirname(__FILE__)
 
+	# If true, check for implicti changes in the object 
+	# graph. For example when you add an object to a parent
+	# the object might be removed from his previous parent.
+	# In this case Og emmits a warning.
+
+	mattr_accessor :check_implicit_graph_changes, false
+	
 	# If true, only allow reading from the database. Usefull
 	# for maintainance.
+	# WARNING: not implemented yet.
 	
 	mattr_accessor :read_only_mode, false
 
@@ -154,7 +158,7 @@ module Og
 	# for convienience.
 	
 	mattr_accessor :create_schema, true
-	
+
 	# The active database. Og allows you to access multiple
 	# databases from a single application.
 	
@@ -183,3 +187,4 @@ end
 # gmosx: leave this here.
 
 require 'og/database'
+require 'og/validation'

data/lib/og/adapter.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: adapter.rb 270 2005-03-07 17:52:16Z gmosx $
+# $Id: adapter.rb 281 2005-03-10 12:24:14Z gmosx $
 
 require 'yaml'
 require 'singleton'

data/lib/og/adapters/filesys.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: filesys.rb 264 2005-02-23 13:46:55Z gmosx $
+# $Id: filesys.rb 281 2005-03-10 12:24:14Z gmosx $
 
 require 'fileutils'
 

data/lib/og/adapters/mysql.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: mysql.rb 270 2005-03-07 17:52:16Z gmosx $
+# $Id: mysql.rb 281 2005-03-10 12:24:14Z gmosx $
 
 require 'mysql'
 
@@ -75,12 +75,13 @@ class MysqlAdapter < Adapter
 	end
 
 	def create_db(database, user = nil, password = nil)
-		`mysqladmin -f --user=#{user} --password=#{password} create #{database}`
+		# gmosx: system is used to avoid shell expansion.
+		system 'mysqladmin', '-f', "--user=#{user}", "--password=#{password}", 'create', database
 		super
 	end
 
 	def drop_db(database, user = nil, password = nil)
-		`mysqladmin -f --user=#{user} --password=#{password} drop #{database}`
+		system 'mysqladmin', '-f', "--user=#{user}", "--password=#{password}", 'drop', database
 		super
 	end
 

data/lib/og/adapters/oracle.rb

@@ -1,7 +1,7 @@
 # * Matt Bowen  <matt.bowen@farweststeel.com>
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: oracle.rb 270 2005-03-07 17:52:16Z gmosx $
+# $Id: oracle.rb 281 2005-03-10 12:24:14Z gmosx $
 
 require 'oracle'
 

data/lib/og/adapters/psql.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: psql.rb 270 2005-03-07 17:52:16Z gmosx $
+# $Id: psql.rb 281 2005-03-10 12:24:14Z gmosx $
 
 require 'postgres'
 
@@ -50,12 +50,13 @@ class PsqlAdapter < Adapter
 	end
 
 	def create_db(database, user = nil, password = nil)
-		`createdb #{database} -U #{user}`
+		# gmosx: system is used to avoid shell expansion.
+		system 'createdb', database, '-U', user
 		super
 	end
 
 	def drop_db(database, user = nil, password = nil)
-		`dropdb #{database} -U #{user}`
+		system 'dropdb', database, '-U', user
 		super
 	end
 

data/lib/og/adapters/sqlite.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: sqlite.rb 270 2005-03-07 17:52:16Z gmosx $
+# $Id: sqlite.rb 281 2005-03-10 12:24:14Z gmosx $
 
 require 'sqlite3'
 require 'fileutils'

data/lib/og/backend.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: backend.rb 263 2005-02-23 13:45:08Z gmosx $
+# $Id: backend.rb 281 2005-03-10 12:24:14Z gmosx $
 
 require 'yaml'
 

data/lib/og/connection.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: connection.rb 270 2005-03-07 17:52:16Z gmosx $
+# $Id: connection.rb 281 2005-03-10 12:24:14Z gmosx $
 
 module Og; 
 

data/lib/og/database.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: database.rb 270 2005-03-07 17:52:16Z gmosx $
+# $Id: database.rb 281 2005-03-10 12:24:14Z gmosx $
 
 require 'glue/logger'
 require 'glue/attribute'

data/lib/og/meta.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: meta.rb 270 2005-03-07 17:52:16Z gmosx $
+# $Id: meta.rb 281 2005-03-10 12:24:14Z gmosx $
 #--
 # TODO:
 # - precreate the meta sql statements as much as possible to 
@@ -183,7 +183,7 @@ module MetaLanguage
 		meta :descendants, klass, linkback
 		meta :props_and_relations, HasMany.new(name, klass, :linkback => linkback)
 
-		module_eval %{
+		code = %{
 			def #{name}(extrasql = nil)
 				Og.db.select("SELECT * FROM #{Og::Adapter.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}", #{klass})
 			end
@@ -194,6 +194,15 @@ module MetaLanguage
 
 			def add_#{name_s}(obj = nil)
 				yield(obj = #{klass}.new) unless obj
+		}
+		if Og.check_implicit_graph_changes
+			code << %{
+				if obj.#{linkback}
+					Logger.warn "Implicit graph change for object #{obj.inspect}"
+				end
+			}
+		end
+		code << %{
 				obj.#{linkback} = @oid
 				obj.save!
 			end
@@ -202,6 +211,8 @@ module MetaLanguage
 				Og.db.exec("DELETE FROM #{Og::Adapter.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}") 
 			end			
 		}
+
+		module_eval(code)
 	end
 	
 	# Implements a 'many_to_many' relation.

data/lib/og/observer.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: observer.rb 271 2005-03-07 17:56:45Z gmosx $
+# $Id: observer.rb 281 2005-03-10 12:24:14Z gmosx $
 
 module Og
 

data/lib/og/typemacros.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: typemacros.rb 267 2005-02-28 14:52:41Z gmosx $
+# $Id: typemacros.rb 281 2005-03-10 12:24:14Z gmosx $
 
 module Og
 

data/lib/og/validation.rb

@@ -0,0 +1,81 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: validation.rb 301 2005-03-16 13:24:25Z gmosx $
+
+require 'glue/validation'
+
+module N 
+
+# Extend the Validation methods defined in glue/validation.rb with 
+# extra db related options.
+
+module Validation
+
+	# Encapsulates a list of validation errors.
+	
+	class Errors
+		cattr_accessor :not_unique, 'The value is already used'
+		cattr_accessor :invalid_relation, 'Invalid relations'
+	end
+
+	module MetaLanguage 
+
+		# Validate the value of this attribute is unique
+		# for this class.
+		#
+		# The Og libraries are required for this methdod to 
+		# work. You can override this method if you want to
+		# use another OR mapping library.
+		#
+		#--
+		# TODO: :unique should implicitly generate 
+		# validate_unique.
+		#++
+
+		def validate_unique(*params)
+			c = { 
+				:msg => N::Validation::Errors.not_unique, 
+				:on => :save 
+			}
+			c.update(params.pop) if params.last.is_a?(Hash)
+
+			for name in params
+				# FIXME: improve the generated code.
+				code = %{
+					others = obj.class.find_by_#{name}(obj.#{name})
+					unless (others.is_a?(Array) and others.empty?)
+						errors.add(:#{name}, '#{c[:msg]}')
+					end;
+				}
+
+				__meta[:validations] << [code, c[:on]]
+			end
+		end
+
+		# Validate the related object or objects. Works
+		# with all relations.
+		
+		def validate_related(*params)
+			c = { 
+				:msg => N::Validation::Errors.invalid_relation, 
+				:on => :save 
+			}
+			c.update(params.pop) if params.last.is_a?(Hash)
+			
+			for name in params
+				code = %{
+					unless (obj.#{name}.is_a?(Array) ? obj.#{name} : [obj.#{name}]).inject(true) { |memo, obj| (obj.nil? or obj.valid?) and memo }
+						errors.add(:#{name}, '#{c[:msg]}')
+					end;
+				}
+
+				__meta[:validations] << [code, c[:on]]
+			end
+		end
+		alias_method :validate_associated, :validate_related
+
+	end
+	
+end 
+
+end

data/test/og/tc_validation.rb

@@ -0,0 +1,89 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+
+require 'og'
+require 'og/validation'
+
+N::Property.type_checking = false
+
+class TC_OgValidation < Test::Unit::TestCase # :nodoc: all
+
+	class Group; end
+
+	class User
+		property :name, String
+		validate_unique :name
+
+		def initialize(name = nil)
+			@name = name
+		end
+	end
+
+	class Filler
+		property :name, String
+		validate_length :name, :min => 3
+
+		belongs_to :group, Group
+
+		def initialize(name = nil)
+			@name = name
+		end
+	end
+	
+	class Group
+		property :name, String
+
+		has_many :fillers, Filler
+		validate_related :fillers
+	end
+	
+	def test_all
+		config = {
+			:adapter => 'psql',
+			:database => 'test',
+			:user => 'postgres',
+			:password => 'navelrulez',
+			:connection_count => 2
+		}
+
+		Og::Database.drop_db!(config)
+		og = Og::Database.new(config)
+
+		og.get_connection
+
+		# validate_unique
+		
+		u1 = User.create('gmosx')
+
+		u2 = User.new('gmosx')
+		assert !u2.valid?
+		assert_equal 1, u2.errors.count
+
+		u2.name = 'stella'
+		u2.valid?
+		assert u2.valid?
+
+		# validate_related
+
+		f1 = Filler.new('g')
+		f2 = Filler.new('ok')
+
+		g = Group.create
+		g.add_filler(f1)
+		g.add_filler(f2)
+
+		assert !g.valid?
+
+		f1.name = 'george'
+		f1.save
+		f2.name = 'stella'
+		f2.save
+
+		assert g.valid?
+
+		og.put_connection
+		og.shutdown
+	end
+
+end