nitro 0.15.0 → 0.16.0

data/lib/nitro/session/drb.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: drb.rb 264 2005-02-23 13:46:55Z gmosx $
+# $Id: drb.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'drb'
 
@@ -9,7 +9,7 @@ require 'nitro/session'
 
 Logger.debug 'Using Drb sessions.'
 
-module N
+module Nitro
 
 class Session
 	

data/lib/nitro/session/drbserver.rb

@@ -2,7 +2,7 @@
 
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: drbserver.rb 264 2005-02-23 13:46:55Z gmosx $
+# $Id: drbserver.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'drb'
 require 'optparse'
@@ -49,7 +49,7 @@ rescue OptionParser::InvalidOption
 	exit
 end
 
-sessions = N::SafeHash.new 
+sessions = Glue::SafeHash.new 
 
 if debug
 

data/lib/nitro/session/memory.rb

@@ -1,12 +1,12 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: memory.rb 264 2005-02-23 13:46:55Z gmosx $
+# $Id: memory.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'glue/hash'
 
 Logger.debug 'Using In-Memory sessions.'
 
-module N
+module Nitro
 
 Session.store = SafeHash.new
 

data/lib/nitro/shaders.rb

@@ -1,10 +1,10 @@
 # George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: shaders.rb 202 2005-01-17 10:44:13Z gmosx $
+# $Id: shaders.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'nitro/template'
 
-module N
+module Nitro
 
 # A shader defines a transformation-pipeline that tansforms 
 # the .xhtml files to actual ruby code ready for evaluation 
@@ -59,7 +59,6 @@ class RubyShader < Shader
 
 	# Convert the xhtml script to actual Ruby code, ready 
 	# to be evaluated.
-	#
 	#--
 	# Investigate:
 	# perhaps xl:href should be used to be XLink compatible?
@@ -107,8 +106,10 @@ class XSLTShader < Shader
 	attr :mtime
 	
 	def initialize(xsl_filename, next_stage = nil)
+
 		# leave this require here. only inlcude the xslt 
 		# library if the project needs it.
+		
 		require "xml/xslt"
 
 		@name = File.basename(xsl_filename, '.*')
@@ -123,7 +124,7 @@ class XSLTShader < Shader
 		parse_xsl()
 		@xslt.xml = text
 		hash += @name
-
+		Logger.debug "Applying xsl '#{@xsl_filename}' to template" if $DBG
 		process_next(hash, xslt.serve)
 	end
 	
@@ -165,7 +166,7 @@ class MorphingShader < Shader
 		# <tag if="x">..</tag>
 		# <tag unless="x">..</tag>
 
-		text.gsub!(/<(\w*?)([^>]*?)(if|unless)="(.*?)"(.*?)>(.*?)<\/\1>/m) do |match|
+		text.gsub!(/<(\w*?)([^>]*?)(if|unless)=["|'](.*?)["|'](.*?)>(.*?)<\/\1>/m) do |match|
 			%{<?r #$3 #$4 ?>
 				<#$1#$2#$5>#$6</#$1>
 			<?r end ?>}
@@ -173,7 +174,7 @@ class MorphingShader < Shader
 
 		# <tag times="x">..</tag>
 
-		text.gsub!(/<(\w*?)([^>]*?)times="(.*?)"(.*?)>(.*?)<\/\1>/m) do |match|
+		text.gsub!(/<(\w*?)([^>]*?)times=["|'](.*?)["|'](.*?)>(.*?)<\/\1>/m) do |match|
 			%{<?r #$3.times do ?>
 				<#$1#$2#$4>#$5</#$1>
 			<?r end ?>}
@@ -181,7 +182,7 @@ class MorphingShader < Shader
 
 		# <tag each="x">..</tag>
 
-		text.gsub!(/<(\w*?)([^>]*?)each="(.*?)"(.*?)>(.*?)<\/\1>/m) do |match|
+		text.gsub!(/<(\w*?)([^>]*?)each=["|'](.*?)["|'](.*?)>(.*?)<\/\1>/m) do |match|
 			%{<?r for #$3 ?>
 				<#$1#$2#$4>#$5</#$1>
 			<?r end ?>}

data/lib/nitro/simple.rb

@@ -3,6 +3,9 @@ require 'nitro/controller'
 # A simple controller, only handles templates.
 # Useful to implement php/asp/jsp style applications.
 # Dispatcher uses this as the default Controller.
+#--
+# gmosx, FIXME: this is a nasty hack, remove!
+#++
 
-class SimpleController < N::Controller; 
+class SimpleController < Nitro::Controller; 
 end

data/lib/nitro/template.rb

@@ -1,10 +1,10 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: template.rb 332 2005-03-29 11:31:52Z gmosx $
+# $Id: template.rb 9 2005-04-13 00:08:20Z nasis $
 
 require 'glue/flexob'
 
-module N
+module Nitro
 
 # A template is a text file with embeded Ruby code. The template
 # processor converts the original text file to ruby code and
@@ -41,7 +41,7 @@ module TemplateMixin
 		# Example:		
 		# <?include href="root/myfile.sx" ?>
 		
-		text.gsub!(/<\?include href="(.*?)"(.*)\?>/) do |match|
+		text.gsub!(/<\?include href=["|'](.*?)["|'](.*)\?>/) do |match|
 			text = File.read("#{base_dir}/#$1")
 			text.gsub!(/<\?xml.*\?>/, '')
 			text.gsub!(/<\/?root(.*?)>/m, ' ');
@@ -51,22 +51,22 @@ module TemplateMixin
 		# 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|
+		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|
+		text.gsub!(/<inject href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
 			"<?r render '/#$1' ?>"
 		end
 		
-		text.gsub!(/<render href="(.*?)"(.*)(.?)\/>/) do |match|
+		text.gsub!(/<render href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
 			"<?r render '/#$1' ?>"
 		end
 
@@ -93,7 +93,7 @@ module TemplateMixin
 
 		text.gsub!(/%>/, "\n#{buffer} << %^")
 		text.gsub!(/<%/, "^\n")
-	
+
 		# Alterative versions of interpolation.
 		# (very useful in xsl stylesheets)
 		

data/lib/nitro/testing.rb

@@ -0,0 +1,6 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: testing.rb 1 2005-04-11 11:04:30Z gmosx $
+
+require 'nitro/testing/assertions'
+require 'nitro/testing/testcase'

data/lib/nitro/testing/assertions.rb

@@ -0,0 +1,102 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: assertions.rb 1 2005-04-11 11:04:30Z gmosx $
+
+require 'test/unit'
+require 'test/unit/assertions'
+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
+
+end

data/lib/nitro/testing/context.rb

@@ -0,0 +1,52 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: context.rb 1 2005-04-11 11:04:30Z gmosx $
+
+require 'test/unit'
+require 'test/unit/assertions'
+require 'rexml/document'
+
+require 'nitro/context'
+
+module Nitro
+
+# Override the default Request implementation
+# to include methods useful for testing.
+
+module Request
+end
+
+# Override the default Response implementation
+# to include methods useful for testing.
+
+module Response
+
+	def status_ok?
+		@status == 200
+	end
+
+	def redirect?
+		(300..399).include?(@status)
+	end
+
+	def redirect_url
+		@response_headers['location']
+	end
+
+	def response_cookie(name)
+		return nil unless @response_cookies
+		@response_cookies.find { |c| c.name == name }
+	end
+
+end
+
+# Override the default Response implementation
+# to include methods useful for testing.
+
+class Context
+	def session
+		@session || @session = {}
+	end
+end
+
+end

data/lib/nitro/testing/testcase.rb

@@ -0,0 +1,55 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: testcase.rb 1 2005-04-11 11:04:30Z gmosx $
+
+require 'test/unit'
+require 'test/unit/assertions'
+require 'rexml/document'
+
+require 'glue'
+require 'glue/logger'
+require 'nitro/conf'
+require 'nitro/testing/context'
+
+module Test::Unit
+	
+class TestCase
+	include Nitro
+
+	attr_accessor :conf
+	attr_accessor :context
+
+	def handle(path, request = {}, session = nil, headers = {})
+		@conf ||= Conf.new({})
+		@conf.public_root ||= File.join(File.dirname(__FILE__), '..', 'public')
+		@conf.template_root ||= File.join(File.dirname(__FILE__), '..', 'public')
+		
+		begin
+			Og.db.get_connection if defined?(Og) and Og.db
+
+			context = Context.new(@conf)
+
+			# context.in = StringIO.new(req.body || "")
+
+			context.params = request
+			context.headers ||= headers
+			context.session = session if session
+		
+			context.headers['REQUEST_URI'] = path
+			# CgiUtils.parse_params(context)
+			# CgiUtils.parse_cookies(context)
+
+			context.render(path)
+		
+			@context = context
+
+			return context
+		ensure
+			Og.db.put_connection if defined?(Og) and Og.db
+		end
+	end
+	alias_method :process, :handle
+
+end
+
+end

data/lib/nitro/ui/pager.rb

@@ -1,10 +1,10 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: pager.rb 266 2005-02-28 14:50:48Z gmosx $
+# $Id: pager.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'nitro/uri'
 
-module N; module UI
+module Nitro; module UI
 
 # Displays a collection of entitities in multiple pages.
 #
@@ -198,7 +198,7 @@ class Pager < Array
 	# 
 	def target_uri(page)
 		params = {"__pg#{@name}" => page}
-		return N::UriUtils.update_query_string(@request.uri.to_s, params)
+		return UriUtils.update_query_string(@request.uri.to_s, params)
 	end
 
 end

data/lib/nitro/ui/popup.rb

@@ -1,20 +1,16 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: popup.rb 99 2004-10-22 09:50:28Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: popup.rb 1 2005-04-11 11:04:30Z gmosx $
 
-module N; module UI
+module Nitro
 
-# = Popup
-#
 # Display a popup window.
-#
+
 class Popup
 
 	#  Emit the needed javascript.
 	#  Alternatively use this code: <script src="/r/js/std.js">#{}</script>
-	# 
+	 
 	def self.script
 %[
 function newWin(url, name, w, h, scroll) {
@@ -30,17 +26,16 @@ function newWin(url, name, w, h, scroll) {
 	end
 
 	# gmosx: keep the leading / to be IE friendly.
-	#
+	
 	def self.onclick(uri, width, height, title = "Popup", type="PAGE", options = "scrollbars=yes,resizable", container = "/p/glue/popup.sx")
 		%[javascript: var pwl = (screen.width - #{width}) / 2; var pwt = (screen.height - #{height}) / 2; window.open('#{container}?uri=#{uri};type=#{type}', '#{title}', 'width=#{width},height=#{height},top='+pwt+',left='+pwl+', #{options}'); return false"]		
 	end	
 	
 	# gmosx: keep the leading / to be IE friendly.
-	#
+	
 	def self.link(uri, width, height, link = "link", title = "Popup", type="PAGE", options = "scrollbars=yes,resizable", container = "/p/glue/popup.sx")
 		%[<a href="#" onclick="#{self.onclick(uri, width, height, title, type, options, container)}">#{link}</a>]
 	end
 end
 
-end; end # module
-
+end