nitro 0.4.1 → 0.5.0

data/lib/nitro/server/request.rb

@@ -2,14 +2,14 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: request.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: request.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require "cgi"
 require "ftools"
 
-require "nitro/utils/string"
-require "nitro/utils/uri"
-require "nitro/utils/http"
+require "glue/string"
+require "nitro/uri"
+require "nitro/http"
 require "nitro/server/cookie"
 require "nitro/server/requestpart"
 
@@ -352,7 +352,7 @@ class Request
 	def get(key, default=nil)
 		val = @parameters[key]
 
-		if !val or (val.is_a?(String) and (not N::StringUtils.valid?(val)))
+		if !val or (val.is_a?(String) and (not G::StringUtils.valid?(val)))
 			@parameters[key] = default
 			return default			
 		elsif default.is_a?(Integer)
@@ -429,7 +429,7 @@ class Request
 	# Check if a parameter is valid
 	#
 	def param?(param)
-		return N::StringUtils.valid?(self[param])
+		return G::StringUtils.valid?(self[param])
 	end
 	alias_method :action?, :param?
 
@@ -465,7 +465,7 @@ class Request
 		end
 		
 		# gmosx: to avoid using param?
-		if param.is_a?(String) and (not N::StringUtils.valid?(param))
+		if param.is_a?(String) and (not G::StringUtils.valid?(param))
 			return nil
 		else
 			return param

data/lib/nitro/server/requestpart.rb

@@ -2,14 +2,14 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: requestpart.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: requestpart.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require "cgi"
 require "ftools"
 
-require "nitro/utils/string"
-require "nitro/utils/uri"
-require "nitro/utils/http"
+require "glue/string"
+require "nitro/uri"
+require "nitro/http"
 require "nitro/server/cookie"
 
 module N

data/lib/nitro/server/script.rb

@@ -2,11 +2,11 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: script.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: script.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require "fileutils"
 
-require "nitro/utils/cache"
+require "glue/cache"
 require "nitro/server/fragment"
 
 module N
@@ -63,7 +63,7 @@ class Script
 
 		# sub-scripts set: a set of files this script depends on.
 		# We use a hash to implement a set.
-		@sub_scripts = N::SafeArray.new
+		@sub_scripts = G::SafeArray.new
 
 		# a cache for the script outputs (fragments). Keeps multiple revisions
 		# of the script output according to user, access rights etc.
@@ -74,7 +74,7 @@ class Script
 		#
 		# DISK CACHING IS SLOW!
 		#
-		@fragment_cache = N::LRUCache.new(1000)
+		@fragment_cache = G::LRUCache.new(1000)
 		
 		__init()
 	end

data/lib/nitro/server/server.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: server.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: server.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require "drb"
 
@@ -25,7 +25,7 @@ module ServerMixin
 			$sessions = DRbObject.new(nil, $drb_sessions_cluster)
 		else
 			# NoCluster mode: use standard Ruby onjects.
-			$lm = N::SafeHash.new
+			$lm = G::SafeHash.new
 			$sessions = N::App::SessionManager.new
 		end
 

data/lib/nitro/server/session.rb

@@ -2,11 +2,11 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2002-2003 Navel, all rights reserved.
-# $Id: session.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: session.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require "md5"
 
-require "nitro/utils/hash"
+require "glue/hash"
 require "nitro/server/user"
 
 module N
@@ -23,13 +23,13 @@ module N
 #
 # SOS: This object lives in the Cluster!
 #
-class SessionManager < N::SafeHash
+class SessionManager < G::SafeHash
 	# the collection of online users.
 	attr_reader :online
 
 	def initialize
 		super
-		@online = N::SafeHash.new
+		@online = G::SafeHash.new
 	end
 
 	# Return the number of anonymous sessions.

data/lib/nitro/server/webrick.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: webrick.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: webrick.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require "webrick"
 
@@ -34,7 +34,7 @@ module WEBrick
 		# clickstream there is no referer, set "/" by default.
 		#
 		def referer
-			return @header["referer"].shift || "/"
+			return @header["referer"][0] || "/"
 		end
 		alias_method :referrer, :referer
 

data/lib/nitro/service.rb

@@ -2,9 +2,10 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: service.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: service.rb 159 2004-11-18 10:18:30Z gmosx $
 
 require 'nitro/server/render'
+require 'nitro/scaffold'
 
 module N
 

data/lib/nitro/sitemap.rb

@@ -6,9 +6,9 @@
 # George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: sitemap.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: sitemap.rb 167 2004-11-23 14:03:10Z gmosx $
 
-require "nitro/utils/hash"
+require "glue/hash"
 
 module N
 
@@ -85,7 +85,7 @@ end
 # - Use a second class in the UI namespace for rendering 
 # 	related stuff?
 #
-class SiteMap < N::SafeHash
+class SiteMap < G::SafeHash
 
 	# The root page for this sitemap
 	attr_accessor :root

data/lib/nitro/{utils/uri.rb → uri.rb}

@@ -2,12 +2,12 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: uri.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: uri.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require "uri"
 require "cgi"
 
-require "nitro/utils/string"
+require "glue/string"
 
 module N
 
@@ -165,7 +165,7 @@ module UriUtils
 		hash.update(parameters)
 		query_string = self.hash_to_query_string(hash)
 
-		if N::StringUtils.valid?(query_string)
+		if G::StringUtils.valid?(query_string)
 			return "#{rest}?#{query_string}"
 		else
 			return rest

data/lib/nitro/version.rb

@@ -2,10 +2,10 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: version.rb 157 2004-11-13 20:43:11Z gmosx $
+# $Id: version.rb 167 2004-11-23 14:03:10Z gmosx $
 
 # The name of the server.
 $srv_name = 'Nitro'
 
 # The version of the server.
-$srv_version = '0.4.1'
+$srv_version = '0.5.0'

data/lib/og.rb

@@ -2,13 +2,13 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: og.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: og.rb 167 2004-11-23 14:03:10Z gmosx $
 
-require "nitro/properties"
-require "nitro/utils/array"
-require "nitro/utils/hash"
-require "nitro/utils/time"
-require "nitro/utils/pool"
+require "glue/property"
+require "glue/array"
+require "glue/hash"
+require "glue/time"
+require "glue/pool"
 
 require "og/meta"
 
@@ -158,8 +158,8 @@ class Database
 		require "og/backends/#{backend}"
 		eval %{	@config[:backend] = #{backend.capitalize}Backend }
 		
-		@connection_pool = N::Pool.new
-		@managed_classes = N::SafeHash.new
+		@connection_pool = G::Pool.new
+		@managed_classes = G::SafeHash.new
 		
 		$log.info "Connecting to database '#{@config[:database]}' using backend '#{backend}'."
 		

data/lib/og/backends/mysql.rb

@@ -3,7 +3,7 @@
 # * Elias Athanasopoulos  <elathan@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: mysql.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: mysql.rb 159 2004-11-18 10:18:30Z gmosx $
 
 require "mysql"
 
@@ -266,6 +266,8 @@ class MysqlBackend < Og::Backend
 		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]
@@ -285,18 +287,8 @@ class MysqlBackend < Og::Backend
 			sql << ", #{constrains.join(', ')}"
 		end
 		
-		sql << ");"
-		
-		# Create indices
+		sql << ');'
 		
-		if klass.__meta
-			for data in klass.__meta[:sql_index]
-				idx, pre_sql, post_sql = *data
-				idxname = idx.gsub(/ /, "").gsub(/,/, "_").gsub(/\(.*\)/, "")
-				sql << " CREATE #{pre_sql} INDEX #{klass::DBTABLE}_#{idxname}_idx #{post_sql} ON #{klass::DBTABLE} (#{idx});"  
-			end
-		end
-
 		begin
 			exec(sql)
 			$log.info "Created table '#{klass::DBTABLE}'."
@@ -307,6 +299,18 @@ class MysqlBackend < Og::Backend
 				raise
 			end
 		end
+		
+		# Create indices
+		
+		if klass.__meta
+			for data in klass.__meta[:sql_index]
+				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		
 	end
 
 	# Deserialize one row of the resultset.

data/lib/og/backends/psql.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: psql.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: psql.rb 159 2004-11-18 10:18:30Z gmosx $
 
 require "postgres"
 
@@ -243,6 +243,8 @@ class PsqlBackend < Og::Backend
 		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]
@@ -268,7 +270,9 @@ class PsqlBackend < Og::Backend
 		
 		if klass.__meta
 			for data in klass.__meta[:sql_index]
-				idx, pre_sql, post_sql = *data
+				idx, options = *data
+				idx = idx.to_s
+				pre_sql, post_sql = options[:pre], options[:post]
 				idxname = idx.gsub(/ /, "").gsub(/,/, "_").gsub(/\(.*\)/, "")
 				sql << " CREATE #{pre_sql} INDEX #{klass::DBTABLE}_#{idxname}_idx #{post_sql} ON #{klass::DBTABLE} (#{idx});"  
 			end

data/lib/og/connection.rb

@@ -2,13 +2,13 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: connection.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: connection.rb 167 2004-11-23 14:03:10Z gmosx $
 
 module Og; 
 
-require "nitro/properties"
-require "nitro/utils/array"
-require "nitro/utils/time"
+require "glue/property"
+require "glue/array"
+require "glue/time"
 
 # = Connection
 #

data/lib/og/meta.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: meta.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: meta.rb 159 2004-11-18 10:18:30Z gmosx $
 
 require 'og/backend'
 
@@ -33,6 +33,12 @@ end
 #
 module MetaLanguage
 
+	# Defines an SQL index.
+	#
+	def sql_index(index, options = {})
+		meta :sql_index, [index, options]
+	end
+
 	# Implements a 'belongs_to' relation.
 	# Automatically enchants the calling class with helper methods.
 	# 

data/lib/og/version.rb

@@ -0,0 +1,8 @@
+# code: 
+# * George Moschovitis  <gm@navel.gr>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id$
+
+# The version of Og.
+$og_version = '0.5.0'

data/lib/xsl/base.xsl

@@ -77,6 +77,16 @@ author: gmosx
 		</xsl:processing-instruction>
 	</xsl:template>
 	
+	<!-- rendering errors -->
+	<xsl:template name='x:rendering-errors' match='x:rendering-errors'>
+		<ruby>unless @rendering_errors.empty?</ruby>
+			<div id="rendering-errors">
+				<h3>RENDERING ERRORS:</h3>
+				#{@rendering_errors.join('<br />')}
+			</div>
+		<ruby>end</ruby>
+	</xsl:template>
+	
 	<!-- form errors temlate -->
 	<xsl:template name='x:form-errors' match='x:form-errors'>
 		<ruby>if errors = request.errors_to_a()</ruby>

data/test/{n/utils → glue}/tc_cache.rb

@@ -1,17 +1,17 @@
 # :nodoc: all
 
 require "test/unit"
-require "nitro/utils/cache"
+require "glue/cache"
 
 class TC_N_Utils_Cache < Test::Unit::TestCase
 	# :nodoc: all
 
 	class Dummy
-		include N::LRUCache::Item
+		include G::LRUCache::Item
 	end
 	
 	def setup
-		@cache = N::LRUCache.new(maxitems = 3)
+		@cache = G::LRUCache.new(maxitems = 3)
 	end
 
 	def teardown

data/test/{n/utils → glue}/tc_hash.rb

@@ -1,14 +1,13 @@
 # :nodoc: all
 
 require "test/unit"
-require "nitro/utils/cache"
+require "glue/hash"
 
 class TC_N2_Utils_Cache < Test::Unit::TestCase
 	# :nodoc: all
-	include N
 
 	def setup
-		@safe_cache = SafeHash.new(Hash.new)
+		@safe_cache = G::SafeHash.new(Hash.new)
 	end
 
 	def teardown