nitro 0.3.0 → 0.4.1

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

@@ -2,19 +2,19 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: backend.rb 123 2004-11-01 11:55:11Z gmosx $
+# $Id: backend.rb 155 2004-11-13 20:32:12Z gmosx $
 
 require "yaml"
 
-require "n/og/connection"
+require "og/connection"
 
-module N
+module Og
 
 # = OgUtils
 #
 # A collection of useful utilities.
 #
-module OgUtils
+module Utils
 
 	# The name of the SQL table where objects of this class are stored.
 	# The Module separators are replaced with _ and NOT stripped out so 
@@ -124,7 +124,7 @@ module OgUtils
 			if idx = og.managed_classes[klass].field_index[p.name]
 				# more fault tolerant if a new field is added and it 
 				# doesnt exist in the database.
-				code << "@#{p.name} = #{N::OgUtils.read_prop(p, idx)}"
+				code << "@#{p.name} = #{Og::Utils.read_prop(p, idx)}"
 			end
 		end
 		
@@ -137,12 +137,12 @@ module OgUtils
 	
 end
 
-# = OgBackend
+# = Backend
 #
 # Abstract backend. A backend communicates with the RDBMS.
 # This is the base class for the various backend implementations.
 #
-class OgBackend
+class Backend
 	
 	# The actual connection to the database
 	attr_accessor :conn
@@ -246,6 +246,12 @@ class OgBackend
 	def deserialize_all(res, klass)	
 		raise "Not implemented"
 	end
+	
+	# Return a single integer value from the resultset.
+	#
+	def get_int(res, idx = 0)
+		raise "Not implemented"
+	end
 
 end
 

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

@@ -3,19 +3,19 @@
 # * Elias Athanasopoulos  <elathan@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: mysql.rb 123 2004-11-01 11:55:11Z gmosx $
+# $Id: mysql.rb 155 2004-11-13 20:32:12Z gmosx $
 
 require "mysql"
 
-require "n/og/backend"
+require "og/backend"
 
-module N
+module Og
 
-# = OgUtils
+# = Utils
 #
 # A collection of useful utilities.
 #
-module OgUtils
+module Utils
 
 	# Escape an SQL string
 	#
@@ -63,17 +63,20 @@ module OgUtils
 	# FIXME: add extra handling for float.
 	#
 	def self.write_prop(p)
-		if String == p.klass
-			return "'#\{N::OgUtils.escape(@#{p.symbol})\}'"
-		elsif Time == p.klass
-			return %|#\{@#{p.symbol} ? "'#\{N::OgUtils.timestamp(@#{p.symbol})\}'" : 'NULL'\}|
-		elsif Date == p.klass
-			return %|#\{@#{p.symbol} ? "'#\{N::OgUtils.date(@#{p.symbol})\}'" : 'NULL'\}|
-		elsif Object == p.klass or Array == p.klass or Hash == p.klass
-			return %|#\{@#{p.symbol} ? "'#\{N::OgUtils.escape(@#{p.symbol}.to_yaml)\}'" : ''\}|
-		else
-			# Fixnum, TrueClass
+		if p.klass.ancestors.include?(Integer)
 			return "#\{@#{p.symbol} || 'NULL'\}"
+		elsif p.klass.ancestors.include?(Float)
+			return "#\{@#{p.symbol} || 'NULL'\}"		
+		elsif p.klass.ancestors.include?(String)
+			return "'#\{Og::Utils.escape(@#{p.symbol})\}'"
+		elsif p.klass.ancestors.include?(Time)
+			return %|#\{@#{p.symbol} ? "'#\{Og::Utils.timestamp(@#{p.symbol})\}'" : 'NULL'\}|
+		elsif p.klass.ancestors.include?(Date)
+			return %|#\{@#{p.symbol} ? "'#\{Og::Utils.date(@#{p.symbol})\}'" : 'NULL'\}|
+		elsif p.klass.ancestors.include?(TrueClass)
+			return "#\{@#{p.symbol} || 'NULL'\}"
+		else 
+			return %|#\{@#{p.symbol} ? "'#\{Og::Utils.escape(@#{p.symbol}.to_yaml)\}'" : "''"\}|
 		end
 	end		
 
@@ -81,26 +84,21 @@ module OgUtils
 	# No need to optimize this, used only to precalculate code.
 	#
 	def self.read_prop(p, idx)
-		case p.klass.to_s
-			when Fixnum.name
-				return "res[#{idx}].to_i()"
-			when Float.name
-				return "res[#{idx}].to_f()"
-			when Time.name
-				return "N::OgUtils.parse_timestamp(res[#{idx}])"
-			when Date.name
-				return "N::OgUtils.parse_date(res[#{idx}])"
-			when TrueClass.name
-				return "('true' == res[#{idx}])"
-			when Object.name
-				return "YAML::load(res[#{idx}])"
-			when Array.name
-				return "YAML::load(res[#{idx}])"
-			when Hash.name
-				return "YAML::load(res[#{idx}])"
-			else # String 
-				return "res[#{idx}]"
-		end		
+		if p.klass.ancestors.include?(Integer)
+			return "res[#{idx}].to_i()"
+		elsif p.klass.ancestors.include?(Float)
+			return "res[#{idx}].to_f()"
+		elsif p.klass.ancestors.include?(String)
+			return "res[#{idx}]"
+		elsif p.klass.ancestors.include?(Time)
+			return "Og::Utils.parse_timestamp(res[#{idx}])"
+		elsif p.klass.ancestors.include?(Date)
+			return "Og::Utils.parse_date(res[#{idx}])"
+		elsif p.klass.ancestors.include?(TrueClass)
+			return "('true' == res[#{idx}])"
+		else 
+			return "YAML::load(res[#{idx}])"
+		end				
 	end
 
 	# Returns the props that will be included in the insert query.
@@ -139,7 +137,7 @@ module OgUtils
 	#
 	def self.eval_og_oid(klass)
 		klass.class_eval %{
-			prop_accessor Fixnum, "integer AUTO_INCREMENT PRIMARY KEY", :oid
+			prop_accessor :oid, Fixnum, :sql => "integer AUTO_INCREMENT PRIMARY KEY"
 		}
 	end
 end
@@ -148,7 +146,7 @@ end
 #
 # Implements a MySQL powered backend.
 #
-class MysqlBackend < N::OgBackend
+class MysqlBackend < Og::Backend
 
 	# A mapping between Ruby and SQL types.
 	#
@@ -270,8 +268,8 @@ class MysqlBackend < N::OgBackend
 		klass.__props.each do |p|
 			field = "#{p.symbol}"
 			
-			if p.sql
-				field << " #{p.sql}"
+			if p.meta and p.meta[:sql]
+				field << " #{p.meta[:sql]}"
 			else
 				field << " #{TYPEMAP[p.klass]}"
 			end
@@ -346,6 +344,12 @@ class MysqlBackend < N::OgBackend
 		
 		return entities
 	end
+
+	# Return a single integer value from the resultset.
+	#
+	def get_int(res, idx = 0)	
+		return res.fetch_row[idx].to_i
+	end
 	
 end
 

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

@@ -2,19 +2,19 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: psql.rb 123 2004-11-01 11:55:11Z gmosx $
+# $Id: psql.rb 155 2004-11-13 20:32:12Z gmosx $
 
 require "postgres"
 
-require "n/og/backend"
+require "og/backend"
 
-module N
+module Og
 
-# = OgUtils
+# = Utils
 #
 # A collection of useful utilities.
 #
-module OgUtils
+module Utils
 
 	# Escape an SQL string
 	#
@@ -62,17 +62,20 @@ module OgUtils
 	# FIXME: add extra handling for float.
 	#
 	def self.write_prop(p)
-		if String == p.klass
-			return "'#\{N::OgUtils.escape(@#{p.symbol})\}'"
-		elsif Time == p.klass
-			return %|#\{@#{p.symbol} ? "'#\{N::OgUtils.timestamp(@#{p.symbol})\}'" : 'NULL'\}|
-		elsif Date == p.klass
-			return %|#\{@#{p.symbol} ? "'#\{N::OgUtils.date(@#{p.symbol})\}'" : 'NULL'\}|
-		elsif Object == p.klass or Array == p.klass or Hash == p.klass
-			return %|#\{@#{p.symbol} ? "'#\{N::OgUtils.escape(@#{p.symbol}.to_yaml)\}'" : ''\}|
-		else
-			# Fixnum, TrueClass
+		if p.klass.ancestors.include?(Integer)
 			return "#\{@#{p.symbol} || 'NULL'\}"
+		elsif p.klass.ancestors.include?(Float)
+			return "#\{@#{p.symbol} || 'NULL'\}"		
+		elsif p.klass.ancestors.include?(String)
+			return "'#\{Og::Utils.escape(@#{p.symbol})\}'"
+		elsif p.klass.ancestors.include?(Time)
+			return %|#\{@#{p.symbol} ? "'#\{Og::Utils.timestamp(@#{p.symbol})\}'" : 'NULL'\}|
+		elsif p.klass.ancestors.include?(Date)
+			return %|#\{@#{p.symbol} ? "'#\{Og::Utils.date(@#{p.symbol})\}'" : 'NULL'\}|
+		elsif p.klass.ancestors.include?(TrueClass)
+			return "#\{@#{p.symbol} || 'NULL'\}"
+		else 
+			return %|#\{@#{p.symbol} ? "'#\{Og::Utils.escape(@#{p.symbol}.to_yaml)\}'" : "''"\}|
 		end
 	end		
 
@@ -80,25 +83,20 @@ module OgUtils
 	# No need to optimize this, used only to precalculate code.
 	#
 	def self.read_prop(p, idx)
-		case p.klass.to_s
-			when Fixnum.name
-				return "res.getvalue(tuple, #{idx}).to_i()"
-			when Float.name
-				return "res.getvalue(tuple, #{idx}).to_f()"
-			when Time.name
-				return "N::OgUtils.parse_timestamp(res.getvalue(tuple, #{idx}))"
-			when Date.name
-				return "N::OgUtils.parse_date(res.getvalue(tuple, #{idx}))"
-			when TrueClass.name
-				return "('true' == res.getvalue(tuple, #{idx}))"
-			when Object.name
-				return "YAML::load(res.getvalue(tuple, #{idx}))"
-			when Array.name
-				return "YAML::load(res.getvalue(tuple, #{idx}))"
-			when Hash.name
-				return "YAML::load(res.getvalue(tuple, #{idx}))"
-			else # String 
-				return "res.getvalue(tuple, #{idx})"
+		if p.klass.ancestors.include?(Integer)
+			return "res.getvalue(tuple, #{idx}).to_i()"
+		elsif p.klass.ancestors.include?(Float)
+			return "res.getvalue(tuple, #{idx}).to_f()"
+		elsif p.klass.ancestors.include?(String)
+			return "res.getvalue(tuple, #{idx})"
+		elsif p.klass.ancestors.include?(Time)
+			return "Og::Utils.parse_timestamp(res.getvalue(tuple, #{idx}))"
+		elsif p.klass.ancestors.include?(Date)
+			return "Og::Utils.parse_date(res.getvalue(tuple, #{idx}))"
+		elsif p.klass.ancestors.include?(TrueClass)
+			return "('true' == res.getvalue(tuple, #{idx}))"
+		else 
+			return "YAML::load(res.getvalue(tuple, #{idx}))"
 		end		
 	end
 
@@ -131,7 +129,7 @@ module OgUtils
 	#
 	def self.eval_og_oid(klass)
 		klass.class_eval %{
-			prop_accessor Fixnum, "integer PRIMARY KEY", :oid
+			prop_accessor :oid, Fixnum, :sql => "integer PRIMARY KEY"
 		}
 	end
 end
@@ -140,7 +138,7 @@ end
 #
 # Implements a PostgreSQL powered backend.
 #
-class PsqlBackend < N::OgBackend
+class PsqlBackend < Og::Backend
 
 	# A mapping between Ruby and SQL types.
 	#
@@ -247,8 +245,8 @@ class PsqlBackend < N::OgBackend
 		klass.__props.each do |p|
 			field = "#{p.symbol}"
 			
-			if p.sql
-				field << " #{p.sql}"
+			if p.meta and p.meta[:sql]
+				field << " #{p.meta[:sql]}"
 			else
 				field << " #{TYPEMAP[p.klass]}"
 			end
@@ -346,6 +344,12 @@ class PsqlBackend < N::OgBackend
 		return entities
 	end
 
+	# Return a single integer value from the resultset.
+	#
+	def get_int(res, idx = 0)	
+		return res.getvalue(0, idx).to_i
+	end
+
 end
 
 end # module

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

@@ -2,15 +2,15 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: connection.rb 124 2004-11-01 12:34:17Z gmosx $
+# $Id: connection.rb 155 2004-11-13 20:32:12Z gmosx $
 
-module N; 
+module Og; 
 
-require "n/properties"
-require "n/utils/array"
-require "n/utils/time"
+require "nitro/properties"
+require "nitro/utils/array"
+require "nitro/utils/time"
 
-# = OgConnection
+# = Connection
 #
 # A Connection to the Database. This file defines the skeleton 
 # functionality. A backend specific implementation file (driver) 
@@ -21,7 +21,7 @@ require "n/utils/time"
 # - support caching.
 # - support prepared statements.
 #
-class OgConnection
+class Connection
 	# The frontend (Og) contains useful strucutres.
 	attr_reader :og
 	
@@ -140,7 +140,7 @@ class OgConnection
 			sql = "SELECT * FROM #{klass::DBTABLE} WHERE #{sql}"
 		end
 		
-		res = query(sql)
+		res = @db.safe_query(sql)
 		@deserialize? @db.deserialize_all(res, klass) : res
 	end
 	
@@ -151,9 +151,21 @@ class OgConnection
 			sql = "SELECT * FROM #{klass::DBTABLE} WHERE #{sql}"
 		end
 		
-		res = query(sql)
+		res = @db.safe_query(sql)
 		@deserialize? @db.deserialize_one(res, klass) : res
 	end	
+
+	# Perform a count query.
+	#	
+	def count(sql, klass = nil)
+		unless sql =~ /SELECT/i
+			sql = "SELECT COUNT(*) FROM #{klass::DBTABLE} WHERE #{sql}"
+		end
+		
+		res =	@db.safe_query(sql)
+		
+		return @db.get_int(res)
+	end
 	
 	# Delete an object from the database. Allways perform a deep delete.
 	#

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

@@ -2,26 +2,28 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: meta.rb 124 2004-11-01 12:34:17Z gmosx $
+# $Id: meta.rb 155 2004-11-13 20:32:12Z gmosx $
 
-module N
+require 'og/backend'
 
-# = OgMetaUtils
+module Og
+
+# = MetaUtils
 #
 # Some useful meta-language utilities.
 #
-module OgMetaUtils # :nodoc: all
+module MetaUtils # :nodoc: all
 
 	# Conver the klass to a string representation
 	# The leading module if available is removed.
 	#
 	def self.expand(klass)
-		return klass.name.gsub(/^.*::/, "").gsub(/::/, "_").downcase
+		return klass.name.gsub(/^.*::/, '').gsub(/::/, '_').downcase
 	end
 
 end
 
-# = OgMetaLanguage
+# = MetaLanguage
 #
 # Implements a meta-language for manipulating og-managed objects
 # and defining their relationships. The original idea comes
@@ -29,7 +31,7 @@ end
 #
 # Many more useful relations will be available soon.
 #
-module OgMetaLanguage
+module MetaLanguage
 
 	# Implements a 'belongs_to' relation.
 	# Automatically enchants the calling class with helper methods.
@@ -46,7 +48,7 @@ module OgMetaLanguage
 	# def parent; ... end
 	# def parent=(obj_or_oid); ... end
 	#
-	def belongs_to(klass, name, options = {})
+	def belongs_to(name, klass, options = {})
 		module_eval %{
 			prop_accessor Fixnum, :#{name}_oid 
 			
@@ -96,10 +98,10 @@ module OgMetaLanguage
 	#
 	# def children; ... end
 	#
-	def has_many(klass, name, options = {})
+	def has_many(name, klass, options = {})
 		# linkback is the property of the child object that 'links back' 
 		# to this object. 
-		linkback = options[:linkback] || "#{N::OgMetaUtils.expand(self)}_oid"
+		linkback = options[:linkback] || "#{MetaUtils.expand(self)}_oid"
 		
 		module_eval %{
 			@@og_descendants ||= {}
@@ -112,7 +114,11 @@ module OgMetaLanguage
 			end
 			
 			def #{name}(extrasql = nil)
-				$og.select("#{linkback}=\#\@oid \#\{extrasql\}", #{klass})
+				$og.select("SELECT * FROM #{Utils.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}", #{klass})
+			end
+
+			def #{name}_count(extrasql = nil)
+				$og.count("SELECT COUNT(*) FROM #{Utils.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}")
 			end			
 		}
 	end
@@ -122,6 +128,6 @@ end
 end # module
 
 class Module # :nodoc: all
-	include N::OgMetaLanguage
+	include Og::MetaLanguage
 end