nitro 0.6.0 → 0.7.0

data/lib/nitro/server/cookie.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: cookie.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: cookie.rb 112 2004-10-27 10:59:55Z gmosx $
 
 require "cgi"
 

data/lib/nitro/server/dispatcher.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: dispatcher.rb 167 2004-11-23 14:03:10Z gmosx $
+# $Id: dispatcher.rb 200 2004-12-27 11:24:41Z gmosx $
 
 require 'nitro/server/render'
 
@@ -15,6 +15,7 @@ module Dispatcher
 	
 	def process(request, response)
 		begin
+			# gmosx, INVESTIGATE: this is not really needed.
 			$og.get_connection if $og
 			
 			session = create_session(request, response)
@@ -38,14 +39,12 @@ module Dispatcher
 					<p>Click <a href="#{request.referer}">here</a> to return 
 					to the previous page.</p>
 				}
-=begin				
-				if request.error_log
+				if @rendering_errors
 					body << %{
-						<h3>Request error log</h3>
-						<pre>#{request.error_log.join("\n")}</pre>
+						<h3>Rendering errors</h3>
+						<pre>#{@rendering_errors.join("\n")}</pre>
 					}
 				end
-=end
 				body << %{
 					<h3>Exception</h3>
 					<pre>#{pp_exception(e)}</pre>

data/lib/nitro/server/filters.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 20024 Navel, all rights reserved.
-# $Id: filters.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: filters.rb 133 2004-11-10 19:08:29Z gmosx $
 
 require "socket"
 require "thread"

data/lib/nitro/server/render.rb

@@ -2,7 +2,9 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: render.rb 185 2004-12-10 13:29:09Z gmosx $
+# $Id: render.rb 200 2004-12-27 11:24:41Z gmosx $
+
+require 'cgi'
 
 module N
 
@@ -53,7 +55,7 @@ module RenderUtils
 				meth = parts[2]
 		end
 		
-#		p '--', api, base, render_class, meth, '--'
+		#		p '--', api, base, render_class, meth, '--'
 		
 		return api, base, render_class, meth
 	end
@@ -125,7 +127,7 @@ module RenderUtils
 		if klass.instance_methods.include?("#{meth}__xhtml")
 			valid = true
 			code << %{
-				#{meth}__xhtml();
+				return unless #{meth}__xhtml();
 			}
 		end
 		
@@ -133,7 +135,7 @@ module RenderUtils
 		if template = template_for_method(base, meth)
 			valid = true
 			code << %{
-				__#{meth}_xhtml();
+				return unless __#{meth}_xhtml();
 			}
 		end
 		
@@ -158,9 +160,11 @@ module RenderUtils
 				end
 			}
 		end
-
-#		puts '++', code, '++'
-		
+=begin	
+		puts '--'
+		puts dump(code)
+		puts '--'
+=end
 		klass.class_eval(code)
 		
 		return "__#{meth}"
@@ -198,7 +202,7 @@ module RenderUtils
 		if klass.instance_methods.include?("#{meth}__xml")
 			valid = true
 			code << %{
-				#{meth}__xml();
+				return unless #{meth}__xml();
 			}
 		end
 		
@@ -206,7 +210,7 @@ module RenderUtils
 		if template = template_for_method(base, meth, 'xml')
 			valid = true
 			code << %{
-				__#{meth}_xml();
+				return unless __#{meth}_xml();
 			}
 		end
 		
@@ -236,20 +240,20 @@ module RenderUtils
 		return "__rest_#{meth}"
 	end
 
-	#
-	#
-	def load_statically_included(filename)
-		$log.debug "Statically including '#{filename}'" if $DBG
-		
-		text = File.read(filename)
-		text.gsub!(/<\?xml.*\?>/, '')
-		text.gsub!(/<\/?root(.*?)>/m, ' ');
-		
-		return text
+	def self.dump(str)
+		str.split("\n").each_with_index do |line, idx|
+			puts "#{idx+1}: #{line}"
+		end
 	end
-	
 end
 
+# = RenderExit
+#
+# Raise this exception to stop rendering.
+#
+class RenderExit < Exception
+end
+	
 # = Render
 #
 module Render
@@ -324,6 +328,9 @@ module Render
 				r.send(meth)
 				@out = r.out
 			end
+		rescue N::RenderExit => e
+			# Just stop rendering.
+			# For example called by redirects.
 		rescue Exception, StandardError => e
 			log_error "error while handling '#{path}'."
 			log_error pp_exception(e)
@@ -345,15 +352,12 @@ module Render
 	# Send a redirect response.
 	#
 	def redirect(url, status = 303)
-		begin
-			@response.status = status
-			@response.set_redirect(status, url)
-		rescue Exception, StandardError => ex
-			# drink it!
-		end
-		
-		# stop the filter pipeline
-		return false
+		@response.status = status
+		@response.body = "<html><a href=\"#{url.to_s}\">#{url.to_s}</a>.</html>\n"
+		@response.header['location'] = url.to_s
+
+		# stop the rendering
+		raise N::RenderExit
 	end
 	
 	# Redirect to the referer of this method.

data/lib/nitro/server/shaders.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: shaders.rb 188 2004-12-10 14:14:17Z gmosx $
+# $Id: shaders.rb 189 2004-12-13 21:38:05Z gmosx $
 
 module N
 
@@ -62,12 +62,28 @@ class RubyShader < N::Shader
 	# Convert the xhtml script to actual Ruby code, ready to be 
 	# evaluated.
 	#
+	#--
+	# Investigate:
+	# perhaps xl:href should be used to be XLink compatible?
+	#++
+	#
 	def process(hash, text)
 		# strip the xml header! (interracts with the following gsub!)
 		text.gsub!(/<\?xml.*\?>/, "")
 
-		# statically include files.
-		# TODO: Add here!
+		# statically include sub script files.
+		# The target file is included at compile time.
+		#
+		# gmosx: must be xformed before the <?r pi.
+		#
+		# Example:		
+		# <?include xl:href="root/myfile.sx" ?>
+		#
+		text.gsub!(/<\?include href="(.*?)"(.*)\?>/) { |match|
+			# gmosx: xmm match matches the whole string.
+			# match = overload_path($1)				
+			load_statically_included("#$root_dir/#$1")
+		}
 
 		# xform include instructions <include href="xxx" />
 		# must be transformed before the processinc instructions.
@@ -103,6 +119,19 @@ class RubyShader < N::Shader
 		process_next(hash, text)
 	end
 
+	# Loads and statically includes a file.
+	#
+	def load_statically_included(filename)
+		$log.debug "Statically including '#{filename}'" if $DBG
+		
+		text = File.read(filename)
+		text.gsub!(/<\?xml.*\?>/, '')
+		text.gsub!(/<\/?root(.*?)>/m, ' ');
+		
+		return text
+	end
+	
+	
 end
 
 # = XSLTShader

data/lib/nitro/server/user.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: user.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: user.rb 99 2004-10-22 09:50:28Z gmosx $
 
 require "singleton"
 

data/lib/nitro/server/webrick.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: webrick.rb 167 2004-11-23 14:03:10Z gmosx $
+# $Id: webrick.rb 200 2004-12-27 11:24:41Z gmosx $
 
 require "webrick"
 
@@ -45,7 +45,7 @@ module WEBrick
 		def fill(obj, name = nil)
 			# if an object is passed create an instance.
 			obj = obj.new if obj.is_a?(Class)
-			
+		
 			@query.each do |param, val|
 				begin
 					# gmosx: DO NOT escape by default !!!
@@ -90,9 +90,14 @@ class WebrickServer < N::AppServer
 	#
 	def start
     Socket.do_not_reverse_lookup = true # patch for OS X
+
+=begin
+		accesslog = WEBrick::BasicLog::new('/dev/null')
+		referer = WEBrick::BasicLog::new('/dev/null')	
+=end
 		
-		accesslog = WEBrick::BasicLog::new("/dev/null") 
-		referer = WEBrick::BasicLog::new("/dev/null")	
+		accesslog = WEBrick::BasicLog::new('log/access.log')
+		referer = WEBrick::BasicLog::new('log/referer.log')	
 
     @webrick = WEBrick::HTTPServer.new(
 			:BindAddress => $appsrv_address, 

data/lib/nitro/ui/popup.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: popup.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: popup.rb 99 2004-10-22 09:50:28Z gmosx $
 
 module N; module UI
 

data/lib/nitro/ui/select.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: select.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: select.rb 99 2004-10-22 09:50:28Z gmosx $
 
 module N; module UI
 

data/lib/nitro/ui/tabs.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: tabs.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: tabs.rb 101 2004-10-22 12:35:39Z gmosx $
 
 module N; module UI
 

data/lib/nitro/version.rb

@@ -2,10 +2,10 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: version.rb 185 2004-12-10 13:29:09Z gmosx $
+# $Id: version.rb 194 2004-12-20 20:23:57Z gmosx $
 
 # The name of the server.
 $srv_name = 'Nitro'
 
 # The version of the server.
-$srv_version = '0.6.0'
+$srv_version = '0.7.0'

data/lib/og.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: og.rb 185 2004-12-10 13:29:09Z gmosx $
+# $Id: og.rb 197 2004-12-21 13:50:17Z gmosx $
 
 require "glue/property"
 require "glue/array"
@@ -28,6 +28,11 @@ $og_auto_manage_classes = true
 # If true, automatically include the Og meta-language into Module. 
 $og_include_meta_language = true
 
+# Attach the following prefix to all generated SQL table names.
+# Usefull on hosting scenarios where you have to run multiple
+# web applications/sites on a single database.
+$og_table_prefix = nil
+
 require "og/meta"
 
 # = Og
@@ -169,7 +174,10 @@ class Database
 		@config[:connection_count].times do
 			@connection_pool << Og::Connection.new(self)
 		end
-		
+	
+		# gmosx, FIXME: this automanage code is not elegant and slow
+		# should probably recode this, along with glue/property.rb
+		#
 		if $og_auto_manage_classes
 			# automatically manage classes with properties and metadata.
 			# gmosx: Any idea how to optimize this?
@@ -286,8 +294,6 @@ class Database
 		Og::Utils.eval_og_oid(klass) unless klass.instance_methods.include?(:oid)
 		
 		klass.class_eval %{
-			inherit_meta(superclass) if superclass
-			
 			DBTABLE = "#{Og::Utils.table(klass)}"
 			DBSEQ = "#{Og::Utils.table(klass)}_oids_seq" 
 			
@@ -311,7 +317,12 @@ class Database
 	# class and its instances. 
 	#
 	def enchant(klass)
-		klass.class_eval %{
+		klass.module_eval <<-"end_eval", __FILE__, __LINE__
+			def self.create(*params)
+				obj = #{klass}.new(*params)
+				obj.save!
+			end
+				
 			def self.save(obj)
 				$og << obj
 			end
@@ -362,7 +373,7 @@ class Database
 			def delete!
 				$og.delete(@oid, #{klass})
 			end
-		}
+		end_eval
 	end
 	
 	# Automatically wrap connection methods.

data/lib/og/backend.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: backend.rb 185 2004-12-10 13:29:09Z gmosx $
+# $Id: backend.rb 197 2004-12-21 13:50:17Z gmosx $
 
 require "yaml"
 
@@ -28,13 +28,13 @@ module Utils
 	# The name of the SQL table where objects of this class are stored.
 	#
 	def self.table(klass)
-		"_#{encode(klass)}"
+		"_#{$og_table_prefix}#{encode(klass)}"
 	end
 
 	# The name of the join table for the two given classes.
 	#
 	def self.join_table(klass1, klass2)
-		"_j_#{Og::Utils.encode(klass1)}_#{Og::Utils.encode(klass2)}"
+		"_#{$og_table_prefix}j_#{Og::Utils.encode(klass1)}_#{Og::Utils.encode(klass2)}"
 	end
 	
 	# Returns the props that will be included in the insert query.
@@ -232,7 +232,37 @@ class Backend
 	def rollback
 		exec "ROLLBACK"
 	end	
-	
+
+	# Create the fields that correpsond to the klass properties.
+	# The generated fields array is used in create_table.
+	# If the property has an :sql metadata this overrides the default mapping.
+	# If the property has an :extra_sql metadata the extra sql is appended
+	# after the default mapping.
+	#
+	def create_fields(klass, typemap)
+		fields = []
+		
+		klass.__props.each do |p|
+			klass.sql_index(p.symbol) if p.meta[:sql_index]
+				
+			field = "#{p.symbol}"
+			
+			if p.meta and p.meta[:sql]
+				field << " #{p.meta[:sql]}"
+			else
+				field << " #{typemap[p.klass]}"
+				# attach extra sql
+				if p.meta and extra_sql = p.meta[:extra_sql]
+					field << " #{extra_sql}"
+				end
+			end
+			
+			fields << field 
+		end
+
+		return fields
+	end
+
 	# Create the managed object table. The properties of the
 	# object are mapped to the table columns. Additional sql relations
 	# and constrains are created (indicices, sequences, etc).