og 0.15.0 → 0.16.0

data/lib/og/adapters/filesys.rb

@@ -1,12 +1,10 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: filesys.rb 281 2005-03-10 12:24:14Z gmosx $
+# $Id: filesys.rb 17 2005-04-14 16:03:40Z gmosx $
 
 require 'fileutils'
 
-require 'og/adapter'
-require 'og/connection'
-require 'glue/attribute'
+require 'og/adapters/base'
 
 module Og
 
@@ -40,17 +38,15 @@ class FilesysAdapter < Adapter
 		end
 	end
 
-	def insert_code(klass, db, pre_cb, post_cb)
+	def insert_code(klass, db)
 		props = props_for_insert(klass)
 		values = props.collect { |p| write_prop(p) }.join(',') 
 		
 		sql = "INSERT INTO #{klass::DBTABLE} (#{props.collect {|p| p.name}.join(',')}) VALUES (#{values})"
 
 		%{
-			#{pre_cb}
 			conn.store.query("#{sql}").close
 			@oid = conn.store.last_insert_row_id
-			#{post_cb}
 		}
 	end
 

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 326 2005-03-28 11:07:17Z gmosx $
+# $Id: mysql.rb 17 2005-04-14 16:03:40Z gmosx $
 
 begin
 	require 'mysql'
@@ -9,9 +9,7 @@ rescue Object => ex
 	Logger.error ex
 end
 
-require 'og/adapter'
-require 'og/connection'
-require 'glue/attribute'
+require 'og/adapters/base'
 
 module Og
 
@@ -94,18 +92,16 @@ class MysqlAdapter < Adapter
 		klass.__props.reject { |p| :oid == p.symbol }
 	end
 
-	def insert_code(klass, db, pre_cb, post_cb)
+	def insert_code(klass, db)
 		props = props_for_insert(klass)
 		values = props.collect { |p| write_prop(p) }.join(',') 
 		
 		sql = "INSERT INTO #{klass::DBTABLE} (#{props.collect {|p| p.name}.join(',')}) VALUES (#{values})"
 
 		%{
-			#{pre_cb}
 			conn.store.query_with_result = false
 			conn.store.query "#{sql}"
 			@oid = conn.store.insert_id()
-			#{post_cb}
 		}
 	end
 
@@ -314,7 +310,7 @@ class MysqlConnection < Connection
 		return nil unless valid_res?(res)
 		
 		row = res.fetch_row
-		obj = klass.new
+		obj = klass.allocate
 		obj.og_read(row)
 		
 		res.free
@@ -329,7 +325,7 @@ class MysqlConnection < Connection
 		for tuple in (0...res.num_rows)
 			row = res.fetch_row
 
-			obj = klass.new
+			obj = klass.allocate
 			obj.og_read(row)
 			
 			objects << obj

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 337 2005-03-31 16:20:40Z gmosx $
+# $Id: oracle.rb 17 2005-04-14 16:03:40Z gmosx $
 
 begin
 	require 'oracle'
@@ -10,9 +10,7 @@ rescue
 	Logger.error ex
 end
 
-require 'og/adapter'
-require 'og/connection'
-require 'glue/attribute'
+require 'og/adapters/base'
 
 module Og
 
@@ -86,19 +84,17 @@ class OracleAdapter < Adapter
     super
   end
 
-  def insert_code(klass, db, pre_cb, post_cb)
+  def insert_code(klass, db)
     props = props_for_insert(klass)
     values = props.collect { |p| write_prop(p) }.join(',') 
 
     sql = "INSERT INTO #{klass::DBTABLE} (#{props.collect {|p| p.name}.join(',')}) VALUES (#{values})"
 
     %{
-      #{pre_cb}
       res = conn.store.exec("SELECT #{klass::DBSEQ}.nextval FROM DUAL")
       @oid = res.fetch[0].to_i
       res.close
       conn.exec "#{sql}"
-      #{post_cb}
     }
   end
 
@@ -337,7 +333,7 @@ class OracleConnection < Connection
     row = res.fetch
     return nil unless row
 
-    obj = klass.new
+    obj = klass.allocate
     obj.og_read(row)
 
     res.close
@@ -349,7 +345,7 @@ class OracleConnection < Connection
     objects = []
 
     while row = res.fetch
-      obj = klass.new
+      obj = klass.allocate
       obj.og_read(row)
       objects << obj
     end

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 326 2005-03-28 11:07:17Z gmosx $
+# $Id: psql.rb 17 2005-04-14 16:03:40Z gmosx $
 
 begin
 	require 'postgres'
@@ -9,9 +9,7 @@ rescue Object => ex
 	Logger.error ex
 end
 
-require 'og/adapter'
-require 'og/connection'
-require 'glue/attribute'
+require 'og/adapters/base'
 
 module Og
 
@@ -65,19 +63,17 @@ class PsqlAdapter < Adapter
 		super
 	end
 
-	def insert_code(klass, db, pre_cb, post_cb)
+	def insert_code(klass, db)
 		props = props_for_insert(klass)
 		values = props.collect { |p| write_prop(p) }.join(',') 
 
 		sql = "INSERT INTO #{klass::DBTABLE} (#{props.collect {|p| p.name}.join(',')}) VALUES (#{values})"
 
 		%{
-			#{pre_cb}
 			res = conn.store.exec("SELECT nextval('#{klass::DBSEQ}')")
 			@oid = res.getvalue(0, 0).to_i
 			res.clear
 			conn.exec "#{sql}"
-			#{post_cb}
 		}
 	end
 
@@ -244,7 +240,7 @@ class PsqlConnection < Connection
 	def read_one(res, klass)
 		return nil unless valid_res?(res)
 
-		obj = klass.new
+		obj = klass.allocate
 		obj.og_read(res, 0)
 	
 		res.clear
@@ -256,7 +252,7 @@ class PsqlConnection < Connection
 		objects = []
 
 		for tuple in (0...res.num_tuples)
-			obj = klass.new
+			obj = klass.allocate
 			obj.og_read(res, tuple)
 			objects << obj
 		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 326 2005-03-28 11:07:17Z gmosx $
+# $Id: sqlite.rb 17 2005-04-14 16:03:40Z gmosx $
 
 begin
 	require 'sqlite3'
@@ -11,9 +11,7 @@ end
 
 require 'fileutils'
 
-require 'og/adapter'
-require 'og/connection'
-require 'glue/attribute'
+require 'og/adapters/base'
 
 module Og
 
@@ -50,17 +48,15 @@ class SqliteAdapter < Adapter
 		end
 	end		
 =end
-	def insert_code(klass, db, pre_cb, post_cb)
+	def insert_code(klass, db)
 		props = props_for_insert(klass)
 		values = props.collect { |p| write_prop(p) }.join(',') 
 		
 		sql = "INSERT INTO #{klass::DBTABLE} (#{props.collect {|p| p.name}.join(',')}) VALUES (#{values})"
 
 		%{
-			#{pre_cb}
 			conn.store.query("#{sql}").close
 			@oid = conn.store.last_insert_row_id
-			#{post_cb}
 		}
 =begin		
 		props = props_for_insert(klass)
@@ -233,7 +229,7 @@ class SqliteConnection < Connection
 		row = res.next
 		return nil unless row
 
-		obj = klass.new
+		obj = klass.allocate
 		obj.og_read(row)
 	
 		res.close
@@ -245,7 +241,7 @@ class SqliteConnection < Connection
 		objects = []
 
 		res.each do |row|
-			obj = klass.new
+			obj = klass.allocate
 			obj.og_read(row)
 			objects << obj
 		end

data/lib/og/adapters/sqlserver.rb

@@ -1,6 +1,6 @@
 # * Anastasios Koutoumanos  <ak@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: sqlserver.rb 341 2005-04-04 08:28:54Z gmosx $
+# $Id: sqlserver.rb 17 2005-04-14 16:03:40Z gmosx $
 
 begin
 	require 'dbi'
@@ -9,9 +9,7 @@ rescue Object => ex
 	Logger.error ex
 end
 
-require 'glue/attribute'
-require 'og/adapter'
-require 'og/connection'
+require 'og/adapters/base'
 
 module Og
 
@@ -128,20 +126,18 @@ class SqlserverAdapter < Adapter
 		klass.__props.reject { |p| :oid == p.symbol }
 	end
 
-	def insert_code(klass, db, pre_cb, post_cb="123")
+	def insert_code(klass, db)
 		props = props_for_insert(klass)
 		values = props.collect { |p| write_prop(p) }.join(',') 
 
 		sql = "INSERT INTO #{klass::DBTABLE} (#{props.collect {|p| p.name}.join(',')}) VALUES (#{values});"
 
 		%{
-			#{pre_cb}
 			conn.exec "#{sql}"
 			conn.commit
 			res = conn.query("SELECT IDENT_CURRENT('#{klass::DBTABLE}')")
 			@oid = res[0][0].to_i
 			#res.finish
-			#{post_cb}
 		}
 	end
 
@@ -326,7 +322,7 @@ class SqlserverConnection < Connection
 		return nil unless valid_res?(res)
 		return nil unless res
 
-		obj = klass.new
+		obj = klass.allocate
 		obj.og_read(res)
 	
 		return obj
@@ -337,7 +333,7 @@ class SqlserverConnection < Connection
 		objects = []
 
 		for tuple in (0...res.size)
-			obj = klass.new
+			obj = klass.allocate
 			obj.og_read(res, tuple)
 			objects << obj
 		end

data/lib/og/database.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: database.rb 326 2005-03-28 11:07:17Z gmosx $
+# $Id: database.rb 19 2005-04-15 09:24:19Z gmosx $
 
 require 'glue/logger'
 require 'glue/attribute'
@@ -9,17 +9,17 @@ require 'glue/array'
 require 'glue/hash'
 require 'glue/time'
 require 'glue/pool'
+require 'glue/aspects'
 
 require 'og/enchant'
 require 'og/meta'
-require 'og/observer'
 
 module Og
 	
 # Encapsulates an Og Database.
 
 class Database
-	include Og::Enchant
+	include Enchant
 
 	# Managed class metadata
 	
@@ -59,7 +59,7 @@ class Database
 		@config = config
 
 		# populate with default options if needed.
-		@config[:connection_count] ||= 1
+		@config[:connection_count] ||= 5 
 		
 		Logger.info "Connecting to database '#{@config[:database]}' using the '#{@config[:adapter]}' adapter."
 
@@ -67,8 +67,8 @@ class Database
 
 		self.class.drop!(config) if config[:drop]
 		
-		@connection_pool = N::Pool.new
-		@managed_classes = N::SafeHash.new
+		@connection_pool = Pool.new
+		@managed_classes = SafeHash.new
 		
 		@config[:connection_count].times do
 			@connection_pool << @adapter.new_connection(self)
@@ -202,7 +202,7 @@ class Database
 		klass.class_eval %{
 			DBTABLE = "#{Adapter.table(klass)}"
 			DBSEQ = "#{Adapter.table(klass)}_oid_seq" 
-	
+
 			cattr_accessor :og_db
 
 			def to_i
@@ -214,10 +214,6 @@ class Database
 
 		klass.og_db = self
 		
-		# Add observer support.
-		
-		klass.extend(Observable)
-
 		# Create the schema for this class if not available.
 		
 		@adapter.create_table(klass, self) if Og.create_schema				
@@ -285,4 +281,10 @@ class Database
 	end
 end
 
+# Helper method
+
+def self.connect(*args)
+	db = Database.new(*args)
+end
+
 end

data/lib/og/enchant.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: enchant.rb 1 2005-04-11 11:04:30Z gmosx $
 
 module Og
 

data/lib/og/errors.rb

@@ -0,0 +1,21 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: errors.rb 1 2005-04-11 11:04:30Z gmosx $
+
+module Og
+
+# This exception is thrown when a low level error
+# happens in the store implementation.
+#--
+# TODO: rename adapter_exception to store_exception.
+#++
+
+class SqlException < Exception
+	attr_accessor :adapter_exception, :sql
+
+	def initialize(adapter_exception, sql = nil)
+		@adapter_exception, @sql = adapter_exception, sql
+	end
+end
+	
+end 

data/lib/og/meta.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: meta.rb 337 2005-03-31 16:20:40Z gmosx $
+# (c) 2005 Navel, all rights reserved.
+# $Id: meta.rb 1 2005-04-11 11:04:30Z gmosx $
 #--
 # TODO:
 # - precreate the meta sql statements as much as possible to 
@@ -8,12 +8,12 @@
 #++
 
 require 'glue/inflector'
-require 'og/adapter'
+require 'og/adapters/base'
 require 'og/typemacros'
 
 module Og
 
-class Relation < N::Property
+class Relation < Property
 	alias foreign_class klass
 end
 
@@ -48,7 +48,7 @@ module MetaUtils # :nodoc: all
 	#++
 
 	def self.resolve_class(name, klass)
-		klass ||= N::Inflector.camelize(name)
+		klass ||= Inflector.camelize(name)
 		
 		return klass if klass.is_a?(Class)
 		
@@ -178,7 +178,7 @@ module MetaLanguage
 	#	end
 	
 	def has_many(name, klass, options = {})
-		name_s = N::Inflector.singularize(name.to_s)
+		name_s = Inflector.singularize(name.to_s)
 		
 		# linkback is the property of the child object that 'links back' 
 		# to this object. 
@@ -254,9 +254,9 @@ module MetaLanguage
 	
 	def many_to_many(name, klass, options = {})
 		list_o = name.to_s
-		prop_o = N::Inflector.singularize(list_o)
-		list_m = (options[:linkback] || N::Inflector.plural_name(self)).to_s
-		prop_m = N::Inflector.singularize(list_m)
+		prop_o = Inflector.singularize(list_o)
+		list_m = (options[:linkback] || Inflector.plural_name(self)).to_s
+		prop_m = Inflector.singularize(list_m)
 	
 		# Exit if the class is allready indirectly 'enchanted' from the
 		# other class of the many_to_many relation.
@@ -393,6 +393,7 @@ end
 if Og.include_meta_language
 	class Module # :nodoc: all
 		include Og::MetaLanguage
+
 =begin
 		A hack to avoid forward references. Does not work
 		with namespave modules though. Any idea?