og 0.6.0 → 0.7.0

data/lib/og/backends/psql.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: psql.rb 185 2004-12-10 13:29:09Z gmosx $
+# $Id: psql.rb 194 2004-12-20 20:23:57Z gmosx $
 
 require "postgres"
 
@@ -137,6 +137,8 @@ end
 # = PsqlBackend
 #
 # Implements a PostgreSQL powered backend.
+# This backend is compatible with Michael Neumann's postgres-pr
+# pure ruby driver.
 #
 class PsqlBackend < Og::Backend
 
@@ -240,21 +242,7 @@ class PsqlBackend < Og::Backend
 	# and constrains are created (indicices, sequences, etc).
 	#
 	def create_table(klass)
-		fields = []
-		
-		klass.__props.each do |p|
-			klass.sql_index(p.symbol) if p.meta[:sql_index]
-				
-			field = "#{p.symbol}"
-			
-			if p.meta and p.meta[:sql]
-				field << " #{p.meta[:sql]}"
-			else
-				field << " #{TYPEMAP[p.klass]}"
-			end
-			
-			fields << field 
-		end
+		fields = create_fields(klass, TYPEMAP)
 
 		sql = "CREATE TABLE #{klass::DBTABLE} (#{fields.join(', ')}"
 		
@@ -319,7 +307,7 @@ class PsqlBackend < Og::Backend
 				join_src = "#{Og::Utils.encode(klass)}_oid"
 				join_dst = "#{Og::Utils.encode(join_class)}_oid"
 				begin
-					exec "CREATE TABLE #{join_table} ( key1 integer, key2 integer )"
+					exec "CREATE TABLE #{join_table} ( key1 integer NOT NULL, key2 integer NOT NULL )"
 					exec "CREATE INDEX #{join_table}_key1_idx ON #{join_table} (key1)"
 					exec "CREATE INDEX #{join_table}_key2_idx ON #{join_table} (key2)"
 				rescue => ex

data/lib/og/meta.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: meta.rb 185 2004-12-10 13:29:09Z gmosx $
+# $Id: meta.rb 198 2004-12-22 11:26:59Z gmosx $
 
 require 'og/backend'
 require 'glue/inflector'
@@ -17,7 +17,9 @@ module MetaUtils # :nodoc: all
 
 	# Conver the klass to a string representation
 	# The leading module if available is removed.
-	#
+	#--
+	# gmosx, FIXME: unify with the ogutils.encode method?
+	#++
 	def self.expand(klass)
 		return klass.name.gsub(/^.*::/, '').gsub(/::/, '_').downcase
 	end
@@ -46,7 +48,7 @@ module MetaLanguage
 	# Example:
 	#
 	# class MyObject
-	#		belongs_to AnotherObject, :parent
+	#		belongs_to AnotherObject, :prop => :parent
 	# end
 	#
 	# creates the code:
@@ -56,8 +58,12 @@ module MetaLanguage
 	# def parent=(obj_or_oid); ... end
 	#
 	def belongs_to(name, klass, options = {})
+		prop_eval = "prop_accessor Fixnum, :#{name}_oid"
+		prop_eval << ", :sql => '#{options[:sql]}'" if options[:sql]
+		prop_eval << ", :extra_sql => '#{options[:extra_sql]}'" if options[:extra_sql]
+
 		module_eval %{
-			prop_accessor Fixnum, :#{name}_oid 
+			#{prop_eval}
 			
 			def #{name}
 				$og.load_by_oid(@#{name}_oid, #{klass})
@@ -75,14 +81,14 @@ module MetaLanguage
 	# Example:
 	#
 	# class MyObject
-	#		has_one :children, AnotherObject
+	#		has_one AnotherObject
 	# end
 	#
 	# creates the code:
 	#
-	# def children; ... end
+	# ...
 	#
-	def has_one(klass, name, options = {})
+	def has_one(name, klass, options = {})
 		# linkback is the property of the child object that 'links back' 
 		# to this object. 
 		linkback = options[:linkback] || "#{MetaUtils.expand(self)}_oid"
@@ -117,6 +123,8 @@ module MetaLanguage
 	# def children; ... end
 	#
 	def has_many(name, klass, options = {})
+		name_s = G::Inflector.singularize(name.to_s)
+		
 		# linkback is the property of the child object that 'links back' 
 		# to this object. 
 		linkback = options[:linkback] || "#{MetaUtils.expand(self)}_oid"
@@ -138,6 +146,11 @@ module MetaLanguage
 			def #{name}_count(extrasql = nil)
 				$og.count("SELECT COUNT(*) FROM #{Utils.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}")
 			end			
+
+			def add_#{name_s}(obj, extra = nil)
+				obj.#{linkback} = @oid
+				obj.save!
+			end
 		}
 	end
 	
@@ -145,10 +158,12 @@ module MetaLanguage
 	# Two objects are associated using an intermediate join table.
 	# Automatically enchants the calling class with helper methods.
 	#
+	# Options:
+	#
 	# Example:
 	#
 	# class Article
-	#		many_to_many :children, Categories
+	# 	many_to_many :categories, Category, :linkback => articles
 	# end
 	#
 	# article.categories
@@ -162,15 +177,15 @@ module MetaLanguage
 	#--
 	# FIXME: make more compatible with other enchant methods.
 	#++
-	def many_to_many(klass, options = {})
-		name1 = options[:name1] || G::Inflector.name(self)
-		pname1 = options[:list_name1] || G::Inflector.plural_name(self) 
-		name2 = options[:name2] || G::Inflector.name(klass)
-		pname2 = options[:list_name2] || G::Inflector.plural_name(klass) 
+	def many_to_many(name, klass, options = {})
+		list_o = name.to_s
+		prop_o = G::Inflector.singularize(list_o)
+		list_m = options[:linkback] || G::Inflector.plural_name(self) 
+		prop_m = G::Inflector.singularize(list_m)
 	
 		# exit if the class is allready indirectly 'enchanted' from the
 		# other class of the many_to_many relation.
-		return if self.respond_to?(name1)
+		return if self.respond_to?(prop_m)
 	
 		# Add some metadata to the class to allow for automatic join table
 		# calculation.
@@ -181,24 +196,24 @@ module MetaLanguage
 		# enchant this class
 		
 		module_eval %{
-			def #{pname2}(extrasql = nil)
+			def #{list_o}(extrasql = nil)
 				$og.select("SELECT d.* FROM #{Utils.table(klass)} AS d, #{Utils.join_table(self, klass)} AS j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
 			end
 
-			def #{pname2}_count(extrasql = nil)
+			def #{list_o}_count(extrasql = nil)
 				$og.select("SELECT COUNT(*) FROM #{Utils.table(klass)} AS d, #{Utils.join_table(self, klass)} AS j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
 			end						
 			
-			def add_#{name2}(obj, extra = nil)
+			def add_#{prop_o}(obj, extra = nil)
 				$og.exec("INSERT INTO #{Utils.join_table(self, klass)} (key1, key2) VALUES (\#\@oid, \#\{obj.oid\})") 
 			end
 			
-			def del_#{name2}(obj_or_oid, extra = nil)
+			def del_#{prop_o}(obj_or_oid, extra = nil)
 				$og.exec("DELETE FROM #{Utils.join_table(self, klass)} WHERE key2=\#\{obj_or_oid.to_i\}") 
 			end
-			alias_method :delete_#{name2}, :del_#{name2}
+			alias_method :delete_#{prop_o}, :del_#{prop_o}
 
-			def clear_#{pname2}
+			def clear_#{list_o}
 				$og.exec("DELETE FROM #{Utils.join_table(self, klass)} WHERE key1=\#\@oid") 
 			end			
 		}
@@ -206,24 +221,24 @@ module MetaLanguage
 		# indirectly enchant the other class of the relation.
 		
 		klass.module_eval %{
-			def #{pname1}(extrasql = nil)
+			def #{list_m}(extrasql = nil)
 				$og.select("SELECT s.* FROM #{Utils.table(self)} AS s, #{Utils.join_table(self, klass)} AS j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
 			end
 
-			def #{pname1}_count(extrasql = nil)
+			def #{list_m}_count(extrasql = nil)
 				$og.select("SELECT COUNT(*) FROM #{Utils.table(self)} AS s, #{Utils.join_table(self, klass)} AS j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
 			end
 			
-			def add_#{name1}(obj, extra = nil)
+			def add_#{prop_m}(obj, extra = nil)
 				$og.exec("INSERT INTO #{Utils.join_table(self, klass)} (key1, key2) VALUES (\#\{obj.oid\}, \#\@oid)") 
 			end
 			
-			def del_#{name1}(obj_or_oid, extra = nil)
+			def del_#{prop_m}(obj_or_oid, extra = nil)
 				$og.exec("DELETE FROM #{Utils.join_table(self, klass)} WHERE key1=\#\{obj_or_oid.to_i\}") 
 			end
-			alias_method :delete_#{name1}, :del_#{name1}						
+			alias_method :delete_#{prop_m}, :del_#{prop_m}						
 
-			def clear_#{pname1}
+			def clear_#{list_m}
 				$og.exec("DELETE FROM #{Utils.join_table(self, klass)} WHERE key2=\#\@oid") 
 			end			
 		}

data/lib/og/mock.rb

@@ -0,0 +1,223 @@
+# code:
+# * George Moschovitis  <gm@navel.gr>
+# * Thomas Quas  <tquas@yahoo.com>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id$
+
+require 'og'
+
+require 'rubygems'
+require_gem 'flexmock'
+
+module Og
+	
+# = MockDatabase
+#
+# A utility object to Mock a Database in test units.
+# Extends the standard FlexMock object.
+#
+#--
+# TODO: Factor out common functionality with Database
+# to avoid code duplication.
+#++
+class MockDatabase < ::FlexMock 
+
+	# Managed class metadata
+	#
+	class ManagedClassMeta
+		# The managed class.
+		attr_accessor :klass
+		
+		# A mapping of the database fields to the object properties.
+		attr_accessor :field_index
+		
+		def initialize(klass = nil)
+			@klass = klass
+			@field_index = {}
+		end
+	end
+
+	# hash of configuration options.
+	attr_accessor :config
+
+	# Pool of connections to the backend.
+	attr_accessor :connection_pool
+
+	# Managed classes.
+	attr_accessor :managed_classes
+
+	# Initialize the database interface.
+	#
+	def initialize
+		# Initialize FlexMock
+		super
+		
+		@managed_classes = G::SafeHash.new
+		
+		$log.info "Using mock database."
+		
+		if $og_auto_manage_classes
+			# automatically manage classes with properties and metadata.
+			# gmosx: Any idea how to optimize this?
+			classes_to_manage = []
+			ObjectSpace.each_object(Class) do |c|
+				if c.respond_to?(:__props) and c.__props
+					classes_to_manage << c
+				end
+			end
+			$log.info "Og auto manages the following classes:"
+			$log.info "#{classes_to_manage.inspect}"
+			manage_classes(*classes_to_manage)
+		end
+	end
+		
+	# Shutdown the database interface.
+	#
+	def shutdown
+	end
+	alias_method :close, :shutdown
+
+	# Register a standard Ruby class as managed.
+	#
+	def manage(klass)
+		return if managed?(klass) or klass.ancestors.include?(Og::Unmanageable)
+		
+		@managed_classes[klass] = ManagedClassMeta.new(klass)
+		
+		# Add standard og methods to the class.
+		convert(klass)
+		
+		# Add helper methods to the class.
+		enchant(klass) if $og_enchant_managed_classes 
+	end
+	
+	# Helper method to set multiple managed classes.
+	#
+	def manage_classes(*klasses)
+		for klass in klasses
+			manage(klass)
+		end
+	end
+	
+	# Stop managing a Ruby class
+	#
+	def unmanage(klass)
+		@managed_classes.delete(klass)
+	end
+	
+	# Is this class managed?
+	#	
+	def managed?(klass)
+		return @managed_classes.include?(klass)
+	end
+	
+	# Add standard og functionality to the class
+	#
+	def convert(klass)
+		klass.class_eval %{
+			DBTABLE = "#{Og::Utils.table(klass)}"
+			DBSEQ = "#{Og::Utils.table(klass)}_oids_seq" 
+			
+			def to_i()
+				@oid
+			end			
+		}
+	end
+	
+	# Enchant a managed class. Add useful DB related methods to the 
+	# class and its instances. 
+	#
+	def enchant(klass)
+		klass.class_eval %{
+			def self.save(obj)
+				$og << obj
+			end
+			
+			def self.load(oid_or_name)
+				$og.load(oid_or_name, #{klass})
+			end
+
+			def self.[](oid_or_name)
+				$og.load(oid_or_name, #{klass})
+			end
+			
+			def self.load_all(extra_sql = nil)
+				$og.load_all(#{klass}, extra_sql)
+			end
+			
+			def self.all(extra_sql = nil)
+				$og.load_all(#{klass}, extra_sql)
+			end
+
+			def self.count(sql = "SELECT COUNT(*) FROM #{klass::DBTABLE}")
+				$og.count(sql, #{klass})
+			end
+
+			def self.select(sql)
+				$og.select(sql, #{klass})
+			end
+
+			def self.select_one(sql)
+				$og.select_one(sql, #{klass})
+			end
+			
+			def self.delete(obj_or_oid)
+				$og.delete(obj_or_oid, #{klass})
+			end
+			
+			def save
+				$og << self
+				return self
+			end
+			alias_method :save!, :save
+			
+			def update_properties(updatesql)
+				$og.pupdate(updatesql, self.oid, #{klass})
+			end
+			alias_method :pupdate!, :update_properties
+			
+			def delete!
+				$og.delete(@oid, #{klass})
+			end
+		}
+	end
+
+	# Automatically wrap connection methods.
+	#
+	def self.wrap_method(method, args)
+		args = args.split(/,/)
+		class_eval %{
+			def #{method}(#{args.join(", ")})
+				# nop
+			end
+		}
+	end
+=begin	
+	wrap_method :create_table, "klass"
+	wrap_method :drop_table, "klass"
+	wrap_method :save, "obj";	alias_method :<<, :save; alias_method :put, :save
+	wrap_method :insert, "obj"
+	wrap_method :update, "obj"
+	wrap_method :update_properties, "update_sql, obj_or_oid, klass = nil"
+	wrap_method :pupdate, "update_sql, obj_or_oid, klass = nil"
+	wrap_method :load, "oid, klass"; alias_method :get, :load	
+	wrap_method :load_by_oid, "oid, klass"
+	wrap_method :load_by_name, "name, klass"	
+	wrap_method :load_all, "klass, extrasql = nil"
+	wrap_method :select, "sql, klass"
+	wrap_method :select_one, "sql, klass"
+	wrap_method :count, "sql, klass = nil"
+	wrap_method :delete, "obj_or_oid, klass = nil"	
+	wrap_method :query, "sql"
+	wrap_method :exec, "sql"
+=end	
+	def self.create_db!(config)
+	end
+
+	def self.drop_db!(config)
+	end
+end
+
+end # module
+

data/lib/og/version.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: version.rb 175 2004-11-26 16:11:27Z gmosx $
+# $Id: version.rb 198 2004-12-22 11:26:59Z gmosx $
 
 # The version of Og.
-$og_version = '0.6.0'
+$og_version = '0.7.0'