nitro 0.7.0 → 0.8.0

data/lib/nitro/server/cluster.rb

@@ -73,7 +73,7 @@ class Cluster < N::Application
 					begin
 						sdrb.server_sync(key, value)
 					rescue => ex
-						$log.error "Server at #{uri} is down, removing from cluster"
+						Logger.error "Server at #{uri} is down, removing from cluster"
 						cluster.delete(uri)
 					end
 				}
@@ -94,7 +94,7 @@ class Cluster < N::Application
 					begin
 						sdrb.server_sync(key, value) unless uri == server_uri
 					rescue => ex
-						$log.error "Server at #{uri} is down, removing from cluster"
+						Logger.error "Server at #{uri} is down, removing from cluster"
 						cluster.delete(uri)
 					end
 				}

data/lib/nitro/server/dispatcher.rb

@@ -22,8 +22,8 @@ module Dispatcher
 			render(request.request_uri.path, request, response, session)
 			response.body = @out 
 		rescue Exception, StandardError => e
-			$log.error "error while handling the request #{request.request_uri}"
-			$log.error pp_exception(e)
+			Logger.error "error while handling the request #{request.request_uri}"
+			Logger.error pp_exception(e)
 
 			if $error_page_url
 				# gmosx: SOS: TEST ME!

data/lib/nitro/server/filters/autologin.rb

@@ -38,7 +38,7 @@ class AutoLoginFilter < N::ServerFilter
 						request.del_cookie($users_auth_cookie)
 					end
 				else
-					$log.warn "Unknown user or wrong password in auth-cookie: #{cookie} from IP: #{request.remote_addr}"
+					Logger.warn "Unknown user or wrong password in auth-cookie: #{cookie} from IP: #{request.remote_addr}"
 				end
 			end
 		end

data/lib/nitro/server/fragment.rb

@@ -28,8 +28,8 @@ module N
 # - can run background cron scripts over the fragments (compression)
 #
 class Fragment
-	include G::Expirable
-	include G::LRUCache::Item
+	include N::Expirable
+	include N::LRUCache::Item
 
 	# precompiled flags for fragment key "customization"
 

data/lib/nitro/server/handlers.rb

@@ -50,7 +50,7 @@ class ScriptHandler < Handler
 
 	# cache the compiled page scripts to optimize future references.
 	# use a thread safe cache.
-	@@compiled_script_cache = G::SafeHash.new()
+	@@compiled_script_cache = N::SafeHash.new()
 
 	# dont allow 2 threads to compile the same script. In fact dont allow
 	# two threads to compile in parallel.
@@ -65,7 +65,7 @@ class ScriptHandler < Handler
 		if ::File.exists?("#$root_dir/#{path}")
 			return path
 		else
-			$log.debug "OVERLOAD: '#{path}' -> 'p/#{path}'" if $DBG
+			Logger.debug "OVERLOAD: '#{path}' -> 'p/#{path}'" if $DBG
 			return "p/#{path}"
 		end		
 	end

data/lib/nitro/server/render.rb

@@ -1,7 +1,5 @@
-# code:
-# * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: render.rb 200 2004-12-27 11:24:41Z gmosx $
 
 require 'cgi'
@@ -11,19 +9,19 @@ module N
 # = RenderUtils
 #
 # Various render related utilities.
-#
+
 module RenderUtils
 
 	# Split the path to base, render_class and method.
 	#
-	# Examples:
+	# == Examples
 	#
 	# / -> nil, index, nil
 	# /add_user -> nil, add_user, nil
 	# /add_user?user=gmosx -> nil, add_user, user=gmosx
 	# /blog/new_entry -> blog, new_entry
 	#	/blog -> blog, index, nil
-	# 
+ 
 	def self.split_path(path)
 		# paths that start with rest/xxx are REST requests.
 		# FIXME: better chack here!
@@ -86,7 +84,7 @@ module RenderUtils
 	# Transform a template to ruby rendering code.
 	#
 	def self.transform_template(path)
-		$log.debug "Transforming '#{path}'" if $DBG
+		Logger.debug "Transforming '#{path}'" if $DBG
 
 		text = File.read(path)
 		hash, text = $shader.process(path, text)
@@ -98,7 +96,7 @@ module RenderUtils
 	# Compile a HTTP method.
 	#	
 	def self.compile_http_method(klass, base, meth)
-		$log.debug "Compiling HTTP method '#{klass}:#{meth}'" if $DBG
+		Logger.debug "Compiling HTTP method '#{klass}:#{meth}'" if $DBG
 
 		valid = false
 		
@@ -173,7 +171,7 @@ module RenderUtils
 	# Compile a REST method.
 	#	
 	def self.compile_rest_method(klass, base, meth)
-		$log.debug "Compiling REST method '#{klass}:#{meth}'" if $DBG
+		Logger.debug "Compiling REST method '#{klass}:#{meth}'" if $DBG
 
 		valid = false
 		
@@ -250,12 +248,12 @@ end
 # = RenderExit
 #
 # Raise this exception to stop rendering.
-#
+
 class RenderExit < Exception
 end
 	
 # = Render
-#
+
 module Render
 	# The outbut buffer. The output of a script/action is accumulated
 	# in this buffer.
@@ -321,9 +319,12 @@ module Render
 			if self.class == render_class
 				self.send(meth)
 			else
+=begin
+				gmosx: reolading fucks up validation and meta data propagation.
 			 	if $reload_scripts and defined?(render_class::SOURCE_FILE)
 					load(render_class::SOURCE_FILE)
 				end
+=end
 				r = render_class.new(base, @request, @response, @session)
 				r.send(meth)
 				@out = r.out
@@ -362,8 +363,8 @@ module Render
 	
 	# Redirect to the referer of this method.
 	#
-	def redirect_referer(status = 303)
-		redirect(@request.referer, status)
+	def redirect_referer(postfix = nil, status = 303)
+		redirect("#{@request.referer}#{postfix}", status)
 	end
 
 	# Log a rendering error.
@@ -373,7 +374,7 @@ module Render
 	def log_error(str)
 		@rendering_errors ||= []
 		@rendering_errors << str
-		$log.error str
+		Logger.error str
 	end
 	
 	# --------------------------------------------------------------------
@@ -400,6 +401,7 @@ module Render
 		@out = @out_buffers.pop
 		@out << nested_buffer
 	end
+
 	# --------------------------------------------------------------------
 	# Caching methods.
 	

data/lib/nitro/server/request.rb

@@ -68,7 +68,7 @@ module RequestUtils
 				return obj
 			end
 		else
-			# $log.error "request.get_object('#{oid_param}') failed!"
+			# Logger.error "request.get_object('#{oid_param}') failed!"
 			return nil
 		end
 	end
@@ -89,7 +89,7 @@ module RequestUtils
 					return nil
 				end
 			else
-				# $log.error "request.get_object_by_name('#{name_param}') failed!"
+				# Logger.error "request.get_object_by_name('#{name_param}') failed!"
 				return obj
 			end
 		else
@@ -352,7 +352,7 @@ class Request
 	def get(key, default=nil)
 		val = @parameters[key]
 
-		if !val or (val.is_a?(String) and (not G::StringUtils.valid?(val)))
+		if !val or (val.is_a?(String) and (not N::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 G::StringUtils.valid?(self[param])
+		return N::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 G::StringUtils.valid?(param))
+		if param.is_a?(String) and (not N::StringUtils.valid?(param))
 			return nil
 		else
 			return param
@@ -547,7 +547,7 @@ class Request
 	def log_error(str)
 		@error_log = [] unless @error_log
 		@error_log << str if @error_log.size < 200 # gmosx: dod attack!
-		$log.error str
+		Logger.error str
 	end
 
 	# ====================================================================

data/lib/nitro/server/script.rb

@@ -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 = G::SafeArray.new
+		@sub_scripts = N::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 = G::LRUCache.new(1000)
+		@fragment_cache = N::LRUCache.new(1000)
 		
 		__init()
 	end

data/lib/nitro/server/server.rb

@@ -25,7 +25,7 @@ module ServerMixin
 			$sessions = DRbObject.new(nil, $drb_sessions_cluster)
 		else
 			# NoCluster mode: use standard Ruby onjects.
-			$lm = G::SafeHash.new
+			$lm = N::SafeHash.new
 			$sessions = N::App::SessionManager.new
 		end
 
@@ -50,7 +50,7 @@ class Server < N::Server
 		super
 		initialize_app()
 		
-		$log.info "Server listening at #$srv_url"
+		Logger.info "Server listening at #$srv_url"
 	end
 end
 

data/lib/nitro/server/session.rb

@@ -23,13 +23,13 @@ module N
 #
 # SOS: This object lives in the Cluster!
 #
-class SessionManager < G::SafeHash
+class SessionManager < N::SafeHash
 	# the collection of online users.
 	attr_reader :online
 
 	def initialize
 		super
-		@online = G::SafeHash.new
+		@online = N::SafeHash.new
 	end
 
 	# Return the number of anonymous sessions.
@@ -80,12 +80,12 @@ class SessionManager < G::SafeHash
 			begin
 				session = $sessions[key]
  				if session.stale?
-					$log.debug "Session finalized: logging out idle user '#{session.user}'" if $DBG
+					Logger.debug "Session finalized: logging out idle user '#{session.user}'" if $DBG
 					session.logout()
 					$sessions.delete(key)
 				end
 			rescue Exception, StandardError => e
-				$log.error "Session gc errror #$!"
+				Logger.error "Session gc errror #$!"
 			end
 		end
 	end	
@@ -138,7 +138,7 @@ class Session < Hash
 		@user = user
 		@user.login(request)
 		$sessions.login(@user.oid, @user.name)
-		$log.info "User '#{user}' logged in!"
+		Logger.info "User '#{user}' logged in!"
 		return true
 	end
 
@@ -148,7 +148,7 @@ class Session < Hash
 		self.clear()
 		@user.logout()
 		$sessions.logout(@user.oid)
-		$log.info "User '#{user}' logged out!"
+		Logger.info "User '#{user}' logged out!"
 		@user = N::AnonymousUser.instance
 	end
 	

data/lib/nitro/server/shaders.rb

@@ -122,7 +122,7 @@ class RubyShader < N::Shader
 	# Loads and statically includes a file.
 	#
 	def load_statically_included(filename)
-		$log.debug "Statically including '#{filename}'" if $DBG
+		Logger.debug "Statically including '#{filename}'" if $DBG
 		
 		text = File.read(filename)
 		text.gsub!(/<\?xml.*\?>/, '')
@@ -176,7 +176,7 @@ class XSLTShader < N::Shader
 	# Parse the xsl.
 	#
 	def parse_xsl
-		$log.debug "Parsing xsl '#{@xsl_filename}'" if $DBG
+		Logger.debug "Parsing xsl '#{@xsl_filename}'" if $DBG
 		@mtime = File.mtime(@xsl_filename)
 		@xslt.xsl = File.read(@xsl_filename)
 	end

data/lib/nitro/server/webrick.rb

@@ -164,7 +164,7 @@ class WebrickDispatcher < WEBrick::HTTPServlet::AbstractServlet
 		end	
 			
 		unless session
-			$log.debug 'Creating new session.' if $DBG
+			Logger.debug 'Creating new session.' if $DBG
 			# no session cookie or stale session (garbage collected).
 			session_id = N::Session.calculate_id()
 			cookie = WEBrick::Cookie.new(N::Session::COOKIE_NAME, session_id)

data/lib/nitro/sitemap.rb

@@ -85,7 +85,7 @@ end
 # - Use a second class in the UI namespace for rendering 
 # 	related stuff?
 #
-class SiteMap < G::SafeHash
+class SiteMap < N::SafeHash
 
 	# The root page for this sitemap
 	attr_accessor :root
@@ -121,7 +121,7 @@ class SiteMap < G::SafeHash
 			
 			return res
 		else
-			$log.warn "The uri #{uri} is not registered in the SiteMap!"
+			Logger.warn "The uri #{uri} is not registered in the SiteMap!"
 		end
 		
 		return nil

data/lib/nitro/uri.rb

@@ -165,7 +165,7 @@ module UriUtils
 		hash.update(parameters)
 		query_string = self.hash_to_query_string(hash)
 
-		if G::StringUtils.valid?(query_string)
+		if N::StringUtils.valid?(query_string)
 			return "#{rest}?#{query_string}"
 		else
 			return rest

data/lib/nitro/version.rb

@@ -1,11 +1,13 @@
-# code: 
-# * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+#--
+# George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: version.rb 194 2004-12-20 20:23:57Z gmosx $
+#++
 
 # The name of the server.
+
 $srv_name = 'Nitro'
 
 # The version of the server.
-$srv_version = '0.7.0'
+
+$srv_version = '0.8.0'

data/lib/og.rb

@@ -4,36 +4,12 @@
 # (c) 2004 Navel, all rights reserved.
 # $Id: og.rb 197 2004-12-21 13:50:17Z gmosx $
 
-require "glue/property"
-require "glue/array"
-require "glue/hash"
-require "glue/time"
-require "glue/pool"
-
-# If true, only allow reading from the database. Usefull
-# for maintainance.
-#
-$og_read_only_mode = false
-
-# If true, the library automatically 'enchants' managed classes.
-# In enchant mode, special db aware methods are added to 
-# managed classes and instances.
-#
-$og_enchant_managed_classes = true
-
-# If true, use Ruby's advanced introspection capabilities to 
-# automatically manage classes tha define properties.
-$og_auto_manage_classes = true
-
-# If true, automatically include the Og meta-language into Module. 
-$og_include_meta_language = true
-
-# Attach the following prefix to all generated SQL table names.
-# Usefull on hosting scenarios where you have to run multiple
-# web applications/sites on a single database.
-$og_table_prefix = nil
-
-require "og/meta"
+require 'glue/logger'
+require 'glue/property'
+require 'glue/array'
+require 'glue/hash'
+require 'glue/time'
+require 'glue/pool'
 
 # = Og
 #
@@ -58,11 +34,12 @@ require "og/meta"
 # + Transparent support for cascading deletes for all backends.
 # + Hierarchical structures (preorder traversal, materialized paths)
 # + Works safely as part of distributed application.
-# + Simple implementation < 2k lines of code.
+# + Simple implementation.
 #
 # === Meta language
 #
-# primary_key :pid
+# primary_key :pid (NOT IMPLEMENTED)
+# name_key :name (NOT IMPLEMENTED)
 # prop_accessor Fixnum, :pid, :sql => "smallint DEFAULT 1"
 # has_many Child, :children
 # many_to_many Role, :roles
@@ -71,10 +48,10 @@ require "og/meta"
 # === Design
 #
 # Keep the main classes backend agnostic. 
-#
+#--
 # Try to make the methods work with oids. Do NOT implement descendants 
 # use a root id (rid).
-#
+#++
 # For class ids we use the name instead of a hash. Class ids are
 # typically not used in querys, they are stored for completeness.
 # If we store a hash we cannot reclaim the class thus invalidating
@@ -89,7 +66,7 @@ require "og/meta"
 # This is NOT a singleton, an application may access multiple
 # databases.
 #
-# The $og.xxx methods are more flexible and allow you to use
+# The og.xxx methods are more flexible and allow you to use
 # multiple databases for example.
 # 
 # === Managed Objects Lifecycle Callbacks
@@ -101,7 +78,6 @@ require "og/meta"
 # * og_pre_insert_update
 # * og_post_insert_update
 # * self.og_pre_delete
-# * validate
 #
 # A class level callback is used for delete because typically you call
 # delete with an oid and not an object to avoid a deserialization.
@@ -114,8 +90,53 @@ require "og/meta"
 # * Deserialize to OpenStruct.
 # * Better documentation.
 #
-module Og
+class Og
+	class << self
+		# If true, only allow reading from the database. Usefull
+		# for maintainance.
+		attr_accessor :read_only_mode
+
+		# If true, the library automatically 'enchants' managed classes.
+		# In enchant mode, special db aware methods are added to 
+		# managed classes and instances.
+		attr_accessor :enchant_managed_classes
+		
+		# If true, use Ruby's advanced introspection capabilities to 
+		# automatically manage classes tha define properties.
+		attr_accessor :auto_manage_classes
 
+		# If true, automatically include the Og meta-language into Module. 
+		attr_accessor :include_meta_language
+		
+		# Attach the following prefix to all generated SQL table names.
+		# Usefull on hosting scenarios where you have to run multiple
+		# web applications/sites on a single database.
+		attr_accessor :table_prefix
+
+		# The active database. Og allows you to access multiple
+		# databases from a single application.
+		attr_accessor :db
+
+		def use(db)
+			@db = db
+			@db.get_connection
+		end
+	end
+	
+	# set default options:
+	self.read_only_mode = false
+	self.enchant_managed_classes = true
+	self.auto_manage_classes = true
+	self.include_meta_language = true
+	self.table_prefix = nil
+end
+
+# gmosx: leave this here.
+require 'og/enchant'
+require 'og/meta'
+
+class Og
+	
 # = Unmanageable
 #
 # Marker module. If included this in a class, the Og automanager
@@ -128,6 +149,7 @@ module Unmanageable; end
 # Encapsulates an Og Database.
 #
 class Database
+	include Og::Enchant
 
 	# Managed class metadata
 	#
@@ -166,10 +188,10 @@ class Database
 		require "og/backends/#{backend}"
 		eval %{	@config[:backend] = #{backend.capitalize}Backend }
 		
-		@connection_pool = G::Pool.new
-		@managed_classes = G::SafeHash.new
+		@connection_pool = N::Pool.new
+		@managed_classes = N::SafeHash.new
 		
-		$log.info "Connecting to database '#{@config[:database]}' using backend '#{backend}'."
+		Logger.info "Connecting to database '#{@config[:database]}' using backend '#{backend}'."
 		
 		@config[:connection_count].times do
 			@connection_pool << Og::Connection.new(self)
@@ -178,7 +200,7 @@ class Database
 		# gmosx, FIXME: this automanage code is not elegant and slow
 		# should probably recode this, along with glue/property.rb
 		#
-		if $og_auto_manage_classes
+		if Og.auto_manage_classes
 			# automatically manage classes with properties and metadata.
 			# gmosx: Any idea how to optimize this?
 			classes_to_manage = []
@@ -187,10 +209,13 @@ class Database
 					classes_to_manage << c
 				end
 			end
-			$log.info "Og auto manages the following classes:"
-			$log.info "#{classes_to_manage.inspect}"
+			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.
@@ -206,8 +231,6 @@ class Database
 	# Stores the connection in a thread-local variable.
 	#
 	def get_connection
-		$log.debug "Get Og connection" if $DBG
-		
 		thread = Thread.current
 		
 		unless conn = thread[:og_conn]
@@ -217,12 +240,11 @@ class Database
 		
 		return conn
 	end
+	alias_method :connection, :get_connection
 	
 	# Restore an unused connection to the pool.
 	#
 	def put_connection
-		$log.debug "Put Og connection" if $DBG
-
 		thread = Thread.current
 		
 		if conn = thread[:og_conn]
@@ -263,7 +285,7 @@ class Database
 		convert(klass)
 		
 		# Add helper methods to the class.
-		enchant(klass) if $og_enchant_managed_classes 
+		enchant(klass) if Og.enchant_managed_classes 
 	end
 	
 	# Helper method to set multiple managed classes.
@@ -289,13 +311,16 @@ class Database
 	# Add standard og functionality to the class
 	#
 	def convert(klass)
+		# Grab backend class
+		backend = @config[:backend]
+
 		# gmosx: this check is needed to allow the developer to customize
 		# the sql generated for oid
-		Og::Utils.eval_og_oid(klass) unless klass.instance_methods.include?(:oid)
+		backend.eval_og_oid(klass) unless klass.instance_methods.include?(:oid)
 		
 		klass.class_eval %{
-			DBTABLE = "#{Og::Utils.table(klass)}"
-			DBSEQ = "#{Og::Utils.table(klass)}_oids_seq" 
+			DBTABLE = "#{backend.table(klass)}"
+			DBSEQ = "#{backend.table(klass)}_oids_seq" 
 			
 			def to_i()
 				@oid
@@ -308,72 +333,9 @@ class Database
 		# Precompile some code that gets executed all the time.
 		# Deletion code is not precompiled, because it is not used
 		# as frequently.
-		Og::Utils.eval_og_insert(klass)
-		Og::Utils.eval_og_update(klass)
-		Og::Utils.eval_og_deserialize(klass, self)
-	end
-	
-	# Enchant a managed class. Add useful DB related methods to the 
-	# class and its instances. 
-	#
-	def enchant(klass)
-		klass.module_eval <<-"end_eval", __FILE__, __LINE__
-			def self.create(*params)
-				obj = #{klass}.new(*params)
-				obj.save!
-			end
-				
-			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_eval
+		backend.eval_og_insert(klass)
+		backend.eval_og_update(klass)
+		backend.eval_og_deserialize(klass, self)
 	end
 	
 	# Automatically wrap connection methods.
@@ -412,19 +374,23 @@ class Database
 	wrap_method :query, "sql"
 	wrap_method :exec, "sql"
 
-	def self.create_db!(config)
-		get_connection().db.create_db(config[:database], config[:user], 
-				config[:password])
-	end
-
-	def self.drop_db!(config)
-		backend = config[:backend] || "psql"
-		require "og/backends/#{backend}"
-		eval %{
-			#{backend.capitalize}Backend.drop_db(config[:database], config[:user], 
+	class << self
+		def create_db!(config)
+			get_connection().db.create_db(config[:database], config[:user], 
 					config[:password])
-		}
+		end
+		alias_method :create!, :create_db!
+
+		def drop_db!(config)
+			backend = config[:backend] || "psql"
+			require "og/backends/#{backend}"
+			eval %{
+				#{backend.capitalize}Backend.drop_db(config[:database], config[:user], 
+						config[:password])
+			}
+		end
+		alias_method :drop!, :drop_db!
 	end
 end
 
-end # module
+end # namespace