nitro 0.10.0 → 0.11.0

data/lib/glue/hash.rb

@@ -1,22 +1,17 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: hash.rb 202 2005-01-17 10:44:13Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: hash.rb 263 2005-02-23 13:45:08Z gmosx $
 
-require "sync"
+require 'sync'
 
-module N;
+module N
 
-# == SafeHash
-#
 # A thread-safe hash. We use a sync object instead of a mutex,
-# because it is re-entrant.
-# An exclusive lock is needed when writing, a shared lock IS NEEDED
-# when reading
+# because it is re-entrant. An exclusive lock is needed when 
+# writing, a shared lock IS NEEDED when reading
 # uses the delegator pattern to allow for multiple
 # implementations!
-#
+
 class SafeHash < Hash
 	attr :sync
 
@@ -27,63 +22,47 @@ class SafeHash < Hash
 	end
 
 	def [](key)
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		@sync.synchronize(::Sync::SH) { super }
 	end
 
 	def []=(key, value)
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		@sync.synchronize(::Sync::EX) { super }
 	end
 
 	def delete(key)
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		@sync.synchronize(::Sync::EX) { super }
 	end
 
 	def clear
-		@sync.synchronize(::Sync::EX) {
-			super
-		}
+		@sync.synchronize(::Sync::EX) {	super }
 	end
 
 	def size
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		@sync.synchronize(::Sync::SH) {	super }
 	end
 
 	def values
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		@sync.synchronize(::Sync::SH) { super }
 	end
 
 	def keys
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		@sync.synchronize(::Sync::SH) { super }
 	end
 
-end # SafeHash
+end 
 
-# == SafeHashDelegator
-#
 # A thread-safe hash. We use a sync object instead of a mutex,
-# because it is re-entrant.
-# An exclusive lock is needed when writing, a shared lock IS NEEDED
-# when reading
+# because it is re-entrant. An exclusive lock is needed when 
+# writing, a shared lock IS NEEDED when reading.
+#
+# === Design
 #
-# Design:
 # This class uses the delegator pattern. However we dont use rubys
 # delegation facilities, they are more general and powerfull than we
 # need here (and slower). Instead a custom (but simple) solution is
 # used.
 #
-# Example:
+# === Example
 #
 # hash = SafeHashDelegator.new(Hash.new)
 # hash = SafeHashDelegator.new(Hash.new)
@@ -96,20 +75,20 @@ class SafeHashDelegator < Hash
 		@sync = ::Sync.new
 	end
 
-    def [](key)
-		return @sync.synchronize(::Sync::SH) {
+	def [](key)
+		@sync.synchronize(::Sync::SH) {
 			@delegate[key]
 		}
-    end
+  end
 
-    def []=(key, value)
-		return @sync.synchronize(::Sync::EX) {
+  def []=(key, value)
+		@sync.synchronize(::Sync::EX) {
 			@delegate[key] = value
 		}
-    end
+  end
 
 	def delete(key)
-		return @sync.synchronize(::Sync::EX) {
+		@sync.synchronize(::Sync::EX) {
 			@delegate.delete(key)
 		}
 	end
@@ -121,23 +100,23 @@ class SafeHashDelegator < Hash
 	end
 
 	def size
-		return @sync.synchronize(::Sync::SH) {
+		@sync.synchronize(::Sync::SH) {
 			@delegate.size()
 		}
 	end
 
 	def values
-		return @sync.synchronize(::Sync::SH) {
+		@sync.synchronize(::Sync::SH) {
 			@delegate.values()
 		}
 	end
 
 	def keys
-		return @sync.synchronize(::Sync::SH) {
+		@sync.synchronize(::Sync::SH) {
 			@delegate.keys()
 		}
 	end
 
-end # SafeHashDelegator
+end
 
-end # module
+end 

data/lib/glue/pool.rb

@@ -1,21 +1,17 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: pool.rb 202 2005-01-17 10:44:13Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: pool.rb 266 2005-02-28 14:50:48Z gmosx $
 
-require "thread"
-require "monitor"
+require 'thread'
+require 'monitor'
 
 module N
 
-# = Pool
-#
 # Generalized object pool implementation. Implemented as a thread 
 # safe stack. Exclusive locking is needed both for push and pop. 
 #
 # INVESTIGATE: Could use the SizedQueue/Queue.
-#
+
 class Pool < Array
 	include MonitorMixin
 	
@@ -25,7 +21,7 @@ class Pool < Array
 	end
 
 	# Add, restore an object to the pool.
-	#
+	
 	def push(obj)
 		synchronize do
 			super
@@ -34,7 +30,7 @@ class Pool < Array
 	end
 	
 	# Obtain an object from the pool.
-	#
+	
 	def pop
 		synchronize do
 			@cv.wait_while { empty? }
@@ -44,6 +40,7 @@ class Pool < Array
 
 	# Obtains an object, passes it to a block for processing
 	# and restores it to the pool.
+
 	def obtain
 		result = nil
 		
@@ -60,4 +57,4 @@ class Pool < Array
 	
 end
 
-end # module
+end

data/lib/glue/property.rb

@@ -1,7 +1,7 @@
 # * George Moschovitis  <gm@navel.gr>
 # * Michael Neumann  <mneumann@ntecs.de>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: property.rb 254 2005-02-10 12:44:05Z gmosx $
+# $Id: property.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'glue/attribute'
 require 'glue/array'
@@ -30,22 +30,35 @@ class Property
 
 	cattr_accessor :type_checking, false
 
-	# the symbol of the property
+	# The symbol of the property.
 	
 	attr_accessor :symbol
 	
-	# the string representation of the symbol
+	# The string representation of the symbol.
 	
 	attr_accessor :name
 	
-	# the class of the property
+	# The class of the property.
 	
 	attr_accessor :klass
-	
-	# additional metadata (like sql declaration, sql index, etc)
+
+	# Additional metadata (like sql declaration, sql index, etc)
+	# Here is a list of predefined metadata:
+	#
+	# [+:reader+]
+	#		create reader?
+	#
+	#	[+:writer+]
+	#		create writer?
+	#
+	#	[+:sql_index+]
+	#		create an sql index for the column this poperty maps to?
+	#
+	# You can use this mechanism to add your own, custom,
+	# metadata.
 	
 	attr_accessor :meta
-	
+
 	def initialize(symbol, klass, meta = {})
 		@symbol, @klass = symbol, klass
 		@meta = meta
@@ -124,6 +137,11 @@ module PropertyUtils
 		else
 			target.__props << prop
 		end
+
+		# Store the property in the :props_and_relations
+		# metadata array.
+
+		target.meta :props_and_relations, prop
 		
 		# Precompile the property read/write methods
 
@@ -366,7 +384,7 @@ class Module
 			prop(klass, symbol, meta)
 		end
 	end
-	
+	alias_method :property, :prop_accessor
 	
 	# Attach metadata. 
 	# Guard against duplicates, no need to keep order.
@@ -375,7 +393,11 @@ class Module
 	# gmosx: crappy implementation, recode.
 	#++
 	
-	def meta(key, val)
+	def meta(key, *val)
+		val = val.first if val.size == 1
+
+		N::PropertyUtils.enchant(self)
+
 		self.module_eval %{  
 			@@__meta[key] ||= [] 
 			@@__meta[key].delete_if { |v| val == v }

data/lib/nitro.rb

@@ -12,17 +12,11 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: nitro.rb 259 2005-02-15 08:54:54Z gmosx $
+# $Id: nitro.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'glue'
 require 'glue/logger'
 
-require 'nitro/context'
-require 'nitro/dispatcher'
-require 'nitro/render'
-require 'nitro/conf'
-require 'nitro/runner'
-
 # Define Nitro namespace.
 
 module Nitro
@@ -33,10 +27,38 @@ module Nitro
 
 	# The version.
 
-	Version = '0.10.0'
+	Version = '0.11.0'
 
 	# Library path.
 
 	LibPath = File.dirname(__FILE__)
 
+	# If set to true, action methods can have arguments which are 
+	# automatically resolved.
+	#
+	# === Example 
+	#
+	# def list(username, oid)
+	# 	...
+	# end
+  # 
+	# http://www.mysite.com/list?username=tml;oid=2
+  #
+	# calls list() with the correct parameters, no need to 
+	# use request['oid'], just use oid.
+	#
+	# WARNING: this feature requires the ParseTree library which
+	# is not compatible with Windows.
+	
+	mattr_accessor :resolve_action_arguments, false
+
 end
+
+# gmosx: leave them here.
+
+require 'nitro/context'
+require 'nitro/dispatcher'
+require 'nitro/render'
+require 'nitro/conf'
+require 'nitro/runner'
+require 'nitro/component'

data/lib/nitro/adapters/cgi.rb

@@ -140,11 +140,26 @@ class CgiUtils
 	end
 
 	# Build the response headers for the context. 
+	#
+	# [+context+]
+	#		The context of the response.
+	#
+	# [+proto+]
+	#		If true emmit the protocol line. Useful for MOD_RUBY.
+	#--
+	# FIXME: return the correct protocol from env.
+	# TODO: Perhaps I can optimize status calc.
+	#++
 																																											
-	def self.response_headers(context)
+	def self.response_headers(context, proto = false)
 		reason = STATUS_STRINGS[context.status] 
-		buf = "HTTP/1.1 #{context.status} #{reason} #{EOL}"
-		
+
+		if proto
+			buf = "HTTP/1.1 #{context.status} #{reason}#{EOL}Date: #{CGI::rfc1123_date(Time.now)}#{EOL}"
+		else
+			buf = "Status: #{context.status} #{reason}#{EOL}"
+		end
+
 		context.response_headers.each do |key, value|
 			tmp = key.gsub(/\bwww|^te$|\b\w/) { |s| s.upcase }
 			buf << "#{tmp}: #{value}" << EOL
@@ -155,6 +170,8 @@ class CgiUtils
 		end if context.response_cookies
 			
 		buf << EOL
+
+		return buf
 	end
 	
 	# Initialize the request params.
@@ -184,6 +201,9 @@ class CgiUtils
 	end
 
 	# Parse a multipart request.
+	#--
+	# FIXME: implement me, not working
+	#++
 
 	def self.parse_multipart(context, boundary)
 		io = context.in

data/lib/nitro/adapters/webrick.rb

@@ -33,7 +33,7 @@ class Webrick
 		attr_accessor :server
 
 		def start(conf)
-			conf = Flexob.new(conf) unless conf.is_a?(Flexob)
+			conf = Conf.new(conf) unless conf.is_a?(Conf)
 			
 			# patch for OSX
 			
@@ -49,7 +49,7 @@ class Webrick
 				accesslog = STDERR
 				refererlog = STDERR
 			end
-	
+
 			@server = WEBrick::HTTPServer.new(
 				:BindAddress => conf.host, 
 				:Port => conf.port, 
@@ -70,6 +70,10 @@ class Webrick
 end
 
 # A Webrick Adapter for Nitro.
+#--
+# TODO: optimize the conversion from WEBrick's
+# parameters to the Nitro parameters.
+#++
 
 class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 
@@ -107,11 +111,13 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 			req.cookies.each { |c| context.cookies[c.name] = c.value }
 		
 			context.render(path)
-
+			
 			res.status = context.status
 			res.header = context.response_headers || {}
 			res.cookies = context.response_cookies || {}
 			res.body = context.out
+
+			context.close
 		end
 	ensure
 		# REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?