nitro 0.17.0 → 0.18.0

data/lib/nitro/markup.rb

@@ -1,6 +1,4 @@
-# George Moschovitis  <gm@navel.gr>
-# (c) 2004 Navel, all rights reserved.
-# $Id: markup.rb 7 2005-04-12 14:24:10Z gmosx $
+require 'redcloth'
 
 require 'glue/property'
 
@@ -127,4 +125,23 @@ module Markup
 	
 end
 
+# Markup shader.
+#
+# === Examples
+#
+# <h1>#{{Welcome}}</h1>
+
+class MarkupShader < Shader
+	
+	def process(hash, text)
+		# handle strings 
+		text.gsub!(/\#\{\{(.*?)\}\}/, '#{RedCloth.new(\1).to_html}')
+
+		process_next(hash, text)
+	end
+
 end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/output.rb

@@ -1,12 +1,8 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: output.rb 1 2005-04-11 11:04:30Z gmosx $
-
-require 'nitro/builders/xml'
-require 'nitro/builders/xhtml'
-require 'nitro/builders/rss'
-require 'nitro/builders/form'
-require 'nitro/builders/table'
+require 'nitro/builder/xml'
+require 'nitro/builder/xhtml'
+require 'nitro/builder/rss'
+require 'nitro/builder/form'
+require 'nitro/builder/table'
 
 module Nitro
 	

data/lib/nitro/part.rb

@@ -1,11 +1,11 @@
-# UNDER CONSTRUCTION, dont use yet!
+# WARNING: UNDER CONSTRUCTION, dont use yet!
 
 require 'glue/attribute'
 
 module Nitro
 
 	class Part
-		cattr_accessor :parts_root, "/home/gmosx/private/plasma/parts"
+		cattr_accessor :parts_root, '/home/gmosx/private/plasma/src'
 	end
 	
 end
@@ -20,4 +20,3 @@ module Kernel
 	end
 
 end
-

data/lib/nitro/render.rb

@@ -6,6 +6,7 @@ require 'glue/object'
 
 require 'nitro/shaders'
 require 'nitro/buffering'
+require 'nitro/errors'
 
 module Nitro
 
@@ -25,6 +26,10 @@ module Rendering
 
 	@@sync = Sync.new
 
+	# The default template root
+	
+	mattr_accessor :default_template_root, 'public'
+	
 	# The default template name (no extension).
 
 	mattr_accessor :default_template, 'index'
@@ -54,20 +59,18 @@ module Rendering
 	# Returns nil if no template file is found.
 	
 	def self.template_for_action(template_root, action, ext = :xhtml)
-
 		# attempt to find a template of the form
 		# template_root/action.xhtml
 
 		path = "#{template_root}/#{action.gsub(/__/, '/')}.#{ext}".squeeze('/')
-	
+		
 		unless File.exist?(path)
-
 			# attempt to find a template of the form
 			# template_root/action/index.xhtml
 
 			path = "#{template_root}/#{action.gsub(/__/, '/')}/#{Rendering.default_template}.#{ext}".squeeze('/')
 
-			unless File.exist?(path)
+			unless File.exist?(path)	
 				# No template found!
 				path = nil
 			end
@@ -89,7 +92,7 @@ module Rendering
 	
 	# Compile a controller action.
 	
-	def self.compile_action(klass, action, template_root)
+	def self.compile_action(klass, action)
 		@@sync.synchronize do
 			Aspects.include_advice_modules(klass)
 			
@@ -99,7 +102,7 @@ module Rendering
 
 			return false unless action
 
-			Logger.debug "Compiling action '#{template_root}/#{action}'" if $DBG
+			Logger.debug "Compiling action '#{klass.template_root}/#{action}'" if $DBG
 
 			valid = false
 			
@@ -166,13 +169,23 @@ module Rendering
 			end
 			view ||= action
 
-			if (template = template_for_action(template_root, view.to_s)) or 
-					klass.instance_methods.include?("#{action}_template")
-				valid = true
-
-				code << %{
-					#{action}_template;
-				}
+			cklass = klass
+			
+			while cklass.respond_to?(:template_root)
+				if template = template_for_action(cklass.template_root, view.to_s)
+					valid = true
+					code << %{
+						#{action}_template;
+					}
+					break
+				end 
+				
+				# don't search in parent template roots if an
+				# action is defined.
+				
+				break if valid
+				
+				cklass = cklass.superclass
 			end
 
 			# raise "Invalid action '#{action}' for '#{klass}'!" unless valid
@@ -194,26 +207,28 @@ module Rendering
 				end
 			}
 			
+			# First compile the action method. 
+			
+#			begin
+				klass.class_eval(code)
+#			rescue SyntaxError => e
+#				raise ActionCompileError.new(code, action, e)
+#			end
+			
+			# Try to compile the template (if exists).
+			
 			if template
-				code << %{
+				code = %{
 					def #{action}_template
 						#{transform_template(template, Rendering.shader)}
 					end
 				}
-			end
-
-			# puts '---', klass, '==', code, '---'
-
-			begin
-				# FIXME: replace with correct file, line. search for
-				# lines in error radius.
-				klass.class_eval(code, __FILE__, __LINE__)
-			rescue SyntaxError => e
-				where = "Action: #{action}"
-				where += ", Template: #{template}" if template
-				Logger.error "Action compilation error, #{where}"
-				Logger.error e
-				return false
+				
+				begin
+					klass.class_eval(code, template)
+				rescue SyntaxError => e
+					raise TemplateCompileError.new(code, template, e)
+				end				
 			end
 		end
 
@@ -307,9 +322,11 @@ private
 	# Send a redirect response.
 	
 	def redirect(url, status = 303)
+		url = url.to_s
+  	url = "#{@context.host_url}/#{url.gsub(/^\//, '')}" unless url =~ /http/
 		@context.status = status
-		@context.out = "<html><a href=\"#{url.to_s}\">#{url.to_s}</a>.</html>\n"
-		@context.response_headers['location'] = url.to_s
+		@context.out = "<html><a href=\"#{url}\">#{url}</a>.</html>\n"
+		@context.response_headers['location'] = url
 
 		raise RenderExit
 	end
@@ -363,3 +380,5 @@ private
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/request.rb

@@ -116,9 +116,10 @@ module Request
 	end
 
 	# The server host name.
+	# Also handles proxy forwarding.
 
 	def host
-		@headers['HTTP_HOST'] 
+		@headers['HTTP_X_FORWARDED_HOST'] || @headers['HTTP_HOST'] 
 	end
 
 	def host_url

data/lib/nitro/runner.rb

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
 
-# * George Moschovitis  <gm@navel.gr>
-# * James Britt  <james_b@neurogami.com>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: runner.rb 9 2005-04-13 00:08:20Z nasis $
-
 require 'optparse'
 
 require 'glue/misc'
@@ -222,12 +217,12 @@ class Runner
 	alias_method :setup_production, :setup_live
 	
 	def invoke_fcgi_proc(conf)
-		require 'nitro/adapters/fastcgi'
+		require 'nitro/adapter/fastcgi'
 		FastCGI.start(conf)
 	end
 
   def invoke_cgi_proc(conf)
-		require 'nitro/adapters/cgi'
+		require 'nitro/adapter/cgi'
 		Cgi.start(conf)
 	end
 
@@ -258,19 +253,19 @@ class Runner
 
 			case @server
 				when :webrick
-					require 'nitro/adapters/webrick'
+					require 'nitro/adapter/webrick'
 					Webrick.start(conf)
-					
+
 				when :lhttpd
-					require 'nitro/adapters/fastcgi'
+					require 'nitro/adapter/fastcgi'
 					`lighttpd -f conf/lhttpd.conf`
 
 				when :apache
-					require 'nitro/adapters/fastcgi'
+					require 'nitro/adapter/fastcgi'
 					`apachectl -d #{Dir.pwd} -f conf/apache.conf -k start`
 
 				when :cgi
-					require 'nitro/adapters/cgi'
+					require 'nitro/adapter/cgi'
 			end
 		
 		when :stop
@@ -287,6 +282,18 @@ class Runner
 		end
 	end
 
+	def daemonize
+		require 'daemons/daemonize'
+		pwd = Dir.pwd
+		Daemonize.daemonize(File.join(pwd, 'log/app.log'))
+		# Restore the original pwd (daemonize sets the 
+		# pwd to '/').
+		Dir.chdir(pwd)
+		# Set the logger to a file (daemonize closes the
+		# std streams).
+		Logger.set(Logger.new('log/app.log'))
+	end
+
 	# Helper method.
 
 	def self.run(conf)
@@ -313,6 +320,7 @@ end
 
 def self.run(conf = nil)
 	runner = Runner.new.setup
+	runner.daemonize if runner.daemon
 	conf ||= Conf.new({})
 	$nitro_environment = conf
 	yield(conf) if block_given?
@@ -320,3 +328,6 @@ def self.run(conf = nil)
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>
+# * James Britt <james_b@neurogami.com>

data/lib/nitro/scaffold.rb

@@ -1,4 +1,6 @@
-require 'glue/inflector'
+require 'facet/string/singular'
+require 'facet/string/demodulize'
+require 'facet/string/underscore'
 
 module Nitro
 
@@ -23,8 +25,8 @@ module Scaffolding
 		def scaffold(klass, options = {})
 			
 			oid = options[:oid] || 'oid'
-			name = options[:name] || Inflector.name(klass.name)
-			list_name = options[:list_name] || Inflector.plural_name(name)
+			name = options[:name] || klass.to_s.demodulize.underscore.downcase
+			list_name = options[:list_name] || name.plural
 			options[:nosuffix] ? suffix = nil : suffix = "_#{name}"
 
 			# Add methods to the scaffolded class.

data/lib/nitro/service.rb

@@ -0,0 +1,22 @@
+require 'nitro/controller'
+
+module Nitro
+
+class Service < Nitro::Controller
+	
+	def index
+		method, args = decode_request(request.raw_body)
+	
+		res = send(method, *args)
+		
+		response.content_type = 'text/xml'
+		print encode_response(method, res)
+
+		return :stop
+	end
+	
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/service/xmlrpc.rb

@@ -0,0 +1,42 @@
+require 'xmlrpc/marshal'
+
+require 'nitro/service'
+
+module Nitro
+
+# The XML-RPC protocol.
+
+module XmlRpc
+
+	# === In
+	#
+	# [+request+]
+	#		Raw request data.
+	#
+	# === Out
+	#
+	#	[+method+]
+	#	[+args+]	
+	
+	def decode_request(request)
+		method, args = XMLRPC::Marshal.load_call(request)
+		return method.gsub(/\./, '__'), args
+	end
+
+	def encode_response(method_name, response)
+		XMLRPC::Marshal.dump_response(response)
+	end
+
+	private
+
+end
+
+# The XML-RPC base service.
+
+class XmlRpcService < Service
+	include XmlRpc
+end
+	
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/session.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: session.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'md5'
 require 'webrick'
 
@@ -156,3 +152,5 @@ class SessionStore
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/template.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: template.rb 30 2005-04-25 12:28:02Z gmosx $
-
 require 'glue/flexob'
 
 module Nitro
@@ -79,20 +75,20 @@ module TemplateMixin
 		# Transform the processing instructions, use <?r as
 		# a marker.
 		
-		text.gsub!(/\?>/, "\n#{buffer} << %^")
-		text.gsub!(/<\?r(\s?)/, "^\n")
+		text.gsub!(/\?>/, "; #{buffer} << %^")
+		text.gsub!(/<\?r(\s?)/, "^; ")
 		
 		# Transform alternative code tags. 
 		# (very useful in xsl stylesheets)
 		
-		text.gsub!(/<\/ruby>/, "\n#{buffer} << %^")
-		text.gsub!(/<ruby>/, "^\n")
+		text.gsub!(/<\/ruby>/, "; #{buffer} << %^")
+		text.gsub!(/<ruby>/, "^; ")
 
 		# Also handle erb/asp/jsp style tags. Those tags
 		# *cannot* be used with an xslt stylesheet.
 
-		text.gsub!(/%>/, "\n#{buffer} << %^")
-		text.gsub!(/<%/, "^\n")
+		text.gsub!(/%>/, "; #{buffer} << %^")
+		text.gsub!(/<%/, "^; ")
 
 		# Alterative versions of interpolation.
 		# (very useful in xsl stylesheets)
@@ -186,3 +182,5 @@ class FileTemplate < Flexob
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>