nitro 0.5.0 → 0.6.0

data/lib/og/backend.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: backend.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: backend.rb 185 2004-12-10 13:29:09Z gmosx $
 
 require "yaml"
 
@@ -16,15 +16,27 @@ module Og
 #
 module Utils
 
-	# The name of the SQL table where objects of this class are stored.
+	# Encode the name of the klass as an sql safe string.
 	# The Module separators are replaced with _ and NOT stripped out so 
 	# that we can convert back to the original notation if needed.
 	# The leading module if available is removed.
 	#
+	def self.encode(klass)
+		"#{klass.name.gsub(/^.*::/, "")}".gsub(/::/, "_").downcase
+	end
+
+	# The name of the SQL table where objects of this class are stored.
+	#
 	def self.table(klass)
-		return "_#{klass.name.gsub(/^.*::/, "")}".gsub(/::/, "_").downcase
+		"_#{encode(klass)}"
 	end
 
+	# The name of the join table for the two given classes.
+	#
+	def self.join_table(klass1, klass2)
+		"_j_#{Og::Utils.encode(klass1)}_#{Og::Utils.encode(klass2)}"
+	end
+	
 	# Returns the props that will be included in the insert query.
 	# For some backends the oid should be stripped.
 	#

data/lib/og/backends/mysql.rb

@@ -3,7 +3,7 @@
 # * Elias Athanasopoulos  <elathan@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: mysql.rb 159 2004-11-18 10:18:30Z gmosx $
+# $Id: mysql.rb 185 2004-12-10 13:29:09Z gmosx $
 
 require "mysql"
 
@@ -302,14 +302,41 @@ class MysqlBackend < Og::Backend
 		
 		# Create indices
 		
-		if klass.__meta
-			for data in klass.__meta[:sql_index]
+		if klass.__meta and indices = klass.__meta[:sql_index] 
+			for data in indices
 				idx, options = *data
 				idx = idx.to_s
 				pre_sql, post_sql = options[:pre], options[:post]
 				idxname = idx.gsub(/ /, "").gsub(/,/, "_").gsub(/\(.*\)/, "")
 				exec "CREATE #{pre_sql} INDEX #{klass::DBTABLE}_#{idxname}_idx #{post_sql} ON #{klass::DBTABLE} (#{idx})"  
 			end
+		end
+
+		# Create join tables if needed. Join tables are used in
+		# 'many_to_many' relations.
+		
+		if klass.__meta and joins = klass.__meta[:sql_join] 
+			for data in joins
+				# the class to join to and some options.
+				join_class, options = *data
+				
+				# gmosx: dont use DBTABLE here, perhaps the join class
+				# is not managed yet.
+				join_table = "#{Og::Utils.join_table(klass, join_class)}"
+				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 INDEX #{join_table}_key1_idx ON #{join_table} (key1)"
+					exec "CREATE INDEX #{join_table}_key2_idx ON #{join_table} (key2)"
+				rescue => ex
+					if ex.errno == 1050 # table already exists.
+						$log.debug "Join table already exists" if $DBG
+					else
+						raise
+					end
+				end
+			end
 		end		
 	end
 

data/lib/og/backends/psql.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: psql.rb 159 2004-11-18 10:18:30Z gmosx $
+# $Id: psql.rb 185 2004-12-10 13:29:09Z gmosx $
 
 require "postgres"
 
@@ -268,8 +268,8 @@ class PsqlBackend < Og::Backend
 		
 		# Create indices
 		
-		if klass.__meta
-			for data in klass.__meta[:sql_index]
+		if klass.__meta and indices = klass.__meta[:sql_index]
+			for data in indices
 				idx, options = *data
 				idx = idx.to_s
 				pre_sql, post_sql = options[:pre], options[:post]
@@ -304,6 +304,47 @@ class PsqlBackend < Og::Backend
 				raise
 			end
 		end
+		
+		# Create join tables if needed. Join tables are used in
+		# 'many_to_many' relations.
+		
+		if klass.__meta and joins = klass.__meta[:sql_join] 
+			for data in joins
+				# the class to join to and some options.
+				join_class, options = *data
+				
+				# gmosx: dont use DBTABLE here, perhaps the join class
+				# is not managed yet.
+				join_table = "#{Og::Utils.join_table(klass, join_class)}"
+				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 INDEX #{join_table}_key1_idx ON #{join_table} (key1)"
+					exec "CREATE INDEX #{join_table}_key2_idx ON #{join_table} (key2)"
+				rescue => ex
+					# gmosx: any idea how to better test this?
+					if ex.to_s =~ /relation .* already exists/i
+						$log.debug "Join table already exists" if $DBG
+					else
+						raise
+					end
+				end
+			end
+		end
+		
+		begin
+			exec(sql)
+			$log.info "Created join table '#{join_table}'."
+		rescue => ex
+			# gmosx: any idea how to better test this?
+			if ex.to_s =~ /relation .* already exists/i
+				$log.debug "Join table already exists" if $DBG
+			else
+				raise
+			end
+		end
+		
 	end
 	
 	# Drop the managed object table

data/lib/og/meta.rb

@@ -2,9 +2,10 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: meta.rb 159 2004-11-18 10:18:30Z gmosx $
+# $Id: meta.rb 185 2004-12-10 13:29:09Z gmosx $
 
 require 'og/backend'
+require 'glue/inflector'
 
 module Og
 
@@ -68,15 +69,13 @@ module MetaLanguage
 		}
 	end
 
-	# Implements a 'has_many' relation.
+	# Implements a 'has_one' relation.
 	# Automatically enchants the calling class with helper methods.
 	#
-	# NOT IMPLEMENTED.
-	# 
 	# Example:
 	#
 	# class MyObject
-	#		has_many AnotherObject, :children
+	#		has_one :children, AnotherObject
 	# end
 	#
 	# creates the code:
@@ -84,10 +83,23 @@ module MetaLanguage
 	# def children; ... end
 	#
 	def has_one(klass, name, options = {})
+		# linkback is the property of the child object that 'links back' 
+		# to this object. 
+		linkback = options[:linkback] || "#{MetaUtils.expand(self)}_oid"
+		
 		module_eval %{
+			@@og_descendants ||= {}
+			@@og_descendants[#{klass}] = :#{linkback} 
+	
+			unless defined?(og_descendants)
+				def self.og_descendants
+					@@og_descendants
+				end
+			end
+			
 			def #{name}(extrasql = nil)
-				$og.select_one("article_oid=\#\@oid \#\{extrasql\}", #{klass})
-			end			
+				$og.select_one("SELECT * FROM #{Utils.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}", #{klass})
+			end
 		}
 	end	
 	
@@ -97,7 +109,7 @@ module MetaLanguage
 	# Example:
 	#
 	# class MyObject
-	#		has_many AnotherObject, :children
+	#		has_many :children, AnotherObject
 	# end
 	#
 	# creates the code:
@@ -129,11 +141,106 @@ module MetaLanguage
 		}
 	end
 	
+	# Implements a 'many_to_many' relation.
+	# Two objects are associated using an intermediate join table.
+	# Automatically enchants the calling class with helper methods.
+	#
+	# Example:
+	#
+	# class Article
+	#		many_to_many :children, Categories
+	# end
+	#
+	# article.categories
+	# article.del_category
+	# article.add_category
+	#	article.clear_categories
+	#
+	# category.articles
+	# ...
+	#
+	#--
+	# 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) 
+	
+		# exit if the class is allready indirectly 'enchanted' from the
+		# other class of the many_to_many relation.
+		return if self.respond_to?(name1)
+	
+		# Add some metadata to the class to allow for automatic join table
+		# calculation.
+		meta :sql_join, [klass, options]
+
+		# gmosx, FIXME: should I update descendants here ?
+
+		# enchant this class
+		
+		module_eval %{
+			def #{pname2}(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)
+				$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)
+				$og.exec("INSERT INTO #{Utils.join_table(self, klass)} (key1, key2) VALUES (\#\@oid, \#\{obj.oid\})") 
+			end
+			
+			def del_#{name2}(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}
+
+			def clear_#{pname2}
+				$og.exec("DELETE FROM #{Utils.join_table(self, klass)} WHERE key1=\#\@oid") 
+			end			
+		}
+		
+		# indirectly enchant the other class of the relation.
+		
+		klass.module_eval %{
+			def #{pname1}(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)
+				$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)
+				$og.exec("INSERT INTO #{Utils.join_table(self, klass)} (key1, key2) VALUES (\#\{obj.oid\}, \#\@oid)") 
+			end
+			
+			def del_#{name1}(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}						
+
+			def clear_#{pname1}
+				$og.exec("DELETE FROM #{Utils.join_table(self, klass)} WHERE key2=\#\@oid") 
+			end			
+		}
+	end
+	alias :has_and_belongs_to_many :many_to_many 
+
 end
 
 end # module
 
-class Module # :nodoc: all
-	include Og::MetaLanguage
+# Include the meta-language extensions into Module. If the flag is
+# false the developer is responsible for including the MetaLanguage
+# module where needed.
+#
+if $og_include_meta_language
+	class Module # :nodoc: all
+		include Og::MetaLanguage
+	end
 end
 

data/lib/og/version.rb

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

data/lib/xsl/base.xsl

@@ -54,19 +54,28 @@ author: gmosx
 		<xsl:apply-templates/>
 	</xsl:template>
 
-	<!-- create a new, nested output buffer NOT WORKING -->
+	<!-- create a new, nested output buffer -->
 	<xsl:template name="x:ob-start" match="x:ob-start">
 		<ruby>
-		<![CDATA[__out_buffers = [] unless __out_buffers
-		__out_buffers.push(__out)
-		__out = ""]]>
+			@out_buffers = [] unless @out_buffers
+			@out_buffers.push(@out)
+			@out = ""
 		</ruby>
 	</xsl:template>
 	
-	<!-- close a nested output buffer NOT WORKING -->
+	<!-- close a nested output buffer -->
 	<xsl:template name="x:ob-end" match="x:ob-end">
 		<ruby>
-		<![CDATA[__out == __out_buffers.pop()]]>
+			@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>
 	
@@ -135,4 +144,64 @@ author: gmosx
 		</script>	
 	</xsl:template>
 
+	<xsl:template name="x:pager-first" match="x:pager-first">
+		<ruby>unless @pager.page == @pager.first_page</ruby>
+			<a>
+				<xsl:attribute name="href">#{@pager.target_uri(@pager.first_page)}</xsl:attribute>
+				<xsl:apply-templates />
+			</a>
+		<ruby>end</ruby>
+	</xsl:template>
+	
+	<xsl:template name="x:pager-prev" match="x:pager-prev">
+		<ruby>unless @pager.page == @pager.first_page</ruby>
+			<a>
+				<xsl:attribute name="href">#{@pager.target_uri(@pager.previous_page)}</xsl:attribute>
+				<xsl:apply-templates />
+			</a>
+		<ruby>end</ruby>
+	</xsl:template>
+	
+	<xsl:template name="x:pager-next" match="x:pager-next">
+		<ruby>unless @pager.page == @pager.last_page</ruby>
+		<a>
+			<xsl:attribute name="href">#{@pager.target_uri(@pager.next_page)}</xsl:attribute>
+			<xsl:apply-templates />
+		</a>
+		<ruby>end</ruby>
+	</xsl:template>
+
+	<xsl:template name="x:pager-last" match="x:pager-last">
+		<ruby>unless @pager.page == @pager.last_page</ruby>
+			<a>
+				<xsl:attribute name="href">#{@pager.target_uri(@pager.last_page)}</xsl:attribute>
+				<xsl:apply-templates />
+			</a>
+		<ruby>end</ruby>
+	</xsl:template>
+	
+	<xsl:template name="x:pager-pages" match="x:pager-pages">
+		<ruby>
+			for i in @pager.nav_range()
+				if i == @pager.page
+				 @out += %|<xsl:apply-templates select="x:pager-selected" />|
+				else
+				 @out += %|<xsl:apply-templates select="x:pager-page" />|		
+				end
+			end
+		</ruby>
+	</xsl:template>
+
+	<xsl:template name="x:pager-selected" match="x:pager-selected">
+		<xsl:apply-templates />
+	</xsl:template>
+
+	<xsl:template name="x:pager-page" match="x:pager-page">
+		<xsl:param name="index"><xsl:value-of select="@index"/></xsl:param>
+		<a>
+			<xsl:attribute name="href">#{@pager.target_uri(i)}</xsl:attribute>
+			<xsl:apply-templates />
+		</a>
+	</xsl:template>
+	
 </xsl:stylesheet>

data/lib/xsl/ui.xsl

@@ -0,0 +1,51 @@
+<?xml version="1.0" ?>
+
+<!--
+author: gmosx
+-->
+
+<!DOCTYPE shader
+[
+<!ENTITY nbsp "<![CDATA[&nbsp;]]>">
+<!ENTITY copy "<![CDATA[&copy;]]>">
+<!ENTITY euro "<![CDATA[&euro;]]>">
+<!ENTITY laquo "<![CDATA[&laquo;]]>">
+<!ENTITY raquo "<![CDATA[&raquo;]]>">
+]>
+
+<xsl:stylesheet
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns:x="http://www.navel.gr/xml/pager.xsd"
+		exclude-result-prefixes="x"
+		version="1.0">
+	
+	<xsl:template name="x:pager-first" match="x:pager-first">
+		<xsl:apply-templates />				
+			<a href="#{target_uri(first_page())}">
+				<xsl:apply-templates />
+			</a>
+	</xsl:template>
+
+	<xsl:template name="x:pager-prev" match="x:pager-prev">
+		<xsl:apply-templates />				
+			<a href="#{target_uri(previous_page())}">
+				<xsl:apply-templates />
+			</a>
+	</xsl:template>
+	
+	<xsl:template name="x:pager-next" match="x:pager-next">
+		<xsl:apply-templates />				
+			<a href="#{target_uri(next_page())}">
+				<xsl:apply-templates />
+			</a>
+	</xsl:template>
+	
+	<xsl:template name="x:pager-last" match="x:pager-last">
+		<xsl:apply-templates />				
+			<a href="#{target_uri(first_page())}">
+				<xsl:apply-templates />
+			</a>
+	</xsl:template>
+
+</xsl:stylesheet>
+