og 0.13.0 → 0.14.0

data/lib/og/connection.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: connection.rb 281 2005-03-10 12:24:14Z gmosx $
+# $Id: connection.rb 326 2005-03-28 11:07:17Z gmosx $
 
 module Og; 
 
@@ -12,10 +12,10 @@ require 'glue/time'
 # functionality. A backend specific implementation file (driver) 
 # implements all methods.
 #
-# === Future 
-#
+#--
 # - support caching.
 # - support prepared statements.
+#++
 
 class Connection
 
@@ -139,6 +139,12 @@ class Connection
 		raise 'Not implemented!'
 	end
 
+	# Get a row from the resultset.
+
+	def get_row(res)
+		return res
+	end
+
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
 	# :section: Managed object methods.
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -187,6 +193,7 @@ class Connection
 		exec "UPDATE #{klass::DBTABLE} SET #{update_sql} WHERE oid=#{oid}"
 	end
 	alias_method :pupdate, :update_properties
+	alias_method :update_propery, :update_properties
 
 	# Load an object from the database.
 	#
@@ -282,7 +289,7 @@ class Connection
 		# this is a class callback!
 		
 		if klass.respond_to?(:og_pre_delete)
-			klass.og_pre_delete(self, oid)
+			klass.og_pre_delete(self, obj_or_oid)
 		end
 		
 		# TODO: implement this as stored procedure? naaah.
@@ -298,7 +305,21 @@ class Connection
 		end
 	end
 	alias_method :delete!, :delete
-		
+	
+	protected
+
+	# Handles an adapter exception.
+
+	def handle_db_exception(ex, sql = nil)
+		Logger.error "DB error #{ex}, [#{sql}]"
+		Logger.error ex.backtrace.join("\n")
+		raise SqlException.new(ex, sql) if Og.raise_db_exceptions
+
+		# FIXME: should return :error or something.
+
+		return nil 
+	end
+
 end
 
 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 281 2005-03-10 12:24:14Z gmosx $
+# $Id: database.rb 326 2005-03-28 11:07:17Z gmosx $
 
 require 'glue/logger'
 require 'glue/attribute'
@@ -65,6 +65,8 @@ class Database
 
 		@adapter =  Adapter.for_name(@config[:adapter])
 
+		self.class.drop!(config) if config[:drop]
+		
 		@connection_pool = N::Pool.new
 		@managed_classes = N::SafeHash.new
 		
@@ -72,26 +74,7 @@ class Database
 			@connection_pool << @adapter.new_connection(self)
 		end
 	
-		# gmosx, FIXME: this automanage code is not elegant and slow
-		# should probably recode this, along with glue/property.rb
-		
-		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
-			
-			Logger.debug "Og auto manages the following classes:"
-			Logger.debug "#{classes_to_manage.inspect}"
-			
-			manage_classes(*classes_to_manage)
-		end
+		auto_manage_classes if Og.auto_manage_classes
 
 		# use the newly created database.
 		Og.use(self)
@@ -169,6 +152,32 @@ class Database
 			manage(klass)
 		end
 	end
+
+	# Use Ruby's advanced reflection features to find
+	# and manage all manageable classes. Manageable are all
+	# classes that include Properties or Metadata.
+	#--
+	# gmosx, FIXME: this automanage code is not elegant and slow
+	# should probably recode this, along with glue/property.rb	
+	# FIXME: can this be optimized?
+	# TODO: find a better name.
+	#++
+
+	def auto_manage_classes
+		classes_to_manage = []
+
+		ObjectSpace.each_object(Class) do |c|
+			if c.respond_to?(:__props) and c.__props
+				classes_to_manage << c
+			end
+		end
+		
+		Logger.debug "Og auto manages the following classes:"
+		Logger.debug "#{classes_to_manage.inspect}"
+		
+		manage_classes(*classes_to_manage)
+	end
+	alias_method :auto_manage, :auto_manage_classes
 	
 	# Stop managing a Ruby class
 	
@@ -177,7 +186,7 @@ class Database
 	end
 	
 	# Is this class managed?
-	#	
+	
 	def managed?(klass)
 		return @managed_classes.include?(klass)
 	end
@@ -212,11 +221,6 @@ class Database
 		# Create the schema for this class if not available.
 		
 		@adapter.create_table(klass, self) if Og.create_schema				
-
-		# @adapter.eval_og_insert(klass, self)
-		# @adapter.eval_og_update(klass, self)
-		# @adapter.eval_og_read(klass, self)
-
 		@adapter.eval_lifecycle_methods(klass, self)
 	end
 	
@@ -257,6 +261,8 @@ class Database
 	wrap_method :prepare, 'sql'
 	wrap_method :query, 'sql'
 	wrap_method :exec, 'sql'
+	wrap_method :get_row, 'res'
+	wrap_method :transaction, '&block'
 
 	class << self
 

data/lib/og/enchant.rb

@@ -43,6 +43,14 @@ module Enchant
 				@@og_db.load_all(#{klass}, extra_sql)
 			end
 
+			def self.update_all(set_sql, extra_sql = nil)
+				@@og_db.exec("UPDATE #{klass::DBTABLE} SET \#\{set_sql\} \#\{extra_sql\}")
+			end
+
+			def self.update(set_sql, extra_sql = nil)
+				@@og_db.exec("UPDATE #{klass::DBTABLE} SET \#\{set_sql\} \#\{extra_sql\}")
+			end
+
 			def self.count(sql = "SELECT COUNT(*) FROM #{klass::DBTABLE}")
 				@@og_db.count(sql, #{klass})
 			end
@@ -71,11 +79,15 @@ module Enchant
 				@@og_db.delete(obj_or_oid, #{klass})
 			end
 
+			def self.transaction(&block)
+				@@og_db.transaction(&block)
+			end
+
 			def self.properties_and_relations
 				@@__meta[:props_and_relations]
 			end
 
-			def each(&block)
+			def self.each(&block)
 				all.each(&block)
 			end
 			include Enumerable
@@ -85,14 +97,26 @@ module Enchant
 				return self
 			end
 			alias_method :save!, :save
-			
+
+			def reload
+				raise 'Cannot reload unmanaged object' unless @oid
+				res = @@og_db.query "SELECT * FROM #{klass::DBTABLE} WHERE oid=\#\{@oid\}"
+				og_read(@@og_db.get_row(res))
+			end
+			alias_method :reload!, :reload
+
 			def update_properties(updatesql)
 				@@og_db.pupdate(updatesql, self.oid, #{klass})
 			end
-			alias_method :pupdate!, :update_properties
+			alias_method :pupdate, :update_properties
+			alias_method :update_property, :update_properties
+
+			def set_property(prop, value)
+				@@og_db.pupdate("\#\{prop\}=\#\{value\}", self.oid, #{klass})
+			end
 			
 			def delete!
-				@@og_db.delete(@oid, #{klass})
+				@@og_db.delete(self, #{klass})
 			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 281 2005-03-10 12:24:14Z gmosx $
+# $Id: meta.rb 326 2005-03-28 11:07:17Z gmosx $
 #--
 # TODO:
 # - precreate the meta sql statements as much as possible to 
@@ -11,6 +11,8 @@ require 'glue/inflector'
 require 'og/adapter'
 require 'og/typemacros'
 
+require 'og/mixins/list'
+
 module Og
 
 class Relation < N::Property
@@ -138,7 +140,7 @@ module MetaLanguage
 		linkback = (options[:linkback].to_s || "#{MetaUtils.expand(self)}_oid").to_s
 		
 		meta :descendants, klass, linkback
-		meta :props_and_relations, HasOne.new(name, klass, :linkback => linkback)
+		meta :props_and_relations, HasOne.new(name, klass, options)
 		
 		module_eval %{
 			def #{name}(extrasql = nil)
@@ -150,10 +152,18 @@ module MetaLanguage
 			end			
 		}
 	end	
-	
+
 	# Implements a 'has_many' relation.
 	# Automatically enchants the calling class with helper methods.
 	# 
+	# Options:
+	#
+	# [+linkback+]
+	# 
+	#	[+order+]
+	#
+	# [+extrasql+]
+	#
 	# Example:
 	#
 	# class MyObject
@@ -176,16 +186,21 @@ module MetaLanguage
 		# to this object. 
 
 		linkback = (options[:linkback] || "#{MetaUtils.expand(self)}_oid").to_s
+
+		if order = options[:order]
+			order = "ORDER BY #{order}"
+		end
+		default_extrasql = "#{order}#{options[:sql]}"
 		
 		# keep belongs to metadata, useful for 
 		# reflection/scaffolding.
 
 		meta :descendants, klass, linkback
-		meta :props_and_relations, HasMany.new(name, klass, :linkback => linkback)
+		meta :props_and_relations, HasMany.new(name, klass, options)
 
 		code = %{
 			def #{name}(extrasql = nil)
-				Og.db.select("SELECT * FROM #{Og::Adapter.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}", #{klass})
+				Og.db.select("SELECT * FROM #{Og::Adapter.table(klass)} WHERE #{linkback}=\#\@oid #{default_extrasql} \#\{extrasql\}", #{klass})
 			end
 
 			def #{name}_count(extrasql = nil)
@@ -380,5 +395,15 @@ end
 if Og.include_meta_language
 	class Module # :nodoc: all
 		include Og::MetaLanguage
+		include Og::List
+=begin
+		A hack to avoid forward references. Does not work
+		with namespave modules though. Any idea?
+		-> try TOPLEVEL_BINDING
+
+		def const_missing(sym)
+			eval "class ::#{sym}; end; return #{sym}"
+		end
+=end
 	end
 end

data/lib/og/mixins/list.rb

@@ -0,0 +1,158 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: list.rb 326 2005-03-28 11:07:17Z gmosx $
+
+module Og
+
+# Attach list/ordering methods to the enchanted class.
+#--
+# TODO:
+# Convert to new Og filter system.
+# Implement as super-mixin.
+#++
+
+module List 
+
+	# The enchanted object acts as a list item.
+
+	def acts_as_list(options = {})
+		c = { :position => 'position', :type => Fixnum, :scope => '1 = 1' }
+		c.update(options) if options.is_a?(Hash)
+		c[:scope] = "#{c[:scope]}_oid".intern if c[:scope].is_a?(Symbol) && c[:scope].to_s !~ /_oid$/
+
+		position = c[:position]
+		scope = c[:scope]
+
+		if scope.is_a?(Symbol)
+			scope = %{(#{scope} ? "#{scope} = \#{@#{scope}}" : "#{scope} IS NULL")}
+		end
+		
+		module_eval <<-EOE, __FILE__, __LINE__		
+			property :#{position}, #{c[:type]}
+		
+			def og_pre_insert(conn)
+				add_to_bottom
+			end
+
+			def self.og_pre_delete(conn, obj)
+				obj.decrement_position_of_lower_items
+			end
+			
+			def move_higher
+				if higher = higher_item
+					#{self}.transaction do
+						higher.increment_position
+						decrement_position
+					end
+				end
+			end
+
+			def move_lower
+				if lower = lower_item
+					#{self}.transaction do
+						lower.decrement_position
+						increment_position
+					end
+				end
+			end
+
+			def move_to_top
+				#{self}.transaction do
+					increment_position_of_higher_items
+					set_top_position
+				end
+			end
+
+			def move_to_bottom
+				#{self}.transaction do
+					decrement_position_of_lower_items
+					set_bottom_position
+				end											
+			end
+
+			def move_to
+			end
+
+			def add_to_top
+				increment_position_of_all_items
+			end
+
+			def add_to_bottom
+				@#{position} = bottom_position + 1
+			end
+
+			def add_to
+			end
+
+			def higher_item
+				#{self}.one(#{scope} + " AND #{position}=\#\{@#{position} - 1\}")
+			end
+			alias_method :previous_item, :higher_item
+
+			def lower_item
+				#{self}.one(#{scope} + " AND #{position}=\#\{@#{position} + 1\}")
+			end
+			alias_method :next_item, :lower_item
+
+			def top_item
+			end
+			alias_method :first_item, :top_item
+
+			def bottom_item
+				#{self}.one(#{scope} + " ORDER BY #{position} DESC")
+			end
+			alias_method :last_item, :last_item
+
+			def top?
+				@#{position} == 1
+			end
+			alias_method :first?, :top?
+
+			def bottom?
+				@#{position} == bottom_position
+			end
+			alias_method :last?, :bottom?
+
+			def increment_position
+				@#{position} += 1
+				set_property('#{position}', @#{position})
+			end
+		
+			def decrement_position
+				@#{position} -= 1
+				set_property('#{position}', @#{position})
+			end
+
+			def bottom_position
+				item = bottom_item
+				item ? item.#{position} : 0
+			end
+
+			def set_top_position
+				@#{position} = 1
+				set_property('#{position}', 1)
+			end
+
+			def set_bottom_position
+				@#{position} = bottom_position + 1
+				set_property('#{position}', @#{position})
+			end
+
+			def increment_position_of_higher_items
+				#{self}.update("#{position}=(#{position} + 1)", "WHERE " + #{scope} + " AND #{position} < \#\{@#{position}\}")
+			end
+
+			def increment_position_of_all_items
+				#{self}.update("#{position}=(#{position} + 1)", "WHERE " + #{scope})
+			end
+			
+			def decrement_position_of_lower_items
+				#{self}.update("#{position}=(#{position} - 1)", "WHERE " + #{scope} + " AND #{position} > \#\{@#{position}\}")
+			end
+		EOE
+	end
+	
+
+end
+
+end