nitro 0.7.0 → 0.8.0

data/examples/blog/lib/blog.rb

@@ -1,5 +1,4 @@
-# code: 
-# * George Moschovitis  <gm@navel.gr>
+# George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
 # $Id: blog.rb 185 2004-12-10 13:29:09Z gmosx $
@@ -8,6 +7,8 @@ require 'nitro/service'
 require 'nitro/builders/rss'
 require 'nitro/ui/pager'
 
+require 'parts/content'
+
 $blog_username = 'George Moschovitis'
 $blog_password = 'mypassword'
 
@@ -16,53 +17,48 @@ module N
 # = Common
 # 
 # Common properties/methods for the other classes.
-#
-class Common
-	prop :create_time, Time
-	prop_accessor :author, String
-	prop_accessor :body, String, :form => :textarea
+# Since markup is required, automatically handles
+# the markup expanding/compacting for the body.
 
-	def initialize
-		@create_time = Time.now
-	end
-	
+module Common
+	include N::BaseContent
+	include N::CreateTime
+
+	prop_accessor :author, String
+	validate_value :body
 end
 
-class Comment < Common; end
+
+# Forward reference to the Comment definition. 
+
+class Comment; end
 
 # = BlogEntry
-#
-class BlogEntry < Common
-	prop_accessor :title, String
-	has_many :comments, N::Comment, :linkback => 'entry_oid'
 
-	# Play a bit with the text the user enters.
-	#
-	def body=(str)
-		if str
-			str.gsub!(/</, '&lt;')		
-			str.gsub!(/>/, '&gt;')		
-			str.gsub!(/"/, '&quot;')		
-			str.gsub!(/'/, '&#39;')		
-			str.gsub!(/\r\n/, ' <br />')
-			@body = str
-		end
-	end			
+class BlogEntry 
+	include N::Common
+	has_many :comments, N::Comment, :linkback => 'entry_oid'
+	validate_value :title, :msg => 'Please provide a title'
 end
 
 # = Comment
-#
-class Comment < Common
+
+class Comment 
+	include N::Common
 	belongs_to :entry, N::BlogEntry
+	validate_value :author, :msg => 'Please enter your name'
 end
 
 # = BlogService 
 #
+# Implements the Blog service. This encapsulates
+# the action controller.
+
 class BlogService < N::Service
 	SOURCE_FILE = __FILE__
 	
-	before_filter :audit
-	after_filter :cache
+	before_filter :get_errors
+	# after_filter :cache
 	
 	scaffold N::BlogEntry, :name => 'entry', :index => true
 	scaffold N::Comment
@@ -71,11 +67,19 @@ class BlogService < N::Service
 		@pager = N::UI::Pager.new('entries', @request, 3)
 		@entries = N::BlogEntry.all("ORDER BY oid DESC #{@pager.sql_limit}")
 		@pager.set(N::BlogEntry.count)
+
+		puts N::Common.__meta[:validations]
 	end
 	
 	def new_entry
 		entry = request.fill(N::BlogEntry.new)
 		entry.author = session['username']
+
+		unless entry.valid?
+			session[:errors] = entry.errors
+			redirect_referer '#new_entry'
+		end
+
 		entry.save!
 	end	
 
@@ -86,6 +90,12 @@ class BlogService < N::Service
 	
 	def new_comment
 		comment = request.fill(N::Comment.new)
+
+		unless comment.valid?
+			session[:errors] = comment.errors
+			redirect_referer '#new_comment'
+		end
+		
 		comment.save!
 	end
 
@@ -112,14 +122,24 @@ class BlogService < N::Service
 	
 private
 
-	def audit
-		puts "audit (before filter example)"
+	# A helper prefilter, autocleans session errors.
+	# Used as an example.
+
+	def get_errors 
+		# gmosx: should better implement top-level filters!
+		if errors = session.delete(:errors)
+			@errors = errors
+		end
 	end
 
+	# Just an example
+
 	def cache
-		puts "cache (after filter example)"
+		# Call the automatically configured logger.
+
+		Logger.info "cache (after filter example)"
 	end
 	
 end
 
-end # module
+end 

data/examples/blog/root/comments.xhtml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<root>
+<root xmlns:x="http://www.navel.gr/xml/shader.xsd">
 
 <h2>#{@entry.comments_count} Comments:</h2>			
 <?r	
@@ -22,15 +22,18 @@ else
 ?>
 no comments.
 <?r		end ?>
-<form action="new_comment" method="post">
+<form id="new_comment" action="new_comment" method="post">
 	<input type="hidden" name="entry_oid" value="#{@entry.oid}" />
 	<p>
 		<b>Your name:</b><br />
 		<input type="text" name="author" value="#{session['username']}" />
+		<x:error attr="author" />
+		<x:error attr="title" />
 	</p>
 	<p>
 		<b>Write your thoughts:</b><br />
 		<textarea name="body" style="width: 90%; height: 100px">#{}</textarea>
+		<x:error attr="body"><br /></x:error>
 	</p>
 	<input type="submit" value="Add comment" />
 </form>

data/examples/blog/root/entry_form.xhtml

@@ -1,16 +1,21 @@
 <?xml version="1.0"?>
 
-<div id="comments">
+<div id="comments" xmlns:x="http://www.navel.gr/xml/shader.xsd">
+	
+<?r errors = session[:errors] ?>
+
 	<h2>Post new entry:</h2>			
 
-	<form action="new_entry" method="post">
+	<form id="new_entry" action="new_entry" method="post">
 		<p>
 			<b>Title:</b><br />
 			<input type="text" name="title" />
+			<x:error attr="title" />
 			</p>
 		<p>
 		<b>Body:</b><br />
 			<textarea name="body" style="width: 90%; height: 100px">#{}</textarea>
+			<x:error attr="body"><br /></x:error>
 		</p>		
 		<input type="submit" value="Post" />
 	</form>

data/examples/blog/root/login.xhtml

@@ -15,7 +15,7 @@
 		<form action="login" method="post">
 			<p>
 			<b>Password:</b><br />
-			<input type="password" name="password" />
+			<input type="password" name="password" value="#$blog_password" />
 			</p>
 			<input type="submit" value="Login" />
 		</form>

data/examples/blog/root/style.xsl

@@ -60,6 +60,13 @@ $Id: style.xsl 194 2004-12-20 20:23:57Z gmosx $
 		</div>
 	</xsl:template>
 
+	<xsl:template name="x:error" match="x:error">
+		<ruby>if @errors and __err__ = @errors[:<xsl:value-of select="@attr" />]</ruby>
+		<xsl:apply-templates />
+		<span class="error">#{__err__}</span>
+		<ruby>end</ruby>
+	</xsl:template>
+
 	<!--
 	can only include x:blocks, all other templates are ignored
 	-->

data/examples/og/mock_example.rb

@@ -9,15 +9,12 @@
 # (c) 2004 Navel, all rights reserved.
 # $Id: run.rb 185 2004-12-10 13:29:09Z gmosx $
 
-$LOAD_PATH.unshift '../../lib'
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
 require 'rubygems'
 require 'flexmock'
 require 'og'
 require 'og/mock'
-require 'logger'
-
-$log = Logger.new($stderr)
 
 class Article
 	prop_accessor :body, String
@@ -30,11 +27,11 @@ end
 class SimpleTest < Test::Unit::TestCase
 
 	def setup
-		$og = Og::MockDatabase.new
+		@og = Og::MockDatabase.new
 	end
 
 	def teardown
-		$og = nil
+		@og = nil
 	end
 
 	def test_me
@@ -43,15 +40,15 @@ class SimpleTest < Test::Unit::TestCase
 			Article.new('body2'),
 			Article.new('body3')
 		]
-		$og.mock_handle(:load_all) { |klass, extrasql| mocks }
+		@og.mock_handle(:load_all) { |klass, extrasql| mocks }
 
 		# differnt ways to call the mocked method...
 		puts 'Here are the articles:', Article.all
 		puts 'Here are the articles:', Article.load_all
-		puts 'Here are the articles:', $og.load_all(Article)
+		puts 'Here are the articles:', @og.load_all(Article)
 
 		# 3 times called
-		assert_equal(3, $og.mock_count(:load_all))
+		assert_equal(3, @og.mock_count(:load_all))
 	end
 
 end

data/examples/og/mysql_to_psql.rb

@@ -0,0 +1,100 @@
+# = Og Mysql to PostgreSQL copy example 
+#
+# A simple example to demonstrate the flexibility of
+# Og. Two connections to different databases are 
+# created and data is copied from a MySQL database
+# to a PostgreSQL database.
+#
+# Og makes it easier to switch to a REAL database :)
+#
+# code: 
+# * George Moschovitis  <gm@navel.gr>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id$
+
+raise 'WARNING, this example does not work yet, for the moment ' + 
+			'just have a look at the source code.'
+
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'og'
+
+# An example managed object.
+# Looks like an ordinary Ruby object.
+#
+class Article
+	prop_accessor :name, :body, String
+
+	def initialize(name = nil, body = nil)
+		@name, @body = name, body
+	end
+end
+
+# Configure databases.
+
+psql_config = {
+	:address => 'localhost',
+	:database => 'test',
+	:backend => 'psql',
+	:user => 'postgres',
+	:password => 'navelrulez',
+	:connection_count => 1
+}
+
+mysql_config = {
+	:address => 'localhost',
+	:database => 'mysql',
+	:backend => 'psql',
+	:user => 'postgres',
+	:password => 'navelrulez',
+	:connection_count => 1
+}
+=begin
+mysql_config = {
+	:address => 'localhost',
+	:database => 'test',
+	:backend => 'mysql',
+	:user => 'root',
+	:password => 'navelrulez',
+	:connection_count => 1
+}
+=end
+
+# Cleanup the databases, remove data from
+# earlier executions.
+
+Og::Database.drop!(psql_config)
+Og::Database.drop!(mysql_config)
+
+# Initialize Og.
+
+psql = Og::Database.new(psql_config)
+mysql = Og::Database.new(mysql_config)
+
+# First populate the mysql database.
+
+Og.use(mysql)
+
+a1 = Article.create('name1', 'body1')
+a1 = Article.create('name1', 'body1')
+a1 = Article.create('name1', 'body1')
+
+# Read all articles from Mysql.
+
+articles = Article.all
+
+# Switch to PostgreSQL.
+
+Og.use(psql)
+
+# Store all articles.
+
+for article in articles
+	article.save!
+end
+
+# Fetch an article from PostgreSQL
+# as an example. Lookup by name.
+
+article = Article['name1']

data/examples/og/run.rb

@@ -8,10 +8,9 @@
 # (c) 2004 Navel, all rights reserved.
 # $Id: run.rb 198 2004-12-22 11:26:59Z gmosx $
 
-$:.unshift "../../lib"
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
-require "glue/logger"
-require "og"
+require 'og'
 
 # Full debug information.
 $DBG = true
@@ -138,9 +137,6 @@ class Part
 	end
 end
 
-# Initialize a logger.
-
-$log = Logger.new(STDERR); 
 # Og configuration.
 config = {
 	:address => "localhost",
@@ -162,23 +158,19 @@ config = {
 =end
 # Cleanup the database for earlier executions
 
-Og::Database.drop_db!(config)
+Og::Database.drop!(config)
 
 # Initialize Og
 
-$og = Og::Database.new(config)
-
-# Get an Og connection for this thread.
-
-$og.get_connection
+db = Og::Database.new(config)
 
 # Create some articles
 
 a1 = Article.new("Title1", "Body1")
 a1.save!
 
-a2 = Article.new("Title2", "Body2")
-a2.save!
+# shortcut
+a2 = Article.create("Title2", "Body2")
 
 puts "\n\n"
 puts "* Get and print all articles:"
@@ -194,9 +186,8 @@ c1.save!
 c2 = ArticleComment.new("Comment 2")
 # alternative way to set the parent.
 c2.article_oid = a1.oid
-# an alternative way to save (add to the $og 'virtal collection' of
-# managed objects).
-$og << c2
+# an alternative way to save 
+db << c2
 
 # an alternative (easier and cooler) way to add children in a 
 # has_many relation:

data/lib/glue.rb

@@ -5,13 +5,14 @@
 # code: 
 # * George Moschovitis  <gm@navel.gr>
 #
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: glue.rb 175 2004-11-26 16:11:27Z gmosx $
 
-require "English"
-require "pp"
+require 'English'
+require 'pp'
 
 require 'glue/property'
+require 'glue/attribute'
 
 class NilClass
 	# quite usefull for error tolerant apps.
@@ -26,12 +27,13 @@ class Class
 	#--
 	# gmosx: is this really needed?
 	#++
-	def to_i()
-		return self.hash()
+	def to_i
+		return self.hash
 	end
 end
 
 module Kernel
+
 	# pretty prints an exception/error object
 	# usefull for helpfull debug messages
 	#
@@ -47,6 +49,3 @@ module Kernel
 
 end
 
-# predefine some comonly used objects
-
-EMPTY_STRING = ""