nitro 0.2.0 → 0.3.0

data/lib/n/{app → server}/handlers/page-handler.rb

@@ -3,7 +3,7 @@
 # * Anastasios Koutoumanos  <ak@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: page-handler.rb 99 2004-10-22 09:50:28Z gmosx $
+# $Id: page-handler.rb 112 2004-10-27 10:59:55Z gmosx $
 
 require "cgi"
 require "singleton"
@@ -11,11 +11,11 @@ require "sync"
 
 require "n/utils/cache"
 require "n/utils/uri"
-require "n/app/script"
-require "n/app/fragment"
-require "n/app/handlers"
+require "n/server/script"
+require "n/server/fragment"
+require "n/server/handlers"
 
-module N; module App
+module N
 
 # = PageHandler
 #
@@ -277,9 +277,11 @@ class PageHandler < ScriptHandler
 		# FIXME: perhaps the xslt could strip this?
 		pagecode.gsub!(/<\?xml.*\?>/, "")
 
-		# xform the processing instructions
+		# xform the processing instructions, use <?ruby, <?rb, <?r as
+		# a marker.
 		pagecode.gsub!(/\?>/, "\n__out << %{")
 		pagecode.gsub!(/<\?ruby /, "}\n")
+		pagecode.gsub!(/<\?ruby /, "}\n")
 		pagecode.gsub!(/<\?r /, "}\n")
 		
 		# tml, TODO: resolve static injects! scan injects and update the metadata
@@ -607,4 +609,4 @@ class PageScript < Script
 	
 end # PageScript
 
-end; end # module
+end # module

data/lib/n/{app → server}/request.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: request.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: request.rb 124 2004-11-01 12:34:17Z gmosx $
 
 require "cgi"
 require "ftools"
@@ -10,10 +10,10 @@ require "ftools"
 require "n/utils/string"
 require "n/utils/uri"
 require "n/utils/http"
-require "n/app/cookie"
-require "n/app/request-part"
+require "n/server/cookie"
+require "n/server/requestpart"
 
-module N; module App
+module N
 
 # = RequestUtils
 #
@@ -56,7 +56,7 @@ module RequestUtils
 	#
 	def get_entity(oid_param, klass = nil)
 		if oid = self[oid_param]
-			obj = $db.get(oid, klass)
+			obj = $og.load(oid, klass)
 
 			if klass
 				if obj.is_a?(klass)
@@ -80,7 +80,7 @@ module RequestUtils
 	#
 	def get_entity_by_name(name_param, klass)
 		if name = self[name_param]
-			obj = $db.get_by_name(name, klass)
+			obj = $og.load_by_name(name, klass)
 
 			if klass
 				if obj.is_a?(klass)
@@ -323,7 +323,7 @@ class Request
 	# time to the past (epoch).
 	#
 	def del_cookie(name)
-		cookie = N::App::Cookie.new(name, "nil")
+		cookie = N::Cookie.new(name, "nil")
 		cookie.path = "/"
 		cookie.expires = Time.at(0)
 		@out_cookies[name] = cookie
@@ -655,4 +655,4 @@ class Request
 		
 end
 
-end; end # module
+end # module

data/lib/n/{app/request-part.rb → server/requestpart.rb}

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: request-part.rb 99 2004-10-22 09:50:28Z gmosx $
+# $Id: requestpart.rb 112 2004-10-27 10:59:55Z gmosx $
 
 require "cgi"
 require "ftools"
@@ -10,9 +10,9 @@ require "ftools"
 require "n/utils/string"
 require "n/utils/uri"
 require "n/utils/http"
-require "n/app/cookie"
+require "n/server/cookie"
 
-module N; module App
+module N
 
 # RequestPart
 #
@@ -51,4 +51,4 @@ class RequestPart
 	end	
 end
 
-end; end # module
+end # module

data/lib/n/{app → server}/script.rb

@@ -2,12 +2,12 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: script.rb 99 2004-10-22 09:50:28Z gmosx $
+# $Id: script.rb 112 2004-10-27 10:59:55Z gmosx $
 
 require "fileutils"
 
 require "n/utils/cache"
-require "n/app/fragment"
+require "n/server/fragment"
 
 module N
 
@@ -20,7 +20,7 @@ class ScriptExitException < Exception; end
 
 end # module
 
-module N; module App
+module N
 
 # = Script
 #
@@ -382,6 +382,6 @@ class Script
 		}
 	end
 	
-end # class
+end
 
-end; end # module
+end # module

data/lib/n/{app → server}/server.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: server.rb 106 2004-10-25 11:31:11Z gmosx $
+# $Id: server.rb 111 2004-10-27 09:30:19Z gmosx $
 
 require "drb"
 

data/lib/n/{app → server}/session.rb

@@ -2,14 +2,14 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2002-2003 Navel, all rights reserved.
-# $Id: session.rb 99 2004-10-22 09:50:28Z gmosx $
+# $Id: session.rb 124 2004-11-01 12:34:17Z gmosx $
 
 require "md5"
 
 require "n/utils/hash"
-require "n/app/user"
+require "n/server/user"
 
-module N; module App
+module N
 
 # = SessionManager
 #
@@ -182,7 +182,7 @@ class Session < Hash
 	# === Warning: the current version only refreshes the "USER" entity.
 	#
 	def refresh!
-		@user = $db.get(@user.oid, @user.class) if @user
+		@user = $og.load(@user.oid, @user.class) if @user
 	end
 
 	# Calculates a unique id.
@@ -217,4 +217,4 @@ class Session < Hash
 	
 end
 
-end; end # module
+end # module

data/lib/n/{app → server}/user.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: user.rb 99 2004-10-22 09:50:28Z gmosx $
+# $Id: user.rb 111 2004-10-27 09:30:19Z gmosx $
 
 require "singleton"
 

data/lib/n/{app/webrick-servlet.rb → server/webrick.rb}

@@ -1,19 +1,23 @@
 # code:
 # * George Moschovitis  <gm@navel.gr>
+# * Elias Athanasopoulos  <elathan@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: webrick-servlet.rb 106 2004-10-25 11:31:11Z gmosx $
+# $Id: webrick.rb 118 2004-11-01 10:13:42Z gmosx $
 
 require "drb"
+require "cgi"
 require "singleton"
 require "webrick"
 
 require "n/logger"
+require "n/application"
 require "n/utils/cache"
-require "n/app/request"
-require "n/app/request"
-require "n/app/handlers"
-require "n/app/session"
+require "n/server/request"
+require "n/server/request"
+require "n/server/handlers"
+require "n/server/session"
+require "n/server/appserver"
 
 # Override WEBrick to suit our needs.
 #
@@ -49,7 +53,61 @@ module WEBrick
 	end
 end
 
-module N; module App
+module N
+
+# = Webrick AppServer
+#
+# The Application Server. Handles dynamic requests in a web application.
+# Dont keepalive (or use a VERY SMALL keepalive). Typically this server
+# is used along with a standard http server that handles other resources.
+#
+# Used temporarily unitl we build our own app server.
+#
+class Webrick < N::AppServer
+	include WEBrick
+
+	# the integrated webrock server.
+	attr_accessor :webrick
+	
+	def initialize(name = "WebrickServer")
+		super
+	end
+
+	# Start the application server.
+	#
+	def start
+		accesslog = WEBrick::BasicLog::new("/dev/null") 
+		referer = WEBrick::BasicLog::new("/dev/null")	
+		
+		@webrick = HTTPServer.new(
+			:BindAddress => $appsrv_address, 
+			:Port => $appsrv_port, 
+			:DocumentRoot => $root_dir,
+			# gmosx, FIXME: this shit still logs!!
+			:Logger => Log.new(nil, WEBrick::Log::WARN),
+			# elathan: amateur...
+			:AccessLog => [
+          [accesslog, AccessLog::COMMON_LOG_FORMAT],
+          [referer, AccessLog::REFERER_LOG_FORMAT]
+        ]
+		)
+		
+		@webrick.mount("/", N::WebrickServlet)
+		
+		trap("INT") {
+		 @webrick.shutdown() 
+		}
+		
+		@webrick.start()
+	end
+	
+	# Stop the application server.
+	#
+	def stop
+		@webrick.stop
+	end
+	
+end
 
 # = WebrickServlet
 #
@@ -75,6 +133,7 @@ class WebrickServlet < WEBrick::HTTPServlet::AbstractServlet
 		end
 
 		begin
+			$og.get_connection if $og
 			fragment, script = handler.process(request)
 
 			if fragment
@@ -117,6 +176,8 @@ class WebrickServlet < WEBrick::HTTPServlet::AbstractServlet
 				}
 				request.out_buffer = body
 			end
+		ensure
+			$og.put_connection if $og
 		end
 		
 		# gmosx: optimize me, do something more clever!!!
@@ -128,12 +189,8 @@ class WebrickServlet < WEBrick::HTTPServlet::AbstractServlet
 		wres.body = request.out_buffer
 	end
 
-	# Just reuse the GET code.
-	#
-	def do_POST(wreq, wres)
-		do_GET(wreq, wres)
-	end
-	
+	alias :do_POST :do_GET
+
 #-------------------------------------------------------------------------------
 
 	private
@@ -143,7 +200,7 @@ class WebrickServlet < WEBrick::HTTPServlet::AbstractServlet
 	#
 	def create_request(wreq)
 		# FIXME: use a resource pool!
-		request = N::App::Request.new
+		request = N::Request.new
 
 		request.uri = wreq.unparsed_uri
 		request.translated_uri = wreq.path_info
@@ -168,7 +225,7 @@ class WebrickServlet < WEBrick::HTTPServlet::AbstractServlet
 
 		wreq.query.each { |k, v|
 			if v.filename
-				request.parts[k] = N::App::RequestPart.new(v.filename,	v)
+				request.parts[k] = N::RequestPart.new(v.filename,	v)
 			else
 				request.parameters[k] = v
 			end
@@ -204,23 +261,23 @@ class WebrickServlet < WEBrick::HTTPServlet::AbstractServlet
 		# gmosx: i have to fix the get_cookie method to return a
 		# full cookie object.
 
-		if session_id = request.get_cookie(N::App::Session::COOKIE_NAME)
+		if session_id = request.get_cookie(N::Session::COOKIE_NAME)
 			session = $sessions[session_id]
 			$log.debug "Stale session cookie: #{session_id}" unless session
 			# FIXME: remove cookie if stale!
 		else
-			session_id = N::App::Session.calculate_id()
-			cookie = N::App::Cookie.new(N::App::Session::COOKIE_NAME, session_id)
-			request.out_cookies[N::App::Session::COOKIE_NAME] = cookie
+			session_id = N::Session.calculate_id()
+			cookie = N::Cookie.new(N::Session::COOKIE_NAME, session_id)
+			request.out_cookies[N::Session::COOKIE_NAME] = cookie
 		end
 
 		# session not found and must be created
 		unless session
-			session = N::App::Session.new(session_id)
+			session = N::Session.new(session_id)
 		end
 		
 		return session
 	end
 end
 
-end; end # module
+end # module

data/lib/n/shaders.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: shaders.rb 99 2004-10-22 09:50:28Z gmosx $
+# $Id: shaders.rb 109 2004-10-27 09:12:45Z gmosx $
 
 module N;
 
@@ -103,7 +103,8 @@ end
 #
 class NilShader < Shader
 	def initialize
-		@name = "nil"
+		# gmosx: to get better display.
+		@name = nil
 		@mtime = Time.at(0)
 	end
 

data/lib/n/std.rb

@@ -6,7 +6,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: std.rb 99 2004-10-22 09:50:28Z gmosx $
+# $Id: std.rb 123 2004-11-01 11:55:11Z gmosx $
 
 # we want readable code
 
@@ -14,34 +14,23 @@ require "English"
 require "pp"
 
 class NilClass
-	# to_i, to_s are handled by default.
-	
-	def to_i
-		return nil
-	end
-	
-	def to_f
-		return 0.0
-	end
-	
 	# quite usefull for error tolerant apps.
-	# a bit dangerous though.
+	# a bit dangerous? Will have to rethink this.
 	#
 	def empty?
 		return true
 	end
 end
 
-#
-#
 class Class
+	#--
+	# gmosx: is this really needed?
+	#++
 	def to_i()
 		return self.hash()
 	end
 end
 
-#
-#
 module Kernel
 	# pretty prints an exception/error object
 	# usefull for helpfull debug messages
@@ -62,19 +51,3 @@ end
 
 EMPTY_STRING = ""
 
-# = N
-#
-# This module is used as a namespace that encapsulates 
-# engine objects.
-#
-module N
-end # module
-
-# This the default 72 chars separator, copy paste to use it
-# in your source file. Btw all lines in your source file should 
-# be less than 72 chars. So you can use this as a ruler if your 
-# editor does not support it.
-
-#-----------------------------------------------------------------------
-
-