nitro 0.9.5 → 0.10.0

data/lib/glue/time.rb

@@ -1,8 +1,8 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: time.rb 202 2005-01-17 10:44:13Z gmosx $
+# $Id: time.rb 259 2005-02-15 08:54:54Z gmosx $
 
-require "time.rb"
+require 'time.rb'
 
 module N;
 

data/lib/glue/validation.rb

@@ -8,7 +8,7 @@ module N
 # objects. Typically used in Validator objects but can be
 # included in managed objects too.
 #
-# == Example
+# === Example
 #
 # class User
 #		prop_accessor :name, String 
@@ -50,8 +50,6 @@ module N
 
 module Validation
 
-	# = Errors
-	#
 	# Encapsulates a list of validation errors.
 	
 	class Errors
@@ -159,8 +157,6 @@ module Validation
 		base.extend(MetaLanguage)
 	end
 
-	# = MetaLanguage
-	#
 	# Implements the Validation meta-language.
 	
 	module MetaLanguage 
@@ -172,9 +168,9 @@ module Validation
 		# Validates that the attributes have a values, ie they are
 		# neither nil or empty.
 		#
-		# == Example
+		# === Example
 		#
-		# validate_value :, :msg => 'No confirmation'
+		# validate_value :param, :msg => 'No confirmation'
 		
 		def validate_value(*params)
 			c = { 
@@ -199,7 +195,7 @@ module Validation
 
 		# Validates the confirmation of +String+ attributes.
 		#
-		# == Example
+		# === Example
 		#
 		# validate_confirmation :password, :msg => 'No confirmation'
 		
@@ -228,7 +224,7 @@ module Validation
 
 		# Validates the format of +String+ attributes.
 		#
-		# == Example
+		# === Example
 		# 
 		# validate_format :name, :format => /$A*/, :msg => 'My error', :on => :create
 		
@@ -263,7 +259,7 @@ module Validation
 		
 		# Validates the length of +String+ attributes.
 		#
-		# == Example
+		# === Example
 		# 
 		# validate_length :name, :max => 30, :msg => 'Too long'
 		# validate_length :name, :min => 2, :msg => 'Too sort'
@@ -354,7 +350,7 @@ module Validation
 		# Validates that the attributes are included in 
 		# an enumeration.
 		#
-		# == Example
+		# === Example
 		#
 		# validate_inclusion :sex, :in => %w{ Male Female }, :msg => 'huh??'
 		# validate_inclusion :age, :in => 5..99 

data/lib/nitro.rb

@@ -12,7 +12,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: nitro.rb 215 2005-01-24 10:44:05Z gmosx $
+# $Id: nitro.rb 259 2005-02-15 08:54:54Z gmosx $
 
 require 'glue'
 require 'glue/logger'
@@ -20,8 +20,23 @@ require 'glue/logger'
 require 'nitro/context'
 require 'nitro/dispatcher'
 require 'nitro/render'
+require 'nitro/conf'
+require 'nitro/runner'
 
 # Define Nitro namespace.
 
 module Nitro
+
+	# The name.
+
+	Name = 'Nitro'
+
+	# The version.
+
+	Version = '0.10.0'
+
+	# Library path.
+
+	LibPath = File.dirname(__FILE__)
+
 end

data/lib/nitro/{adaptors → adapters}/cgi.rb

@@ -4,24 +4,24 @@
 
 require 'cgi'
 
+require 'glue/attribute'
+
 module N
 
-=begin
-# Extend the Request module.
+class Cgi
+	# Maximum content length allowed in requests.
 
-module Request
-	include CGI::QueryExtension
-	
-	def stdinput
-		@in	
-	end
+	cattr_accessor :max_content_length, (2 * 1024 * 1024)
+
+	# Multipart parsing buffer size.
+
+	cattr_accessor :buffer_size, (10 * 1024)
 end
-=end
 
 # CGI utility methods.
 
 class CgiUtils
-	
+
 	# HTTP protocol EOL constants
 
 	CR = "\x0d"
@@ -84,8 +84,8 @@ class CgiUtils
 	# to arrays.
 
 	def self.parse_query_string(query_string)
-		# gmosx, THINK: better return nil here?
 
+		# gmosx, THINK: better return nil here?
 		return {} if (query_string.nil? or query_string.empty?)
 
 		params = {}
@@ -167,13 +167,14 @@ class CgiUtils
 		if (:post == method) and
 				%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.params = read_multipart(boundary, Integer(context.headers['CONTENT_LENGTH']), context.in, context.headers)
+			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.in.binmode #  if defined?(context.in.binmode)
 										
 				context.params = CgiUtils.parse_query_string(
 						context.in.read(
@@ -183,8 +184,85 @@ class CgiUtils
 	end
 
 	# Parse a multipart request.
+
+	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
+		
+		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)
+	def self.read_multipart(boundary, content_length, stdinput, env_table)
 		params = Hash.new([])
 		boundary = "--" + boundary
 		buf = ""
@@ -192,9 +270,7 @@ class CgiUtils
 
 		# start multipart/form-data
 		stdinput.binmode if defined? stdinput.binmode
-		boundary_size = boundary.size + EOL.size
-		content_length -= boundary_size
-		status = stdinput.read(boundary_size)
+		
 		if nil == status
 			raise EOFError, "no content body"
 		elsif boundary + EOL != status
@@ -274,11 +350,16 @@ end
 			/Content-Disposition:.* name="?([^\";]*)"?/ni.match(head)
 			name = $1.dup
 
-			if params.has_key?(name)
-				params[name].push(body)
+			if name =~ /(.*)\[\]$/
+				if params.has_name?($1)
+					params[$1] << body
+				else
+					params[$1] = [body]
+				end
 			else
-				params[name] = [body]
+				params[name] = body.nil? ? nil : body
 			end
+			
 			break if buf.size == 0
 			break if content_length === -1
 		end

data/lib/nitro/{adaptors → adapters}/fastcgi.rb

@@ -1,5 +1,5 @@
 # * George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
 require 'cgi'
@@ -7,7 +7,7 @@ require 'fcgi'
 
 require 'nitro/context'
 require 'nitro/dispatcher'
-require 'nitro/adaptors/cgi'
+require 'nitro/adapters/cgi'
 
 require 'glue/flexob'
 
@@ -44,6 +44,7 @@ class FastCGI
 			cgi.out.print(context.out)
 
 			cgi.finish
+
 		end
 	end
 

data/lib/nitro/{adaptors → adapters}/webrick.rb

@@ -25,7 +25,7 @@ end
 
 module N
 	
-# Helper methods for the WebrickAdaptor.
+# Helper methods for the WebrickAdapter.
 
 class Webrick
 	
@@ -62,16 +62,16 @@ class Webrick
 			
 			trap('INT') { @server.shutdown }
 
-			@server.mount('/', WebrickAdaptor, conf)
+			@server.mount('/', WebrickAdapter, conf)
 			@server.start
 		end
 	end
 
 end
 
-# A Webrick Adaptor for Nitro.
+# A Webrick Adapter for Nitro.
 
-class WebrickAdaptor < WEBrick::HTTPServlet::AbstractServlet
+class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 
 	# REQUEST_MUTEX = Mutex.new
 		

data/lib/nitro/builders/rss.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: rss.rb 202 2005-01-17 10:44:13Z gmosx $
+# $Id: rss.rb 249 2005-02-04 14:03:00Z gmosx $
 
 require 'rss/0.9'
 

data/lib/nitro/builders/xml.rb

@@ -4,8 +4,6 @@
 
 module N
 
-# = XmlBuilderMixin
-#
 # A helper mixin for programmatically building XML
 # blocks. 
 
@@ -25,7 +23,7 @@ module XmlBuilderMixin
 					self << args.first 
 					end_tag('#{tag}')
 				else
-					start_tag('#{tag}', attrs)
+					start_tag('#{tag}', attrs, false)
 					self << ' />'
 				end
 			end
@@ -34,9 +32,13 @@ module XmlBuilderMixin
 		self.send(tag, *args, &block)
 	end
 
-	def start_tag(tag, attributes = nil)
+	def start_tag(tag, attributes = nil, close = true)
 		unless attributes
-			self << "<#{tag}>"
+			if close
+				self << "<#{tag}>"
+			else
+				self << "<#{tag}"
+			end
 		else
 			self << "<#{tag}"
 			for name, value in attributes
@@ -46,7 +48,7 @@ module XmlBuilderMixin
 					self << %| #{name}="1"|
 				end
 			end
-			self << ">"
+			self << ">" if close
 		end
 
 		return self
@@ -72,8 +74,6 @@ module XmlBuilderMixin
 	
 end
 
-# = XmlString
-#
 # A String extension with XML generation
 # functionality.
 
@@ -81,8 +81,6 @@ class XmlString < String
 	include N::XmlBuilderMixin
 end
 
-# = XmlBuilder
-#
 # A class that encapsulats the XML generation
 # functionality. Utilizes duck typing to redirect 
 # output to a target buffer.

data/lib/nitro/cluster.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: cluster.rb 234 2005-01-27 13:01:40Z gmosx $
+# $Id: cluster.rb 249 2005-02-04 14:03:00Z gmosx $
 
 # WARNING: This is old code, not updated to work in the
 # latest nitro release. Will be fixed ASAP.

data/lib/nitro/conf.rb

@@ -0,0 +1,34 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: conf.rb 260 2005-02-15 08:58:04Z gmosx $
+
+require 'glue/flexob'
+
+module N
+	
+# Configuration.
+
+class Conf < Flexob
+
+	def initialize(options)
+		unless options.is_a?(Hash)
+			raise ArgumentError.new('An options hash is required!')
+		end
+
+		# Default configuration parameters.
+
+		hash = {
+			:name => 'Nitro Application',
+			:host => 'localhost',
+			:port => 8069,
+			:dispatcher => Dispatcher.new
+		}
+		
+		hash.update(options)
+
+		super(hash)
+	end
+
+end
+
+end