nitro 0.3.0 → 0.4.1

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

@@ -6,9 +6,9 @@
 # George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: sitemap.rb 98 2004-10-22 07:36:20Z gmosx $
+# $Id: sitemap.rb 155 2004-11-13 20:32:12Z gmosx $
 
-require "n/utils/hash"
+require "nitro/utils/hash"
 
 module N
 

data/lib/{n → nitro}/ui/pager.rb

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

data/lib/{n → nitro}/ui/popup.rb

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

data/lib/{n → nitro}/ui/select.rb

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

data/lib/{n → nitro}/ui/tabs.rb

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

data/lib/{n → nitro}/utils/array.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2002-2003 Navel, all rights reserved.
-# $Id: array.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: array.rb 152 2004-11-13 20:02:35Z gmosx $
 
 require "sync"
 

data/lib/{n → nitro}/utils/cache.rb

@@ -3,7 +3,7 @@
 # * Anastasios Koutoumanos  <ak@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: cache.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: cache.rb 152 2004-11-13 20:02:35Z gmosx $
 
 module N;
 

data/lib/{n → nitro}/utils/gfx.rb

@@ -3,7 +3,7 @@
 # * Elias Athanasopoulos  <elathan@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: gfx.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: gfx.rb 152 2004-11-13 20:02:35Z gmosx $
 
 module N
 

data/lib/{n → nitro}/utils/hash.rb

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

data/lib/{n → nitro}/utils/html.rb

@@ -4,7 +4,7 @@
 # * Elias Karakoulakis  <ekarak@ktismata.com>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: html.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: html.rb 152 2004-11-13 20:02:35Z gmosx $
 
 require "uri"
 require "cgi"

data/lib/{n → nitro}/utils/http.rb

@@ -3,7 +3,7 @@
 # * Elias Karakoulakis  <ekarak@ktismata.com>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: http.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: http.rb 152 2004-11-13 20:02:35Z gmosx $
 
 require "uri"
 require "cgi"

data/lib/{n → nitro}/utils/mail.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: mail.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: mail.rb 152 2004-11-13 20:02:35Z gmosx $
 
 require "net/smtp"
 

data/lib/{n → nitro}/utils/number.rb

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

data/lib/{n → nitro}/utils/pool.rb

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

data/lib/{n → nitro}/utils/string.rb

@@ -4,7 +4,7 @@
 # * Elias Karakoulakis  <ekarak@ktismata.com>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: string.rb 106 2004-10-25 11:31:11Z gmosx $
+# $Id: string.rb 152 2004-11-13 20:02:35Z gmosx $
 
 require "uri"
 
@@ -56,7 +56,10 @@ module StringUtils
 		"�" => "w", "�" => "W", "�" => "w", "�"=>"W"
 	}
 
-	# Convert the input string to greeklish
+	# Convert the input string to greeklish.
+	#--
+	# gmosx, TODO: remove from public distribution
+	#++
 	#
 	def self.to_greeklish(input)
 		return nil unless input
@@ -86,13 +89,13 @@ module StringUtils
 		return nil unless string
 		return nil if count < 2
 
-        if string.size > count
-            cut_at = force_cutoff ? count : (string.index(' ', count-1) || count)
-            xstring = string.slice(0, cut_at)
+		if string.size > count
+			cut_at = force_cutoff ? count : (string.index(' ', count-1) || count)
+			xstring = string.slice(0, cut_at)
 			return xstring.chomp(" ") + ellipsis
-        else
-            return string
-        end
+		else
+			return string
+		end
 	end
 
 	# Apply a set of rules (regular expression matches) to the
@@ -130,7 +133,10 @@ module StringUtils
 
 	# Enforces a maximum width of a string inside an
 	# html container. If the string exceeds this maximum width
-	# the string gets wraped
+	# the string gets wraped.
+	#
+	# Not really useful, better use the CSS overflow: hidden
+	# functionality.
 	#
 	# === Input:
 	# the string to be wrapped
@@ -142,7 +148,7 @@ module StringUtils
 	#
 	# === Example:
 	#  text = "1111111111111111111111111111111111111111111"
-	#  text = Web::Utils::Html.wrap(text, 10, " ")
+	#  text = wrap(text, 10, " ")
 	#  p text # => "1111111111 1111111111 1111111111"
 	#
 	# See the test cases to better understand the behaviour!
@@ -156,70 +162,6 @@ module StringUtils
 		return wrapped_string
 	end
 
-	EXTENSION_REGEX = /\.(\w+)$/
-
-	# extracts the extension from a path or filename.
-	#
-	# === Input:
-	# the path to a file (or just a plain filename)
-	#
-	# === Output:
-	# the extension of the filename
-	# returns nil if no exception
-	# the extension is DOWNCASED!
-	#
-	def self.extension_from_path(path)
-		if md = EXTENSION_REGEX.match(path)
-			return md[1].downcase
-		else
-			return nil
-		end
-	end
-
-	# Extracts the (file)name from a path or filename.
-	#
-	# === Input:
-	# the path to a file (or just a plain filename)
-	#
-	# === Output:
-	# the name part of the filename (the extension is stripped)
-	# returns empty string if input is nil (safer?)
-	#
-	def self.filename_from_path(path)
-		# gmosx: "" is safer, no??? and it is logical too.
-		return "" unless path
-		parts = path.split(EXTENSION_REGEX)
-		return parts[0]
-	end
-
-	# Extracts the file part from a path or filename.
-	#
-	# === Input:
-	# the path to a file (or just a plain filename)
-	#
-	# === Output:
-	# the file part (the directory is stripped)
-	# returns empty string if input is nil (safer?)
-	#
-	def self.file_from_path(path)
-		return "" unless path
-		return path.split("/").slice(-1)
-	end	
-	
-	# Extracts the directory part from a path or filename.
-	#
-	# === Input:
-	# the path to a file (or just a plain filename)
-	#
-	# === Output:
-	# the directory part (the filename is stripped)
-	# returns empty string if input is nil (safer?)
-	#
-	def self.directory_from_path(path)
-		return "" unless path
-		return path.chomp(self.file_from_path(path)).chop()
-	end
-	
 	# Replace dangerours chars in filenames
 	#
 	def self.rationalize_filename(filename)
@@ -261,29 +203,11 @@ module StringUtils
 		return string
 	end
 
-  # Converts unicode to ISO8859-7 (unfortunately Ruby is a little poor at i18n)
-	# Usefull for parsing xmls with libxml.
-	#
-	# === Input:
-	# the string to convert
-	#
-	# === Output:
-	# the converted string
-	#
-	# === TODO:
-	# - MORE TEST UNITS !!!!
-	#
-	def self.unicode_to_iso88597(string)
-		return string.to_s.unpack('U*').collect {|ch|
-			ch>127 ? ch-0x02d0 : ch
-		}.pack('C*')
-	end
-
-
 	# Screen an IP address
-	#
+	#--
 	# gmosx: copied this method from n1, check how it works!
-	#
+	# probably deprecate?
+	#++
 	def self.screen_ip_address(address)
 		if address
 			return address.split(',').collect { |hostip|

data/lib/{n → nitro}/utils/time.rb

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

data/lib/{n → nitro}/utils/uri.rb

@@ -2,12 +2,12 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: uri.rb 101 2004-10-22 12:35:39Z gmosx $
+# $Id: uri.rb 155 2004-11-13 20:32:12Z gmosx $
 
 require "uri"
 require "cgi"
 
-require "n/utils/string"
+require "nitro/utils/string"
 
 module N
 
@@ -37,7 +37,7 @@ module UriUtils
 		if md = URI::REGEXP::REL_URI.match(escaped_uri)
 
 			path = "#{md[5]}#{md[6]}"
-			type = N::StringUtils.extension_from_path(path)
+			type = File.extname(path)
 			query_string = md[7]
 
 #			real_path = "#{$root_dir}/#{path}"

data/lib/nitro/version.rb

@@ -0,0 +1,11 @@
+# code: 
+# * George Moschovitis  <gm@navel.gr>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id: version.rb 157 2004-11-13 20:43:11Z gmosx $
+
+# The name of the server.
+$srv_name = 'Nitro'
+
+# The version of the server.
+$srv_version = '0.4.1'

data/lib/{n/og.rb → og.rb}

@@ -2,28 +2,15 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: og.rb 124 2004-11-01 12:34:17Z gmosx $
+# $Id: og.rb 155 2004-11-13 20:32:12Z gmosx $
 
-require "n/properties"
-require "n/utils/array"
-require "n/utils/hash"
-require "n/utils/time"
-require "n/utils/pool"
+require "nitro/properties"
+require "nitro/utils/array"
+require "nitro/utils/hash"
+require "nitro/utils/time"
+require "nitro/utils/pool"
 
-require "n/og/meta"
-
-module N
-
-# If true, only allow reading from the database. Usefull
-# for maintainance.
-#
-$og_read_only_mode = false
-
-# If true, the library automatically 'enchants' managed classes.
-# In enchant mode, special db aware methods are added to 
-# managed classes and instances.
-#
-$og_enchant_managed_classes = true
+require "og/meta"
 
 # = Og
 #
@@ -104,7 +91,35 @@ $og_enchant_managed_classes = true
 # * Deserialize to OpenStruct.
 # * Better documentation.
 #
-class Og
+module Og
+
+# If true, only allow reading from the database. Usefull
+# for maintainance.
+#
+$og_read_only_mode = false
+
+# If true, the library automatically 'enchants' managed classes.
+# In enchant mode, special db aware methods are added to 
+# managed classes and instances.
+#
+$og_enchant_managed_classes = true
+
+# If true, use Ruby's advanced introspection capabilities to 
+# automatically manage classes tha define properties.
+$og_auto_manage_classes = true
+
+# = Unmanageable
+#
+# Marker module. If included this in a class, the Og automanager
+# ignores this class.
+#
+module Unmanageable; end
+
+# = Database
+#
+# Encapsulates an Og Database.
+#
+class Database
 
 	# Managed class metadata
 	#
@@ -140,7 +155,7 @@ class Og
 		
 		# require the backend.		
 		backend = @config[:backend] || "psql"
-		require "n/og/backends/#{backend}"
+		require "og/backends/#{backend}"
 		eval %{	@config[:backend] = #{backend.capitalize}Backend }
 		
 		@connection_pool = N::Pool.new
@@ -149,7 +164,21 @@ class Og
 		$log.info "Connecting to database '#{@config[:database]}' using backend '#{backend}'."
 		
 		@config[:connection_count].times do
-			@connection_pool << N::OgConnection.new(self)
+			@connection_pool << Og::Connection.new(self)
+		end
+		
+		if $og_auto_manage_classes
+			# automatically manage classes with properties and metadata.
+			# gmosx: Any idea how to optimize this?
+			classes_to_manage = []
+			ObjectSpace.each_object(Class) do |c|
+				if c.respond_to?(:__props) and c.__props
+					classes_to_manage << c
+				end
+			end
+			$log.info "Og auto manages the following classes:"
+			$log.info "#{classes_to_manage.inspect}"
+			manage_classes(*classes_to_manage)
 		end
 	end
 		
@@ -215,7 +244,7 @@ class Og
 	# Register a standard Ruby class as managed.
 	#
 	def manage(klass)
-		return if managed?(klass)
+		return if managed?(klass) or klass.ancestors.include?(Og::Unmanageable)
 		
 		@managed_classes[klass] = ManagedClassMeta.new(klass)
 		
@@ -251,13 +280,13 @@ class Og
 	def convert(klass)
 		# gmosx: this check is needed to allow the developer to customize
 		# the sql generated for oid
-		N::OgUtils.eval_og_oid(klass) unless klass.instance_methods.include?(:oid)
+		Og::Utils.eval_og_oid(klass) unless klass.instance_methods.include?(:oid)
 		
 		klass.class_eval %{
 			inherit_meta(superclass) if superclass
 			
-			DBTABLE = "#{N::OgUtils.table(klass)}"
-			DBSEQ = "#{N::OgUtils.table(klass)}_oids_seq" 
+			DBTABLE = "#{Og::Utils.table(klass)}"
+			DBSEQ = "#{Og::Utils.table(klass)}_oids_seq" 
 			
 			def to_i()
 				@oid
@@ -270,9 +299,9 @@ class Og
 		# Precompile some code that gets executed all the time.
 		# Deletion code is not precompiled, because it is not used
 		# as frequently.
-		N::OgUtils.eval_og_insert(klass)
-		N::OgUtils.eval_og_update(klass)
-		N::OgUtils.eval_og_deserialize(klass, self)
+		Og::Utils.eval_og_insert(klass)
+		Og::Utils.eval_og_update(klass)
+		Og::Utils.eval_og_deserialize(klass, self)
 	end
 	
 	# Enchant a managed class. Add useful DB related methods to the 
@@ -359,6 +388,7 @@ class Og
 	wrap_method :load_all, "klass, extrasql = nil"
 	wrap_method :select, "sql, klass"
 	wrap_method :select_one, "sql, klass"
+	wrap_method :count, "sql, klass = nil"
 	wrap_method :delete, "obj_or_oid, klass = nil"	
 	wrap_method :query, "sql"
 	wrap_method :exec, "sql"
@@ -370,7 +400,7 @@ class Og
 
 	def self.drop_db!(config)
 		backend = config[:backend] || "psql"
-		require "n/og/backends/#{backend}"
+		require "og/backends/#{backend}"
 		eval %{
 			#{backend.capitalize}Backend.drop_db(config[:database], config[:user], 
 					config[:password])