nitro 0.4.1 → 0.5.0

data/AUTHORS

@@ -1,6 +1,11 @@
+MAIN DEVELOPER:
+
 * George Moschovitis  <gm@navel.gr>
-	Architecture and Design, lead developer, documentation, maintainer.
+	Project Leader, Architecture and Design, main coder, documentation, 
+	maintainer.
 	
+IDEAS, ADDITIONAL CODING, SUPPORT:
+
 * Anastasios Koutoumanos  <ak@navel.gr>
 	Design, additional coding.
 
@@ -9,3 +14,6 @@
 
 * Elias Karakoulakis  <ekarak@navel.gr>
 	Additional design.
+
+* Kostas Nasis  <kostas@nasis.com>
+	Ideas and bug reports.

data/ChangeLog

@@ -1,5 +1,111 @@
-15-10-2004  George Moschovitis  <gm@navel.gr>
+
+23-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* test/*: fixed directory structure,
+	fixed include N.
+	
+	* RELEASES: updated.
+	
+	* lib/nitro/scaffold.rb: add methods to the scaffolded class!
+	add view_uri method.
+	
+	* examples/blog/root/style.xsl: added RSS links.
+	
+	* examples/blog/lib/blog.rb (#view_uri): added.
+	
+	* lib/nitro/builders/rss.rb: introduced,
+	headers, list, render, default pubDate,
+	yeah it works,
+	Recoded builder to use the RSS library included in Ruby.
+	
+	* lib/nitro/builders: introduced.
+	
+	* lib/nitro/template.rb: scrapped.
+
+22-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* lib/xsl/base.xsl: rendering-errors.
+	
+	* lib/nitro/server/render.rb (#render): rescue errors, flag with (error),
+	introduced rendering_errors,
+	(#log_error)
+	
+21-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* examples/blog/root/view_entry.xml: just cool :)
+	
+	* lib/nitro/server/dispatcher.rb (#process): removed api check,
+	dont set content-type.
+
+	* lib/nitro/server/webrick.rb (#do_GET): removed api check.
+	
+	* lib/nitro/server/render.rb (#template_for_method): implemented,
+	(#transform_template): renamed,
+	(RenderUtils#compile_method): catch invlaid methods, raise exception,
+	yeah, correctly handle dir/index.xhtml case,
+	fixed check for valid methods,
+	uses api.
+	(RenderUtils#split_path): extracts api.
+	(RenderUtils#compile_rest_method): implemented.
+	set content-type in render methods.
+	ULTRACOOL: the rest dispatcher works.
+	
+	
+	* lib/nitro/config.rb: $template_ext, $xml_template_ext,
+	$index_template.
+
+18-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/server/dispatcher.rb (#process): support for rpc.
+
+	* lib/nitro/server/webrick.rb (#referer): no shift,
+	(#do_GET): check for ^rpc case.
+	
+	* AUTHORS: updated.
+	
+	* RELEASES.og: written.
+	
+	* README.og: written.
+	
+	* Rakefile: updated to copy glue in the og distribution,
+	yeah, the Og distribution works.
+	
+	* lib/nitro/gfx.rb: moved to Gen.
+	
+	* lib/glue: introduced,
+	moved many files from lib/nitro/* and lib/nitro/utils/* here.
+
+17-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* README.og: introduced.
+	* RELEASES.og: introduced.
+	* ChangeLog.og: introduced.
 	
+	* lib/og/version.rb: introduced.
+	
+	* Rakefile: introduced Og GemSpec.
+
+16-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* lib/og/backends/mysql.rb (#create_table): handles sql indices.
+
+	* lib/og/backends/psql.rb (#create_table): handles sql indices.
+	
+	* lib/og/meta.rb (MetaLanguage#sql_index): introduced.
+	
+	* yeah, scaffolding works!
+	
+	* lib/nitro/utils/inflector.rb: temporarily copied from rails.
+	
+	* lib/nitro/scaffold.rb: introduced,
+	(#scaffold): started working on this method,
+	cool append_features trick,
+	:noindex flag!
+
+15-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* --- VERSION 0.4.1 ---
+
 	* README: updated.
 	
 	* examples/blog: better documentation.

data/README

@@ -1,4 +1,4 @@
-= Nitro 0.4.1
+= Nitro 0.5.0
 
 Nitro is an efficient, yet simple engine for developing professional Web 
 Applications using the Ruby language. Nitro aims to provide a robust 

data/RELEASES

@@ -1,3 +1,17 @@
+== Version 0.5 was released on 23/11/2004.
+
+Many new features:
+
+* Stand-alone Og distribution.
+* Scaffolding.
+* Og RDBMS index support (works again).
+* improved render/dispatcher.
+* REST/XML dspatcher.
+* RssBuilder.
+* Improved BLOG example.
+* Many fixes.
+
+
 == Version 0.4.1 was released on 15/11/2004.
 
 A MAJOR revision! The rendering engine was recoded from 

data/Rakefile

@@ -12,7 +12,8 @@ require "rake/gempackagetask"
 require "rake/testtask"
 require "rubygems"
 
-require "lib/nitro/version"
+project = 'nitro'
+#project = 'og'
 
 # ----------------------------------------------------------------------
 
@@ -47,33 +48,77 @@ end
 	
 # ----------------------------------------------------------------------
 
-PKG_VERSION = $srv_version
-PKG_FILES = FileList[
-	"[A-Z]*", "{bin,etc,ext,examples,doc,lib,test}/**/*" 
-#	"examples/*.rb"
-].exclude(".svn/**/*")
-
-spec = Gem::Specification.new do |s|
-	s.name = "nitro"
-	s.version = PKG_VERSION
-	s.summary = "Web Engine"
-	s.description = "An efficient, yet simple engine for Web Applications"
-	#	s.add_dependency("postgres", ">= 0.7.1")
-	#	s.add_dependency("extensions", ">= 0.5")
-	# s.add_dependency("builder")
-	s.required_ruby_version = ">= 1.8.1"
-	s.files = PKG_FILES.to_a 
-	s.require_path = "lib"
-	s.autorequire = "n/std"
-	s.has_rdoc = true
-	s.extra_rdoc_files = FileList["[A-Z]*"].to_a
-	s.rdoc_options << "--main" << "README" << "--title" << "Nitro Documentation"
-	s.test_files = []
-	s.bindir = "bin"
-	s.author = "George Moschovitis"
-	s.email = "gm@navel.gr"
-	s.homepage = "http://www.navel.gr/nitro"
-	s.rubyforge_project = "nitro"
+if 'nitro' == project
+	
+	# Nitro GemSpec
+	#
+	require "lib/nitro/version"
+	
+	PKG_VERSION = $srv_version
+	PKG_FILES = FileList[
+		"[A-Z]*", "{bin,etc,ext,examples,doc,lib,test}/**/*" 
+	#	"examples/*.rb"
+	].exclude(".svn/**/*").exclude("*.og").exclude("**/*.log")
+	
+	spec = Gem::Specification.new do |s|
+		s.name = "nitro"
+		s.version = PKG_VERSION
+		s.summary = "Web Engine"
+		s.description = "An efficient, yet simple engine for Web Applications"
+		#	s.add_dependency("postgres", ">= 0.7.1")
+		#	s.add_dependency("extensions", ">= 0.5")
+		# s.add_dependency("builder")
+		s.required_ruby_version = ">= 1.8.1"
+		s.files = PKG_FILES.to_a 
+		s.require_path = "lib"
+		s.autorequire = "nitro"
+		s.has_rdoc = true
+		s.extra_rdoc_files = FileList["[A-Z]*"].exclude("*.og").to_a
+		s.rdoc_options << "--main" << "README" << "--title" << "Nitro Documentation"
+		s.test_files = []
+		s.bindir = "bin"
+		s.author = "George Moschovitis"
+		s.email = "gm@navel.gr"
+		s.homepage = "http://www.navel.gr/nitro"
+		s.rubyforge_project = "nitro"
+	end
+
+else
+
+	# Og stand-alone GemSpec
+	#
+	require "lib/og/version"
+	
+	PKG_VERSION = $og_version
+	PKG_FILES = FileList[
+		"README.og", "RELEASES.og", "LICENSE", "AUTHORS", 
+		"examples/og/*", "lib/glue.rb", "lib/glue/**/*", "lib/og/**/*", "lib/og.rb",
+		"test/*og*.rb"
+	].exclude(".svn/**/*").exclude("**/*.log")
+	
+	spec = Gem::Specification.new do |s|
+		s.name = 'og'
+		s.version = PKG_VERSION
+		s.summary = 'Og (ObjectGraph)'
+		s.description = 'An efficient and transparent Object-Relational mapping library'
+		#	s.add_dependency("postgres", ">= 0.7.1")
+		#	s.add_dependency("extensions", ">= 0.5")
+		# s.add_dependency("builder")
+		s.required_ruby_version = ">= 1.8.1"
+		s.files = PKG_FILES.to_a 
+		s.require_path = "lib"
+		s.autorequire = "og"
+		s.has_rdoc = true
+		s.extra_rdoc_files = FileList["README.og", "RELEASES.og", "LICENSE", "AUTHORS"].to_a
+		s.rdoc_options << "--main" << "README.og" << "--title" << "Og Documentation"
+		s.test_files = []
+		s.bindir = "bin"
+		s.author = "George Moschovitis"
+		s.email = "gm@navel.gr"
+		s.homepage = "http://www.navel.gr/og"
+		s.rubyforge_project = "og-rml"
+	end
+
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/bin/cluster.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: cluster.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: cluster.rb 167 2004-11-23 14:03:10Z gmosx $
 
 $:.unshift "lib"
 
@@ -11,7 +11,7 @@ require "monitor"
 
 require "nitro/application"
 require "nitro/server"
-require "nitro/utils/cache"
+require "glue/cache"
 require "nitro/server/session"
 
 module N

data/examples/blog/app.rb

@@ -8,10 +8,10 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: app.rb 149 2004-11-13 19:52:32Z gmosx $
+# $Id: app.rb 167 2004-11-23 14:03:10Z gmosx $
 
 # set to true for DEBUG mode.
-$DBG = false 
+$DBG = true 
 
 $LOAD_PATH.unshift "lib"
 $LOAD_PATH.unshift "../../lib"

data/examples/blog/config.rb

@@ -11,24 +11,23 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: config.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: config.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require "nitro"
-require "nitro/logger"
+require "glue/logger"
 require "nitro/config"
 
 require "og"
 require "nitro/l10n"
 require "nitro/events"
-require "nitro/mixins"
+require "glue/mixins"
 require "nitro/sitemap"
 
-require "nitro/utils/number"
-require "nitro/utils/string"
-require "nitro/utils/array"
-require "nitro/utils/hash"
-require "nitro/utils/html"
-require "nitro/utils/gfx"
+require "glue/number"
+require "glue/string"
+require "glue/array"
+require "glue/hash"
+require "nitro/html"
 
 require "nitro/server/webrick"
 require "nitro/server/shaders"
@@ -52,10 +51,10 @@ if $DBG # DEBUG mode
 
 	$og = Og::Database.new(
 		:address => "localhost",
-		:backend => "mysql",
-#		:backend => "psql",
+#		:backend => "mysql",
+		:backend => "psql",
 		:database => "blog",
-		:user => "root",
+		:user => "postgres",
 		:password => "navelrulez",
 		:connection_count => 3
 	)
@@ -71,10 +70,10 @@ else # LIVE mode
 
 	$og = Og::Database.new(
 		:address => "localhost",
-		:backend => "mysql",
-#		:backend => "psql",
+#		:backend => "mysql",
+		:backend => "psql",
 		:database => "blog",
-		:user => "root",
+		:user => "postgres",
 		:password => "navelrulez",
 		:connection_count => 20
 	)

data/examples/blog/lib/blog.rb

@@ -2,9 +2,10 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: blog.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: blog.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require 'nitro/service'
+require 'nitro/builders/rss'
 
 $blog_username = 'your user name'
 $blog_password = 'your password'
@@ -31,7 +32,7 @@ class Comment < Common; end
 #
 class BlogEntry < Common
 	prop_accessor :title, String
-	has_many :comments, N::Comment, :linkback => 'entry_oid'
+	has_many :comments, N::Comment, :linkback => 'entry_oid'	
 end
 
 # = Comment
@@ -43,12 +44,10 @@ end
 # = BlogMethods
 #
 module BlogMethods
+	include N::Scaffolding	
 
-#	scaffold N::BlogEntry, :name => 'entry'
-	
-	def index
-		@entries = N::BlogEntry.all('ORDER BY oid DESC LIMIT 5')
-	end
+	scaffold N::BlogEntry, :name => 'entry', :index => true
+	scaffold N::Comment
 	
 	def new_entry
 		entry = request.fill(N::BlogEntry.new)
@@ -56,26 +55,20 @@ module BlogMethods
 		entry.save!
 	end	
 
-	def view_entry
-		@entry = N::BlogEntry[params['oid']]
+	# example of generated view
+	def list_entry__xml
+		@out << N::RssBuilder.render(@entries)
 	end
 	
-	def list_entry
-		@entries = N::BlogEntry.all('ORDER BY oid DESC LIMIT 5')
-	end
-
-	def del_entry
-		N::BlogEntry.delete(params['oid'])
-	end
-
 	def new_comment
 		comment = request.fill(N::Comment.new)
 		comment.save!
 	end
 
-	def del_comment
-		N::Comment.delete(params['oid'])
-	end			
+	# example of generated view
+	def list_comment__xml
+		@out << N::RssBuilder.render(@comments)
+	end
 	
 	def login
 		if password = params['password']

data/examples/blog/root/entry_form.xhtml

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
 <div id="comments">
-
 	<h2>Post new entry:</h2>			
 
 	<form action="new_entry" method="post">

data/examples/blog/root/style.css

@@ -199,3 +199,20 @@ h2.date {
 	overflow: hidden;
 	background-color: #f00;
 }	
+
+#rendering-errors {
+	float: left;
+	border: 1px solid red;
+	background: white;
+	padding: 10px;
+	margin: 20px; 
+}
+
+.rss li {
+  list-style: none;
+  padding-left: 34px; padding-top: 3px;
+  margin-bottom: 3px;
+	height: 18px;
+  background: url(m/rss.gif) no-repeat 0 6px;
+}
+