nitro 0.9.5 → 0.10.0

data/lib/og/database.rb

@@ -0,0 +1,268 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: database.rb 255 2005-02-10 12:45:32Z gmosx $
+
+require 'glue/logger'
+require 'glue/attribute'
+require 'glue/property'
+require 'glue/array'
+require 'glue/hash'
+require 'glue/time'
+require 'glue/pool'
+
+require 'og/enchant'
+require 'og/meta'
+
+class Og
+	
+# Encapsulates an Og Database.
+
+class Database
+	include Og::Enchant
+
+	# 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
+
+	# The adapter that comunicates with the backend
+	# datastore.
+
+	attr_accessor :adapter
+
+	# Pool of connections.
+	
+	attr_accessor :connection_pool
+
+	# Managed classes.
+	
+	attr_accessor :managed_classes
+
+	# Initialize the database interface.
+	
+	def initialize(config)
+		@config = config
+
+		# populate with default options if needed.
+		@config[:connection_count] ||= 1
+		
+		Logger.info "Connecting to database '#{@config[:database]}' using the '#{@config[:adapter]}' adapter."
+
+		@adapter =  Adapter.for_name(@config[:adapter])
+
+		@connection_pool = N::Pool.new
+		@managed_classes = N::SafeHash.new
+		
+		@config[:connection_count].times do
+			# @connection_pool << Og::Connection.new(self)
+			@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.info "Og auto manages the following classes:"
+			Logger.info "#{classes_to_manage.inspect}"
+			
+			manage_classes(*classes_to_manage)
+		end
+
+		# use the newly created database.
+		Og.use(self)
+	end
+		
+	# Shutdown the database interface.
+	
+	def shutdown
+		for con in @connection_pool
+			con.close()
+		end
+	end
+	alias_method :close, :shutdown
+
+	# Get a connection from the pool to access the database.
+	# Stores the connection in a thread-local variable.
+
+	def get_connection
+		thread = Thread.current
+		
+		unless conn = thread[:og_conn]
+			conn = @connection_pool.pop()
+			thread[:og_conn] = conn
+		end
+		
+		return conn
+	end
+	alias_method :connection, :get_connection
+	
+	# Restore an unused connection to the pool.
+	
+	def put_connection
+		thread = Thread.current
+		
+		if conn = thread[:og_conn]
+			thread[:og_conn] = nil
+			return @connection_pool.push(conn)
+		end
+	end	
+	
+	# Utility method, automatically restores a connection to the pool.
+	
+	def connect(&block)
+		result = nil
+		
+		begin
+			conn = get_connection
+			result = yield(conn)
+		ensure
+			put_connection
+		end
+
+		return result
+	end
+	alias_method :open, :connect
+	
+	
+	# 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)
+		# gmosx: this check is needed to allow the developer to customize
+		# the sql generated for oid
+
+		@adapter.eval_og_oid(klass) unless klass.instance_methods.include?(:oid)
+		
+		klass.class_eval %{
+			DBTABLE = "#{Adapter.table(klass)}"
+			DBSEQ = "#{Adapter.table(klass)}_oid_seq" 
+			
+			def to_i()
+				@oid
+			end			
+		}
+
+		# Create the schema for this class if not available.
+		@adapter.create_table(klass, self)				
+
+		# Precompile some code that gets executed all the time.
+		# Deletion code is not precompiled, because it is not used
+		# as frequently.
+
+		@adapter.eval_og_insert(klass, self)
+		@adapter.eval_og_update(klass, self)
+		@adapter.eval_og_read(klass, self)
+	end
+	
+	# Automatically wrap connection methods.
+	
+	def self.wrap_method(method, args)
+		args = args.split(/,/)
+		class_eval %{
+			def #{method}(#{args.join(", ")})
+				thread = Thread.current
+				
+				unless conn = thread[:og_conn]
+					conn = @connection_pool.pop()
+					thread[:og_conn] = conn
+				end
+			
+				return conn.#{method}(#{args.collect {|a| a.split(/=/)[0]}.join(", ")})
+			end
+		}
+	end
+
+	wrap_method :db, ''
+	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 :prepare, 'sql'
+	wrap_method :query, 'sql'
+	wrap_method :exec, 'sql'
+
+	class << self
+		def create_db!(config)
+			adapter = Adapter.for_name(config[:adapter])
+			adapter.create_db(config[:database], config[:user], config[:password])
+		end
+		alias_method :create!, :create_db!
+
+		def drop_db!(config)
+			adapter = Adapter.for_name(config[:adapter])
+			adapter.drop_db(config[:database], config[:user], config[:password])
+		end
+		alias_method :drop!, :drop_db!
+	end
+end
+
+end

data/lib/og/meta.rb

@@ -1,14 +1,17 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: meta.rb 248 2005-01-31 13:38:34Z gmosx $
-
-require 'og/backend'
+# $Id: meta.rb 254 2005-02-10 12:44:05Z gmosx $
+#--
+# TODO:
+# - precreate the meta sql statements as much as possible to 
+#   avoid string interpolations.
+#++
+
+require 'og/adapter'
 require 'glue/inflector'
 
 class Og
 
-# = MetaUtils
-#
 # Some useful meta-language utilities.
 
 module MetaUtils # :nodoc: all
@@ -48,8 +51,6 @@ module MetaUtils # :nodoc: all
 
 end
 
-# = MetaLanguage
-#
 # Implements a meta-language for manipulating og-managed objects
 # and defining their relationships. The original idea comes
 # from the excellent ActiveRecord library.
@@ -125,11 +126,11 @@ module MetaLanguage
 		
 		module_eval %{
 			def #{name}(extrasql = nil)
-				Og.db.select_one("SELECT * FROM #{Backend.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}", #{klass})
+				Og.db.select_one("SELECT * FROM #{Og::Adapter.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}", #{klass})
 			end
 
 			def delete_#{name}(extrasql = nil)
-				Og.db.exec("DELETE FROM #{Backend.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}") 
+				Og.db.exec("DELETE FROM #{Og::Adapter.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}") 
 			end			
 		}
 	end	
@@ -162,11 +163,11 @@ module MetaLanguage
 
 		module_eval %{
 			def #{name}(extrasql = nil)
-				Og.db.select("SELECT * FROM #{Backend.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}", #{klass})
+				Og.db.select("SELECT * FROM #{Og::Adapter.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}", #{klass})
 			end
 
 			def #{name}_count(extrasql = nil)
-				Og.db.count("SELECT COUNT(*) FROM #{Backend.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}")
+				Og.db.count("SELECT COUNT(*) FROM #{Og::Adapter.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}")
 			end			
 
 			def add_#{name_s}(obj, extra = nil)
@@ -175,7 +176,7 @@ module MetaLanguage
 			end
 			
 			def delete_all_#{name}(extrasql = nil)
-				Og.db.exec("DELETE FROM #{Backend.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}") 
+				Og.db.exec("DELETE FROM #{Og::Adapter.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}") 
 			end			
 		}
 	end
@@ -226,23 +227,23 @@ module MetaLanguage
 		
 		module_eval %{
 			def #{list_o}(extrasql = nil)
-				Og.db.select("SELECT d.* FROM #{Backend.table(klass)} AS d, #{Backend.join_table(self, klass)} AS j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
+				Og.db.select("SELECT d.* FROM #{Og::Adapter.table(klass)} AS d, #{Og::Adapter.join_table(self, klass)} AS j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
 			end
 
 			def #{list_o}_count(extrasql = nil)
-				Og.db.select("SELECT COUNT(*) FROM #{Backend.table(klass)} AS d, #{Backend.join_table(self, klass)} AS j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
+				Og.db.select("SELECT COUNT(*) FROM #{Og::Adapter.table(klass)} AS d, #{Og::Adapter.join_table(self, klass)} AS j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
 			end						
 			
 			def add_#{prop_o}(obj, extra = nil)
-				Og.db.exec("INSERT INTO #{Backend.join_table(self, klass)} (key1, key2) VALUES (\#\@oid, \#\{obj.oid\})") 
+				Og.db.exec("INSERT INTO #{Og::Adapter.join_table(self, klass)} (key1, key2) VALUES (\#\@oid, \#\{obj.oid\})") 
 			end
 			
 			def delete_#{prop_o}(obj_or_oid, extra = nil)
-				Og.db.exec("DELETE FROM #{Backend.join_table(self, klass)} WHERE key2=\#\{obj_or_oid.to_i\}") 
+				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass)} WHERE key2=\#\{obj_or_oid.to_i\}") 
 			end
 
 			def clear_#{list_o}
-				Og.db.exec("DELETE FROM #{Backend.join_table(self, klass)} WHERE key1=\#\@oid") 
+				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass)} WHERE key1=\#\@oid") 
 			end			
 		}
 		
@@ -250,23 +251,23 @@ module MetaLanguage
 		
 		klass.module_eval %{
 			def #{list_m}(extrasql = nil)
-				Og.db.select("SELECT s.* FROM #{Backend.table(self)} AS s, #{Backend.join_table(self, klass)} AS j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
+				Og.db.select("SELECT s.* FROM #{Og::Adapter.table(self)} AS s, #{Og::Adapter.join_table(self, klass)} AS j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
 			end
 
 			def #{list_m}_count(extrasql = nil)
-				Og.db.select("SELECT COUNT(*) FROM #{Backend.table(self)} AS s, #{Backend.join_table(self, klass)} AS j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
+				Og.db.select("SELECT COUNT(*) FROM #{Og::Adapter.table(self)} AS s, #{Og::Adapter.join_table(self, klass)} AS j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
 			end
 			
 			def add_#{prop_m}(obj, extra = nil)
-				Og.db.exec("INSERT INTO #{Backend.join_table(self, klass)} (key1, key2) VALUES (\#\{obj.oid\}, \#\@oid)") 
+				Og.db.exec("INSERT INTO #{Og::Adapter.join_table(self, klass)} (key1, key2) VALUES (\#\{obj.oid\}, \#\@oid)") 
 			end
 			
 			def delete_#{prop_m}(obj_or_oid, extra = nil)
-				Og.db.exec("DELETE FROM #{Backend.join_table(self, klass)} WHERE key1=\#\{obj_or_oid.to_i\}") 
+				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass)} WHERE key1=\#\{obj_or_oid.to_i\}") 
 			end
 
 			def clear_#{list_m}
-				Og.db.exec("DELETE FROM #{Backend.join_table(self, klass)} WHERE key2=\#\@oid") 
+				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass)} WHERE key2=\#\@oid") 
 			end			
 		}
 	end

data/lib/og/mock.rb

@@ -3,10 +3,9 @@
 # (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
-require 'og'
+require 'flexmock'
 
-require 'rubygems'
-require_gem 'flexmock'
+require 'og'
 
 class Og
 	

data/lib/xsl/base.xsl

@@ -15,16 +15,10 @@ author: gmosx
 
 <xsl:stylesheet
 		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		xmlns:xl="http://www.w3.org/1999/xlink"		
 		xmlns:x="http://www.navel.gr/xml/shader.xsd"
-		exclude-result-prefixes="x xl"
+		exclude-result-prefixes="x"
 		version="1.0">
 
-	<!-- parameters and constants -->
-
-	<!-- <xsl:variable name='css'>style.css</xsl:variable> -->
-	<!-- <xsl:variable name='lang'>el</xsl:variable> -->
-
 	<!-- strip comments -->
 	<xsl:template match="comment()">
 		<!-- strip -->
@@ -53,38 +47,6 @@ author: gmosx
 	<xsl:template match="root">
 		<xsl:apply-templates/>
 	</xsl:template>
-
-	<!-- create a new, nested output buffer -->
-	<xsl:template name="x:ob-start" match="x:ob-start">
-		<ruby>
-			@out_buffers = [] unless @out_buffers
-			@out_buffers.push(@out)
-			@out = ""
-		</ruby>
-	</xsl:template>
-	
-	<!-- close a nested output buffer -->
-	<xsl:template name="x:ob-end" match="x:ob-end">
-		<ruby>
-			@out = @out_buffers.pop()
-		</ruby>
-	</xsl:template>
-
-	<!-- close a nested output buffer and write to the parent buffer -->
-	<xsl:template name="x:ob-write-end" match="x:ob-write-end">
-		<ruby>
-			__nested_buffer = @out
-			@out = @out_buffers.pop()
-			@out += __nested_buffer
-		</ruby>
-	</xsl:template>
-	
-	<!-- NOT WORKING YET -->
-	<xsl:template name="x:cache" match="x:cache">
-		<xsl:processing-instruction name='ruby'>
-		<![CDATA[__out == __out_buffers.pop()]]>
-		</xsl:processing-instruction>
-	</xsl:template>
 	
 	<!-- rendering errors -->
 	<xsl:template name='x:rendering-errors' match='x:rendering-errors'>
@@ -128,22 +90,6 @@ author: gmosx
 		</input>
 	</xsl:template>
 
-	<!-- 
-		Background dispatcher
-		A clever hack, web actions are performed in the background without
-		redirecting.
-	-->
-	<xsl:template name='x:dispatcher' match='x:dispatcher'>
-		<img id="_dispatch" src="d.gif" alt="" style="display: none" />
-		<script type="text/javascript">
-			<![CDATA[
-				function dispatch(dispatch_url) {
-					d = document.getElementById('_dispatch').src = dispatch_url;
-				}
-			]]>
-		</script>	
-	</xsl:template>
-
 	<xsl:template name="x:pager-first" match="x:pager-first">
 		<ruby>unless @pager.page == @pager.first_page</ruby>
 			<a>