nitro 0.7.0 → 0.8.0

data/lib/nitro/builders/form.rb

@@ -13,7 +13,7 @@ module N
 #
 class FormBuilder
 	
-	@@cache = G::SafeHash.new
+	@@cache = N::SafeHash.new
 
 	# Render a standard form for the given managed object.
 	# If show_all is false then apply field filtering.
@@ -39,7 +39,7 @@ class FormBuilder
 				str << %{
 	<dt><label for="#{p.name}">#{p.name}</label></dt>
 	<dd>
-		<input type="text" name="#{p.name}" value="#{obj.send(p.symbol)}" />
+		<input type="text" id="#{p.name}" name="#{p.name}" value="#{obj.send(p.symbol)}" />
 	</dd>
 				}
 			elsif p.klass.ancestors.include?(String)
@@ -54,11 +54,11 @@ class FormBuilder
 				end
 				if :textarea == p.meta[:ui]
 					str << %{
-		<textarea name="#{p.name}">#{val}</textarea>
+		<textarea id="#{p.name}" name="#{p.name}">#{val}</textarea>
 					}
 				else
 					str << %{
-		<input type="text" name="#{p.name}" value="#{val}" />
+		<input type="text" id="#{p.name}" name="#{p.name}" value="#{val}" />
 					}				
 				end
 				str << %{
@@ -68,7 +68,7 @@ class FormBuilder
 				str << %{
 	<dt><label for="#{p.name}">#{p.name}</label></dt>
 	<dd>
-		<input type="checkbox" name="${p.name}" />
+		<input type="checkbox" id="#{p.name}" name="#{p.name}" />
 	</dd>
 				}
 =begin

data/lib/nitro/builders/rss.rb

@@ -25,7 +25,7 @@ class RssBuilder
 		for obj in objects
 			item = RSS::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.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)
 			channel.items << item
 		end

data/lib/nitro/builders/xhtml.rb

@@ -0,0 +1,119 @@
+# George Moschovitis  <gm@navel.gr>
+# (c) 2005 Navel, all rights reserved.
+# $Id$
+
+require 'nitro/builders/xml'
+
+module N
+
+# = XhtmlBuilderMixin
+#
+# A helper mixin for programmatically building XHTML 
+# blocks. 
+#--
+# TODO: add table generator, form generator
+#++
+
+module XhtmlBuilderMixin
+
+	# Render select.
+	#
+	# The first argument can be a String denoting the
+	# default option.
+	#--
+	# gmosx: hmmm String defines select, this is bad!
+	#++
+	
+	def select(*args)
+		attrs = args.last.is_a?(Hash) ? args.pop : nil
+		start_tag('select', attrs)
+		self << %|<option>#{args.first}</option>| unless args.empty?
+		yield
+		end_tag('select')
+	end
+
+	# Render select options.
+	#
+	# [+opts+]
+	#		The options to render, can be an Array or a 
+	#		Hash (allows you to explicitly set the value 
+	#		mapping).
+	#
+	# [+selected+]
+	#		The value of the selected option.
+	#
+	# == Example
+	#
+	# options = ['Male', 'Female']
+	# o.select(:name => 'sex') { 
+	#		o.options(options, selected = 1) 
+	# }
+	#
+	# or
+	#
+	# options = { 'Male' => 'm', 'Female' => 'f' }
+	# o.select(:name => 'sex') { 
+	#		o.options(options, selected = 1) 
+	# }
+	
+	def options(opts, selected = nil)
+		if opts.is_a?(Array)
+			selected = selected.to_i
+			opts.each_with_index do |label, value|
+				if value == selected
+					self << %|<option value="#{value}" selected="1">#{label}</option>|
+				else
+					self << %|<option value="#{value}">#{label}</option>|
+				end
+			end
+		else
+			opts.each do |label, value|
+				if value == selected
+					self << %|<option value="#{value}" selected="1">#{label}</option>|
+				else
+					self << %|<option value="#{value}">#{label}</option>|
+				end
+			end
+		end
+	end
+end
+
+# = XhtmlString
+#
+# A String extension with XHTML generation
+# functionality.
+
+class XhtmlString < String
+	include N::XmlBuilderMixin
+	include N::XhtmlBuilderMixin
+end
+
+# = XhtmlBuilder
+#
+# A class that encapsulats the XHTML generation
+# functionality. Utilizes duck typing to redirect 
+# output to a target buffer.
+
+class XhtmlBuilder
+	include N::XmlBuilderMixin
+	include N::XhtmlBuilderMixin
+
+	# The target receives the generated xml,
+	# should respond_to :<<
+	
+	attr_accessor :target
+	
+	def initialize(target = '')
+		@target = target
+	end
+
+	def << (str)
+		@target << str
+	end
+
+	def to_s
+		@target.to_s
+	end
+end
+
+end

data/lib/nitro/builders/xml.rb

@@ -0,0 +1,111 @@
+# George Moschovitis  <gm@navel.gr>
+# (c) 2005 Navel, all rights reserved.
+# $Id$
+
+module N
+
+# = XmlBuilderMixin
+#
+# A helper mixin for programmatically building XML
+# blocks. 
+
+module XmlBuilderMixin
+
+	def method_missing(tag, *args, &block)
+		self.class.module_eval <<-"end_eval", __FILE__, __LINE__
+			def #{tag}(*args)
+				attrs = args.last.is_a?(Hash) ? args.pop : nil
+
+				if block_given?
+					start_tag('#{tag}', attrs)
+					yield
+					end_tag('#{tag}')
+				elsif (!args.empty?)
+					start_tag('#{tag}', attrs)
+					self << args.first 
+					end_tag('#{tag}')
+				else
+					start_tag('#{tag}', attrs)
+					self << ' />'
+				end
+			end
+		end_eval
+
+		self.send(tag, *args, &block)
+	end
+
+	def start_tag(tag, attributes = nil)
+		unless attributes
+			self << "<#{tag}>"
+		else
+			self << "<#{tag}"
+			for name, value in attributes
+				if value
+					self << %| #{name}="#{value}"|
+				else
+					self << %| #{name}="1"|
+				end
+			end
+			self << ">"
+		end
+
+		return self
+	end
+
+	def end_tag(tag)
+		self << "</#{tag}>" 
+
+		return self
+	end
+
+	def text(str)
+		self << str
+
+		return self
+	end
+
+	def comment(str)
+		self << "<!-- #{str} -->" 
+
+		return self
+	end
+	
+end
+
+# = XmlString
+#
+# A String extension with XML generation
+# functionality.
+
+class XmlString < String
+	include N::XmlBuilderMixin
+end
+
+# = XmlBuilder
+#
+# A class that encapsulats the XML generation
+# functionality. Utilizes duck typing to redirect 
+# output to a target buffer.
+
+class XmlBuilder
+	include N::XmlBuilderMixin
+
+	# The target receives the generated xml,
+	# should respond_to :<<
+	
+	attr_accessor :target
+	
+	def initialize(target = '')
+		@target = target
+	end
+
+	def << (str)
+		@target << str
+	end
+
+	def to_s
+		@target.to_s
+	end
+end
+
+end

data/lib/nitro/config.rb

@@ -62,7 +62,7 @@ $default_content_type = 'text/html'
 $services = { :index => N::Service }
 
 # The service method map.
-$methods = G::SafeHash.new
+$methods = N::SafeHash.new
 
 # The shader. The default shader is very simple, here
 # is a typical example of a production shader pipeline:
@@ -82,8 +82,8 @@ if $DBG
 	
 	# Logger (redirect to STDERR)
 
-	$log = Logger.new(STDERR); 
-	$log.level = Logger::DEBUG
+	Logger.set(Logger.new(STDERR)) 
+	Logger.get.level = Logger::DEBUG
 
 	# If set to true disables xsl caching. Usefull when debugging xsls.
 
@@ -92,7 +92,7 @@ if $DBG
 	# If set to true disables script compilation. Usefull when debugging
 	# statically included scripts.
 
-	$reload_scripts = true
+	$reload_scripts = true 
 
 	# Standard server setup for debugging.
 
@@ -105,8 +105,8 @@ else
 
 	puts "\nRunning LIVE configuration.\n\n"
 
-	$log = Logger.new("log/app.log", 10); 
-	$log.level = Logger::INFO
+	Logger.set(Logger.new("log/app.log", 10))
+	Logger.get.level = Logger::INFO
 	
 	# If set to true disables xsl caching. Usefull when debugging xsls.
 

data/lib/nitro/events.rb

@@ -63,7 +63,7 @@ class EventManager
 		if event_handlers = @events[event]
 			event_handlers.delete(name)
 		else
-			$log.debug "ev: cannot remove, handler #{name} not found for event #{event}" if $DBG
+			Logger.debug "ev: cannot remove, handler #{name} not found for event #{event}" if $DBG
 		end
 	end
 

data/lib/nitro/html.rb

@@ -141,7 +141,7 @@ module HtmlUtils
 	# convert plain newlines into line breaks <br/>
 
 	def self.convert_newlines(string)
-		return nil unless G::StringUtils.valid?(string)
+		return nil unless N::StringUtils.valid?(string)
 		xstring = string.gsub(/\n/, "<br/>")
 		return xstring;
 	end

data/lib/nitro/markup.rb

@@ -1,17 +1,16 @@
-# code:
-# * George Moschovitis  <gm@navel.gr>
-#
+# George Moschovitis  <gm@navel.gr>
 # (c) 2004 Navel, all rights reserved.
 # $Id$
 
 require 'glue/property'
 
-module G
+module N 
 
 #--
 # Override the default PropertyUtils implementation to
 # add markup support.
 #++
+
 module PropertyUtils
 	# Override to add markup code.	
 	#
@@ -40,10 +39,6 @@ module PropertyUtils
 	end
 end
 
-end # module
-
-module N
-	
 # = Markup
 #
 # Generalised Markup transformations.
@@ -62,7 +57,7 @@ module N
 # here comes the #{obj.body} # => prints the expanded version.
 #
 #	obj.body = N::Markup.expand(@params['body'])	
-#
+
 module Markup
 	def self.expand_html!(str)
 		return unless str
@@ -82,39 +77,39 @@ module Markup
 	end
 
 	# Expand the markup code to produce the
-	# actual content.
-	#
+	# actual content. You should override this method 
+	# in your application to call your custom markup 
+	# methods.
+
 	def self.expand(str)
 		if str
 			xstr = str.dup
 			expand_html!(xstr)
-			expand_wiki!(xstr)
 			return xstr
-		else
-			return str
 		end
+		return nil
 	end
 
 	# Compact (reverse) the content to the origial markup
 	# code. Not all markup transformations are reversible.
-	#
+	# You should override this method in your application 
+	# to call your custom markup methods.
+	
 	def self.compact(str)
 		if str
 			xstr = str.dup
 			compact_html!(xstr)
-			compact_wiki!(xstr)
 			return xstr
-		else
-			return str
 		end
+		return nil
 	end
 
 	# Remove markup code from the input string.
 	# NOT IMPLEMENTED.
-	#
+	
 	def self.clear(str)
 	end
 	
 end
 
-end # module
+end

data/lib/nitro/scaffold.rb

@@ -25,8 +25,8 @@ module Scaffolding
 		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)
+			name = options[:name] || N::Inflector.name(klass.name)
+			list_name = options[:list_name] || N::Inflector.plural_name(name)
 			suffix = "_#{name}"
 
 			# Add methods to the scaffolded class.

data/lib/nitro/server/appserver.rb

@@ -26,7 +26,7 @@ module AppServerMixin
 			$sessions = DRbObject.new(nil, $drb_sessions_cluster)
 		else
 			# NoCluster mode: use standard Ruby onjects.
-			$lm = G::SafeHash.new
+			$lm = N::SafeHash.new
 			$sessions = N::SessionManager.new
 		end
 
@@ -59,8 +59,8 @@ class AppServer < N::Server
 		super
 		initialize_app()
 		
-		$log.info "Web Server listening at #$srv_url"
-		$log.info "App Server listening at http://#$appsrv_address:#$appsrv_port"
+		Logger.info "Web Server listening at #$srv_url"
+		Logger.info "App Server listening at http://#$appsrv_address:#$appsrv_port"
 	end
 end