nitro 0.12.0 → 0.13.0

data/examples/tiny/conf/apache.conf

@@ -6,7 +6,7 @@ Listen 9999
 
 PidFile /var/tmp/httpd.pid
 TypesConfig /etc/mime.types
-DocumentRoot /home/gmosx/navel/nitro/examples/tiny/root
+DocumentRoot /home/gmosx/navel/nitro/examples/tiny/public
 
 # The error log.
 ErrorLog log/apache.error_log
@@ -18,7 +18,7 @@ LoadModule fastcgi_module /usr/local/apache2/modules/mod_fastcgi.so
 
 FastCgiIpcDir /var/tmp/fcgi
 # gmosx: if you have installed the distribution the -I is not needed.
-FastCgiConfig -initial-env 'RUBYOPT=-rubygems -I/home/gmosx/navel/nitro/lib'
+FastCgiConfig -initial-env 'RUBYOPT=-rubygems -I/home/gmosx/navel/nitro/lib -I/home/gmosx/navel/og/lib -I/home/gmosx/navel/glue/lib'
 AddHandler fastcgi-script fcgi rb
 Options +FollowSymLinks +ExecCGI
 

data/examples/tiny/log/apache.error_log

@@ -28,3 +28,103 @@ DEBUG: Rendering '/include'.
 DEBUG: Rendering '/'.
 DEBUG: Rendering '/include'.
 [Sun Feb 27 15:00:15 2005] [notice] caught SIGTERM, shutting down
+[Thu Mar 17 12:31:03 2005] [notice] Digest: generating secret for digest authentication ...
+[Thu Mar 17 12:31:03 2005] [notice] Digest: done
+[Thu Mar 17 12:31:04 2005] [notice] FastCGI: process manager initialized (pid 4964)
+[Thu Mar 17 12:31:04 2005] [notice] Apache/2.0.53 (Unix) DAV/2 mod_fastcgi/2.4.2 configured -- resuming normal operations
+[Thu Mar 17 12:31:06 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/tiny/public/fcgi.rb" started (pid 4970)
+DEBUG: Rendering '/view_entry/3'.
+ERROR: Error while handling '/view_entry/3'.
+ERROR: No controller for action
+	BACKTRACE:
+	/home/gmosx/navel/nitro/lib/nitro/render.rb:231:in `render'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:39:in `start'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:26:in `each'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:26:in `start'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:217:in `invoke_fcgi_proc'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:188:in `run'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:276:in `run'
+	/home/gmosx/navel/nitro/examples/tiny/public/../run.rb:9
+	/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:18:in `require__'
+	/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:18:in `require'
+	/home/gmosx/navel/nitro/examples/tiny/public/fcgi.rb:4
+	LOGGED FROM:
+	/home/gmosx/navel/nitro/lib/nitro/render.rb:281:in `log_error'
+DEBUG: Rendering '/error'.
+DEBUG: Compiling action 'public/error'
+ERROR: Error while handling '/error'.
+ERROR: undefined method `__xhtml__error' for #<SimpleController:0xf6d142a4>
+	BACKTRACE:
+	/home/gmosx/navel/nitro/lib/nitro/controller.rb:94:in `method_missing'
+	/home/gmosx/navel/nitro/lib/nitro/render.rb:236:in `send'
+	/home/gmosx/navel/nitro/lib/nitro/render.rb:236:in `render'
+	/home/gmosx/navel/nitro/lib/nitro/context.rb:67:in `out'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:44:in `start'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:26:in `each'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:26:in `start'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:217:in `invoke_fcgi_proc'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:188:in `run'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:276:in `run'
+	/home/gmosx/navel/nitro/examples/tiny/public/../run.rb:9
+	/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:18:in `require__'
+	/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:18:in `require'
+	/home/gmosx/navel/nitro/examples/tiny/public/fcgi.rb:4
+	LOGGED FROM:
+	/home/gmosx/navel/nitro/lib/nitro/render.rb:281:in `log_error'
+[Thu Mar 17 12:31:21 2005] [notice] caught SIGTERM, shutting down
+[Thu Mar 17 12:31:34 2005] [notice] Digest: generating secret for digest authentication ...
+[Thu Mar 17 12:31:34 2005] [notice] Digest: done
+[Thu Mar 17 12:31:35 2005] [notice] FastCGI: process manager initialized (pid 4980)
+[Thu Mar 17 12:31:35 2005] [notice] Apache/2.0.53 (Unix) DAV/2 mod_fastcgi/2.4.2 configured -- resuming normal operations
+[Thu Mar 17 12:31:39 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/tiny/public/fcgi.rb" started (pid 4986)
+DEBUG: Rendering '/view_entry/3'.
+ERROR: Error while handling '/view_entry/3'.
+ERROR: No controller for action
+	BACKTRACE:
+	/home/gmosx/navel/nitro/lib/nitro/render.rb:231:in `render'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:39:in `start'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:26:in `each'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:26:in `start'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:217:in `invoke_fcgi_proc'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:188:in `run'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:276:in `run'
+	/home/gmosx/navel/nitro/examples/tiny/public/../run.rb:9
+	/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:18:in `require__'
+	/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:18:in `require'
+	/home/gmosx/navel/nitro/examples/tiny/public/fcgi.rb:4
+	LOGGED FROM:
+	/home/gmosx/navel/nitro/lib/nitro/render.rb:281:in `log_error'
+DEBUG: Rendering '/error'.
+DEBUG: Compiling action 'public/error'
+ERROR: Error while handling '/error'.
+ERROR: undefined method `__xhtml__error' for #<SimpleController:0xf6d14268>
+	BACKTRACE:
+	/home/gmosx/navel/nitro/lib/nitro/controller.rb:94:in `method_missing'
+	/home/gmosx/navel/nitro/lib/nitro/render.rb:236:in `send'
+	/home/gmosx/navel/nitro/lib/nitro/render.rb:236:in `render'
+	/home/gmosx/navel/nitro/lib/nitro/context.rb:67:in `out'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:44:in `start'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:26:in `each'
+	/home/gmosx/navel/nitro/lib/nitro/adapters/fastcgi.rb:26:in `start'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:217:in `invoke_fcgi_proc'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:188:in `run'
+	/home/gmosx/navel/nitro/lib/nitro/runner.rb:276:in `run'
+	/home/gmosx/navel/nitro/examples/tiny/public/../run.rb:9
+	/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:18:in `require__'
+	/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:18:in `require'
+	/home/gmosx/navel/nitro/examples/tiny/public/fcgi.rb:4
+	LOGGED FROM:
+	/home/gmosx/navel/nitro/lib/nitro/render.rb:281:in `log_error'
+DEBUG: Rendering '/'.
+DEBUG: Compiling action 'public/index'
+DEBUG: Transforming 'public/index.xhtml'
+DEBUG: Rendering '/include'.
+DEBUG: Compiling action 'public/include'
+DEBUG: Transforming 'public/include.xhtml'
+DEBUG: Rendering '/'.
+DEBUG: Compiling action 'public/index'
+DEBUG: Transforming 'public/index.xhtml'
+DEBUG: Rendering '/include'.
+DEBUG: Compiling action 'public/include'
+DEBUG: Transforming 'public/include.xhtml'
+[Thu Mar 17 12:34:48 2005] [notice] caught SIGTERM, shutting down

data/examples/tiny/run.rb

@@ -1,10 +1,9 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 266 2005-02-28 14:50:48Z gmosx $
+# $Id: run.rb 300 2005-03-16 13:23:10Z gmosx $
 
 Dir.chdir File.dirname(__FILE__)
 
 require 'nitro'
 
-N::Rendering.reload = false
 N::Runner.run(:host => '127.0.0.1', :port => 9999)

data/examples/why_wiki/wiki.yml

@@ -0,0 +1 @@
+--- {}

data/install.rb

@@ -29,14 +29,17 @@ puts %{
 
 
 ---
-Congratulations, you have successfully installed Nitro + Og!
+Congratulations, you have successfully installed Nitro!
 The libraries where installed in '#{dst_dir}'. 
 
+You probably need to install the Glue and Og libraries 
+as well. (http://nitro.rubyforge.org)
+
 To verify that everything works correctly, try to run the tiny 
 example by issuing:
 
 $ cd exampes/tiny
-$ ruby ctl
+$ ruby run.rb
 
 at the command line.
 

data/lib/nitro.rb

@@ -12,7 +12,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: nitro.rb 270 2005-03-07 17:52:16Z gmosx $
+# $Id: nitro.rb 300 2005-03-16 13:23:10Z gmosx $
 
 require 'glue'
 require 'glue/logger'
@@ -21,13 +21,9 @@ require 'glue/logger'
 
 module Nitro
 
-	# The name.
-
-	Name = 'Nitro'
-
 	# The version.
 
-	Version = '0.12.0'
+	Version = '0.13.0'
 
 	# Library path.
 

data/lib/nitro/adapters/fastcgi.rb

@@ -34,11 +34,11 @@ class FastCGI
 			CgiUtils.parse_cookies(context)
 			
 			# gmosx, TODO: move this into a filter.
-			Og.db.get_connection if defined?(Og)
+			Og.db.get_connection if defined?(Og) and Og.db
 
 			context.render(context.path)
 
-			Og.db.put_connection if defined?(Og)
+			Og.db.put_connection if defined?(Og) and Og.db
 
 			cgi.out.print(CgiUtils.response_headers(context))
 			cgi.out.print(context.out)

data/lib/nitro/adapters/webrick.rb

@@ -57,7 +57,7 @@ class Webrick
 			@server = WEBrick::HTTPServer.new(
 				:BindAddress => conf.host, 
 				:Port => conf.port, 
-				:DocumentRoot => conf.dispatcher.root,
+				:DocumentRoot => conf.dispatcher.public_root,
 				:AccessLog => [
 					[accesslog, WEBrick::AccessLog::COMMON_LOG_FORMAT],
 					[refererlog, WEBrick::AccessLog::REFERER_LOG_FORMAT]
@@ -91,7 +91,7 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 		
     @file_handler = WEBrick::HTTPServlet::FileHandler.new(
 				server, 
-				conf.dispatcher.root, conf.webrick_options || {})
+				conf.dispatcher.public_root, conf.webrick_options || {})
   end
 	
 	def handle(req, res)
@@ -101,7 +101,7 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 			@file_handler.do_GET(req, res)
 		else
 			# gmosx, TODO: move this into a filter.
-			Og.db.get_connection if defined?(Og)
+			Og.db.get_connection if defined?(Og) and Og.db
 
 			# REQUEST_MUTEX.lock
 
@@ -137,7 +137,7 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 		end
 	ensure
 		# REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
-		Og.db.put_connection if defined?(Og)
+		Og.db.put_connection if defined?(Og) and Og.db
 	end
 
 	alias do_GET handle 

data/lib/nitro/conf.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: conf.rb 266 2005-02-28 14:50:48Z gmosx $
+# $Id: conf.rb 302 2005-03-16 14:31:32Z gmosx $
 
 require 'glue/flexob'
 
@@ -22,7 +22,10 @@ class Conf < Flexob
 			# this is accessible as localhost on windows
 			:host => '0.0.0.0',
 			:port => 9999,
-			:dispatcher => Dispatcher.new
+			:dispatcher => Dispatcher.new,
+
+			:template_root => 'templates',
+			:public_root => 'public'
 		}
 		
 		hash.update(options)

data/lib/nitro/controller.rb

@@ -82,13 +82,13 @@ class Controller
 	# A hash containing metadata for the action
 	# methods.
 
-	cattr_accessor :action_metadata, {}
+	cattr_accessor :action_metadata, {} 
 
 	# Use the method_missing hook to compile the actions
 	# for this controller.
 	
 	def method_missing(action, *args)
-		if Rendering.compile_action(self.class, action, @base)
+		if Rendering.compile_action(self.class, action, @template_root)
 			send(action, *args)
 		else
 			super

data/lib/nitro/dispatcher.rb

@@ -13,9 +13,18 @@ require 'nitro/simple'
 class Dispatcher 
 	include Router
 	
-	# The root directory.
+	# The public root directory. The files in this
+	# directory are published by the web server.
 
-	attr_accessor :root
+	attr_accessor :public_root
+	
+	# The template root directory. By default this
+	# points to the public root directory to allow
+	# for PHP/JSP/ASP style programming. But you should
+	# probably change this to another directory for
+	# extra security.
+
+	attr_accessor :template_root
 
 	# The controllers map.
 
@@ -37,7 +46,8 @@ class Dispatcher
 	# 	A hash of apis supported by the Dispatcher.
 	
 	def initialize(controllers = nil, apis = nil, routes = nil)
-		@root = 'root'
+		@public_root = 'public'
+		@template_root = @public_root
 		
 		if controllers and controllers.is_a?(Class) and controllers.ancestors.include?(Controller)
 			controllers = { :root => controllers }
@@ -127,32 +137,33 @@ class Dispatcher
 		case parts.size
 			when 0
 				# / -> root.index
-				base = @root 
+				#	base = @template_root 
 				klass = controller_class_for(:root, context)
 				action = 'index'
 			
 			when 2
 				if klass = controller_class_for(parts[1], context)
 					# controller/ -> controller.index
-					base = "#{@root}/#{parts[1]}"
+					#	base = "#{@template_root}/#{parts[1]}"
 					action = 'index'
 				else
 					# action/ -> root.action
-					base = @root
+					#	base = @template_root
 					klass = controller_class_for(:root, context)
 					action = parts[1]
 				end
 				
 			when 3
 				# controller/action/ -> controller.action
-				base = "#{@root}/#{parts[1]}"
+				# base = "#{@template_root}/#{parts[1]}"
 				klass = controller_class_for(parts[1], context)
 				action = parts[2]
 		end
 	
 		content_type = @apis[:api] || 'text/html'
 
-		return klass, "__#{api}__#{action}", base, content_type 
+		# return klass, "__#{api}__#{action}", base, content_type 
+		return klass, "__#{api}__#{action}", content_type 
 	end
 	alias_method :split_path, :dispatch
 

data/lib/nitro/mail.rb

@@ -1,25 +1,269 @@
+# Based on original code from the RubyOnRails project.
+# http://www.rubyonrails.com
+# Copyright (c) 2004 David Heinemeier Hansson
+# 
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: mail.rb 248 2005-01-31 13:38:34Z gmosx $
+# $Id: mail.rb 300 2005-03-16 13:23:10Z gmosx $
 
 require 'net/smtp'
 
+require 'glue/attribute'
+require 'nitro/template'
+
 module N
 
-# A thin wrapper arround net/smtp
+# Encapsulates an email message.
+
+class Mail
+	
+	# Sender, can be an array.
+
+	attr_accessor :from
+
+	# The list of the recipients, can be arrays.
+	
+	attr_accessor :to, :cc, :bcc
+
+	# The subject
+
+	attr_accessor :subject
+
+	# The body of the message.
+
+	attr_accessor :body
+
+	# Reply to.
+
+	attr_accessor :reply_to
+
+	# Sent on
+
+	attr_accessor :sent_on
+
+	# Encode the subject?
+
+	attr_accessor :encode_subject
+	
+	# The charset used to encode the message.
+
+	attr_accessor :charset
+
+	# Additional headers
+
+	attr_accessor :headers
+
+	def initialize(from = nil, to = nil, subject = nil, body = nil)
+		@from, @to, @subject, @body = from, to, subject, body
+		@headers = {}
+	end
+
+	def [](key)
+		@headers[key]
+	end
 
-module Mail
+	def []=(key, value)
+		@headers[key] = value
+	end
+	
+	# Returns the Mail message in encoded format.
 
-	mattr_accessor :smtp_server, 'localhost'
+	def encoded
+		raise 'No body defined' unless @body
+		raise 'No sender defined' unless @from
+		raise 'No recipients defined' unless @to
 
-	# Send an email
+		# gmosx: From is typically NOT an array.
 
-	def self.send(from, to, body)
-		Net::SMTP.start(N::Mail.smtp_server, 25) do |smtp|
-      smtp.send_message(body, from, to)
+		from = @from.is_a?(Array) ? @from.join(', ') : @from
+		buf = "From: #{from}\n"
+		
+		to = @to.is_a?(Array) ? @to.join(', ') : @to
+		buf << "To: #{to}\n"
+		
+		if @cc
+			cc = @cc.is_a?(Array) ? @cc.join(', ') : @cc
+			buf << "Cc: #{cc}\n"
+		end
+		
+		if @bcc
+			bcc = @bcc.is_a?(Array) ? @bcc.join(', ') : @bcc
+			buf << "Bcc: #{bcc}\n"
 		end
+		
+		buf << "Subject: #@subject\n" if @subject
+		
+		buf << "\n"	
+		buf << @body
+
+		return buf
+	end
+end
+
+module MailerMixin
+
+	def self.append_features(base) # :nodoc: 
+		super
+		base.extend(SingletonMethods)
 	end
+
+	module SingletonMethods 
+
+		def mailer(klass)
+		end
+
+	end
+
+end
+
+# A flexible mailing service.
+#--
+# TODO: add callback/observers support.
+#++
+
+class Mailer < Mail
+
+	# The mail server configuration.
+
+	cattr_accessor :server; @@server = {
+		:address => 'localhost',
+		:port => 25,
+		:domain => 'localhost.localdomain',
+		:username => nil,
+		:password => nil,
+		:authentication => nil
+	}
+
+	# The delivery method. The following options are
+	# supported:
+	#
+	# * :smtp
+	# * :sendmail
+	#	* :test
+
+	cattr_accessor :delivery_method; @@delivery_method = :smtp
+
+	# The encode subject.
+
+	cattr_accessor :encode_subject; @@encode_subject = false # true 
 	
+	# The default charset.
+
+	cattr_accessor :default_charset, 'utf-8'
+
+	# An array to store the delivered mails, useful
+	# for testing.
+
+	cattr_accessor :deliveries; @@deliveries = []
+
+	# Disable deliveries, useful for testing.
+
+	cattr_accessor :disable_deliveries, false
+
+	# The root directory where the templates reside
+
+	attr_accessor :template_root
+
+	def initialize(from = nil, to = nil, subject = nil, body = FileTemplate.new)
+		super
+		@charset = @@default_charset.dup
+		@encode_subject = @@encode_subject
+		@template_root = 'public'
+	end
+
+	class << self 
+
+		def method_missing(method_symbol, *params) #:nodoc:
+			case method_symbol.id2name
+				when /^create_([_a-z]*)/
+					create_from_method($1, *params)
+				when /^deliver_([_a-z]*)/
+					begin
+						deliver(send("create_" + $1, *params))
+					rescue Object => e
+						raise e # FIXME
+					end
+			end        
+		end
+
+    def mail(from, to, subject, body, timestamp = nil, headers = {}, encode = @@encode_subject, charset = @@default_charset) #:nodoc:
+			deliver(create(from, to, subject, body, timestamp, headers, charset))
+		end
+
+		def create(from, to, subject, body, timestamp = nil, headers = {}, encode = @@encode_subject, charset = @@default_charset) #:nodoc:
+			m = Mail.new
+			m.to, m.subject, m.body, m.from = to, ( encode ? quoted_printable(subject, charset) : subject ), body, from
+			# m.date = timestamp.respond_to?("to_time") ? timestamp.to_time : (timestamp || Time.now)    
+			# m.set_content_type "text", "plain", { "charset" => charset }
+      headers.each do |k, v|
+	      m[k] = v
+	    end
+      return m
+		end
+
+		def deliver(mail) #:nodoc:
+			send("perform_delivery_#{delivery_method}", mail) unless disable_deliveries
+		end
+																	
+		def quoted_printable(text, charset) #:nodoc:
+			text = text.gsub( /[^a-z ]/i ) { "=%02x" % $&[0] }.gsub( / /, "_" )
+			"=?#{charset}?Q?#{text}?="
+		end
+															
+		private
+
+		def create_from_method(method_name, *params)
+			mailer = new
+
+			mailer.send(method_name, *params)
+
+			unless mailer.body.is_a?(String)
+				mailer.body = render_body(method_name, mailer)
+			end
+
+			mail = create(mailer.from, mailer.to, mailer.subject, mailer.body, mailer.sent_on, 
+					mailer.headers, mailer.charset)
+
+			mail.cc = mailer.cc if mailer.cc
+			mail.bcc = mailer.bcc if mailer.bcc
+
+			return mail
+		end
+
+		# Render the body by expanfing the template
+		
+		def render_body(method_name, mailer)
+			mailer.body.template_filename = "#{mailer.template_root}/#{method_name.to_s}.xhtml"
+			return mailer.body.process
+		end
+
+		# Deliver emails using SMTP.
+		
+		def perform_delivery_smtp(mail) # :nodoc:
+			c = @@server
+			Net::SMTP.start(c[:address], c[:port], c[:domain], c[:username], c[:password], c[:authentication]) do |smtp|
+				smtp.send_message(mail.encoded, mail.from, mail.to)
+			end
+		end
+
+		# Deliver emails using sendmail.
+		
+		def perform_delivery_sendmail(mail) # :nodoc:
+			IO.popen('/usr/sbin/sendmail -i -t', 'w+') do |sm|
+				sm.print(mail.encoded)
+				sm.flush
+			end																					
+		end
+		
+		# Used for testing, does not actually send the 
+		# mail.
+		
+		def perform_delivery_test(mail) # :nodoc:
+			deliveries << mail
+		end
+	
+	end
+
 end
 
 end