nitro 0.2.0 → 0.3.0

data/examples/simple/app.rb

@@ -8,7 +8,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: app.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: app.rb 112 2004-10-27 10:59:55Z gmosx $
 
 $:.unshift "simple/lib"
 $:.unshift "../lib"
@@ -17,11 +17,11 @@ $:.unshift "../lib"
 $DBG = true 
 $DBG ? (require "simple/conf/debug-config") : (require "simple/conf/live-config")
 
-require "n/app/webrick"
+require "n/server/webrick"
 
 module App
 
-class Server < N::App::Webrick
+class Server < N::Webrick
 	include App::Config	
 end
 

data/examples/simple/conf/config.rb

@@ -8,41 +8,32 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: config.rb 106 2004-10-25 11:31:11Z gmosx $
+# $Id: config.rb 124 2004-11-01 12:34:17Z gmosx $
 
 require "n/std"
 require "n/properties"
 require "n/logger"
 require "n/config"
+require "n/og"
+require "n/server/cluster"
+
+require "simple/conf/requires"
 
 $name = "Simple"
 $root_dir = "simple/root"
 
-# Main logger
-
-$log = Logger.new("simple/logs/app.log", 10); 
-
-# Events logger
-
-$elog = Logger.new("simple/logs/events.log", "weekly"); 
-
-require "n/db"
-require "n/app/cluster"
-
-require "simple/conf/requires"
-
 $srv_extension_map = {
 	"sx" => ["text/html",
-#			N::App::AutoLoginFilter.new(
-				N::App::PageHandler.new
+#			N::AutoLoginFilter.new(
+				N::PageHandler.new
 #			)
 	],
 	"si" => ["text/html",
-		N::App::PageHandler.new
+		N::PageHandler.new
 	],
 	"rx" => ["text/html",
-#		N::App::AutoLoginFilter.new(
-			N::App::CodeHandler.new
+#		N::AutoLoginFilter.new(
+			N::CodeHandler.new
 #		)
 	]
 }
@@ -61,10 +52,7 @@ module Config
 	def initialize_sitemap
 	end
 
-	#
-	#
 	def initialize_shaders
-#		$default_shader = N::NilShader.new
 		$default_shader = N::Shader.new("simple", "#{$root_dir}/shader/shader.xsl")
 	end
 

data/examples/simple/conf/debug-config.rb

@@ -6,47 +6,21 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: debug-config.rb 106 2004-10-25 11:31:11Z gmosx $
+# $Id: debug-config.rb 118 2004-11-01 10:13:42Z gmosx $
 
 require "simple/conf/config"
 
-puts "DEBUG configuration\n\n"
-
-# If set to true disables xsl caching. Usefull when debugging xsls.
-
-$reload_xsl = true
-
-# If set to true disables script compilation. Usefull when debugging
-# statically included scripts.
-
-$reload_scripts = true
-
-# Logger (redirect to STDERR)
-
-$log = Logger.new(STDERR); 
-$log.level = Logger::DEBUG
-
-# Events logger
-
-$elog = Logger.new(STDERR); 
-$elog.level = Logger::INFO
-
 # Database
 
-$db = N::Db.new(
+$og = N::Og.new(
 	:address => "localhost",
 	:database => "simple",
 	:user => "postgres",
 	:password => "navelrulez",
-	# gmosx: NEVER set to 1 to avoid deadlocks! 
-	:connection_count => 5
+	:connection_count => 2
 )
 
-$srv_address = $appsrv_address = "127.0.0.1"
-$srv_port = 8080
-$appsrv_port = 9090
-$srv_url = "http://#$srv_address:#$srv_port"
+$og.get_connection
+$og.manage(N::Article)
+$og.manage(N::Comment)
 
-# gmosx: no error page in debug mode to avoid loops when there
-# is a bug in the handler code or the shader.
-$error_page_url = nil

data/examples/simple/conf/live-config.rb

@@ -6,41 +6,21 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: live-config.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: live-config.rb 118 2004-11-01 10:13:42Z gmosx $
 
 require "simple/conf/config"
 
-puts "LIVE configuration\n\n"
-
-# If set to true disables xsl caching. Usefull when debugging xsls.
-
-$reload_xsl = false
-
-# If set to true disables script compilation. Usefull when debugging
-# statically included scripts.
-
-$reload_scripts = false
-
 # Logger
 
+$log = Logger.new("simple/logs/app.log", 10); 
 $log.level = Logger::INFO
 
-# Events logger
-
-$elog.level = Logger::INFO
-
 # Database
 
-$db = N::Db.new(
+$og = N::Og.new(
 	:address => "localhost",
 	:database => "simple",
 	:user => "postgres",
 	:password => "navelrulez",
 	:connection_count => 20
 )
-
-$appsrv_address = "127.0.0.1"
-$appsrv_port = 9090
-$srv_url = "http://127.0.0.1:8080"
-#$srv_url = "http://192.168.0.3:8080"
-

data/examples/simple/conf/requires.rb

@@ -8,12 +8,12 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: requires.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: requires.rb 118 2004-11-01 10:13:42Z gmosx $
 
 require "n/std"
 require "n/properties"
 
-require "n/db"
+require "n/og"
 require "n/l10n"
 require "n/logger"
 require "n/parts"
@@ -35,9 +35,9 @@ require "n/ui/pager"
 require "n/ui/tabs"
 require "n/ui/date-select"
 
-require "n/app/cluster"
-require "n/app/handlers/page-handler"
-require "n/app/handlers/code-handler"
+require "n/server/cluster"
+require "n/server/handlers/page-handler"
+require "n/server/handlers/code-handler"
 
 require "articles/part"
 

data/examples/simple/env.rb

@@ -7,7 +7,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: env.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: env.rb 124 2004-11-01 12:34:17Z gmosx $
 
 $:.unshift ".."
 $:.unshift "simple/lib"
@@ -16,14 +16,13 @@ $:.unshift "../lib"
 $DBG = true 
 $DBG ? (require "simple/conf/debug-config") : (require "simple/conf/live-config")
 
-require "n/app/server"
-require "n/db/tools" # very useful :)
+require "n/server/server"
 
 $drb_lm_server = "druby://:10000"
 
 module App
 
-class Server < N::App::Server
+class Server < N::AppServer
 	include App::Config	
 end
 

data/examples/simple/lib/articles/entities.rb

@@ -1,35 +1,37 @@
-# = Entities for the Articles part.
-#
-#--
 # code:
-# George Moschovitis  <gm@navel.gr>
+# * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: entities.rb 87 2004-10-19 17:27:45Z gmosx $
-#++
+# $Id: entities.rb 118 2004-11-01 10:13:42Z gmosx $
 
 module N
 
+# gmosx: forward declaration, can we avoid this?
+class Comment; end
+
 # = Article
 #
 class Article
-	include N::Entity
-	include N::CreateTime
-	manage {
 	prop_accessor String, :title
 	prop_accessor String, :body
-	}
+	prop_accessor Time, :create_time
+	has_many N::Comment, :comments
+	
+	def initialize
+		@create_time = Time.now
+	end
 end
 
 # = Comment
 #
 class Comment
-	include N::Entity
-	include N::Child
-	include N::CreateTime
-	manage {
 	prop_accessor String, :body
-	}
+	prop_accessor Time, :create_time
+	belongs_to N::Article, :article
+	
+	def initialize
+		@create_time = Time.now
+	end	
 end
 
 end # module

data/examples/simple/lib/articles/methods.rb

@@ -1,24 +1,24 @@
-# = Methods for the Articles part.
-#
-#--
 # code:
-# George Moschovitis  <gm@navel.gr>
+# * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: methods.rb 84 2004-10-19 13:57:01Z gmosx $
-#++
+# $Id: methods.rb 118 2004-11-01 10:13:42Z gmosx $
 
 module P
 
+# = ArticlesMethods
+#
+# Methods for the Articles part.
+#
 module ArticlesMethods
 
 	# Add an article
 	#
 	def add_article(request)
-		if request.delete("add_article")
+		if request["add_article"]
 			article = N::Article.new
 			request.update_entity(article)
-			$db << article
+			article.save!
 			request.redirect("index.sx")
 		end
 	end
@@ -26,27 +26,27 @@ module ArticlesMethods
 	# Delete an article
 	#
 	def del_article(request)
-		if oid = request.delete("del_article_oid")
-			$db.delete(oid.to_i, N::Article)
+		if oid = request["del_article_oid"]
+			N::Article.delete(oid)
 		end
 	end
 
 	# Add a comment
 	#
 	def add_comment(request)
-		if pid = request.delete("add_comment_pid")
+		if pid = request["add_comment_pid"]
 			comment = N::Comment.new
-			comment.pid = pid
+			comment.article = pid
 			request.update_entity(comment)
-			$db << comment
+			comment.save!
 		end
 	end
 	
 	# Delete a comment
 	#
 	def del_comment(request)
-		if oid = request.delete("del_comment_oid")
-			$db.delete(oid.to_i, N::Comment)
+		if oid = request["del_comment_oid"]
+			N::Comment.delete(oid)
 		end
 	end
 	

data/examples/simple/lib/articles/part.rb

@@ -1,12 +1,8 @@
-# = Simple Articles part.
-#
-#--
 # code:
-# George Moschovitis  <gm@navel.gr>
+# * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: part.rb 87 2004-10-19 17:27:45Z gmosx $
-#++
+# $Id: part.rb 118 2004-11-01 10:13:42Z gmosx $
 
 require "articles/lc-en"
 require "articles/entities"
@@ -14,6 +10,10 @@ require "articles/methods"
 
 module P
 
+# = Articles
+# 
+# A simple articles part.
+#
 class Articles < N::Part
 	extend P::ArticlesMethods
 	
@@ -23,7 +23,7 @@ class Articles < N::Part
 		@name = "articles"
 		@title = "Articles"
 		@body = "Simple articles management"
-		@version = "$Id: part.rb 87 2004-10-19 17:27:45Z gmosx $"
+		@version = "$Id: part.rb 118 2004-11-01 10:13:42Z gmosx $"
 		@path = ""
 		super
 	end
@@ -55,4 +55,3 @@ end
 end # module
 
 a = P::Articles.instance
-

data/examples/simple/root/comments.si

@@ -10,7 +10,7 @@
 	P::Articles.del_comment(request)
 
 	parent = request[:comments_parent]
-	comments = $db.children(parent, N::Comment)
+	comments = parent.comments
 ?>
 
 <?r if comments ?>

data/examples/simple/root/index.sx

@@ -17,7 +17,7 @@
 	# methods:
 	P::Articles.del_article(request)
 
-	articles = $db.get_all(N::Article)
+	articles = N::Article.all
 ?>
 
 <!-- x:page is a trivial template, used as an example -->

data/examples/simple/root/view-article.sx

@@ -5,8 +5,7 @@
 	xmlns:xl="http://www.w3.org/1999/xlink">
 	
 <?r
-	oid = request["oid"]
-	article = $db.get(oid, N::Article)
+	article = Article[request["oid"]]
 ?>
 
 <x:page> 

data/examples/tiny/app.rb

@@ -8,7 +8,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: app.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: app.rb 112 2004-10-27 10:59:55Z gmosx $
 
 $:.unshift "../lib"
 
@@ -16,11 +16,11 @@ $:.unshift "../lib"
 $DBG = true
 
 require "tiny/conf/config"
-require "n/app/webrick"
+require "n/server/webrick"
 
 module App
 
-class Server < N::App::Webrick
+class Server < N::Webrick
 	include App::Config	
 end