nitro 0.3.0 → 0.4.1

data/examples/tiny/README

@@ -7,9 +7,8 @@ An example to test Nitro.
 
 $ cd examples/tiny
 
-$ ./ctl
+$ ruby app.rb --start 
 
-to stop the example press Ctrl+C or execute the
-following command:
+browse http://127.0.0.1:9090
 
-$ ./ctl stop
+to stop the example press Ctrl+C 

data/examples/tiny/app.rb

@@ -8,23 +8,13 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: app.rb 112 2004-10-27 10:59:55Z gmosx $
+# $Id: app.rb 146 2004-11-13 19:05:06Z gmosx $
 
-$:.unshift "../lib"
+$DBG = false 
 
-# Set this to false to optimize for speed.
-$DBG = true
+$LOAD_PATH.unshift "lib"
+$LOAD_PATH.unshift "../../lib"
 
-require "tiny/conf/config"
-require "n/server/webrick"
-
-module App
-
-class Server < N::Webrick
-	include App::Config	
-end
-
-end # module
-
-$app = App::Server.new.exec()
+require "config"
 
+$app = N::WebrickServer.new.exec()

data/examples/tiny/config.rb

@@ -0,0 +1,30 @@
+# = Tiny Configuration 
+#
+# You can find additional configuration variables in
+# lib/n/config.rb. Just copy the variables you want to
+# change in this file
+#
+# code: 
+# * George Moschovitis  <gm@navel.gr>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id: config.rb 155 2004-11-13 20:32:12Z gmosx $
+
+require "nitro"
+require "nitro/logger"
+require "nitro/config"
+
+require "nitro/utils/number"
+require "nitro/utils/string"
+require "nitro/utils/array"
+require "nitro/utils/hash"
+require "nitro/utils/html"
+require "nitro/utils/gfx"
+
+require "nitro/server/webrick"
+
+$name = "Tiny Example"
+
+$srv_address = $appsrv_address = "127.0.0.1"
+$srv_port = 8080
+$srv_url = "http://#$srv_address:#$srv_port"

data/examples/tiny/log/app.log

@@ -0,0 +1,23 @@
+# Logfile created on Sat Nov 13 20:02:50 EET 2004 by logger.rb/1.5.2.4
+I: Web Server listening at http://127.0.0.1:8080
+I: App Server listening at http://127.0.0.1:9090
+I: Web Server listening at http://127.0.0.1:8080
+I: App Server listening at http://127.0.0.1:9090
+I: Web Server listening at http://127.0.0.1:8080
+I: App Server listening at http://127.0.0.1:9090
+I: Web Server listening at http://127.0.0.1:8080
+I: App Server listening at http://127.0.0.1:9090
+I: Web Server listening at http://127.0.0.1:8080
+I: App Server listening at http://127.0.0.1:9090
+I: Web Server listening at http://127.0.0.1:8080
+I: App Server listening at http://127.0.0.1:9090
+I: Web Server listening at http://127.0.0.1:8080
+I: App Server listening at http://127.0.0.1:9090
+I: Web Server listening at http://127.0.0.1:8080
+I: App Server listening at http://127.0.0.1:9090
+I: Web Server listening at http://127.0.0.1:8080
+I: App Server listening at http://127.0.0.1:9090
+ INFO: Web Server listening at http://127.0.0.1:8080
+ INFO: App Server listening at http://127.0.0.1:9090
+ INFO: Web Server listening at http://127.0.0.1:8080
+ INFO: App Server listening at http://127.0.0.1:9090

data/examples/tiny/root/{index.sx → index.xhtml}

@@ -5,14 +5,11 @@
 <?r 
 	# the code that populates the template comes here
 
-	unless name = request["name"]
-		name = "World"
+	unless name = params['name']
+		name = 'World'
 	end
 	
-	# maintain a session variable
-	
-	session = request.session 
-	session[:counter] = 0 unless session[:counter]
+	session[:counter] ||= 0
 	session[:counter] += 1
 ?>
 

data/lib/{n/std.rb → nitro.rb}

@@ -1,12 +1,18 @@
-# = Nitro standard require
+# = Nitro 
 #
-# General utilities. Typically included in all Nitro applications.
+# Nitro is an efficient, yet simple engine for developing professional 
+# Web Applications using the Ruby language. Nitro aims to provide a 
+# robust infrastructure for scalable web applications that can be 
+# distributed over a server cluster. However, Nitro can also power 
+# simple web applications for deployment on intranets or even personal 
+# computers. Nitro integrates the powerful Og Object-Relational mapping 
+# library.
 #
 # code: 
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: std.rb 123 2004-11-01 11:55:11Z gmosx $
+# $Id: nitro.rb 155 2004-11-13 20:32:12Z gmosx $
 
 # we want readable code
 
@@ -50,4 +56,3 @@ end
 # predefine some comonly used objects
 
 EMPTY_STRING = ""
-

data/lib/{n → nitro}/application.rb

@@ -9,13 +9,13 @@
 # Elias Karakoulakis  <ekarak@ktismata.com>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: application.rb 98 2004-10-22 07:36:20Z gmosx $
+# $Id: application.rb 155 2004-11-13 20:32:12Z gmosx $
 
 require 'optparse'
 require 'ostruct'
    
-require "n/logger"
-require "n/std"
+require "nitro/logger"
+require "nitro"
 
 module N
 
@@ -64,22 +64,22 @@ class Application
 			opts.separator "Specific options:"
  
    		opts.on("-s", "--start",
-   				"Start Navel's Application Server.") { 
+   				"Start '#$name'.") { 
 				start()
    		}
 
 			opts.on("-S", "--stop",
-   				"Stop Navel's Application Server.") { 
+   				"Stop '#$name'.") { 
 				stop()
    		}
 
 			opts.on("-r", "--restart",
-   				"Restart Navel's Application Server.") { 
+   				"Restart '#$name'.") { 
 				restart()
    		}
 
 			opts.on("-d", "--daemon",
-   				"Run Navel's Application Server as a daemon.") { 
+   				"Run '#$name' as a daemon.") { 
 				daemonize()
 				start()
    		}
@@ -88,6 +88,12 @@ class Application
    			puts opts
      		exit
 			}
+			
+			opts.on_tail("-v", "--version", "Show version.") {
+   			puts $srv_version
+     		exit
+			}
+			
     }   
 		begin
 			opts.parse!(args)

data/lib/{n → nitro}/config.rb

@@ -6,13 +6,13 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: config.rb 116 2004-10-29 16:26:32Z gmosx $
+# $Id: config.rb 155 2004-11-13 20:32:12Z gmosx $
 
-# the name of the server
-$srv_name = "Nitro"
-
-# the version of the server
-$srv_version = "0.3.0"
+require 'nitro/logger'
+require 'nitro/utils/hash'
+require 'nitro/version'
+require 'nitro/service'
+require 'nitro/server/shaders'
 
 # monitor scripts for changes
 #--
@@ -20,10 +20,14 @@ $srv_version = "0.3.0"
 #++
 $srv_monitor_scripts = true
 
+# The root (public) directory.
+$root_dir = "root"
+
 # the default file to view in a direcotry
 $index_filename = "index.sx"
 
 # seconds till the autologin cookie expires
+# TODO: move to filter.
 $srv_autologin_expires = 60*60*24*30
 
 # session timeout (in seconds)
@@ -39,7 +43,29 @@ $drb_state = false
 $error_page_url = nil
 
 # default encoding for the app.
-$encoding = "iso-8859-1"
+$encoding = 'iso-8859-1'
+
+# default content type.
+$default_content_type = 'text/html'
+
+# The services map.
+# :index represents the '/' mount point
+$services = { :index => N::Service }
+
+# The service method map.
+$methods = N::SafeHash.new
+
+# The shader. The default shader is very simple, here
+# is a typical example of a production shader pipeline:
+#
+# <tt>
+#	$shader = N::XSLTShader.new("#$root_dir/style.xsl",
+#							N::RubyShader.new(
+#								N::CompressShader.new
+#							)
+#						)
+# </tt>
+$shader = N::RubyShader.new
 
 if $DBG
 	
@@ -63,13 +89,16 @@ if $DBG
 
 	$srv_address = $appsrv_address = "127.0.0.1"
 	$srv_port = 8080
-	$appsrv_port = 9090
+	$appsrv_port = 8080
 	$srv_url = "http://#$srv_address:#$srv_port"
 	
 else
 
 	puts "\nRunning LIVE configuration.\n\n"
 
+	$log = Logger.new("log/app.log", 10); 
+	$log.level = Logger::INFO
+	
 	# If set to true disables xsl caching. Usefull when debugging xsls.
 
 	$reload_xsl = false 
@@ -86,4 +115,5 @@ else
 	$srv_port = 8080
 	$appsrv_port = 9090
 	$srv_url = "http://#$srv_address:#$srv_port"
+	
 end

data/lib/{n → nitro}/events.rb

@@ -6,7 +6,7 @@
 # George Moschovitis  <gm@navel.gr>
 #
 # (c) 2002-2003 Navel, all rights reserved.
-# $Id: events.rb 98 2004-10-22 07:36:20Z gmosx $
+# $Id: events.rb 152 2004-11-13 20:02:35Z gmosx $
 
 module N;
 

data/lib/{n → nitro}/l10n.rb

@@ -3,7 +3,7 @@
 # code: tml
 #
 # (c) 2002-2003 Navel, all rights reserved.
-# $Id: l10n.rb 71 2004-10-18 10:50:22Z gmosx $
+# $Id: l10n.rb 152 2004-11-13 20:02:35Z gmosx $
 
 $lc_en = {}
 $lc_el = {}

data/lib/{n → nitro}/logger.rb

@@ -7,7 +7,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: logger.rb 109 2004-10-27 09:12:45Z gmosx $
+# $Id: logger.rb 152 2004-11-13 20:02:35Z gmosx $
 
 require "logger"
 
@@ -38,14 +38,14 @@ class Logger
 
 	private
 		
-		# the default Ruby logger has a hardwired silly format.
-		# we use some Ruby magic to fix it!
-		remove_const "Format"
+	# the default Ruby logger has a hardwired silly format.
+	# we use some Ruby magic to fix it!
+	remove_const "Format"
 
-		Format = "%c: %s\n"
+	Format = "%5s: %s\n"
 
-		def format_message(severity, timestamp, msg, progname)
-			Format % [severity[0], msg]
-		end
+	def format_message(severity, timestamp, msg, progname)
+		Format % [severity, msg]
+	end
 end
 

data/lib/{n → nitro}/macros.rb

@@ -9,7 +9,7 @@
 # George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: macros.rb 98 2004-10-22 07:36:20Z gmosx $
+# $Id: macros.rb 155 2004-11-13 20:32:12Z gmosx $
 
 $__macros__ = {}
 $__required__ = {}
@@ -39,8 +39,8 @@ end
 
 end
 
-require "n/test1.rb"
-require "n/test2.rb"
+require "nitro/test1.rb"
+require "nitro/test2.rb"
 
 __END__
 

data/lib/{n → nitro}/mixins.rb

@@ -42,5 +42,5 @@ module Expirable
 		end
 	end
 end
-	
+
 end # module

data/lib/nitro/properties.rb

@@ -0,0 +1,301 @@
+# code:
+# * George Moschovitis  <gm@navel.gr>
+# design:
+# * Anastastios Koutoumanos  <ak@navel.gr>
+# * Elias Karakoulakis  <ekarak@ktismata.com>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id: properties.rb 155 2004-11-13 20:32:12Z gmosx $
+
+require "nitro/utils/array"
+require "nitro/utils/hash"
+
+module N
+
+# = Property
+#
+# Ruby attributes are typeless and generally this is good. Some times
+# we need extra metadata though, for example in relational mapping,
+# or web form population.
+#
+# Only Fixnums, Strings, Floats, Times, Booleans are converted.
+#
+# The default = methods do not force the  types. A special 
+# __force_set method should be used instead.
+#
+#--
+# TODO:
+# Inject only the really needd methods into Module.
+# Perhaps a sync is needed in evals (!!!!)
+#++
+#
+class Property
+	# the symbol of the property
+	attr_accessor :symbol
+	# the string representation of the symbol
+	attr_accessor :name
+	# the class of the property
+	attr_accessor :klass
+	# additional metadata (like sql declaratio, sql index, etc)
+	attr_accessor :meta
+	
+	def initialize(symbol, klass, meta = {})
+		@symbol, @klass = symbol, klass
+		@meta = meta
+		@name = @symbol.to_s()
+	end
+	
+	def ==(other)
+		return @symbol == other.symbol
+	end
+end
+
+end # module
+
+class Module
+
+	# Define a property (== typed attribute)
+	# This works like Ruby's standard attr method, ie creates
+	# only one property. 
+	#
+	# Use the prop_reader, prop_writer, prop_accessor methods 
+	# for multiple properties.
+	#
+	# Examples:
+	#	prop String, :name, :sql => "char(32), :sql_index => "name(32)"
+	# --> creates only writer.
+	# prop Fixnum, :oid, writer = true, :sql => "integer PRIMARY KEY"
+	#	--> creates reader and writer.
+	# 
+	def prop(*params)
+		meta = {}
+		klass = Object
+		
+		for param in params
+			if param.is_a?(Class)
+				klass = param
+			elsif param.is_a?(Symbol)
+				symbol = param
+			elsif param.is_a?(TrueClass) or param.is_a?(TrueClass) 
+				writer = param
+			elsif param.is_a?(Hash)
+				# the meta hash.
+				meta = param
+			else
+				raise "Error when defining property!"
+			end
+		end
+
+		unless self.methods.include?("__props")
+			eval %{
+				# Properties
+				# An array is used to enforce order.
+				def __props
+					@__props
+				end
+
+				def __props=(props)
+					@__props = props
+				end
+				
+				def __meta
+					@__meta
+				end
+
+				def __meta=(meta)
+					@__meta = meta
+				end				
+			}
+		end
+
+		@__props = N::SafeArray.new() unless @__props
+				
+		property = N::Property.new(symbol, klass, meta)
+		
+		reader = meta[:reader] || true
+		writer = writer || meta[:writer] || false
+		
+		__add_prop(property, reader, writer)
+	end
+
+	# Helper method. Accepts a collection of symbols and generates
+	# properties. Only generates reader.
+	#
+	# Example:
+	#	prop_reader String, :name, :title, :body, :sql => "char(32)"
+	#
+	def prop_reader(*params)
+		meta = {}
+		klass = Object
+		symbols = []
+
+		for param in params
+			if param.is_a?(Class)
+				klass = param
+			elsif param.is_a?(Symbol)
+				symbols << param
+			elsif param.is_a?(Hash)
+				# the meta hash.
+				meta = param
+			else
+				raise "Error when defining property!"
+			end
+		end
+		
+		meta[:reader] = true
+		meta[:writer] = false
+		
+		for symbol in symbols
+			prop(klass, symbol, meta)
+		end
+	end
+
+	# Helper method. Accepts a collection of symbols and generates
+	# properties. Only generates writer.
+	#
+	# Example:
+	#	prop_writer String, :name, :title, :body, :sql => "char(32)"
+	#
+	def prop_writer(*params)
+		meta = {}
+		klass = Object
+		symbols = []
+
+		for param in params
+			if param.is_a?(Class)
+				klass = param
+			elsif param.is_a?(Symbol)
+				symbols << param
+			elsif param.is_a?(Hash)
+				# the meta hash.
+				meta = param
+			else
+				raise "Error when defining property!"
+			end
+		end
+		
+		meta[:reader] = false
+		meta[:writer] = true
+		
+		for symbol in symbols
+			prop(klass, symbol, meta)
+		end
+	end
+
+	# Helper method. Accepts a collection of symbols and generates
+	# properties. Generates reader and writer.
+	#
+	# Example:
+	#	prop_accessor String, :name, :title, :body, :sql => "char(32)"
+	#
+	def prop_accessor(*params)
+		meta = {}
+		klass = Object
+		symbols = []
+
+		for param in params
+			if param.is_a?(Class)
+				klass = param
+			elsif param.is_a?(Symbol)
+				symbols << param
+			elsif param.is_a?(Hash)
+				# the meta hash.
+				meta = param
+			else
+				raise "Error when defining property!"
+			end
+		end
+		
+		meta[:reader] = true
+		meta[:writer] = true
+		
+		for symbol in symbols
+			prop(klass, symbol, meta)
+		end
+	end
+	
+	# Add the property
+	#
+	def __add_prop(prop, reader = true, writer = true)
+		if idx = @__props.index(prop)
+			# override in case of duplicates. Keep the order of the props.
+			@__props[idx] = prop
+		else
+			@__props << prop
+		end
+		
+		# Precompile the property read/write methods
+
+		s, klass = prop.symbol, prop.klass 
+
+		if reader		
+			module_eval %{
+				def #{s}
+					return @#{s}
+				end
+			}
+		end
+			
+		if writer 
+			module_eval %{
+				def #{s}=(val)
+					@#{s} = val
+				end
+				
+				def __force_#{s}(val)
+						@#{s} = } + case klass.name
+													when Fixnum.name
+														"val.to_i()"
+													when String.name
+														"val.to_s()"
+													when Float.name
+														"val.to_f()"
+													when Time.name
+														"Time.parse(val.to_s())"
+													when TrueClass.name, FalseClass.name
+														"val.to_i() > 0"
+													else
+														"val"
+												end + %{ 
+				end
+			}
+		end
+	end
+	
+	# Attach metadata 
+	#
+	def meta(key, val)
+		@__meta = N::SafeHash.new unless @__meta
+
+		@__meta[key] = [] unless @__meta[key]
+
+		# guard against duplicates, no need to keep order.
+		@__meta[key].delete_if { |v| val == v }
+		@__meta[key] << val			
+	end
+	
+	# This method is typically called before including other
+	# modules to preserve properties order. 
+	#
+	def inherit_meta(mod = superclass)
+		# concat props.
+		if mod.__props
+			@__props = N::SafeArray.new unless @__props
+			
+			mod.__props.each { |p|
+				__add_prop(p)
+			} 
+		end
+
+		# concat metadata
+		if mod.__meta
+			mod.__meta.each { |k, val|
+				val.each { |v|
+					meta(k, v)
+				} if val
+			}
+		end
+	end
+	
+end
+