nitro 0.13.0 → 0.14.0

data/examples/tiny/conf/lhttpd.conf

@@ -1,43 +1,35 @@
-# lighttpd configuration file
+# Lighttpd configuration file
 # $Id$
 
-############ Options you really have to take care of ####################
+server.port = 9999 
+server.bind = "127.0.0.1"
+# server.event-handler = "freebsd-kqueue" # needed on OS X
 
-## modules to load
-# at least mod_access and mod_accesslog should be loaded
-# all other module should only be loaded if really neccesary
-# - saves some time
-# - saves memory
+server.modules = ( "mod_rewrite", "mod_fastcgi", "mod_access", "mod_accesslog" )
 
-server.modules = ( 
-	"mod_rewrite", 
-#                               "mod_redirect", 
-	"mod_access", 
-#				"mod_auth", 
-#                               "mod_status", 
-	"mod_fastcgi",
-#				"mod_simple_vhost",
-#				"mod_evhost",
-#				"mod_cgi",
-#				"mod_compress",
-#                               "mod_ssi",
-#                               "mod_usertrack",
-# 				"mod_rrdtool",
-	"mod_accesslog" 
-)
+server.document-root = "/home/gmosx/navel/nitro/examples/tiny/public/"
+server.errorlog = "/home/gmosx/navel/nitro/examples/tiny/log/lighttpd.error.log"
+accesslog.filename = "/home/gmosx/navel/nitro/examples/tiny/log/access.log"
 
-## a static document-root, for virtual-hosting take look at the 
-## server.virtual-* options
-server.document-root = "/home/gmosx/navel/nitro/examples/tiny/root/"
+server.indexfiles = ( "index.html" )
+url.access-deny = ( "~", ".inc" )
 
-## where to send error-messages to
-server.errorlog = "/home/gmosx/navel/nitro/examples/tiny/log/lighttpd.error.log"
+url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
+server.error-handler-404 = "/fcgi.rb"
 
-# files to check for if .../ is requested
-server.indexfiles          = ( "index.html" )
+fastcgi.server = ( ".rb" =>
+	( "localhost" => 
+		( 
+			"min-procs" => 1, 
+			"max-procs" => 1,
+			"socket" => "/tmp/tiny.fcgi.socket",
+			"bin-path" => "/home/gmosx/navel/nitro/examples/tiny/public/fcgi.rb",
+			"bin-environment" => ( "NITRO_ENV" => "development" )
+		)
+	)
+)
 
-# mimetype mapping
-mimetype.assign            = (  
+mimetype.assign = (  
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -84,153 +76,4 @@ mimetype.assign            = (
   ".asf"          =>      "video/x-ms-asf",
   ".asx"          =>      "video/x-ms-asf",
   ".wmv"          =>      "video/x-ms-wmv"
- )
-
-# Use the "Content-Type" extended attribute to obtain mime type if possible
-# mimetypes.use-xattr = "enable"
-
-#### accesslog module
-accesslog.filename = "/home/gmosx/navel/nitro/examples/tiny/log/access.log"
-
-## deny access the file-extensions
-#
-# ~    is for backupfiles from vi, emacs, joe, ...
-# .inc is often used for code includes which should in general not be part
-#      of the document-root
-url.access-deny             = ( "~", ".inc" )
-
-
-
-######### Options that are good to be but not neccesary to be changed #######
-
-## bind to port (default: 80)
-server.port = 9999 
-
-## bind to localhost (default: all interfaces)
-#server.bind                = "grisu.home.kneschke.de"
-
-## error-handler for status 404
-#server.error-handler-404   = "/error-handler.html"
-#server.error-handler-404   = "/error-handler.php"
-
-## to help the rc.scripts
-# server.pid-file              = "/var/run/lighttpd.pid"
-
-
-###### virtual hosts
-##
-##   If you want name-based virtual hosting add the next three settings and load
-##   mod_simple_vhost
-##
-## document-root =
-##   virtual-server-root + virtual-server-default-host + virtual-server-docroot or
-##   virtual-server-root + http-host + virtual-server-docroot
-##
-#simple-vhost.server-root         = "/home/weigon/wwwroot/servers/"
-#simple-vhost.default-host        = "grisu.home.kneschke.de"
-#simple-vhost.document-root       = "/pages/"
-
-
-## 
-## Format: <errorfile-prefix><status>.html
-## -> ..../status-404.html for 'File not found'
-#server.errorfile-prefix    = "/home/weigon/projects/lighttpd/doc/status-"
-
-## virtual directory listings
-#server.dir-listing          = "enable"
-
-## send unhandled HTTP-header headers to error-log
-#debug.dump-unknown-headers  = "enable"
-
-### only root can use these options
-#
-# chroot() to directory (default: no chroot() )
-#server.chroot            = "/"
-
-## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
-
-## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
-
-#### compress module
-#compress.cache-dir          = "/tmp/lighttpd/cache/compress/"
-#compress.filetype           = ("text/plain", "text/html")
-
-#### fastcgi module
-## read fastcgi.txt for more info
-fastcgi.server = ( ".rb" =>
-	( "localhost" => 
-		( 
-			"socket" => "/tmp/nitro-fcgi.socket",
-			"bin-path" => "/home/gmosx/navel/nitro/examples/tiny/root/fcgi.rb"
-		)
-	)
-)
-
-#### CGI module
-#cgi.assign                  = ( ".pl"  => "/usr/bin/perl",
-#                                ".cgi" => "/usr/bin/perl" )
-#
-
-#### SSL engine
-#ssl.engine                  = "enable"
-#ssl.pemfile                 = "server.pem"
-
-#### status module
-# status.status-url = "/server-status"
-# status.config-url = "/server-config"
-
-#### auth module
-## read authentification.txt for more info
-# auth.backend                = "plain"
-# auth.backend.plain.userfile = "lighttpd.user"
-# auth.backend.plain.groupfile = "lighttpd.group"
-
-# auth.backend.ldap.hostname = "localhost"
-# auth.backend.ldap.base-dn  = "dc=my-domain,dc=com"
-# auth.backend.ldap.filter   = "(uid=$)"
-
-# auth.require                = ( "/server-status" => 
-#                                ( 
-#				  "method"  => "digest",
-#				  "realm"   => "download archiv",
-#				  "require" => "group=www|user=jan|host=192.168.2.10"
-#				),
-#				"/server-info" => 
-#                                ( 
-#				  "method"  => "digest",
-#				  "realm"   => "download archiv",
-#				  "require" => "group=www|user=jan|host=192.168.2.10"
-#				)
-#                              )
-
-#### url handling modules (rewrite, redirect, access)
-
-url.rewrite = ( 
-	"^/([\/\-_a-zA-Z0-9]+)?$" => "/fcgi.rb",
-	"^/([\/\-_a-zA-Z0-9]+)?\?([\-_a-zA-Z0-9=;&%]*)$" => "/fcgi.rb?$2"
 )
-
-# url.redirect                = ( "^/wishlist/(.+)" => "http://www.123.org/$1" )
-
-#
-# define a pattern for the host url finding
-# %% => % sign
-# %0 => domain name + tld
-# %1 => tld
-# %2 => domain name without tld
-# %3 => subdomain 1 name
-# %4 => subdomain 2 name
-#
-# evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/"
-
-#### expire module
-# expire.url                  = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
-
-#### ssi
-# ssi.extension              = ( ".shtml" )
-
-#### rrdtool
-# rrdtool.binary = "/usr/bin/rrdtool"
-# rrdtool.db-name = "/var/www/lighttpd.rrd"

data/examples/tiny/log/apache.error_log

@@ -128,3 +128,27 @@ 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
+[Fri Mar 25 12:23:00 2005] [notice] Digest: generating secret for digest authentication ...
+[Fri Mar 25 12:23:00 2005] [notice] Digest: done
+[Fri Mar 25 12:23:01 2005] [notice] FastCGI: process manager initialized (pid 4731)
+[Fri Mar 25 12:23:01 2005] [notice] Apache/2.0.53 (Unix) DAV/2 mod_fastcgi/2.4.2 configured -- resuming normal operations
+[Fri Mar 25 12:23:05 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/tiny/public/fcgi.rb" started (pid 4737)
+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'
+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'
+[Fri Mar 25 12:24:03 2005] [notice] caught SIGTERM, shutting down

data/examples/tiny/public/index.xhtml

@@ -32,12 +32,7 @@
 <p>
 	Counter: #{session[:counter]}
 </p>
-<br />
-
 <render href="include" />
-
-<!--
-<p>#{context.headers.collect { |h| "#{h}<br/>" }}</p>
 <p>
 	<h3>Upload a picture</h3>
 	
@@ -53,6 +48,5 @@
 		<input type="submit" value="Upload" />
 	</form>
 </p>
--->
 
 </html>

data/examples/tiny/public/upload.xhtml

@@ -2,22 +2,20 @@
 
 <html>
 
-<?r 
-	file = context['file']
+	<?r 
+		file = context['file'].read
+		File.open('public/image.png', 'wb') do |f|
+			f << file
+		end
+	?>
 
-	File.open('koko.png', 'wb') do |f|
-		f << file
-	end
-?>
-	<h1>#{context['title']}</h1>	
+	<h1>#{request['title']}</h1>	
 
-	<img src="" />
+	<p><img src="image.png" /></p>
 
-	--- #{context['file'].class}<br />
-
-	#{context.params.keys}
-	<br />
-	
-	#{context.params.values.collect {|v| v.class}.join('<br />')}
+	<p>
+		<strong>original:</strong> #{request['file'].original_filename}<br />
+		<strong>content type:</strong>#{request['file'].content_type}<br />
+	</p>
 
 </html>

data/examples/wee_style/run.rb

@@ -2,6 +2,8 @@
 # (c) 2004-2005 Navel, all rights reserved.
 # $Id: run.rb 266 2005-02-28 14:50:48Z gmosx $
 
+Dir.chdir File.dirname(__FILE__)
+
 require 'nitro'; include N
 require 'nitro/adapters/webrick'
 

data/examples/why_wiki/run.rb

@@ -1,6 +1,8 @@
 # * George Moschovitis  <gm@navel.gr>
 # $Id: run.rb 270 2005-03-07 17:52:16Z gmosx $
 
+Dir.chdir File.dirname(__FILE__)
+
 require 'cgi'
 require 'redcloth'
 require 'yaml/store'

data/lib/nitro.rb

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

data/lib/nitro/adapters/cgi.rb

@@ -3,6 +3,8 @@
 # $Id$
 
 require 'cgi'
+require 'stringio'
+require 'tempfile'
 
 require 'glue/attribute'
 
@@ -185,112 +187,38 @@ class CgiUtils
 				%r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n.match(context.headers['CONTENT_TYPE'])
 			boundary = $1.dup
 			# context.params = read_multipart(boundary, Integer(context.headers['CONTENT_LENGTH']), context.in, context.headers)
-			parse_multipart(context, boundary)
+			context.params = parse_multipart(context, boundary)
 		else 
 			case method
 			when :get, :head
 				context.params = CgiUtils.parse_query_string(context.query_string)	
 			when :post
 				context.in.binmode #  if defined?(context.in.binmode)
-										
-				context.params = CgiUtils.parse_query_string(
-						context.in.read(
-						Integer(context.headers['CONTENT_LENGTH'])) || '')	
+				context.params = CgiUtils.parse_query_string(context.in.read(context.content_length) || '')	
 			end
 		end
 	end
 
 	# Parse a multipart request.
+	# Adapted from Ruby's cgi.rb
 	#--
-	# FIXME: implement me, not working
+	# TODO: optimize and rationalize this.
 	#++
 
 	def self.parse_multipart(context, boundary)
-		io = context.in
-		env = context.headers
-
-		io.binmode # if defined?(ins.binmode)
-	
-		buffer = ''
-		bufsize = Cgi.buffer_size
-
-		boundary = "--" + boundary
-		boundary_size = boundary.size + EOL.size
-
-		content_length = context.headers['CONTENT_LENGTH'].to_i
-
-		if content_length > Cgi.max_content_length
-			raise 'Request content length exceeds limit'
-		end
-
-		context.params = {}
-
-		status = io.read(boundary_size)
-
-		if (status.nil?) or ( (boundary + EOL) != status )
-			raise 'Bad content body'
-		end
+		input = context.in
+		content_length = context.content_length
+		env_table = context.env
 		
-		content_length -= boundary_size
-
-		head = nil
-	
-		loop do 
-			until head and /#{boundary}(?:#{EOL}|--)/n.match(buffer)
-				if (not head) and /#{EOL}#{EOL}/n.match(buffer)
-					buffer = buffer.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
-						head = $1.dup
-						""
-					end
-					next
-				end
-
-				puts "*** #{head}"
-				
-				/Content-Disposition:.* filename="?([^\";]*)"?/ni.match(head)
-				filename = $1
-				if /Mac/ni.match(env['HTTP_USER_AGENT']) and
-						/Mozilla/ni.match(env['HTTP_USER_AGENT']) and
-						(not /MSIE/ni.match(env['HTTP_USER_AGENT']))
-					filename = CGI::unescape(filename)
-				end
-
-				puts "--- f: #{filename}"
-			
-				if filename 
-					/Content-Type: (.*)/ni.match(head)
-					content_type = $1 or ''
-
-					puts "--- c: #{content_type}"
-				end
-				
-				chunk = if bufsize < content_length
-							io.read(bufsize)
-						else
-							io.read(content_length)
-						end
-
-				raise 'Bad content body' unless chunk
-
-					
-				buffer << chunk 
-				content_length -= chunk.size
-			end
-		end
-	end
-
-	# Parse a multipart request.
-	# Copied from ruby's cgi.rb
-	
-	def self.read_multipart(boundary, content_length, stdinput, env_table)
 		params = Hash.new([])
 		boundary = "--" + boundary
 		buf = ""
-		bufsize = 10 * 1024
 
-		# start multipart/form-data
-		stdinput.binmode if defined? stdinput.binmode
-		
+		input.binmode if defined? input.binmode
+		boundary_size = boundary.size + EOL.size
+		content_length -= boundary_size
+		status = input.read(boundary_size)
+
 		if nil == status
 			raise EOFError, "no content body"
 		elsif boundary + EOL != status
@@ -299,15 +227,13 @@ class CgiUtils
 
 		loop do
 			head = nil
+
 			if 10240 < content_length
-				require "tempfile"
 				body = Tempfile.new("CGI")
 			else
 				begin
-					require "stringio"
 					body = StringIO.new
 				rescue LoadError
-					require "tempfile"
 					body = Tempfile.new("CGI")
 				end
 			end
@@ -328,10 +254,10 @@ class CgiUtils
 					buf[0 ... (buf.size - (EOL + boundary + EOL).size)] = ""
 				end
 
-				c = if bufsize < content_length
-							stdinput.read(bufsize)
+				c = if Cgi.buffer_size < content_length
+							input.read(Cgi.buffer_size)
 						else
-							stdinput.read(content_length)
+							input.read(content_length)
 						end
 				if c.nil?
 					raise EOFError, "bad content body"
@@ -351,40 +277,41 @@ class CgiUtils
 			body.rewind
 
 			/Content-Disposition:.* filename="?([^\";]*)"?/ni.match(head)
-filename = ($1 or "")
-if /Mac/ni.match(env_table['HTTP_USER_AGENT']) and
-		/Mozilla/ni.match(env_table['HTTP_USER_AGENT']) and
-		(not /MSIE/ni.match(env_table['HTTP_USER_AGENT']))
-	filename = CGI::unescape(filename)
-end
+			
+			filename = ($1 or "")
+
+			if /Mac/ni.match(env_table['HTTP_USER_AGENT']) and
+					/Mozilla/ni.match(env_table['HTTP_USER_AGENT']) and
+					(not /MSIE/ni.match(env_table['HTTP_USER_AGENT']))
+				filename = CGI::unescape(filename)
+			end
 			
 			/Content-Type: (.*)/ni.match(head)
 			content_type = ($1 or "")
 
 			(class << body; self; end).class_eval do
 				alias local_path path
-				define_method(:original_filename) {filename.dup.taint}
-				define_method(:content_type) {content_type.dup.taint}
+				define_method(:original_filename) { filename.dup.taint }
+				define_method(:content_type) { content_type.dup.taint }
+
+				# gmosx: this hides the performance hit!!
+				define_method(:to_s) { read }
 			end
 
 			/Content-Disposition:.* name="?([^\";]*)"?/ni.match(head)
 			name = $1.dup
 
-			if name =~ /(.*)\[\]$/
-				if params.has_name?($1)
-					params[$1] << body
-				else
-					params[$1] = [body]
-				end
+			if params.has_key?(name)
+				params[name] = [params[name]] << body
 			else
-				params[name] = body.nil? ? nil : body
+				params[name] = body
 			end
-			
+
 			break if buf.size == 0
 			break if content_length === -1
 		end
 
-		params
+		return params
 	end
 
 end