nitro 0.4.1 → 0.5.0

data/lib/nitro.rb

@@ -12,47 +12,6 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: nitro.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: nitro.rb 167 2004-11-23 14:03:10Z gmosx $
 
-# we want readable code
-
-require "English"
-require "pp"
-
-class NilClass
-	# quite usefull for error tolerant apps.
-	# a bit dangerous? Will have to rethink this.
-	#
-	def empty?
-		return true
-	end
-end
-
-class Class
-	#--
-	# gmosx: is this really needed?
-	#++
-	def to_i()
-		return self.hash()
-	end
-end
-
-module Kernel
-	# pretty prints an exception/error object
-	# usefull for helpfull debug messages
-	#
-	# Input:
-	# The Exception/StandardError object
-	#
-	# Output:
-	# the pretty printed string
-	#
-	def pp_exception(ex)
-		return %{#{ex.message}\n\tBACKTRACE:\n\t#{ex.backtrace.join("\n\t")}\n\tLOGGED FROM:\n\t#{caller[0]}}
-	end
-
-end
-
-# predefine some comonly used objects
-
-EMPTY_STRING = ""
+require 'glue'

data/lib/nitro/application.rb

@@ -9,12 +9,12 @@
 # Elias Karakoulakis  <ekarak@ktismata.com>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: application.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: application.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require 'optparse'
 require 'ostruct'
    
-require "nitro/logger"
+require "glue/logger"
 require "nitro"
 
 module N

data/lib/nitro/builders/rss.rb

@@ -0,0 +1,43 @@
+# code:
+# * George Moschovitis  <gm@navel.gr>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id$
+
+require 'rss/0.9'
+
+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.
+#++
+module RssBuilder
+	include RSS
+
+	def self.render(objects)
+		channel = RSS::Rss::Channel.new
+		channel.description = 'Syndication'
+		channel.link = $srv_url
+		
+		for obj in objects
+			item = Rss::Channel::Item.new
+			item.title = obj.title if obj.respond_to?(:title)
+			item.description = G::StringUtils.head(obj.body, 256) if obj.respond_to?(:body)
+			item.link = "#$srv_url/#{obj.view_uri}" if obj.respond_to?(:view_uri)
+			channel.items << item
+		end
+		
+		rss = Rss.new '0.9'
+		rss.channel = channel
+		
+		return rss.to_s
+	end
+	
+end
+
+end # module
+

data/lib/nitro/config.rb

@@ -6,10 +6,10 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: config.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: config.rb 167 2004-11-23 14:03:10Z gmosx $
 
-require 'nitro/logger'
-require 'nitro/utils/hash'
+require 'glue/logger'
+require 'glue/hash'
 require 'nitro/version'
 require 'nitro/service'
 require 'nitro/server/shaders'
@@ -45,6 +45,15 @@ $error_page_url = nil
 # default encoding for the app.
 $encoding = 'iso-8859-1'
 
+# Default template extesnion.
+$template_ext = 'xhtml'
+
+# Default xml template extension.
+$xml_template_ext = 'xml'
+
+# Default template.
+$index_template = 'index.xhtml'
+
 # default content type.
 $default_content_type = 'text/html'
 
@@ -53,7 +62,7 @@ $default_content_type = 'text/html'
 $services = { :index => N::Service }
 
 # The service method map.
-$methods = N::SafeHash.new
+$methods = G::SafeHash.new
 
 # The shader. The default shader is very simple, here
 # is a typical example of a production shader pipeline:

data/lib/nitro/{utils/html.rb → html.rb}

@@ -4,7 +4,7 @@
 # * Elias Karakoulakis  <ekarak@ktismata.com>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: html.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: html.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require "uri"
 require "cgi"
@@ -141,7 +141,7 @@ module HtmlUtils
 	# convert plain newlines into line breaks <br/>
 
 	def self.convert_newlines(string)
-		return nil unless N::StringUtils.valid?(string)
+		return nil unless G::StringUtils.valid?(string)
 		xstring = string.gsub(/\n/, "<br/>")
 		return xstring;
 	end

data/lib/nitro/{utils/http.rb → http.rb}

@@ -3,7 +3,7 @@
 # * Elias Karakoulakis  <ekarak@ktismata.com>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: http.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: http.rb 164 2004-11-18 11:47:50Z gmosx $
 
 require "uri"
 require "cgi"

data/lib/nitro/{utils/mail.rb → mail.rb}

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: mail.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: mail.rb 164 2004-11-18 11:47:50Z gmosx $
 
 require "net/smtp"
 

data/lib/nitro/scaffold.rb

@@ -0,0 +1,80 @@
+# code: 
+# * George Moschovitis  <gm@navel.gr>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id$
+
+require 'glue/inflector'
+
+module N
+
+module Scaffolding
+
+	# 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(SingletonMethods)
+	end
+
+	module SingletonMethods 
+		# Enchant the caller with a number of default methods.
+		# Override the automatically generated methods as needed.
+		#
+		def scaffold(klass, options = {})
+			
+			oid = options[:oid] || 'oid'
+			name = options[:name] || G::Inflector.name(klass.name)
+			list_name = options[:list_name] || G::Inflector.plural_name(name)
+			suffix = "_#{name}"
+
+			# Add methods to the scaffolded class.
+			
+			klass.module_eval <<-"end_eval", __FILE__, __LINE__
+				
+				def view_uri
+					"view#{suffix}?oid=\#\{@oid\}"
+				end
+				
+			end_eval
+			
+			# Add methods to the service.
+			
+			if options[:index]
+				module_eval <<-"end_eval", __FILE__, __LINE__
+					
+					def index
+						list#{suffix}
+					end
+					
+				end_eval
+			end
+		
+			module_eval <<-"end_eval", __FILE__, __LINE__
+				
+				# TODO: add pager support here!
+				def list#{suffix}
+					@#{list_name} = #{klass}.all('ORDER BY oid')
+				end
+				
+				def view#{suffix}
+					@#{name} = #{klass}[@params['#{oid}']]
+				end
+				
+				def save#{suffix}
+				end
+				
+				def del#{suffix}
+					#{klass}.delete(@params['#{oid}'])
+				end
+				alias_method :delete#{suffix}, :del#{suffix}
+				
+			end_eval
+			
+		end
+	end
+
+end
+
+end # module

data/lib/nitro/server/appserver.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: appserver.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: appserver.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require "drb"
 
@@ -26,7 +26,7 @@ module AppServerMixin
 			$sessions = DRbObject.new(nil, $drb_sessions_cluster)
 		else
 			# NoCluster mode: use standard Ruby onjects.
-			$lm = N::SafeHash.new
+			$lm = G::SafeHash.new
 			$sessions = N::SessionManager.new
 		end
 

data/lib/nitro/server/cluster.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: cluster.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: cluster.rb 167 2004-11-23 14:03:10Z gmosx $
 
 $:.unshift "lib"
 
@@ -11,7 +11,7 @@ require "monitor"
 
 require "nitro/application"
 require "nitro/server"
-require "nitro/utils/cache"
+require "glue/cache"
 require "nitro/server/session"
 
 module N

data/lib/nitro/server/dispatcher.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: dispatcher.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: dispatcher.rb 167 2004-11-23 14:03:10Z gmosx $
 
 require 'nitro/server/render'
 
@@ -19,16 +19,13 @@ module Dispatcher
 			
 			session = create_session(request, response)
 			render(request.request_uri.path, request, response, session)
-			
-			unless response.header['Content-Type']
-				response.header['Content-Type'] = $default_content_type
-			end
 			response.body = @out 
 		rescue Exception, StandardError => e
 			$log.error "error while handling the request #{request.request_uri}"
 			$log.error pp_exception(e)
 
 			if $error_page_url
+				# gmosx: SOS: TEST ME!
 				# internal redirect to error page. 
 				request.request_uri.path = $error_page_url
 				retry

data/lib/nitro/server/filters/autologin.rb

@@ -2,9 +2,9 @@
 # * George Moschovitis
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: autologin.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: autologin.rb 167 2004-11-23 14:03:10Z gmosx $
 
-require "nitro/utils/string"
+require "glue/string"
 require "nitro/server/filters"
 
 require_part "users"

data/lib/nitro/server/fragment.rb

@@ -2,10 +2,10 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: fragment.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: fragment.rb 167 2004-11-23 14:03:10Z gmosx $
 
-require "nitro/utils/cache"
-require "nitro/mixins"
+require "glue/cache"
+require "glue/mixins"
 
 module N
 
@@ -28,8 +28,8 @@ module N
 # - can run background cron scripts over the fragments (compression)
 #
 class Fragment
-	include N::Expirable
-	include N::LRUCache::Item
+	include G::Expirable
+	include G::LRUCache::Item
 
 	# precompiled flags for fragment key "customization"
 

data/lib/nitro/server/handlers.rb

@@ -2,9 +2,9 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: handlers.rb 155 2004-11-13 20:32:12Z gmosx $
+# $Id: handlers.rb 167 2004-11-23 14:03:10Z gmosx $
 
-require "nitro/utils/cache"
+require "glue/cache"
 require "nitro/server/filters"
 
 module N
@@ -50,7 +50,7 @@ class ScriptHandler < Handler
 
 	# cache the compiled page scripts to optimize future references.
 	# use a thread safe cache.
-	@@compiled_script_cache = N::SafeHash.new()
+	@@compiled_script_cache = G::SafeHash.new()
 
 	# dont allow 2 threads to compile the same script. In fact dont allow
 	# two threads to compile in parallel.

data/lib/nitro/server/render.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: render.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: render.rb 167 2004-11-23 14:03:10Z gmosx $
 
 module N
 
@@ -23,6 +23,14 @@ module RenderUtils
 	#	/blog -> blog, index, nil
 	# 
 	def self.split_path(path)
+		# paths that start with rest/xxx are REST requests.
+		# FIXME: better chack here!
+		if path.slice!(/rest\//)
+			api = :rest
+		else
+			api = :http
+		end
+		
 		parts = path.split('/')
 		
 		case parts.size
@@ -45,58 +53,91 @@ module RenderUtils
 				meth = parts[2]
 		end
 		
-		return base, render_class, meth
+#		p '--', api, base, render_class, meth, '--'
+		
+		return api, base, render_class, meth
 	end
 
-	# Transform an xhtml file to ruby rendering code.
+	# Given the method try find the matching template.
+	# Can search for xhtml or xml templates.
+	# Returns nil if no template file is found.
 	#
-	def self.transform_xhtml(path)
+	def self.template_for_method(base, meth, ext = $template_ext)
+		# attempt to find a template of the form
+		# base/meth.xhtml
+		path = "#$root_dir/#{base}/#{meth}.#{ext}".squeeze('/')
+		
+		unless File.exist?(path)
+			# attempt to find a template of the form
+			# base/meth/index.xhtml
+			path = "#$root_dir/#{base}/#{meth}/#{$index_template}".squeeze('/')
+			
+			unless File.exist?(path)
+				# No template found!
+				path = nil
+			end
+		end
+		
+		return path
+	end
+	
+	# Transform a template to ruby rendering code.
+	#
+	def self.transform_template(path)
 		$log.debug "Transforming '#{path}'" if $DBG
 
 		text = File.read(path)
 		hash, text = $shader.process(path, text)
+		
 		return text
 	end
+
 	
-	# Compile a rendering method.
+	# Compile a HTTP method.
 	#	
-	def self.compile_method(klass, base, meth)
-		$log.debug "Compiling '#{klass}:#{meth}'" if $DBG
+	def self.compile_http_method(klass, base, meth)
+		$log.debug "Compiling HTTP method '#{klass}:#{meth}'" if $DBG
 
-		xhtml_path = "#$root_dir/#{base}/#{meth}.xhtml".squeeze('/')
+		valid = false
 		
 		code = %{
 			def __#{meth}
+				@response.header['Content-Type'] = 'text/html'
 				@out ||= ''
 		}
 
 		if klass.instance_methods.include?(meth)
+			valid = true
 			code << %{
 				#{meth}();
 			}
 		end
 
-		if klass.instance_methods.include?("#{meth}_xhtml")
+		if klass.instance_methods.include?("#{meth}__xhtml")
+			valid = true
 			code << %{
-				#{meth}_xhtml();
+				#{meth}__xhtml();
 			}
 		end
 		
-		if xhtml_exists = File.exist?(xhtml_path)
+		if template = template_for_method(base, meth)
+			valid = true
 			code << %{
 				__#{meth}_xhtml();
 			}
 		end
 		
+		raise "Invalid method '#{meth}' for service '#{klass}'!" unless valid
+		
 		code << %{
 				redirect_referer if @out.empty?
 			end
 		}
 		
-		if xhtml_exists = File.exist?(xhtml_path)
+		if template
 			code << %{
 				def __#{meth}_xhtml
-					#{transform_xhtml(xhtml_path)}
+					#{transform_template(template)}
 				end
 			}
 		end
@@ -105,6 +146,60 @@ module RenderUtils
 		
 		return "__#{meth}"
 	end
+
+	# Compile a REST method.
+	#	
+	def self.compile_rest_method(klass, base, meth)
+		$log.debug "Compiling REST method '#{klass}:#{meth}'" if $DBG
+
+		valid = false
+		
+		code = %{
+			def __rest_#{meth}
+				@response.header['Content-Type'] = 'text/xml'
+				@out ||= ''
+		}
+
+		if klass.instance_methods.include?(meth)
+			valid = true
+			code << %{
+				#{meth}();
+			}
+		end
+
+		if klass.instance_methods.include?("#{meth}__xml")
+			valid = true
+			code << %{
+				#{meth}__xml();
+			}
+		end
+		
+		if template = template_for_method(base, meth, 'xml')
+			valid = true
+			code << %{
+				__#{meth}_xml();
+			}
+		end
+		
+		raise "Invalid method '#{meth}' for service #{klass}!" unless valid
+		
+		code << %{
+			end
+		}
+		
+		if template
+			code << %{
+				def __#{meth}_xml
+					#{transform_template(template)}
+				end
+			}
+		end
+
+		klass.class_eval(code)
+		
+		return "__rest_#{meth}"
+	end
+
 	
 end
 
@@ -128,6 +223,11 @@ module Render
 	# user session.
 	attr_accessor :session
 	
+	# An array holding the rendering errors for this
+	# request.
+	#
+	attr_accessor :rendering_errors
+	
 	def initialize(base_path = '', request = nil, response = nil, session = nil)
 		@base_path = base_path
 		@request = request
@@ -150,17 +250,34 @@ module Render
 		base, render_class, meth = $methods[path]
 		
 		unless meth
-			base, render_class, meth = RenderUtils.split_path(path)
-			meth = RenderUtils.compile_method(render_class, base, meth)
+			api, base, render_class, meth = RenderUtils.split_path(path)
+			
+			raise "Invalid service!" unless render_class
+			
+			case api
+				when :http
+				meth = RenderUtils.compile_http_method(render_class, base, meth)
+				when :rest
+				meth = RenderUtils.compile_rest_method(render_class, base, meth)
+			end
+				
 			$methods[path] = [base, render_class, meth] unless $reload_scripts
 		end
 
-		if self.class == render_class
-			self.send(meth)
-		else
-			r = render_class.new(base, @request, @response, @session)
-			r.send(meth)
-			@out = r.out
+		begin
+			if self.class == render_class
+				self.send(meth)
+			else
+				r = render_class.new(base, @request, @response, @session)
+				r.send(meth)
+				@out = r.out
+			end
+		rescue Exception, StandardError => e
+			log_error "error while handling '#{path}'."
+			log_error pp_exception(e)
+			# more fault tolerant, only flags the erroneous box with 
+			# errorm not the full page.
+			@out << '(error)'
 		end
 
 		# stop the filter pipeline
@@ -177,7 +294,6 @@ module Render
 	#
 	def redirect(url, status = 303)
 		begin
-#			url = "#$srv_url/#{url}".squeeze('/') unless url =~ /^http/
 			@response.status = status
 			@response.set_redirect(status, url)
 		rescue Exception, StandardError => ex
@@ -194,6 +310,13 @@ module Render
 		redirect(@request.referer, status)
 	end
 
+	# Log a rendering error.
+	#
+	def log_error(str)
+		@rendering_errors ||= []
+		@rendering_errors << str
+		$log.error str
+	end
 end
 
 end # module