nitro 0.10.0 → 0.11.0

data/lib/nitro/builders/form.rb

@@ -1,20 +1,16 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: form.rb 202 2005-01-17 10:44:13Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: form.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'glue/hash'
 require 'nitro/markup'
 
 module N
 
-# = FormBuilder
-#
-class FormBuilder
-	
-	@@cache = N::SafeHash.new
+# FormBuilder.
 
+module FormBuilderMixin
+	
 	# Render a standard form for the given managed object.
 	# If show_all is false then apply field filtering.
 	#
@@ -25,8 +21,8 @@ class FormBuilder
 	#			#{N::FormBuilder.render(entry)}
 	#		</form>
 	#	</p>
-	#
-	def self.render(obj, lc = nil, show_all = false)
+	
+	def build_form(obj, lc = nil, show_all = false)
 		str = '<dl>'
 		
 		for p in obj.class.__props
@@ -85,9 +81,21 @@ class FormBuilder
 		str << %{
 </dl>}
 		
-		return str
+		self << str
 	end
 	
 end
 
-end # module
+# Abstract class for the FormBuilderMixin.
+
+class FormBuilder
+	include FormBuilderMixin
+
+	class << self
+		def build(obj, lc = nil, show_all = false)
+			FormBuilder.new.build_form(obj, lc, show_all)
+		end
+	end
+end
+
+end 

data/lib/nitro/builders/rss.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: rss.rb 249 2005-02-04 14:03:00Z gmosx $
+# $Id: rss.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'rss/0.9'
 
@@ -10,15 +10,15 @@ module N
 
 # Build RSS represenations of ruby object collections.
 # Utilize duck typing to grab the attributes to render.
+# Add this mixin to you classes to support RSS rendering.
+#
 #--
 # TODO: add more options here, 1.0/2.0 support and more.
 #++
 
-class RssBuilder
+module RssBuilderMixin
 
-	class << self
-		
-	# Options:
+	# === Options
 	#
 	# [+:description+]
 	#		Description of the Feed
@@ -27,7 +27,7 @@ class RssBuilder
 	# [+:link+]
 	#		Link of the Feed.
 	
-	def render_0_9(objects, options = {})
+	def build_rss_09(objects, options = {})
 		c = {
 			:description => 'Syndication'
 		}.update(options)
@@ -51,12 +51,23 @@ class RssBuilder
 		rss = RSS::Rss.new '0.9'
 		rss.channel = channel
 		
-		return rss.to_s
+		self << rss.to_s
 	end
-	alias_method :render, :render_0_9
+	alias_method :build_rss, :build_rss_09
+
+end
+
+# Abstract class for the RssBuilderMixin.
 
+class RssBuilder < String
+	include RssBuilderMixin
+
+	class << self
+		def build_09(objects, options = {})
+			RssBuilder.new.build_rss_09(objects, options)
+		end
+	  alias_method :build, :build_09
 	end
-	
 end
 
 end

data/lib/nitro/builders/table.rb

@@ -1,23 +1,82 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: table.rb 185 2004-12-10 13:29:09Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: table.rb 266 2005-02-28 14:50:48Z gmosx $
 
 module N
 
-# = TableBuilder
+# The TableBuilder is a helper class that automates the creation
+# of tables from collections of objects. The resulting html
+# can be styled using css.
 #
-# Example:
+# === Example
 #
-# users = User.all
+# <?r
+# users = User.all.map { |u| [u.name, u.first_name, u.last_name, u.email] }
 # header = ['Username', 'First name', 'Last name', 'Email']
-# N::TableBuilder.render(users, header)
+# ?>
+# 
+# <div class="custom-table-class">
+#   #{N::TableBuilder.build(users, header)}
+# </div>
 #
-class TableBuilder
+# or:
+#
+# <div class="custom-table-class">
+#   #{@out.build_table(users, header)}
+# </div>
+#--
+# TODO: sorting, thead/tbody/legend etc, verbose...
+#++
+
+module TableBuilderMixin
+
+	# [+options+]
+	#		A hash of options.
+	# 
+	# :id = id of the component.
+	# :headers = an array of the header values
+	# :values = an array of arrays.
+
+	def build_table(options)
+		c = options
+
+		buf = '<table'
+		buf << %| id="#{c[:id]}"| if c[:id]
+		buf << '><tr>'
+
+		for h in c[:headers]
+			buf << %|<th>#{h}</th>|
+		end
+
+		buf << "</tr>"
+
+		for row in c[:values]
+			buf << "<tr>"
+			
+			for v in row
+				buf << %|<td>#{v}</td>|
+			end
+			
+			buf << "</tr>"
+		end
+
+		buf << "</table>"
+
+		return buf
+	end
+
 end
 
-end # module
+# Abstract class for the TableBuilderMixin.
 
+class TableBuilder
+	include TableBuilderMixin
 
+	class << self
+		def build(options)
+			TableBuilder.new.build_table(options)
+		end
+	end
+end
 
+end 

data/lib/nitro/builders/xhtml.rb

@@ -74,14 +74,23 @@ module XhtmlBuilderMixin
 			end
 		end
 	end
+
+	def submit(options = nil)
+		if options
+			opts = options.collect { |k, v| %[#{k}="#{v}"] }.join(' ')
+			self << %[<input type="submit" #{opts} />]
+		else
+			self << %|<input type="submit" />|
+		end
+	end
 end
 
 # A String extension with XHTML generation
 # functionality.
 
 class XhtmlString < String
-	include N::XmlBuilderMixin
-	include N::XhtmlBuilderMixin
+	include XmlBuilderMixin
+	include XhtmlBuilderMixin
 end
 
 # A class that encapsulats the XHTML generation
@@ -89,8 +98,8 @@ end
 # output to a target buffer.
 
 class XhtmlBuilder
-	include N::XmlBuilderMixin
-	include N::XhtmlBuilderMixin
+	include XmlBuilderMixin
+	include XhtmlBuilderMixin
 
 	# The target receives the generated xml,
 	# should respond_to :<<

data/lib/nitro/component.rb

@@ -0,0 +1,15 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: component.rb 266 2005-02-28 14:50:48Z gmosx $
+
+require 'nitro/controller'
+
+module N
+	
+# A Web Component. A Component extends from the 
+# base controller class.
+	
+class Component < Controller
+end
+
+end

data/lib/nitro/conf.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: conf.rb 260 2005-02-15 08:58:04Z gmosx $
+# $Id: conf.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'glue/flexob'
 
@@ -19,8 +19,9 @@ class Conf < Flexob
 
 		hash = {
 			:name => 'Nitro Application',
-			:host => 'localhost',
-			:port => 8069,
+			# this is accessible as localhost on windows
+			:host => '0.0.0.0',
+			:port => 9999,
 			:dispatcher => Dispatcher.new
 		}
 		

data/lib/nitro/context.rb

@@ -6,8 +6,8 @@ require 'nitro/request'
 require 'nitro/response'
 require 'nitro/render'
 require 'nitro/session'
-
-require 'nitro/builders/xhtml'
+require 'nitro/output'
+require 'nitro/adapters/cgi.rb'
 
 module N
 	
@@ -25,7 +25,8 @@ class Context
 
 	# The session contains variables that stay alive 
 	# for the full user session. Session variables
-	# should be generally avoided.
+	# should be generally avoided. This variable
+	# becomes populated ONLY if needed.
 
 	attr_reader :session
 
@@ -33,27 +34,34 @@ class Context
 
 	attr_accessor :dispatcher
 
-	# The sessions.
-
-	attr_accessor :sessions
-
 	def initialize(conf)
 		@conf = conf
 		@dispatcher = @conf.dispatcher
 		@context = self
-		@sessions = Session.manager 
-	
-		# gmosx, FIXME: try to avoid creating this hash!
-		@response_headers = {}
-		@out = XhtmlString.new
+
+		# initialize response.
+		
+		@status = CgiUtils::STATUS_OK
+		@response_headers = { 'Content-Type' => 'text/html' }
+
+		# initialize the output buffer.
+
+		@out = OutputBuffer.new
 	end
 
+	# Close the context, should be called at the 
+	# end of the HTTP request handling code.
+
+	def close
+		@session.sync if @session
+	end
+	alias_method :finish, :close
+	
 	# Lazy lookup of the session to avoid costly cookie
 	# lookup when not needed.
 
 	def session
-		return @session if @session
-		return @session = Session.lookup(self)
+		@session || @session = Session.lookup(self)
 	end
 
 	# Populate an object from request parameters.

data/lib/nitro/controller.rb

@@ -36,14 +36,72 @@ class Controller
 			}	
 			__old_inherited(subclass)
 		end
-	end
 
-end
+		# Return the 'action' methods for this Controller.
+		# Some dangerous methods from ancestors are removed.
+		
+		def action_methods
+    	classes = self.ancestors.reject do |a| 
+				[Object, Kernel, Render].include?(a) 
+			end
+			
+			methods =  classes.inject([]) do |action_methods, klass| 
+				action_methods + klass.public_instance_methods(false) 
+			end
+			
+			methods.delete('method_missing')
+
+			# temp hack, FIXME:
+
+			methods.delete('pretty_print')
+			methods.delete('pretty_print_cycle')
+			methods.delete('pretty_print_instance_variables')
+			methods.delete('pretty_print_inspect')
+			
+			return methods
+		end
 
-# A simple controller, only handles templates.
-# Useful to implement php/asp/jsp style applications.
+		# Return the arguments of the given action.
+		
+		def action_method_arguments(action)
+			if Nitro.resolve_action_arguments
+				unless defined?(ArgsProcessor)
+					begin
+						require_gem 'ParseTree'
+						require 'parse_tree'
+						require 'sexp_processor'
+					rescue
+						# No parse tree support
+					end
+					
+					Object.class_eval %{
+						class ArgsProcessor < SexpProcessor # :nodoc:
+							attr_accessor :args
 
-class SimpleController < Controller
+							def initialize
+								super
+								@require_empty = false
+							end
+
+							def process_args(exp)
+								@args = exp.slice(1..-1)
+								return Sexp.new(exp)
+							end
+						end
+					}
+				end
+
+				ptree = ParseTree.new
+				sexpp = ArgsProcessor.new
+				sexp = ptree.parse_tree_for_method(self, action)	
+				sexpp.process(sexp)
+
+				return sexpp.args
+			else
+				return []
+			end
+		end
+	end
 end
 
 end

data/lib/nitro/dispatcher.rb

@@ -5,6 +5,7 @@
 module N
 	
 require 'nitro/controller'
+require 'nitro/simple'
 
 # The Dispatcher manages a set of controllers.
 
@@ -42,7 +43,7 @@ class Dispatcher
 			@controllers = controllers || { :root => SimpleController }
 		end
 
-		@apis = apis
+		@apis = apis || {}
 	end
 
 	# Process the given hash and mount the 
@@ -71,6 +72,10 @@ class Dispatcher
 	#		API symbol
 	# [+data+]
 	#		Data for this API [content_type, ..]
+	#
+	# === Example
+	#
+	# dispatcher.add_api(:xml, 'text/xml')
 	
 	def add_api(api, data)
 		(@apis ||= {})[api] = data
@@ -86,7 +91,7 @@ class Dispatcher
 	# [:context]
 	#		The dispatching context.
 
-	def dispatch(path, context)
+	def dispatch(path, context = nil)
 		api = :xhtml
 
 		if @apis
@@ -101,7 +106,7 @@ class Dispatcher
 				base = @root 
 				klass = controller_class_for(:root, context)
 				action = 'index'
-				
+			
 			when 2
 				if klass = controller_class_for(parts[1], context)
 					# controller/ -> controller.index
@@ -121,7 +126,7 @@ class Dispatcher
 				action = parts[2]
 		end
 	
-		content_type = @apis ? @apis[:api] : 'text/html'
+		content_type = @apis[:api] || 'text/html'
 
 		return klass, "__#{api}__#{action}", base, content_type 
 	end
@@ -133,11 +138,11 @@ class Dispatcher
 	def controller_class_for(key, context)
 		klass = @controllers[key]
 
-		if context[:__RELOADED__].nil? and (:full == Rendering.reload) and klass
+		if (:full == Rendering.reload) and context and context[:__RELOADED__].nil? and klass
 			def_file = klass::DEF_FILE
 			Controller.remove_subclasses
 			load(def_file)
-			klass = @controllers[key] = Object.const_get(klass.name.intern)
+			klass = @controllers[key] = Object.const_get(klass.name.intern) 
 			context[:__RELOADED__] = true
 		end