nitro 0.9.3 → 0.9.5

data/lib/glue/number.rb

@@ -1,20 +1,14 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: number.rb 202 2005-01-17 10:44:13Z gmosx $
 
 module N;
 
-# = NumberUtils
-#
-# === Design:
-#
 # Implement as a module to avoid class polution. You can
 # still use Ruby's advanced features to include the module in your
 # class. Passing the object to act upon allows to check for nil,
 # which isn't possible if you use self.
-#
+
 module NumberUtils
 
 	# Returns the multiple ceil of a number
@@ -27,4 +21,4 @@ module NumberUtils
 
 end
 
-end # module
+end

data/lib/glue/time.rb

@@ -1,29 +1,23 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: time.rb 202 2005-01-17 10:44:13Z gmosx $
 
 require "time.rb"
 
 module N;
 
-# = Time
-#
 # General time utilities collection
 #
-# === Design:
-#
 # Implement as a module to avoid class polution. You can
 # still Ruby's advanced features to include the module in your
 # class. Passing the object to act upon allows to check for nil,
 # which isn't possible if you use self.
 #
-# === TODO:
+# == TODO
 #
 # - SOS: add test units.
 # - add aliases for those methods in Kernel ?
-#
+
 module TimeUtils
 
 	NOW = Time.now
@@ -31,13 +25,13 @@ module TimeUtils
 	ZERO = Time.mktime(1972)
 
 	# Convert the time to a nice String representation. 
-	#	
+		
 	def self.date_time(time)
 		return nil unless time 
 		return time.strftime("%d-%m-%Y %H:%M")
 	end
 	
-	# this method calculates the days extrema given two time objects.
+	# This method calculates the days extrema given two time objects.
 	# start time is the given time1 at 00:00:00
 	# end time is the given time2 at 23:59:59:999
 	#
@@ -48,7 +42,7 @@ module TimeUtils
 	# Output
 	# - the time range. you can get the start/end times using
 	#   range methods.
-	#
+	
 	def self.days_extrema(time1, time2=nil)
 		time2 = time1 if (not time2.valid? Time)
 		time2 = NEVER if (time2 <= time1)
@@ -57,24 +51,23 @@ module TimeUtils
 		return (start_time..end_time)
 	end
 
-	#
-	# set time to start of day
-	#
+	# Set time to start of day
+	
 	def self.start_of_day(time)
 		return Time.mktime(time.year, time.month, time.day, 0, 0, 0, 0)
 	end
 
-	#
-	# set time to end of day
-	#
+	
+	# Set time to end of day
+	
 	def self.end_of_day(time)
 		return Time.mktime(time.year, time.month, time.day, 23, 59, 59, 999)
 	end
 
 
-	# returns true only if day of time is included in the
+	# Returns true only if day of time is included in the
 	# range (stime..etime). Only year days are checked.
-	#
+	
 	def self.time_in_day_range(time, stime=ZERO, etime=NEVER)
 		if (etime <= stime)
 			Logger.debug "Invalid end time (#{etime} < #{stime})" if $DBG
@@ -89,5 +82,4 @@ module TimeUtils
 
 end
 
-end # module
-
+end 

data/lib/glue/validation.rb

@@ -1,11 +1,9 @@
-# George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
 module N 
 
-# = Validation
-#
 # Implements a meta-language for validating managed
 # objects. Typically used in Validator objects but can be
 # included in managed objects too.

data/lib/nitro.rb

@@ -10,11 +10,9 @@
 # Nitro integrates the powerful Og Object-Relational mapping 
 # library.
 #
-#--
-# George Moschovitis  <gm@navel.gr>
+# * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
 # $Id: nitro.rb 215 2005-01-24 10:44:05Z gmosx $
-#++
 
 require 'glue'
 require 'glue/logger'

data/lib/nitro/adaptors/fastcgi.rb

@@ -9,6 +9,8 @@ require 'nitro/context'
 require 'nitro/dispatcher'
 require 'nitro/adaptors/cgi'
 
+require 'glue/flexob'
+
 module N
 
 # FastCGI Adaptor. FastCGI is a language independent, 
@@ -19,7 +21,10 @@ module N
 class FastCGI
 
 	def self.start(conf)
+		conf = Flexob.new(conf) unless conf.is_a?(Flexob)
+		
 		FCGI.each do |cgi|
+
 			context = Context.new(conf)
 
 			context.in = cgi.in
@@ -28,8 +33,13 @@ class FastCGI
 			CgiUtils.parse_params(context)
 			CgiUtils.parse_cookies(context)
 			
+			# gmosx, TODO: move this into a filter.
+			Og.db.get_connection if defined?(Og)
+
 			context.render(context.path)
 
+			Og.db.put_connection if defined?(Og)
+
 			cgi.out.print(CgiUtils.response_headers(context))
 			cgi.out.print(context.out)
 

data/lib/nitro/adaptors/webrick.rb

@@ -1,11 +1,11 @@
-#--
-# George Moschovitis  <gm@navel.gr>
+# * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
 # $Id$
-#++
 
 require 'webrick'
 
+require 'glue/flexob'
+
 require 'nitro/context'
 require 'nitro/dispatcher'
 
@@ -33,24 +33,30 @@ class Webrick
 		attr_accessor :server
 
 		def start(conf)
+			conf = Flexob.new(conf) unless conf.is_a?(Flexob)
+			
 			# patch for OSX
 			
 			Socket.do_not_reverse_lookup = true
 	 
-			# if RUBY_PLATFORM =~ /mswin32/
-			#	accesslog = WEBrick::BasicLog::new('/dev/null')
-			#	referer = WEBrick::BasicLog::new('/dev/null')	
-			
-			accesslog = WEBrick::BasicLog::new('log/access.log')
-			referer = WEBrick::BasicLog::new('log/referer.log')	
-
+			if :none == conf.log and RUBY_PLATFORM !~ /mswin32/
+				accesslog = WEBrick::BasicLog::new('/dev/null')
+				refererlog = WEBrick::BasicLog::new('/dev/null')	
+			elsif (conf.accesslog || conf.refererlog)
+				accesslog = WEBrick::BasicLog::new(conf.accesslog || 'log/access.log')
+				refererlog = WEBrick::BasicLog::new(conf.refererlog || 'log/referer.log')	
+			else
+				accesslog = STDERR
+				refererlog = STDERR
+			end
+	
 			@server = WEBrick::HTTPServer.new(
 				:BindAddress => conf.host, 
 				:Port => conf.port, 
 				:DocumentRoot => conf.dispatcher.root,
 				:AccessLog => [
 					[accesslog, WEBrick::AccessLog::COMMON_LOG_FORMAT],
-					[referer, WEBrick::AccessLog::REFERER_LOG_FORMAT]
+					[refererlog, WEBrick::AccessLog::REFERER_LOG_FORMAT]
 				]
 			)
 			
@@ -66,6 +72,8 @@ end
 # A Webrick Adaptor for Nitro.
 
 class WebrickAdaptor < WEBrick::HTTPServlet::AbstractServlet
+
+	# REQUEST_MUTEX = Mutex.new
 		
   def initialize(server, conf)
 		@conf = conf
@@ -84,6 +92,11 @@ class WebrickAdaptor < WEBrick::HTTPServlet::AbstractServlet
     if path =~ /\./
 			@file_handler.do_GET(req, res)
 		else
+			# gmosx, TODO: move this into a filter.
+			Og.db.get_connection if defined?(Og)
+
+			# REQUEST_MUTEX.lock
+
 			context = Context.new(@conf)
 			
 			context.params = req.query 
@@ -100,6 +113,9 @@ class WebrickAdaptor < WEBrick::HTTPServlet::AbstractServlet
 			res.cookies = context.response_cookies || {}
 			res.body = context.out
 		end
+	ensure
+		# REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
+		Og.db.put_connection if defined?(Og)
 	end
 
 	alias do_GET handle 

data/lib/nitro/builders/rss.rb

@@ -1,32 +1,50 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: rss.rb 202 2005-01-17 10:44:13Z gmosx $
 
 require 'rss/0.9'
 
+require 'glue/string'
+
 module N
 
-# = RssBuilder
-#
 # Build RSS represenations of ruby object collections.
 # Utilize duck typing to grab the attributes to render.
 #--
 # TODO: add more options here, 1.0/2.0 support and more.
 #++
+
 class RssBuilder
 
-	def self.render(objects)
+	class << self
+		
+	# Options:
+	#
+	# [+:description+]
+	#		Description of the Feed
+	# [+:base+]
+	#		Base url of the Feed.
+	# [+:link+]
+	#		Link of the Feed.
+	
+	def render_0_9(objects, options = {})
+		c = {
+			:description => 'Syndication'
+		}.update(options)
+
+		c[:base] ||= c[:link]
+
+		raise "Option ':base' cannot be infered!" unless c[:base] 
+	
 		channel = RSS::Rss::Channel.new
-		channel.description = 'Syndication'
-		channel.link = $srv_url
+		channel.description = c[:description]
+		channel.link = c[:link] if c[:link] 
 		
 		for obj in objects
 			item = RSS::Rss::Channel::Item.new
 			item.title = obj.title if obj.respond_to?(:title)
 			item.description = N::StringUtils.head(obj.body, 256) if obj.respond_to?(:body)
-			item.link = "#$srv_url/#{obj.view_uri}" if obj.respond_to?(:view_uri)
+			item.link = "#{c[:base]}/#{obj.view_uri}" if obj.respond_to?(:view_uri)
 			channel.items << item
 		end
 		
@@ -35,8 +53,10 @@ class RssBuilder
 		
 		return rss.to_s
 	end
+	alias_method :render, :render_0_9
+
+	end
 	
 end
 
-end # module
-
+end

data/lib/nitro/builders/xhtml.rb

@@ -1,13 +1,11 @@
-# George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
 require 'nitro/builders/xml'
 
 module N
 
-# = XhtmlBuilderMixin
-#
 # A helper mixin for programmatically building XHTML 
 # blocks. 
 #--
@@ -78,8 +76,6 @@ module XhtmlBuilderMixin
 	end
 end
 
-# = XhtmlString
-#
 # A String extension with XHTML generation
 # functionality.
 
@@ -88,8 +84,6 @@ class XhtmlString < String
 	include N::XhtmlBuilderMixin
 end
 
-# = XhtmlBuilder
-#
 # A class that encapsulats the XHTML generation
 # functionality. Utilizes duck typing to redirect 
 # output to a target buffer.

data/lib/nitro/context.rb

@@ -7,6 +7,8 @@ require 'nitro/response'
 require 'nitro/render'
 require 'nitro/session'
 
+require 'nitro/builders/xhtml'
+
 module N
 	
 # Encapsulates an HTTP processing cycle context.
@@ -43,7 +45,7 @@ class Context
 	
 		# gmosx, FIXME: try to avoid creating this hash!
 		@response_headers = {}
-		@out = ''
+		@out = XhtmlString.new
 	end
 
 	# Lazy lookup of the session to avoid costly cookie

data/lib/nitro/dispatcher.rb

@@ -1,8 +1,6 @@
-#--
-# George Moschovitis  <gm@navel.gr>
+# * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
 # $Id$
-#++
 
 module N
 	
@@ -24,15 +22,34 @@ class Dispatcher
 
 	attr_accessor :apis
 
+	# Create a new Dispatcher.
+	#
+	# Input:
+	#
+	# [+controllers+]
+	#		Either a hash of controller mappings or a single
+	#		controller that gets mapped to :index.
+	#
+	# [+apis+]
+	# 	A hash of apis supported by the Dispatcher.
+	
 	def initialize(controllers = nil, apis = nil)
 		@root = 'root'
-		@controllers = controllers || { :index => Controller }
+		
+		if controllers and controllers.is_a?(Class) and controllers.ancestors.include?(Controller)
+			@controllers = { :index => controllers }
+		else
+			@controllers = controllers || { :index => Controller }
+		end
+
 		@apis = apis
 	end
 
 	# Process the given hash and mount the 
 	# defined controllers.
 	#
+	# Input:
+	#
 	# [+controllers+]
 	#		A hash representing the mapping of
 	#		mount points to controllers.

data/lib/nitro/filters.rb

@@ -1,8 +1,6 @@
-#-- 
-# George Moschovitis  <gm@navel.gr>
-# (c) 2004 Navel, all rights reserved.
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: filters.rb 215 2005-01-24 10:44:05Z gmosx $
-#++
 
 module N
 
@@ -29,7 +27,7 @@ module Filtering
 
 	# Ruby is sometimes VERY surprising, the following trick is needed
 	# to include singleton methods in other classes.
-	#
+	
 	def self.append_features(base)
 		super; base.extend(ClassMethods)
 	end
@@ -54,43 +52,45 @@ module Filtering
 		end
 		
 		#
-		#
+		
 		def prepend_before_filter(*filters, &block)
 			filters << block if block_given?
 			@@before_filters = filters + @@before_filters
 		end
 		
 		#
-		#
+		
 		def append_before_filter(*filters, &block)
 			filters << block if block_given?
 			@@before_filters = @@before_filters + filters
 		end
 		
 		# Alias for the most common case.
+
 		alias :before_filter :prepend_before_filter
 
 		#
-		#
+		
 		def prepend_after_filter(*filters, &block)
 			filters << block if block_given?
 			@@after_filters = filters + @@after_filters
 		end
 		
 		#
-		#
+		
 		def append_after_filter(*filters, &block)
 			filters << block if block_given?
 			@@after_filters = @@after_filters + filters
 		end
 		
 		# Alias for the most common case.
+
 		alias :after_filter :append_after_filter		
 	
 		# Install an arround Filter. A filter is a class that responds
 		# to the before and after methods. Both methods are prepended to
 		# the respective lists.
-		#
+		
 		def prepend_arround_filter(*filters)
 			filters = [filters].flatten
 			
@@ -108,7 +108,7 @@ module Filtering
 		# Install an arround Filter. A filter is a class that responds
 		# to the before and after methods. Both methods are appended to
 		# the respective lists.
-		#
+		
 		def append_arround_filter(*filters)
 			filters = [filters].flatten
 			
@@ -127,7 +127,7 @@ module Filtering
 		alias :filter :append_arround_filter
 		
 		#
-		#
+		
 		def gen_filters_call_code(filters)
 			code = ""