nitro 0.3.0 → 0.4.1

data/examples/blog/root/recent_posts.xhtml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<span>
+	<h2>Recent posts</h2>
+<?r if @entries ?>
+	<ul>
+<?r	for entry in @entries ?>
+		<li><a href="view_entry?oid=#{entry.oid}">#{entry.title}</a></li>
+<?r	end ?>
+	</ul>
+<?r else ?>
+	no entries
+<?r end ?>
+</span>

data/examples/blog/root/style.css

@@ -0,0 +1,201 @@
+body {
+  margin: 0;
+  padding: 0;
+  font-family: Verdana, sans-serif;
+  font-size: small;
+  color: #333;
+  background: #e0e0e0;
+}
+
+a:link {
+  color: #69c;
+}
+
+a:visited {
+  color: #666699;
+}
+
+a:hover {
+  color: #693;
+}
+
+a:active {
+  color: #cc3333;
+  text-decoration: none;
+}
+
+input, textarea {
+  font-family: Verdana, sans-serif;
+  font-size: small;	
+}
+
+#page {
+	position: relative; top: 50%; left: 50%;
+	margin: 0px; margin-left: -400px; 
+	width: 847px;
+	background: url(m/page_bg.gif) repeat-y;
+}
+
+#header {
+	margin: 0px;
+	color: #fff;
+	font-family: "Lucida Grande", "Trebuchet MS";	
+	background: url(m/header_bg.gif) no-repeat top left;
+}
+
+#header h1 {
+	margin: 0px;
+	padding: 45px 60px 50px 160px;	
+	background: url(m/h1_bg.gif) no-repeat bottom left;
+}
+
+#footer {
+	height: 40px;
+	color: #fff;
+	font-size: 80%;
+	background: url(m/footer_bg.gif) repeat-y;
+	padding-top: 15px; padding-left: 90px;	
+}
+
+#footer a {
+	color: #fff;
+}
+
+#footer a:hover {
+	color: #fc0;
+}
+
+.main {
+	float: left;
+	margin: 10px; margin-left: 60px;
+	padding-left: 2px;
+	margin-bottom: 20px;
+	width: 460px;
+}
+
+.main li {
+  list-style: none;
+  padding-left: 14px;
+  margin-bottom: 3px;
+  background: url(m/obull.gif) no-repeat 0 6px;
+}
+
+.side {
+  color: #999;
+  margin: 0 41px 0px 547px;
+  padding-top: 25px; padding-left: 20px; padding-right: 20px;
+  font-size: 85%;
+  line-height: 1.4em;	
+  background: url(m/sidebar_bg.gif) no-repeat 0 0;
+}
+
+.side h2 {
+  margin: 0 0 0 0;
+  padding: 25px 0 0 30px;
+  color: #666;
+  height: 32px !important;
+  height /**/:57px; /* for IE5/Win */
+  font-family: "Lucida Grande", "Trebuchet MS";
+  font-size: 130%;	
+	background: url(m/side_title_bg.gif) no-repeat 0px 15px;
+}
+
+.side ul {
+	margin-top: 0px;
+	padding: 0px;
+}
+
+.side li {
+  list-style: none;
+	margin-left: 0px; margin-bottom: 3px;
+  padding-left: 14px;
+  background: url(m/gbull.gif) no-repeat 0 6px;
+}
+
+.entry {
+	border-bottom: 1px solid #eee;
+	margin-top: 15px; margin-bottom: 15px;
+}
+
+.full-entry {
+	margin-top: 15px; margin-bottom: 15px;
+}
+
+h2.date {
+  margin-top: 0;
+  padding-left: 14px;
+  font-size: 90%;
+  color: #f93;
+  background: url(m/down.gif) no-repeat 0 50%;	
+}
+
+.post {
+	padding-left: 15px;
+	padding-bottom: 15px;
+}
+
+.post h3.title {
+  margin-top: 0;
+  font-family: "Lucida Grande", "Trebuchet MS";
+  font-size: 130%;
+  letter-spacing: -1px;
+  color: #f63;
+}
+
+.post .footer {
+  margin: 0; margin-top: 10px;
+  padding: 0 0 0 14px;
+  font-size: 88%;
+  color: #999;
+  background: url(m/grbull.gif) no-repeat 0 6px;
+}
+
+#comments {
+	margin-top: 30px;
+  padding-top: 10px;
+  font-size: 85%;
+  line-height: 1.5em;
+  color: #666;
+  background: #eee url(m/comments_curve.gif) no-repeat top left;
+}
+
+#comments h2 {
+  margin: 20px 0 15px 0;
+  padding: 8px 0 0 40px;
+  font-family: "Lucida Grande", "Trebuchet MS";
+  font-size: 130%;
+  color: #666;
+  background: url(m/bubbles.gif) no-repeat 10px 0;
+  height: 29px !important; /* for most browsers */
+  height /**/:37px; /* for IE5/Win */
+}
+
+#comments form {
+	margin: 10px; 
+	padding-bottom: 10px;
+}
+
+.comment {
+	padding: 10px;
+	border-bottom: 1px solid #ddd;
+}
+
+.comment .footer {
+  margin: 4px 0 0 0;
+  padding: 0 0 0 60px;
+  color: #999;
+  background: url(m/garrow.gif) no-repeat 44px 2px;
+}
+
+.error {
+	color: #f00;
+}
+
+.clear {
+	clear: both;
+	height: 0px;
+	line-height: 0px;
+	font-size: 0px;
+	overflow: hidden;
+	background-color: #f00;
+}	

data/examples/blog/root/style.xsl

@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!--
+A Simple Shader
+
+code: 
+* George Moschovitis  <gm@navel.gr>
+
+(c) 2004 Navel, all rights reserved.
+$Id: style.xsl 149 2004-11-13 19:52:32Z 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:xl="http://www.w3.org/1999/xlink"
+		xmlns:x="http://www.navel.gr/xml/shader.xsd" version="1.0"
+		exclude-result-prefixes="x xl">
+
+	<xsl:include href="../../lib/xsl/base.xsl" />
+	
+	<xsl:output method="xml" indent="yes" encoding="iso-8859-1" />
+
+	<xsl:template name="x:head">
+		<head>
+			<title>#$name</title>
+			<meta name="title" content="Blog" />
+			<meta name="description" content="Example" />
+			<meta name="keywords" content="nitro, example, blog" />
+			<meta name="category" content="example" />
+			<meta name="robots" content="index, follow" />		
+			<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+			
+			<xsl:apply-templates select="x:block[@id='meta']"/>
+	
+			<base href="#$srv_url/" />
+			<link href="/style.css" rel="stylesheet" type="text/css" media="screen" />
+
+			<xsl:apply-templates select="x:cell[@id='head']"/>
+		</head>
+	</xsl:template>
+
+	<xsl:template name="x:header">
+		<div id="header">
+			<h1>#$name</h1>
+		</div>
+	</xsl:template>
+
+	<xsl:template name="x:footer">
+		<div id="footer">
+		</div>
+	</xsl:template>
+
+	<!--
+	can only include x:blocks, all other templates are ignored
+	-->
+	<xsl:template match="x:page">
+		<html>
+			<xsl:call-template name="x:head" />
+			<body>
+				<div id="page">
+			
+					<xsl:call-template name="x:header" />
+					
+					<xsl:apply-templates select="x:cell[@id='top']" />
+					
+					<div class="block main">
+						<xsl:apply-templates select="x:cell[@id='main']" />
+					</div>
+
+					<div class="block side">
+						<h2>About</h2>
+						This is a simple blog powered by <a href="http://www.navel.gr/nitro">
+						Nitro</a> Web Engine. Have a look at the source code and enjoy
+						the power of Ruby.
+						<ruby>unless session['owner']</ruby>
+							<p><a href="login">Login</a> as owner.</p>
+						<ruby>else</ruby>
+							<p><a href="logout">Logout</a>.</p>
+						<ruby>end</ruby>
+						
+						<xsl:apply-templates select="x:cell[@id='side']" />
+						
+						<h2>Linkage</h2>
+						<ul>
+							<li><a target="_new" href="http://www.navel.gr">Navel Ltd</a></li>
+							<li><a target="_new" href="http://www.navel.gr/nitro">Nitro Web Engine</a></li>
+							<li><a target="_new" href="http://www.ruby-lang.org">Ruby</a></li>
+							<li><a target="_new" href="http://www.blogger.com">Blogger</a></li>
+							<li><a target="_new" href="http://www.w3c.org">W3 Consortium</a></li>
+						</ul>
+						
+						<br />
+						<p>
+						powered by <b><a href="http://www.navel.gr/nitro">Nitro</a></b>, 
+						Skin from <a href="http://www.blogger.com">Blogger.com</a>.
+						</p>
+					</div>
+					
+					<div class="clear">.</div>
+					
+					<xsl:apply-templates select="x:cell[@id='bottom']" />
+					
+					<xsl:call-template name="x:footer" />
+				</div>
+			</body>
+		</html>	
+	</xsl:template>
+	
+</xsl:stylesheet>

data/examples/blog/root/view_entry.xhtml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<x:page xmlns:x="http://www.navel.gr/xml/shader.xsd">
+
+	<x:cell id="main">
+	
+		<div class="full-@entry">
+			<h2 class="date">#{@entry.create_time.strftime('%B %e, %G')}</h2>
+			<div class="post">
+				<h3 class="title">#{@entry.title}</h3>
+				#{@entry.body}
+				<div class="footer">
+					posted by gmosx at #{@entry.create_time.strftime('%R %p')} 
+<?r	if session['owner'] ?>			
+					[<a href="del_entry?oid=#{@entry.oid}">del</a>]
+<?r end ?>
+				</div>
+			</div>
+		</div>
+
+		<div id="comments">
+			<include href="comments" />
+		</div>
+		
+		<p><a href="/">Home</a></p>
+	</x:cell>
+	
+</x:page>
+

data/examples/og/run.rb

@@ -6,13 +6,13 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: run.rb 124 2004-11-01 12:34:17Z gmosx $
+# $Id: run.rb 155 2004-11-13 20:32:12Z gmosx $
 
 $:.unshift "../../lib"
 
-require "n/std"
-require "n/logger"
-require "n/og"
+require "nitro"
+require "nitro/logger"
+require "og"
 
 # Full debug information.
 $DBG = true
@@ -20,7 +20,7 @@ $DBG = true
 # = A child class
 #
 class Comment
-	prop_accessor String, :body
+	prop_accessor :body, String
 	
 	def initialize(body = nil)
 		@body = body
@@ -43,9 +43,9 @@ class Part; end
 # = A Parent class
 #
 class User
-	prop_accessor String, :name
+	prop_accessor :name, String
 	
-	has_many UserComment, :comments
+	has_many :comments, UserComment
 	
 	def initialize(name = nil)
 		@name = name
@@ -59,22 +59,24 @@ end
 # = A parent class
 #
 class Article
-	prop_accessor String, :title
-	prop_accessor String, :body
+	prop_accessor :title, String
+	prop_accessor :body, String
 	# override the default O->R mapping
-	prop_accessor Fixnum, "smallint DEFAULT 1", :level
-	# store a Ruby Hash in the Database. Marshal
+	prop_accessor :level, Fixnum, :sql => "smallint DEFAULT 1"
+	# store a Ruby Hash in the Database. YAML
 	# is used for serializing the attribute.
-	prop_accessor Hash, :options
-	prop_accessor Time, :create_time
+	# no need to define the class, but you can if you want.
+	prop_accessor :options
+	# exactly like the standard Ruby attr creates only the reader.
+	prop :create_time, Time
 	
 	# define comment relation:
-	has_many ArticleComment, :comments
+	has_many :comments, ArticleComment
 	
-	has_many Part, :parts
+	has_many :parts, Part
 	
 	# define author relation:
-	belongs_to User, :author
+	belongs_to :author, User
 	
 	# this attribute is NOT stored in the db.
 	attr_accessor :other_options
@@ -97,20 +99,20 @@ end
 # = Article comment
 #
 class ArticleComment < Comment
-	belongs_to Article, :article
+	belongs_to :article, Article
 end
 
 # = User comment
 #
 class UserComment < Comment
-	belongs_to User, :author
+	belongs_to :author, User
 end
 
 # = Another child class
 #
 class Part
-	prop_accessor String, :name
-	belongs_to Article, :article
+	prop_accessor :name, String
+	belongs_to :article, Article
 	
 	def initialize(name = nil)
 		@name = name
@@ -126,7 +128,7 @@ end
 $log = Logger.new(STDERR); 
 
 # Og configuration.
-=begin
+
 config = {
 	:address => "localhost",
 	:database => "test",
@@ -135,7 +137,7 @@ config = {
 	:password => "navelrulez",
 	:connection_count => 1
 }
-=end
+=begin
 config = {
 	:address => "localhost",
 	:database => "test",
@@ -144,18 +146,14 @@ config = {
 	:password => "navelrulez",
 	:connection_count => 1
 }
-
+=end
 # Cleanup the database for earlier executions
 
-N::Og.drop_db!(config)
+Og::Database.drop_db!(config)
 
 # Initialize Og
 
-$og = N::Og.new(config)
-
-# Define the managed objects
-
-$og.manage_classes(Article, User, ArticleComment, UserComment, Part)
+$og = Og::Database.new(config)
 
 # Get an Og connection for this thread.