nitro 0.20.0 → 0.21.0

data/lib/nitro/template.rb

@@ -1,4 +1,5 @@
 require 'glue/flexob'
+require 'glue/configuration'
 
 module Nitro
 
@@ -9,131 +10,131 @@ module Nitro
 
 module TemplateMixin
 
-	# Convert a template to actual Ruby code, ready to be 
-	# evaluated.
-	#
-	# [+template+] 
-	#		The template as a String.
-	#
-	# [+buffer+]
-	#		The variable to act as a buffer where the ruby code
-	# 	for this template will be generated. Passed as a|
-	#		String.
-	#
-	#	[+base_dir+]
-	#		The base directory where the templates reside.
-	
-	def compile_template(template, buffer = '@out', base_dir = Dir.pwd)
-		text = template.dup
-
-		# Strip the xml header! (interracts with the following gsub!)
-		text.gsub!(/<\?xml.*\?>/, "")
-
-		# Statically include sub-template files.
-		# The target file is included at compile time.
-		#
-		# gmosx: must be xformed before the <?r pi.
-		#
-		# Example:		
-		# <?include href="root/myfile.sx" ?>
-		
-		text.gsub!(/<\?include href=["|'](.*?)["|'](.*)\?>/) do |match|
-			text = File.read("#{base_dir}/#$1")
-			text.gsub!(/<\?xml.*\?>/, '')
-			text.gsub!(/<\/?root(.*?)>/m, ' ');
-			text
-		end
-
-		# Transform include instructions <include href="xxx" />
-		# must be transformed before the processinc instructions.
-		# Useful to include fragments cached on disk
-		#
-		# gmosx, FIXME: NOT TESTED! test and add caching.
-		# add load_statically_included fixes.
-
-		text.gsub!(/<include href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
-			"<?r File.read( '\#\{@dispatcher.root\}/#$1' ?>"
-		end
-		
-		# xform render/inject instructions <render href="xxx" />
-		# must be transformed before the processinc instructions.
-
-		text.gsub!(/<inject href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
-			"<?r render '/#$1' ?>"
-		end
-		
-		text.gsub!(/<render href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
-			"<?r render '/#$1' ?>"
-		end
-
-		# Remove <root> elements. typically removed by xslt but lets
-		# play it safe. The <root> element is typically added to
-		# template files to make them XHTML valid.
-		
-		text.gsub!(/<(\/)?root>/, '')
-		
-		# Transform the processing instructions, use <?r as
-		# a marker.
-		
-		text.gsub!(/\?>/, "; #{buffer} << %^")
-		text.gsub!(/<\?r(\s?)/, "^; ")
-		
-		# Transform alternative code tags. 
-		# (very useful in xsl stylesheets)
-		
-		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!(/%>/, "; #{buffer} << %^")
-		text.gsub!(/<%/, "^; ")
-
-		# 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;')
-
-		# Compile time ruby code. This code is evaluated when
-		# compiling the template and the result injected directly
-		# into the result. Usefull for example to prevaluate
-		# localization. Just use the #[] marker instead of #{}.
-		
-		text.gsub!(/\#\[(.*?)\]/) do |match|
-			eval($1)
-		end
-		
-		text =  "#{buffer} << %^" + text + "^"
-
-		return text
-	end
-
-	# Render the template.
-	#
-	# [+ruby+]
-	#		A String containing the compiled template
-	#		code.
-	#
-	#	[+binding+]
-	#		The evaluation binding for the rendering.
-
-	def render_template(ruby, the_binding = nil)
-		eval(ruby, the_binding)
-	end
-
-	# Compile and render the template.
-	
-	def process_template(template, buffer = '@out', the_binding = nil)
-		render_template(compile_template(template, buffer), the_binding)
-	end
+  # Convert a template to actual Ruby code, ready to be 
+  # evaluated.
+  #
+  # [+template+] 
+  #    The template as a String.
+  #
+  # [+buffer+]
+  #    The variable to act as a buffer where the ruby code
+  #   for this template will be generated. Passed as a|
+  #    String.
+  #
+  #  [+base_dir+]
+  #    The base directory where the templates reside.
+  
+  def compile_template(template, buffer = '@out', base_dir = Dir.pwd)
+    text = template.dup
+
+    # Strip the xml header! (interracts with the following gsub!)
+    text.gsub!(/<\?xml.*\?>/, "")
+
+    # Statically include sub-template files.
+    # The target file is included at compile time.
+    #
+    # gmosx: must be xformed before the <?r pi.
+    #
+    # Example:    
+    # <?include href="root/myfile.sx" ?>
+    
+    text.gsub!(/<\?include href=["|'](.*?)["|'](.*)\?>/) do |match|
+      text = File.read("#{base_dir}/#$1")
+      text.gsub!(/<\?xml.*\?>/, '')
+      text.gsub!(/<\/?root(.*?)>/m, ' ');
+      text
+    end
+
+    # Transform include instructions <include href="xxx" />
+    # must be transformed before the processinc instructions.
+    # Useful to include fragments cached on disk
+    #
+    # gmosx, FIXME: NOT TESTED! test and add caching.
+    # add load_statically_included fixes.
+
+    text.gsub!(/<include href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
+      "<?r File.read( '\#\{@dispatcher.root\}/#$1' ?>"
+    end
+    
+    # xform render/inject instructions <render href="xxx" />
+    # must be transformed before the processinc instructions.
+
+    text.gsub!(/<inject href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
+      "<?r render '/#$1' ?>"
+    end
+    
+    text.gsub!(/<render href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
+      "<?r render '/#$1' ?>"
+    end
+
+    # Remove <root> elements. typically removed by xslt but lets
+    # play it safe. The <root> element is typically added to
+    # template files to make them XHTML valid.
+    
+    text.gsub!(/<(\/)?root>/, '')
+    
+    # Transform the processing instructions, use <?r as
+    # a marker.
+    
+    text.gsub!(/\?>/, "; #{buffer} << %^")
+    text.gsub!(/<\?r(\s?)/, "^; ")
+    
+    # Transform alternative code tags. 
+    # (very useful in xsl stylesheets)
+    
+    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!(/%>/, "; #{buffer} << %^")
+    text.gsub!(/<%/, "^; ")
+
+    # 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;')
+
+    # Compile time ruby code. This code is evaluated when
+    # compiling the template and the result injected directly
+    # into the result. Usefull for example to prevaluate
+    # localization. Just use the #[] marker instead of #{}.
+    
+    text.gsub!(/\#\[(.*?)\]/) do |match|
+      eval($1)
+    end
+    
+    text =  "#{buffer} << %^" + text + "^"
+
+    return text
+  end
+
+  # Render the template.
+  #
+  # [+ruby+]
+  #    A String containing the compiled template
+  #    code.
+  #
+  #  [+binding+]
+  #    The evaluation binding for the rendering.
+
+  def render_template(ruby, the_binding = nil)
+    eval(ruby, the_binding)
+  end
+
+  # Compile and render the template.
+  
+  def process_template(template, buffer = '@out', the_binding = nil)
+    render_template(compile_template(template, buffer), the_binding)
+  end
 
 end
 
@@ -141,12 +142,27 @@ end
 # as singleton methods.
 
 class Template
-	class << self
-		include TemplateMixin
-		alias_method :compile, :compile_template
-		alias_method :render, :render_template
-		alias_method :process, :process_template
-	end
+  
+  # The default root directory where template files reside.
+  
+  setting :root, :default => 'public', :doc => 'The default root directory where template files reside'
+  
+  # The default template name.
+  
+  setting :default, :default => 'index', :doc => 'The default template name'
+  
+  # The default template file extension.
+  
+  setting :extension, :default => 'xhtml', :doc => 'The default template file extension'
+
+  class << self
+    include TemplateMixin
+    alias_method :compile, :compile_template
+    alias_method :transform, :compile_template
+    alias_method :render, :render_template
+    alias_method :process, :process_template
+  end
+  
 end
 
 # A Template that reads from files and also 
@@ -155,30 +171,30 @@ end
 # expansion environment.
 
 class FileTemplate < Flexob
-	include TemplateMixin
-
-	@@compiled_template_cache = {}
-
-	attr_accessor :template_filename
-
-	def initialize(filename = nil)
-		super
-		@template_filename = filename
-	end
-	
-	def process
-		__out__ = ''
-		
-		unless compiled = @@compiled_template_cache[@template_filename]
-			template = File.read(@template_filename)
-			compiled = compile_template(template, '__out__')
-			@@compiled_template_cache[@template_filename] = compiled
-		end
-		
-		render_template(compiled, binding)	
-		
-		return __out__
-	end
+  include TemplateMixin
+
+  @@compiled_template_cache = {}
+
+  attr_accessor :template_filename
+
+  def initialize(filename = nil)
+    super
+    @template_filename = filename
+  end
+  
+  def process
+    __out__ = ''
+    
+    unless compiled = @@compiled_template_cache[@template_filename]
+      template = File.read(@template_filename)
+      compiled = compile_template(template, '__out__')
+      @@compiled_template_cache[@template_filename] = compiled
+    end
+    
+    render_template(compiled, binding)  
+    
+    return __out__
+  end
 end
 
 end

data/lib/nitro/testing/assertions.rb

@@ -4,96 +4,96 @@ require 'rexml/document'
 
 module Test::Unit::Assertions
 
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-	# :section: General assertions.
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-	
-	def assert_status_ok(msg = nil)
-		msg = format_msg("Status not ok", msg)
-		assert_block(msg) { @context.status_ok? }
-	end
-
-	def assert_output_match(re, msg = nil)
-		msg = format_msg("Rendered output does not match '#{re}'", msg)
-		assert_block(msg) { @context.out =~ Regexp.new(re) }
-	end
-	alias_method :assert_output_contains, :assert_output_match
-
-	def assert_output_no_match(re, msg = nil)
-		msg = format_msg("Rendered output matches '#{re}'", msg)
-		assert_block(msg) { @context.out =~ Regexp.new(re) }
-	end
-	alias_method :assert_output_contains_no, :assert_output_no_match
-
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-	# :section: Session related assertions.
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-
-	def assert_session_has(key, msg = nil)
-		msg = format_msg("Object '#{key}' not found in session", msg)
-		assert_block(msg) {	@context.session[key] }
-	end
-
-	def assert_session_has_no(key, msg = nil)
-		msg = format_msg("Unexpected object '#{key}' found in session", msg)
-		assert_block(msg) { !@context.session[key] }
-	end
-	alias_method :assert_session_has_not, :assert_session_has_no
-
-	def assert_session_equal(key, value, msg = nil)
-		msg = format_msg("The value of session object '#{key}' is '#{@context.session[key]}' but was expected '#{value}'", msg)
-		assert_block(msg) { @context.session[key] == value }
-	end
-
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-	# :section: Cookies related assertions.
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-
-	def assert_has_cookie(name, msg = nil)
-		msg = format_msg("Cookie '#{name}' not found", msg)
-		assert_block(msg) { @context.response_cookie(name) }
-	end
-
-	def assert_has_no_cookie(name, msg = nil)
-		msg = format_msg("Unexpected cookie '#{name}' found", msg)
-		assert_block(msg) { !@context.response_cookie(name) }
-	end
-	
-	def assert_cookie_equal(name, value, msg = nil)
-		unless cookie = @context.response_cookie(name)
-			msg = format_msg("Cookie '#{name}' not found", msg)
-			assert_block(msg) { false }
-		end
-		msg = format_msg("The value of cookie '#{name}' is '#{cookie.value}' but was expected '#{value}'", msg)
-		assert_block(msg) { cookie.value == value }
-	end
-
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-	# :section: Template related assertions.
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-	
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-	# :section: Redirection assertions.
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-
-	def assert_redirect(msg = nil)
-		msg = format_msg("No redirection (status = #{@context.status})", msg)
-		assert_block(msg) { @context.redirect? }
-	end
-
-	def assert_no_redirect(msg = nil)
-		msg = format_msg("Unexpected redirection (location = '#{@context.response_headers['location']}')", msg)
-		assert_block(msg) { !@context.redirect? }
-	end
-	
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-	# :section: Utility methods 
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-
-	def format_msg(message, extra) # :nodoc:
-		extra += ', ' if extra
-		return "#{extra}#{message}"
-	end
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+  # :section: General assertions.
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+  
+  def assert_status_ok(msg = nil)
+    msg = format_msg("Status not ok", msg)
+    assert_block(msg) { @context.status_ok? }
+  end
+
+  def assert_output_match(re, msg = nil)
+    msg = format_msg("Rendered output does not match '#{re}'", msg)
+    assert_block(msg) { @context.out =~ Regexp.new(re) }
+  end
+  alias_method :assert_output_contains, :assert_output_match
+
+  def assert_output_no_match(re, msg = nil)
+    msg = format_msg("Rendered output matches '#{re}'", msg)
+    assert_block(msg) { @context.out =~ Regexp.new(re) }
+  end
+  alias_method :assert_output_contains_no, :assert_output_no_match
+
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+  # :section: Session related assertions.
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
+  def assert_session_has(key, msg = nil)
+    msg = format_msg("Object '#{key}' not found in session", msg)
+    assert_block(msg) {  @context.session[key] }
+  end
+
+  def assert_session_has_no(key, msg = nil)
+    msg = format_msg("Unexpected object '#{key}' found in session", msg)
+    assert_block(msg) { !@context.session[key] }
+  end
+  alias_method :assert_session_has_not, :assert_session_has_no
+
+  def assert_session_equal(key, value, msg = nil)
+    msg = format_msg("The value of session object '#{key}' is '#{@context.session[key]}' but was expected '#{value}'", msg)
+    assert_block(msg) { @context.session[key] == value }
+  end
+
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+  # :section: Cookies related assertions.
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
+  def assert_has_cookie(name, msg = nil)
+    msg = format_msg("Cookie '#{name}' not found", msg)
+    assert_block(msg) { @context.response_cookie(name) }
+  end
+
+  def assert_has_no_cookie(name, msg = nil)
+    msg = format_msg("Unexpected cookie '#{name}' found", msg)
+    assert_block(msg) { !@context.response_cookie(name) }
+  end
+  
+  def assert_cookie_equal(name, value, msg = nil)
+    unless cookie = @context.response_cookie(name)
+      msg = format_msg("Cookie '#{name}' not found", msg)
+      assert_block(msg) { false }
+    end
+    msg = format_msg("The value of cookie '#{name}' is '#{cookie.value}' but was expected '#{value}'", msg)
+    assert_block(msg) { cookie.value == value }
+  end
+
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+  # :section: Template related assertions.
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+  
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+  # :section: Redirection assertions.
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
+  def assert_redirect(msg = nil)
+    msg = format_msg("No redirection (status = #{@context.status})", msg)
+    assert_block(msg) { @context.redirect? }
+  end
+
+  def assert_no_redirect(msg = nil)
+    msg = format_msg("Unexpected redirection (location = '#{@context.response_headers['location']}')", msg)
+    assert_block(msg) { !@context.redirect? }
+  end
+  
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+  # :section: Utility methods 
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
+  def format_msg(message, extra) # :nodoc:
+    extra += ', ' if extra
+    return "#{extra}#{message}"
+  end
 
 end