nitro 0.12.0 → 0.13.0

data/lib/nitro/render.rb

@@ -42,31 +42,31 @@ module Rendering
 
 	mattr_accessor :shader; @@shader = RubyShader.new
 
-	# If true, reloads all controllers. Useful in 
+	# If set to :full, reloads all controllers. Useful in 
 	# development.
 
-	mattr_accessor :reload, :partial 
+	mattr_accessor :reload, false
 	
 	# Given the action try find the matching template.
 	# Can search for xhtml or xml templates.
 	# Returns nil if no template file is found.
 	
-	def self.template_for_action(base, action, ext = :xhtml)
-		
+	def self.template_for_action(template_root, action, ext = :xhtml)
+
 		# attempt to find a template of the form
-		# base/action.xhtml
+		# template_root/action.xhtml
+
+		path = "#{template_root}/#{action}.#{ext}".squeeze('/')
 
-		path = "#{base}/#{action}.#{ext}".squeeze('/')
-	
 		unless File.exist?(path)
 
 			# attempt to find a template of the form
-			# base/action/index.xhtml
+			# template_root/action/index.xhtml
 
-			path = "#{base}/#{action}/#{Rendering.default_template}.#{ext}".squeeze('/')
-			
+			path = "#{template_root}/#{action}/#{Rendering.default_template}.#{ext}".squeeze('/')
+	
 			unless File.exist?(path)
-				# No template found!
+				# No template founD!
 				path = nil
 			end
 		end
@@ -87,7 +87,7 @@ module Rendering
 	
 	# Compile a controller action.
 	
-	def self.compile_action(klass, action, base)
+	def self.compile_action(klass, action, template_root)
 		@@sync.synchronize do
 			dummy, api, action = action.to_s.split('__')
 
@@ -95,7 +95,7 @@ module Rendering
 
 			return false unless action
 
-			Logger.debug "Compiling action '#{base}/#{action}'" if $DBG
+			Logger.debug "Compiling action '#{template_root}/#{action}'" if $DBG
 
 			valid = false
 			
@@ -138,7 +138,7 @@ module Rendering
 			
 			# call the template if exists.
 			
-			if template = template_for_action(base, action)
+			if template = template_for_action(template_root, action)
 				valid = true
 				code << %{
 					return unless __#{api}__#{action}__template();
@@ -169,8 +169,6 @@ module Rendering
 				}
 			end
 	
-			#	puts '---', code, '---'
-
 			klass.class_eval(code)
 		end
 
@@ -203,15 +201,19 @@ module Render
 	
 	attr_accessor :rendering_errors
 
+	# The template root for this render.
+
+	cattr_accessor :template_root
+
 	# Initialize the render.
 	#
 	# [+context+]
 	#		A parent render/controller acts as the context.
 
-	def initialize(context, base)
+	def initialize(context)
 		@request = @context = context
 		@out = context.out
-		@base = base
+		@template_root = @context.dispatcher.template_root
 	end
 
 	# Renders the action denoted by path. The path
@@ -221,16 +223,17 @@ module Render
 	def render(path)
 		Logger.debug "Rendering '#{path}'." if $DBG
 		
-		klass, action, base, ctype = @context.dispatcher.dispatch(path, @context)
+		# klass, action, template_root, ctype = @context.dispatcher.dispatch(path, @context)
+		klass, action, content_type = @context.dispatcher.dispatch(path, @context)
 
-		@context.content_type = ctype
+		@context.content_type = content_type
 
 		raise 'No controller for action' unless klass
 		
 		if self.class == klass 
 			self.send(action)
 		else
-			klass.new(self, base).send(action)
+			klass.new(self).send(action)
 		end
 
 	rescue RenderExit => e

data/lib/nitro/runner.rb

@@ -240,7 +240,7 @@ class Runner
 					end 
 			end
 
-			puts "\n==> Application listening at #{conf.host}:#{conf.port}.\n\n"
+			puts "\n==> Listening at #{conf.host}:#{conf.port}.\n\n"
 
 			case @server
 			when :webrick

data/lib/nitro/scaffold.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: scaffold.rb 270 2005-03-07 17:52:16Z gmosx $
+# $Id: scaffold.rb 300 2005-03-16 13:23:10Z gmosx $
 
 require 'glue/inflector'
 
@@ -8,10 +8,7 @@ module N
 
 module Scaffolding
 
-	# Ruby is sometimes VERY surprising, the following trick is 
-	# needed to include singleton methods in other classes.
-	
-	def self.append_features(base)
+	def self.append_features(base) # :nodoc: 
 		super
 		base.extend(SingletonMethods)
 	end

data/lib/nitro/simple.rb

@@ -4,4 +4,5 @@ require 'nitro/controller'
 # Useful to implement php/asp/jsp style applications.
 # Dispatcher uses this as the default Controller.
 
-class SimpleController < N::Controller; end
+class SimpleController < N::Controller; 
+end

data/lib/nitro/template.rb

@@ -1,6 +1,8 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: template.rb 271 2005-03-07 17:56:45Z gmosx $
+# $Id: template.rb 300 2005-03-16 13:23:10Z gmosx $
+
+require 'glue/flexob'
 
 module N
 
@@ -91,6 +93,11 @@ module TemplateMixin
 		
 		text.gsub!(/\#\((.*?)\)/, '#{\1}')
 
+		# Alternative for entities.
+		# (useful in xsl stylesheets)
+
+		text.gsub!(/%(\S*?);/, '&\1;')
+
 		# Compile time ruby code. This code is evaluated when
 		# compiling the template and the result injected directly
 		# into the result. Usefull for example to prevaluate
@@ -126,7 +133,8 @@ module TemplateMixin
 
 end
 
-# A template class implementing the Template mixin.
+# A helper class that provides access to the Template methods
+# as singleton methods.
 
 class Template
 	class << self
@@ -137,4 +145,36 @@ class Template
 	end
 end
 
+# A Template that reads from files and also 
+# provides a simple but effective caching scheme.
+# An intuitive binding mechanism provides the
+# expansion environment.
+
+class FileTemplate < Flexob
+	include TemplateMixin
+
+	@@compiled_template_cache = {}
+
+	attr_accessor :template_filename
+
+	def initialize(filename = nil)
+		super
+		@template_filename = filename
+	end
+	
+	def process
+		__out__ = ''
+		
+		unless compiled = @@compiled_template_cache[@template_filename]
+			template = File.read(@template_filename)
+			compiled = compile_template(template, '__out__')
+			@@compiled_template_cache[@template_filename] = compiled
+		end
+		
+		render_template(compiled, binding)	
+		
+		return __out__
+	end
+end
+
 end

data/test/nitro/tc_controller.rb

@@ -13,6 +13,11 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
 	class BlogController < Controller
 		attr_reader :aflag, :tflag
 
+		def initialize(context)
+			super
+			@template_root = 'test/public/blog'
+		end
+
 		def list
 			@aflag = true 
 		end
@@ -22,7 +27,7 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
 		@disp = Dispatcher.new({
 			'blog' => BlogController,
 		})
-		@disp.root = File.join(File.dirname(__FILE__), '..', 'root')
+		@disp.template_root = File.join(File.dirname(__FILE__), '..', 'public')
 		@conf = OpenStruct.new
 		@conf.dispatcher = @disp
 	end
@@ -31,9 +36,9 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
 		ctx = Context.new(@conf)
 		ctx.headers = {}
 		ctx.params = {}
-		puts '=', ctx.dispatcher.root
-		klass, action, base = ctx.dispatcher.dispatch('/blog/list', ctx)
-		c = klass.new(ctx, base)
+		ctx.headers['REQUEST_URI'] = '/blog/list'
+		klass, action = ctx.dispatcher.dispatch(ctx.path, ctx)
+		c = klass.new(ctx)
 		begin
 			c.send(action)
 		rescue RenderExit

data/test/nitro/tc_dispatcher.rb

@@ -38,20 +38,18 @@ class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
 		assert_equal BlogController, klass
 		assert_equal '__xhtml__list', action
 		
-		klass, action, base = @d.dispatch('/blog')
+		klass, action, ctype  = @d.dispatch('/blog')
 		assert_equal BlogController, klass
 		assert_equal '__xhtml__index', action
-		assert_equal 'root/blog', base
+		assert_equal 'text/html', ctype 
 		
-		klass, action, base = @d.dispatch('/login')
+		klass, action, ctype = @d.dispatch('/login')
 		assert_equal MainController, klass
 		assert_equal '__xhtml__login', action
-		assert_equal 'root', base
 		
-		klass, action, base = @d.dispatch('/')
+		klass, action = @d.dispatch('/')
 		assert_equal MainController, klass
 		assert_equal '__xhtml__index', action
-		assert_equal 'root', base
 	
 		# multi-api dispatcher. 
 

data/test/nitro/tc_mail.rb

@@ -0,0 +1,95 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'nitro/controller'
+require 'nitro/mail'
+
+class TestCaseMail < Test::Unit::TestCase # :nodoc: all
+	include N 
+	
+	class DummyMailer < Mailer
+		def initialize 
+			super
+			@bcc = 'gm@navel.gr'
+			@template_root = 'test/public/dummy_mailer'
+		end
+
+		def registration(to, username, token)
+			@to = to 
+			@from = 'system@navel.gr'
+			@subject = 'Nitro.com registration'
+			@cc = 'gm@navel.gr'
+			@body.username = username
+			@body.token = token
+		end
+
+		def greek(to)
+			@to = to 
+			@from = 'system@navel.gr'
+			@subject = 'Ελληνικός Τίτλος'
+			@cc = 'gm@navel.gr'
+			@body = 'Τί έγινε ρε παιδιά;'
+		end
+	end
+
+	class DummyController < Controller
+		# mailer DummyMailer
+
+		def register
+			token = 999
+			deliver_registration('gmosx@navel.gr', 'gmosx', token)
+		end
+	end
+
+	def test_mail
+		m = Mail.new 'gmosx@navel.gr', 'drak@navel.gr', 'A simple test', 'This is the body of the message'
+		expected = %{From: gmosx@navel.gr
+To: drak@navel.gr
+Subject: A simple test
+
+This is the body of the message}
+		assert_equal expected, m.encoded
+
+		m.to = %w{ renos@navel.gr stella@navel.gr }
+		expected = %{From: gmosx@navel.gr
+To: renos@navel.gr, stella@navel.gr
+Subject: A simple test
+
+This is the body of the message}
+		assert_equal expected, m.encoded
+
+	end
+	
+	def test_mailer
+		assert_equal 0, DummyMailer.deliveries.size 
+
+		Mailer.server[:address] = 'mail.navel.gr'
+		assert_equal 'mail.navel.gr', DummyMailer.server[:address]
+
+		DummyMailer.delivery_method = :test
+		DummyMailer.template_root = File.join(File.dirname(__FILE__), '..', 'root', 'dummy_mailer')
+		token = 999
+		DummyMailer.deliver_registration('gm@navel.gr', 'gmosx', token)
+		assert_equal 1, DummyMailer.deliveries.size 
+		
+		expected = %{From: system@navel.gr
+To: gm@navel.gr
+Cc: gm@navel.gr
+Bcc: gm@navel.gr
+Subject: =?utf-8?Q?Nitro=2ecom_registration?=
+
+Hello gmosx
+
+how do you feel?
+
+Here is your <b>Token</b>: 999
+}
+		assert_equal expected, DummyMailer.deliveries[0].encoded
+
+		DummyMailer.deliver_greek('gm@navel.gr')
+		assert_equal 2, DummyMailer.deliveries.size 
+	end
+
+end

data/test/public/dummy_mailer/registration.xhtml

@@ -0,0 +1,5 @@
+Hello #{username}
+
+how do you feel?
+
+Here is your <b>Token</b>: #{token}

data/vendor/README

@@ -8,5 +8,4 @@ Libraries from other vendors belong here. This file
 * breakpointer
 * dev-utils
 * postgres-pr
-* ParseTree
 

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.6
+rubygems_version: 0.8.8
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.12.0
-date: 2005-03-07
+  version: 0.13.0
+date: 2005-03-17
 summary: Nitro Web Engine
 require_paths: 
   - lib
 email: gm@navel.gr
-homepage: http://www.rubyforge.com/projects/nitro
+homepage: http://nitro.rubyforge.org
 rubyforge_project: nitro
-description: "An efficient, multiparadigm and flexible platform for rapid web application
-  development. Implements a full development stack."
+description: "Nitro provides everything you need to develop real-world, scalable web
+  applications."
 autorequire: nitro
 default_executable: nitro
 bindir: bin
@@ -22,53 +22,28 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
     - 
       - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 1.8.1
   version: 
 platform: ruby
 authors: 
   - George Moschovitis
 files: 
   - Rakefile
-  - ChangeLog
   - INSTALL
-  - RELEASES
+  - CHANGELOG
   - README
   - install.rb
   - bin/nitro
   - bin/new_app.rb
-  - bin/proto
   - bin/new_form.rb
-  - bin/proto/ctl
-  - bin/proto/log
-  - bin/proto/conf
-  - bin/proto/root
-  - bin/proto/lib
-  - bin/proto/README
-  - bin/proto/log/README
-  - bin/proto/conf/apache.conf
-  - bin/proto/conf/lhttpd.conf
-  - bin/proto/conf/app.conf.rb
-  - bin/proto/root/index.xhtml
-  - bin/proto/root/style.css
-  - bin/proto/root/m
-  - bin/proto/root/fcgi.rb
-  - bin/proto/root/style.xsl
-  - bin/proto/root/m/nitro.png
-  - bin/proto/lib/README
-  - benchmark/nitro
-  - benchmark/og
-  - benchmark/nitro/tiny-lhttpd-n-200-c-5.txt
-  - benchmark/nitro/simple-webrick-n-200.txt
-  - benchmark/nitro/static-webrick-n-200.txt
-  - benchmark/nitro/tiny2-webrick-n-200.txt
-  - benchmark/nitro/tiny-webrick-n-200-c-5.txt
-  - benchmark/nitro/tiny-webrick-n-200.txt
-  - benchmark/nitro/bench.rb
-  - benchmark/og/sqlite-prepare.2.txt
-  - benchmark/og/sqlite-no-prepare.2.txt
-  - benchmark/og/sqlite-no-prepare.1.txt
-  - benchmark/og/bench.rb
-  - benchmark/og/sqlite-prepare.1.txt
+  - benchmark/tiny-lhttpd-n-200-c-5.txt
+  - benchmark/simple-webrick-n-200.txt
+  - benchmark/static-webrick-n-200.txt
+  - benchmark/tiny2-webrick-n-200.txt
+  - benchmark/tiny-webrick-n-200-c-5.txt
+  - benchmark/tiny-webrick-n-200.txt
+  - benchmark/bench.rb
+  - examples/ajax
   - examples/no_xsl_blog
   - examples/why_wiki
   - examples/flash
@@ -76,10 +51,15 @@ files:
   - examples/wee_style
   - examples/blog
   - examples/README.windows
-  - examples/og
+  - examples/ajax/controller.rb
+  - examples/ajax/public
+  - examples/ajax/run.rb
+  - examples/ajax/public/index.xhtml
+  - examples/ajax/public/js
+  - examples/ajax/public/js/ajax.js
   - examples/no_xsl_blog/log
   - examples/no_xsl_blog/conf
-  - examples/no_xsl_blog/root
+  - examples/no_xsl_blog/public
   - examples/no_xsl_blog/run.rb
   - examples/no_xsl_blog/lib
   - examples/no_xsl_blog/README
@@ -87,36 +67,38 @@ files:
   - examples/no_xsl_blog/log/README
   - examples/no_xsl_blog/conf/apache.conf
   - examples/no_xsl_blog/conf/lhttpd.conf
-  - examples/no_xsl_blog/root/login.xhtml
-  - examples/no_xsl_blog/root/index.xhtml
-  - examples/no_xsl_blog/root/style.css
-  - examples/no_xsl_blog/root/entry_form.xhtml
-  - examples/no_xsl_blog/root/m
-  - examples/no_xsl_blog/root/fcgi.rb
-  - examples/no_xsl_blog/root/comments.xhtml
-  - examples/no_xsl_blog/root/recent_posts.xhtml
-  - examples/no_xsl_blog/root/view_entry.xhtml
-  - examples/no_xsl_blog/root/view_entry.xml
-  - examples/no_xsl_blog/root/m/gbull.gif
-  - examples/no_xsl_blog/root/m/garrow.gif
-  - examples/no_xsl_blog/root/m/comments_curve.gif
-  - examples/no_xsl_blog/root/m/obull.gif
-  - examples/no_xsl_blog/root/m/down.gif
-  - examples/no_xsl_blog/root/m/bubbles.gif
-  - examples/no_xsl_blog/root/m/page_bg.gif
-  - examples/no_xsl_blog/root/m/header_bg.gif
-  - examples/no_xsl_blog/root/m/side_title_bg.gif
-  - examples/no_xsl_blog/root/m/rss.gif
-  - examples/no_xsl_blog/root/m/h1_bg.gif
-  - examples/no_xsl_blog/root/m/nitro.gif
-  - examples/no_xsl_blog/root/m/sidebar_bg.gif
-  - examples/no_xsl_blog/root/m/grbull.gif
-  - examples/no_xsl_blog/root/m/footer_bg.gif
+  - examples/no_xsl_blog/public/login.xhtml
+  - examples/no_xsl_blog/public/index.xhtml
+  - examples/no_xsl_blog/public/style.css
+  - examples/no_xsl_blog/public/entry_form.xhtml
+  - examples/no_xsl_blog/public/m
+  - examples/no_xsl_blog/public/fcgi.rb
+  - examples/no_xsl_blog/public/comments.xhtml
+  - examples/no_xsl_blog/public/recent_posts.xhtml
+  - examples/no_xsl_blog/public/view_entry.xhtml
+  - examples/no_xsl_blog/public/view_entry.xml
+  - examples/no_xsl_blog/public/m/gbull.gif
+  - examples/no_xsl_blog/public/m/garrow.gif
+  - examples/no_xsl_blog/public/m/comments_curve.gif
+  - examples/no_xsl_blog/public/m/obull.gif
+  - examples/no_xsl_blog/public/m/down.gif
+  - examples/no_xsl_blog/public/m/bubbles.gif
+  - examples/no_xsl_blog/public/m/page_bg.gif
+  - examples/no_xsl_blog/public/m/header_bg.gif
+  - examples/no_xsl_blog/public/m/side_title_bg.gif
+  - examples/no_xsl_blog/public/m/rss.gif
+  - examples/no_xsl_blog/public/m/h1_bg.gif
+  - examples/no_xsl_blog/public/m/nitro.gif
+  - examples/no_xsl_blog/public/m/sidebar_bg.gif
+  - examples/no_xsl_blog/public/m/grbull.gif
+  - examples/no_xsl_blog/public/m/footer_bg.gif
+  - examples/no_xsl_blog/lib/content.rb
   - examples/no_xsl_blog/lib/blog
   - examples/no_xsl_blog/lib/blog.rb
   - examples/no_xsl_blog/lib/blog/template.rb
   - examples/no_xsl_blog/lib/blog/model.rb
   - examples/no_xsl_blog/lib/blog/controller.rb
+  - examples/why_wiki/wiki.yml
   - examples/why_wiki/run.rb
   - examples/why_wiki/README
   - examples/flash/log
@@ -128,83 +110,80 @@ files:
   - examples/flash/root/show_inline_text.xhtml
   - examples/tiny/log
   - examples/tiny/conf
-  - examples/tiny/root
+  - examples/tiny/public
   - examples/tiny/run.rb
   - examples/tiny/README
   - examples/tiny/log/apache.error_log
   - examples/tiny/log/README
   - examples/tiny/conf/apache.conf
   - examples/tiny/conf/lhttpd.conf
-  - examples/tiny/root/index.xhtml
-  - examples/tiny/root/nitro.png
-  - examples/tiny/root/upload.xhtml
-  - examples/tiny/root/fcgi.rb
-  - examples/tiny/root/include.xhtml
+  - examples/tiny/public/index.xhtml
+  - examples/tiny/public/nitro.png
+  - examples/tiny/public/upload.xhtml
+  - examples/tiny/public/fcgi.rb
+  - examples/tiny/public/include.xhtml
   - examples/wee_style/run.rb
   - examples/wee_style/README
   - examples/blog/log
   - examples/blog/conf
-  - examples/blog/root
+  - examples/blog/public
+  - examples/blog/src
   - examples/blog/run.rb
-  - examples/blog/lib
   - examples/blog/README
   - examples/blog/log/apache.error_log
   - examples/blog/log/README
   - examples/blog/conf/apache.conf
   - examples/blog/conf/lhttpd.conf
-  - examples/blog/root/login.xhtml
-  - examples/blog/root/error.xhtml
-  - examples/blog/root/index.xhtml
-  - examples/blog/root/style.css
-  - examples/blog/root/entry_form.xhtml
-  - examples/blog/root/m
-  - examples/blog/root/fcgi.rb
-  - examples/blog/root/comments.xhtml
-  - examples/blog/root/style.xsl
-  - examples/blog/root/base.xsl
-  - examples/blog/root/recent_posts.xhtml
-  - examples/blog/root/view_entry.xhtml
-  - examples/blog/root/view_entry.xml
-  - examples/blog/root/m/gbull.gif
-  - examples/blog/root/m/garrow.gif
-  - examples/blog/root/m/comments_curve.gif
-  - examples/blog/root/m/obull.gif
-  - examples/blog/root/m/down.gif
-  - examples/blog/root/m/bubbles.gif
-  - examples/blog/root/m/page_bg.gif
-  - examples/blog/root/m/header_bg.gif
-  - examples/blog/root/m/side_title_bg.gif
-  - examples/blog/root/m/rss.gif
-  - examples/blog/root/m/h1_bg.gif
-  - examples/blog/root/m/nitro.gif
-  - examples/blog/root/m/sidebar_bg.gif
-  - examples/blog/root/m/grbull.gif
-  - examples/blog/root/m/footer_bg.gif
-  - examples/blog/lib/blog
-  - examples/blog/lib/blog.rb
-  - examples/blog/lib/blog/model.rb
-  - examples/blog/lib/blog/controller.rb
-  - examples/og/mysql_to_psql.rb
-  - examples/og/run.rb
-  - examples/og/mock_example.rb
-  - examples/og/README
-  - doc/ChangeLog.1
+  - examples/blog/public/style.css
+  - examples/blog/public/m
+  - examples/blog/public/fcgi.rb
+  - examples/blog/public/base.xsl
+  - examples/blog/public/m/gbull.gif
+  - examples/blog/public/m/garrow.gif
+  - examples/blog/public/m/comments_curve.gif
+  - examples/blog/public/m/obull.gif
+  - examples/blog/public/m/down.gif
+  - examples/blog/public/m/bubbles.gif
+  - examples/blog/public/m/page_bg.gif
+  - examples/blog/public/m/header_bg.gif
+  - examples/blog/public/m/side_title_bg.gif
+  - examples/blog/public/m/rss.gif
+  - examples/blog/public/m/h1_bg.gif
+  - examples/blog/public/m/nitro.gif
+  - examples/blog/public/m/sidebar_bg.gif
+  - examples/blog/public/m/grbull.gif
+  - examples/blog/public/m/footer_bg.gif
+  - examples/blog/src/xsl
+  - examples/blog/src/models
+  - examples/blog/src/views
+  - examples/blog/src/blog.rb
+  - examples/blog/src/controller.rb
+  - examples/blog/src/mailer.rb
+  - examples/blog/src/xsl/style.xsl
+  - examples/blog/src/xsl/base.xsl
+  - examples/blog/src/models/content.rb
+  - examples/blog/src/models/blog.rb
+  - examples/blog/src/views/login.xhtml
+  - examples/blog/src/views/blog_entry_email.xhtml
+  - examples/blog/src/views/error.xhtml
+  - examples/blog/src/views/index.xhtml
+  - examples/blog/src/views/entry_form.xhtml
+  - examples/blog/src/views/comments.xhtml
+  - examples/blog/src/views/recent_posts.xhtml
+  - examples/blog/src/views/view_entry.xhtml
+  - examples/blog/src/views/view_entry.xml
   - doc/config.txt
   - doc/LICENSE
   - doc/AUTHORS
+  - doc/CHANGELOG.1
   - doc/apache.txt
+  - doc/faq.txt
+  - doc/RELEASES
   - doc/tutorial.txt
-  - doc/og_tutorial.txt
   - doc/architecture.txt
   - doc/bugs.txt
-  - doc/og_config.txt
   - lib/nitro
-  - lib/parts
-  - lib/glue.rb
   - lib/nitro.rb
-  - lib/glue
-  - lib/og
-  - lib/og.rb
   - lib/nitro/localization.rb
   - lib/nitro/cookie.rb
   - lib/nitro/session.rb
@@ -249,45 +228,8 @@ files:
   - lib/nitro/ui/date-select.rb
   - lib/nitro/ui/tabs.rb
   - lib/nitro/ui/popup.rb
-  - lib/parts/content.rb
-  - lib/parts/content
-  - lib/parts/README
-  - lib/glue/mixins.rb
-  - lib/glue/logger.rb
-  - lib/glue/pool.rb
-  - lib/glue/inflector.rb
-  - lib/glue/hash.rb
-  - lib/glue/number.rb
-  - lib/glue/time.rb
-  - lib/glue/property.rb
-  - lib/glue/misc.rb
-  - lib/glue/flexob.rb
-  - lib/glue/cache.rb
-  - lib/glue/string.rb
-  - lib/glue/object.rb
-  - lib/glue/array.rb
-  - lib/glue/validation.rb
-  - lib/glue/attribute.rb
-  - lib/og/adapter.rb
-  - lib/og/adapters
-  - lib/og/enchant.rb
-  - lib/og/connection.rb
-  - lib/og/observer.rb
-  - lib/og/database.rb
-  - lib/og/mock.rb
-  - lib/og/meta.rb
-  - lib/og/typemacros.rb
-  - lib/og/backend.rb
-  - lib/og/adapters/oracle.rb
-  - lib/og/adapters/filesys.rb
-  - lib/og/adapters/mysql.rb
-  - lib/og/adapters/sqlite.rb
-  - lib/og/adapters/psql.rb
   - test/nitro
-  - test/tc_og.rb
-  - test/root
-  - test/glue
-  - test/og
+  - test/public
   - test/nitro/tc_uri.rb
   - test/nitro/tc_template.rb
   - test/nitro/tc_controller.rb
@@ -295,6 +237,7 @@ files:
   - test/nitro/tc_session.rb
   - test/nitro/builders
   - test/nitro/ui
+  - test/nitro/tc_mail.rb
   - test/nitro/tc_context.rb
   - test/nitro/tc_dispatcher.rb
   - test/nitro/adapters/tc_webrick.rb
@@ -305,32 +248,15 @@ files:
   - test/nitro/builders/tc_xml.rb
   - test/nitro/builders/tc_rss.rb
   - test/nitro/ui/tc_pager.rb
-  - test/root/blog
-  - test/root/blog/list.xhtml
-  - test/glue/tc_strings.rb
-  - test/glue/tc_property_type_checking.rb
-  - test/glue/tc_logger.rb
-  - test/glue/tc_validation.rb
-  - test/glue/tc_property.rb
-  - test/glue/tc_hash.rb
-  - test/glue/tc_attribute.rb
-  - test/glue/tc_property_mixins.rb
-  - test/glue/tc_cache.rb
-  - test/glue/tc_numbers.rb
-  - test/og/tc_sqlite.rb
-  - test/og/tc_observer.rb
-  - test/og/tc_filesys.rb
-  - test/og/tc_meta.rb
-  - test/og/tc_many_to_many.rb
-  - test/og/tc_lifecycle.rb
+  - test/public/blog
+  - test/public/dummy_mailer
+  - test/public/blog/list.xhtml
+  - test/public/dummy_mailer/registration.xhtml
   - vendor/breakpoint_client.rb
-  - vendor/sexp_processor.rb
-  - vendor/composite_sexp_processor.rb
   - vendor/extensions
   - vendor/binding_of_caller.rb
   - vendor/blankslate.rb
   - vendor/breakpoint.rb
-  - vendor/parse_tree.rb
   - vendor/README
   - vendor/extensions/enumerable.rb
   - vendor/extensions/all.rb
@@ -359,15 +285,44 @@ rdoc_options:
   - "--inline-source"
 extra_rdoc_files: 
   - Rakefile
-  - ChangeLog
   - INSTALL
-  - RELEASES
+  - CHANGELOG
   - README
 executables: 
   - nitro
 extensions: []
 requirements: []
 dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: glue
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - "="
+          - !ruby/object:Gem::Version 
+            version: 0.13.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: og
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - "="
+          - !ruby/object:Gem::Version 
+            version: 0.13.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: ruby-breakpoint
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: "0.5"
+      version: 
   - !ruby/object:Gem::Dependency 
     name: extensions
     version_requirement: