nitro 0.16.0 → 0.17.0

data/lib/nitro/adapters/fastcgi.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: fastcgi.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'cgi'
 require 'fcgi'
 
@@ -28,27 +24,29 @@ class FastCGI
 		conf = Flexob.new(conf) unless conf.is_a?(Flexob)
 		
 		FCGI.each do |cgi|
+			begin
+				context = Context.new(conf)
 
-			context = Context.new(conf)
-
-			context.in = cgi.in
-			context.headers = cgi.env
-
-			CgiUtils.parse_params(context)
-			CgiUtils.parse_cookies(context)
-			
-			# gmosx, TODO: move this into a filter.
-			Og.db.get_connection if defined?(Og) and Og.db
+				context.in = cgi.in
+				context.headers = cgi.env
 
-			context.render(context.path)
+				CgiUtils.parse_params(context)
+				CgiUtils.parse_cookies(context)
+				
+				# gmosx, TODO: move this into a filter.
+				# Og.db.get_connection if defined?(Og) and Og.db
 
-			Og.db.put_connection if defined?(Og) and Og.db
+				context.render(context.path)
 
-			cgi.out.print(CgiUtils.response_headers(context))
-			cgi.out.print(context.out)
+				# Og.db.put_connection if defined?(Og) and Og.db
 
-			cgi.finish
+				cgi.out.print(CgiUtils.response_headers(context))
+				cgi.out.print(context.out)
 
+				cgi.finish
+			ensure
+				# Og.db.put_connection if defined?(Og) and Og.db
+			end
 		end
 	end
 

data/lib/nitro/adapters/webrick.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: webrick.rb 9 2005-04-13 00:08:20Z nasis $
+# $Id: webrick.rb 41 2005-05-05 14:56:40Z gmosx $
 
 require 'webrick'
 require 'stringio'
@@ -103,7 +103,7 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 					path = req.request_uri.path
 
 					# gmosx, TODO: move this into a filter.
-					Og.db.get_connection if defined?(Og) and Og.db
+					# Og.db.get_connection if defined?(Og) and Og.db
 
 					# REQUEST_MUTEX.lock
 
@@ -131,7 +131,7 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 					context.close
 				ensure
 					# REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
-					Og.db.put_connection if defined?(Og) and Og.db
+					# Og.db.put_connection if defined?(Og) and Og.db
 				end
 			end
 		end

data/lib/nitro/buffering.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: buffering.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'glue/attribute'
 
 require 'nitro/shaders'

data/lib/nitro/builders/form.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: form.rb 1 2005-04-11 11:04:30Z gmosx $
+# (c) 2005 Navel, all rights reserved.
+# $Id: form.rb 30 2005-04-25 12:28:02Z gmosx $
 
 require 'glue/hash'
 require 'nitro/markup'
@@ -18,7 +18,7 @@ module FormBuilderMixin
 	#
 	#	<p>
 	#		<form name="test">
-	#			#{N::FormBuilder.render(entry)}
+	#			#{o.build_form(entry)}
 	#		</form>
 	#	</p>
 	

data/lib/nitro/builders/rss.rb

@@ -1,10 +1,7 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
-# $Id: rss.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'rss/0.9'
 
 require 'glue/string'
+require 'nitro/builders/xml'
 
 module Nitro
 
@@ -14,9 +11,13 @@ module Nitro
 #
 #--
 # TODO: add more options here, 1.0/2.0 support and more.
+# use custom version to add headers like the following.
+# <?xml version="1.0" encoding="UTF-8"?>
+# <?xml-stylesheet href="rss.css" type="text/css"?>
 #++
 
 module RssBuilderMixin
+	include XmlBuilderMixin
 
 	# === Options
 	#
@@ -55,6 +56,34 @@ module RssBuilderMixin
 	end
 	alias_method :build_rss, :build_rss_09
 
+=begin
+	Experimental.
+	
+	def build_rss(objects, options = {})
+		# pi! :xml, :version => '1.0', :encoding => 'UTF-8'
+		self << '<?xml version="1.0" encoding="UTF-8" ?>'
+		self <<	'<?xml-stylesheet href="rss.css" type="text/css" ?>'
+		rss(:version => '2.0', 
+				'xmlns:dc' => 'http://purl.org/dc/elements/1.1/', 
+				'xmlns:trackback' => 'http://madskills.com/public/xml/rss/module/trackback/') {
+			channel {
+				title 'koko' 
+				language 'en-us'
+				ttl '40'
+				description 'hello lamer'
+
+				for obj in objects
+					item {
+						title(obj.title)
+						description(obj.body)
+						trackback :ping => 'http://www.joy.gr'
+					}
+				end
+			}
+		}
+	end
+=end
+
 end
 
 # Abstract class for the RssBuilderMixin.

data/lib/nitro/builders/xhtml.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2005 Navel, all rights reserved.
-# $Id: xhtml.rb 1 2005-04-11 11:04:30Z gmosx $
+# $Id: xhtml.rb 25 2005-04-18 12:31:55Z gmosx $
 
 require 'nitro/builders/xml'
 

data/lib/nitro/builders/xml.rb

@@ -1,6 +1,6 @@
 # George Moschovitis  <gm@navel.gr>
 # (c) 2005 Navel, all rights reserved.
-# $Id: xml.rb 1 2005-04-11 11:04:30Z gmosx $
+# $Id: xml.rb 25 2005-04-18 12:31:55Z gmosx $
 
 module Nitro
 

data/lib/nitro/context.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: context.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'nitro/request'
 require 'nitro/response'
 require 'nitro/render'

data/lib/nitro/controller.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
-# $Id: controller.rb 20 2005-04-15 15:18:36Z gmosx $
-
 require 'glue/aspects'
 
 require 'nitro/render'

data/lib/nitro/dispatcher.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: dispatcher.rb 23 2005-04-16 18:20:00Z gmosx $
+# $Id: dispatcher.rb 30 2005-04-25 12:28:02Z gmosx $
 
 module Nitro
 
@@ -153,7 +153,7 @@ class Dispatcher
 		klass = @controllers[key]
 
 		if (:full == Rendering.reload) and context and context[:__RELOADED__].nil? and klass
-=begin	
+#=begin	
 			ancestors = [c = klass]
 			while (c = c.superclass) != Nitro::Controller
 				ancestors.unshift(c)
@@ -169,14 +169,14 @@ class Dispatcher
 				load(c::DEF_FILE)
 				c = Object.const_get(klass.name.intern) 
 			end
-=end
-#=begin	
+#=end
+=begin	
 			def_file = klass::DEF_FILE
 			# Object.send(:remove_const, klass) rescue nil
 			#	FIXME: also reload superclasses!
 			Controller.remove_subclasses
 			load(def_file)
-#=end
+=end
 			klass = @controllers[key] = Object.const_get(klass.name.intern) 
 			context[:__RELOADED__] = true
 		end

data/lib/nitro/element.rb

@@ -0,0 +1,151 @@
+require 'rexml/document'
+require 'rexml/streamlistener'
+
+require 'facet/string/capitalized%3F'
+
+module Nitro
+
+# A programmatically generated element.
+# 
+# === Design
+#
+# An underscore is used for the standard attibutes to
+# avoid name clashes.
+#--
+# TODO: 
+# * separate 'view' template files.
+#++
+
+class Element
+	# The parent of this element.
+	
+	attr_accessor :_parent
+	
+	# The childrens of this element.
+	
+	attr_accessor :_children
+	
+	# The text of this element.
+	
+	attr_accessor :_text
+
+	# The view of this element.
+	
+	attr_accessor :_view
+
+	def initialize(*args)
+		@_children = []
+		@_text = ''
+	end
+		
+	def open
+	end
+	
+	def content
+#		"#{@_text}#{render_children}"
+		@_text
+	end
+	
+	def close
+	end	
+
+	def render
+		"#{open}#{content}#{close}"
+	end
+
+	def render_children
+		str = ''
+		for c in @_children
+			str << c.render
+		end
+		
+		return str
+	end	
+	
+	def add_child(child)
+		child._parent = self	
+		@_children << child
+	end
+end
+
+# Processes a page containing elements.
+
+class ElementProcessor # :nodoc: all
+
+	class Listener # :nodoc: all
+		include REXML::StreamListener
+		
+		attr_accessor :buffer
+		attr_accessor :stack
+		
+		def initialize
+			super
+			@buffer = ''
+			@stack = []
+		end
+		
+		def tag_start(name, attributes)		
+			if name.capitalized?		
+				obj = Object.const_get(name).new
+				
+	    	attributes.each do | k, v | 
+	    		obj.instance_variable_set("@#{k}", v)
+	    	end	    	
+	    	
+	    	@stack.push [obj, @buffer]
+	    	
+	    	@buffer = obj._text
+		    @parent.add_child(obj) if @parent
+		    @parent = obj
+	    else # This is a static element.
+	    	attrs = []
+	    	
+	    	attributes.each do | k, v | 
+	    		attrs << %|#{k}="#{v}"|
+	    	end
+	    	
+	    	attrs = attrs.empty? ? nil : " #{attrs.join(' ')}"
+	    	
+				@buffer << "<#{name}#{attrs}>"
+			end
+		end
+
+		def tag_end(name)		
+			if name.capitalized?		
+				obj, @buffer = @stack.pop
+				@buffer << obj.render
+			else
+				@buffer << "</#{name}>"
+			end
+		end
+		
+		def text(str)
+			@buffer << str
+		end
+		
+		def instruction(name, attributes)
+			@buffer << "<?#{name}#{attributes}?>"
+		end
+	end
+	
+	class << self
+		def parse(source)
+			self.new.parse(source)
+		end
+		
+		def render(source)
+			self.new.render(source)
+		end
+
+	end
+
+	# Expand the elemens found in source.
+		
+	def render(source)
+		listener = Listener.new
+		REXML::Document.parse_stream(source, listener)
+		return listener.buffer
+	end
+end
+
+end

data/lib/nitro/part.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
-# $Id: part.rb 20 2005-04-15 15:18:36Z gmosx $
-
 # UNDER CONSTRUCTION, dont use yet!
 
 require 'glue/attribute'

data/lib/nitro/render.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
-# $Id: render.rb 20 2005-04-15 15:18:36Z gmosx $
-
 require 'sync'
 
 require 'glue/attribute'
@@ -12,8 +8,14 @@ require 'nitro/shaders'
 require 'nitro/buffering'
 
 module Nitro
+
+# Raise this exception to stop the current action.
+# Typically called to skip the template.
+
+class ActionExit < Exception; end
 	
-# Raise this exception to stop rendering.
+# Raise this exception to stop rendering altogether.
+# Typically called by redirects.
 
 class RenderExit < Exception; end
 
@@ -81,7 +83,7 @@ module Rendering
 
 		text = File.read(path)
 		hash, text = shader.process(path, text)
-		
+
 		return text
 	end
 	
@@ -111,20 +113,39 @@ module Rendering
 
 			code << Aspects.gen_advice_code(action, klass.advices, :pre) 
 
-			# call the action
+			# Call the action
 			
 			if klass.action_methods.include?(action)
 				valid = true
 
-				if meta = klass.action_metadata[action.intern]
+				# Annotated parameters.
+
+        if meta = klass.action_metadata[action.intern]
 					params = meta.params.keys
-					params = params.collect { |p| "@#{p} = @context['#{p}']" }
+				  params = params.collect { |p| "@#{p} = @context['#{p}']" }
 					code << "#{params.join(';')}"
 				end
+																																	
+				# Try to resolve action parameters.
+
+				param_count = klass.instance_method(action.intern).arity 
 				
-				code << %{
-					#{action}
-				}
+				if param_count > 0
+					code << %{
+						qs = context.query_string.split(/[&;]/)
+						
+						params = []
+						#{param_count}.times do |i|
+							params << qs.shift.split(/=/).last
+						end
+
+						unless :stop == #{action}(*params)
+					}
+				else
+					code << %{
+						unless :stop == #{action}
+					}
+				end
 			end
 
 			# Try to call the template method if it exists. It is a nice
@@ -136,12 +157,21 @@ module Rendering
 			# template file into a template method. It is an even better
 			# practice to place the output related code in an external
 			# template file.
-			
-			if (template = template_for_action(template_root, action)) or 
+
+			# Take :view metadata into account.
+
+			view = nil
+			if md = klass.action_metadata[action.intern] 
+				view = md[:view]
+			end
+			view ||= action
+
+			if (template = template_for_action(template_root, view.to_s)) or 
 					klass.instance_methods.include?("#{action}_template")
 				valid = true
+
 				code << %{
-					return unless #{action}_template;
+					#{action}_template;
 				}
 			end
 
@@ -152,9 +182,14 @@ module Rendering
 
 			code << Aspects.gen_advice_code(action, klass.advices, :post) 
 			
+			if klass.action_methods.include?(action)
+				code << %{
+					end
+				}
+			end
+
 			code << %{
 					@action_name = @parent_action_name
-				
 					redirect_referer if @out.empty?
 				end
 			}
@@ -169,13 +204,16 @@ module Rendering
 
 			# puts '---', klass, '==', code, '---'
 
-			where = "Action: #{action}"
-			where += ", Template: #{template}" if template
-
 			begin
-				klass.class_eval(code, where)
+				# FIXME: replace with correct file, line. search for
+				# lines in error radius.
+				klass.class_eval(code, __FILE__, __LINE__)
 			rescue SyntaxError => e
-				p e
+				where = "Action: #{action}"
+				where += ", Template: #{template}" if template
+				Logger.error "Action compilation error, #{where}"
+				Logger.error e
+				return false
 			end
 		end
 
@@ -192,8 +230,8 @@ end
 
 module Render
 
-	# The output buffer. The output of a script/action is accumulated
-	# in this buffer.
+	# The output buffer. The output of a script/action is 
+	# accumulated in this buffer.
 	
 	attr_accessor :out	
 
@@ -207,9 +245,9 @@ module Render
 	alias_method :ctx, :context
 	alias_method :ctx=, :context=
 	
-	# Alias for context.
+	# Aliases for context.
 
-	attr_accessor :request
+	attr_accessor :request, :response
 
 	# An array holding the rendering errors for this
 	# request.
@@ -226,7 +264,7 @@ module Render
 	#		A parent render/controller acts as the context.
 
 	def initialize(context, base = nil)
-		@request = @context = context
+		@request = @response = @context = context
 		@out = context.out
 	end
 
@@ -264,20 +302,6 @@ module Render
 		@out << '(error)'
 	end
 
-	# Add some text to the output buffer.
-
-	def render_text(text)
-		@out << text
-	end
-		
-	#--
-	# FIXME: do something better to stop the redirect.
-	#++
-
-	def render_nothing
-		@out = ' '
-	end
-
 private
 
 	# Send a redirect response.
@@ -321,6 +345,21 @@ private
 		@out
 	end
 
+	# Add some text to the output buffer.
+
+	def render_text(text)
+		@out << text
+	end
+	alias_method :print, :render_text
+		
+	#--
+	# FIXME: do something better to stop the redirect.
+	#++
+
+	def render_nothing
+		@out = ' '
+	end
+
 end
 
 end

data/lib/nitro/request.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: request.rb 9 2005-04-13 00:08:20Z nasis $
-
 module Nitro
 	
 # Encapsulates a request. This is an abstract request
@@ -129,6 +125,21 @@ module Request
 		"http://#{host}"
 	end
 
+	# The raw data of the request.
+	# Useful to implement Webservices.
+	#--
+	# FIXME: better name and implementation.
+	#++
+
+	def raw_body
+		unless @raw_body
+			@in.rewind
+			@raw_body = @in.read(content_length)
+		end
+
+		@raw_body
+	end
+	
 	# Lookup a query parameter.
 
 	def [](param)

data/lib/nitro/scaffold.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: scaffold.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'glue/inflector'
 
 module Nitro
@@ -32,9 +28,9 @@ module Scaffolding
 			options[:nosuffix] ? suffix = nil : suffix = "_#{name}"
 
 			# Add methods to the scaffolded class.
-			
+	
 			klass.module_eval %{ 
-				def view_uri
+				def to_href 
 					"view#{suffix}?oid=\#\{@oid\}"
 					# "view#{suffix}/\#\{@oid\}"
 				end

data/lib/nitro/shaders.rb

@@ -1,8 +1,7 @@
-# George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: shaders.rb 1 2005-04-11 11:04:30Z gmosx $
+# $Id: shaders.rb 56 2005-05-13 14:16:47Z gmosx $
 
 require 'nitro/template'
+require 'nitro/element'
 
 module Nitro
 
@@ -198,6 +197,8 @@ end
 class ElementsShader < Shader
 
 	def process(hash, text)
+		text = ElementProcessor.render(text)
+		process_next(hash, text)
 	end
 	
 end

data/lib/nitro/template.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: template.rb 9 2005-04-13 00:08:20Z nasis $
+# $Id: template.rb 30 2005-04-25 12:28:02Z gmosx $
 
 require 'glue/flexob'
 
@@ -96,11 +96,13 @@ module TemplateMixin
 
 		# Alterative versions of interpolation.
 		# (very useful in xsl stylesheets)
+		# Example: #(my_val)
 		
 		text.gsub!(/\#\((.*?)\)/, '#{\1}')
 
 		# Alternative for entities.
 		# (useful in xsl stylesheets)
+		# Examples: %nbsp;, %rquo;
 
 		text.gsub!(/%(\S*?);/, '&\1;')