nitro 0.7.0 → 0.8.0

data/lib/og/connection.rb

@@ -4,7 +4,7 @@
 # (c) 2004 Navel, all rights reserved.
 # $Id: connection.rb 167 2004-11-23 14:03:10Z gmosx $
 
-module Og; 
+class Og; 
 
 require "glue/property"
 require "glue/array"
@@ -38,14 +38,14 @@ class Connection
 		@og = og
 		@db = @og.config[:backend].new(@og.config)
 		@deserialize = true
-		$log.debug "Created DB connection."
+		Logger.debug "Created DB connection." if $DBG 
 	end
 	
 	# Close the connection to the database
 	#
 	def close()
 		@db.close()
-		$log.debug "Closed DB connection."
+		Logger.debug "Closed DB connection." if $DBG
 	end
 
 	# Save an object to the database. Insert if this is a new object or
@@ -252,14 +252,13 @@ class Connection
 			yield(@db) 
 			@db.commit()
 		rescue => ex
-			$log.error "DB Error: ERROR IN TRANSACTION"
-			$log.error #{ex}
-			$log.error #{ex.backtrace}
+			Logger.error "DB Error: ERROR IN TRANSACTION"
+			Logger.error #{ex}
+			Logger.error #{ex.backtrace}
 			@db.rollback()
 		end
 	end
 		
 end
 
-end # module
-
+end 

data/lib/og/enchant.rb

@@ -0,0 +1,80 @@
+# code: 
+# * George Moschovitis  <gm@navel.gr>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id: meta.rb 198 2004-12-22 11:26:59Z gmosx $
+
+class Og
+
+module Enchant
+
+	# Enchant a managed class. Add useful DB related methods to the 
+	# class and its instances. 
+	#
+	def enchant(klass)
+		klass.module_eval <<-"end_eval", __FILE__, __LINE__
+			def self.create(*params)
+				obj = #{klass}.new(*params)
+				obj.save!
+			end
+				
+			def self.save(obj)
+				Og.db << obj
+			end
+			
+			def self.load(oid_or_name)
+				Og.db.load(oid_or_name, #{klass})
+			end
+
+			def self.[](oid_or_name)
+				Og.db.load(oid_or_name, #{klass})
+			end
+			
+			def self.load_all(extra_sql = nil)
+				Og.db.load_all(#{klass}, extra_sql)
+			end
+			
+			def self.all(extra_sql = nil)
+				Og.db.load_all(#{klass}, extra_sql)
+			end
+
+			def self.count(sql = "SELECT COUNT(*) FROM #{klass::DBTABLE}")
+				Og.db.count(sql, #{klass})
+			end
+
+			def self.select(sql)
+				Og.db.select(sql, #{klass})
+			end
+
+			def self.select_one(sql)
+				Og.db.select_one(sql, #{klass})
+			end
+
+			def self.one(sql)
+				Og.db.select_one(sql, #{klass})
+			end
+			
+			def self.delete(obj_or_oid)
+				Og.db.delete(obj_or_oid, #{klass})
+			end
+			
+			def save
+				Og.db << self
+				return self
+			end
+			alias_method :save!, :save
+			
+			def update_properties(updatesql)
+				Og.db.pupdate(updatesql, self.oid, #{klass})
+			end
+			alias_method :pupdate!, :update_properties
+			
+			def delete!
+				Og.db.delete(@oid, #{klass})
+			end
+		end_eval
+	end
+
+end
+	
+end # namespace

data/lib/og/meta.rb

@@ -7,7 +7,7 @@
 require 'og/backend'
 require 'glue/inflector'
 
-module Og
+class Og
 
 # = MetaUtils
 #
@@ -66,7 +66,7 @@ module MetaLanguage
 			#{prop_eval}
 			
 			def #{name}
-				$og.load_by_oid(@#{name}_oid, #{klass})
+				Og.db.load_by_oid(@#{name}_oid, #{klass})
 			end
 			
 			def #{name}=(obj_or_oid)
@@ -104,7 +104,7 @@ module MetaLanguage
 			end
 			
 			def #{name}(extrasql = nil)
-				$og.select_one("SELECT * FROM #{Utils.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}", #{klass})
+				Og.db.select_one("SELECT * FROM #{Og::Backend.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}", #{klass})
 			end
 		}
 	end	
@@ -123,7 +123,7 @@ module MetaLanguage
 	# def children; ... end
 	#
 	def has_many(name, klass, options = {})
-		name_s = G::Inflector.singularize(name.to_s)
+		name_s = N::Inflector.singularize(name.to_s)
 		
 		# linkback is the property of the child object that 'links back' 
 		# to this object. 
@@ -140,11 +140,11 @@ module MetaLanguage
 			end
 			
 			def #{name}(extrasql = nil)
-				$og.select("SELECT * FROM #{Utils.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}", #{klass})
+				Og.db.select("SELECT * FROM #{Og::Backend.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\}")
+				Og.db.count("SELECT COUNT(*) FROM #{Og::Backend.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\}")
 			end			
 
 			def add_#{name_s}(obj, extra = nil)
@@ -179,9 +179,9 @@ module MetaLanguage
 	#++
 	def many_to_many(name, klass, options = {})
 		list_o = name.to_s
-		prop_o = G::Inflector.singularize(list_o)
-		list_m = options[:linkback] || G::Inflector.plural_name(self) 
-		prop_m = G::Inflector.singularize(list_m)
+		prop_o = N::Inflector.singularize(list_o)
+		list_m = options[:linkback] || N::Inflector.plural_name(self) 
+		prop_m = N::Inflector.singularize(list_m)
 	
 		# exit if the class is allready indirectly 'enchanted' from the
 		# other class of the many_to_many relation.
@@ -197,24 +197,24 @@ module MetaLanguage
 		
 		module_eval %{
 			def #{list_o}(extrasql = nil)
-				$og.select("SELECT d.* FROM #{Utils.table(klass)} AS d, #{Utils.join_table(self, klass)} AS j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
+				Og.db.select("SELECT d.* FROM #{Og::Backend.table(klass)} AS d, #{Og::Backend.join_table(self, klass)} AS j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
 			end
 
 			def #{list_o}_count(extrasql = nil)
-				$og.select("SELECT COUNT(*) FROM #{Utils.table(klass)} AS d, #{Utils.join_table(self, klass)} AS j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
+				Og.db.select("SELECT COUNT(*) FROM #{Og::Backend.table(klass)} AS d, #{Og::Backend.join_table(self, klass)} AS j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
 			end						
 			
 			def add_#{prop_o}(obj, extra = nil)
-				$og.exec("INSERT INTO #{Utils.join_table(self, klass)} (key1, key2) VALUES (\#\@oid, \#\{obj.oid\})") 
+				Og.db.exec("INSERT INTO #{Og::Backend.join_table(self, klass)} (key1, key2) VALUES (\#\@oid, \#\{obj.oid\})") 
 			end
 			
 			def del_#{prop_o}(obj_or_oid, extra = nil)
-				$og.exec("DELETE FROM #{Utils.join_table(self, klass)} WHERE key2=\#\{obj_or_oid.to_i\}") 
+				Og.db.exec("DELETE FROM #{Og::Backend.join_table(self, klass)} WHERE key2=\#\{obj_or_oid.to_i\}") 
 			end
 			alias_method :delete_#{prop_o}, :del_#{prop_o}
 
 			def clear_#{list_o}
-				$og.exec("DELETE FROM #{Utils.join_table(self, klass)} WHERE key1=\#\@oid") 
+				Og.db.exec("DELETE FROM #{Og::Backend.join_table(self, klass)} WHERE key1=\#\@oid") 
 			end			
 		}
 		
@@ -222,24 +222,24 @@ module MetaLanguage
 		
 		klass.module_eval %{
 			def #{list_m}(extrasql = nil)
-				$og.select("SELECT s.* FROM #{Utils.table(self)} AS s, #{Utils.join_table(self, klass)} AS j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
+				Og.db.select("SELECT s.* FROM #{Og::Backend.table(self)} AS s, #{Og::Backend.join_table(self, klass)} AS j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
 			end
 
 			def #{list_m}_count(extrasql = nil)
-				$og.select("SELECT COUNT(*) FROM #{Utils.table(self)} AS s, #{Utils.join_table(self, klass)} AS j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
+				Og.db.select("SELECT COUNT(*) FROM #{Og::Backend.table(self)} AS s, #{Og::Backend.join_table(self, klass)} AS j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
 			end
 			
 			def add_#{prop_m}(obj, extra = nil)
-				$og.exec("INSERT INTO #{Utils.join_table(self, klass)} (key1, key2) VALUES (\#\{obj.oid\}, \#\@oid)") 
+				Og.db.exec("INSERT INTO #{Og::Backend.join_table(self, klass)} (key1, key2) VALUES (\#\{obj.oid\}, \#\@oid)") 
 			end
 			
 			def del_#{prop_m}(obj_or_oid, extra = nil)
-				$og.exec("DELETE FROM #{Utils.join_table(self, klass)} WHERE key1=\#\{obj_or_oid.to_i\}") 
+				Og.db.exec("DELETE FROM #{Og::Backend.join_table(self, klass)} WHERE key1=\#\{obj_or_oid.to_i\}") 
 			end
 			alias_method :delete_#{prop_m}, :del_#{prop_m}						
 
 			def clear_#{list_m}
-				$og.exec("DELETE FROM #{Utils.join_table(self, klass)} WHERE key2=\#\@oid") 
+				Og.db.exec("DELETE FROM #{Og::Backend.join_table(self, klass)} WHERE key2=\#\@oid") 
 			end			
 		}
 	end
@@ -247,13 +247,13 @@ module MetaLanguage
 
 end
 
-end # module
+end # namespace
 
 # Include the meta-language extensions into Module. If the flag is
 # false the developer is responsible for including the MetaLanguage
 # module where needed.
 #
-if $og_include_meta_language
+if Og.include_meta_language
 	class Module # :nodoc: all
 		include Og::MetaLanguage
 	end

data/lib/og/mock.rb

@@ -10,7 +10,7 @@ require 'og'
 require 'rubygems'
 require_gem 'flexmock'
 
-module Og
+class Og
 	
 # = MockDatabase
 #
@@ -22,6 +22,7 @@ module Og
 # to avoid code duplication.
 #++
 class MockDatabase < ::FlexMock 
+	include Og::Enchant
 
 	# Managed class metadata
 	#
@@ -53,11 +54,11 @@ class MockDatabase < ::FlexMock
 		# Initialize FlexMock
 		super
 		
-		@managed_classes = G::SafeHash.new
+		@managed_classes = N::SafeHash.new
 		
-		$log.info "Using mock database."
+		Logger.info "Using mock database."
 		
-		if $og_auto_manage_classes
+		if Og.auto_manage_classes
 			# automatically manage classes with properties and metadata.
 			# gmosx: Any idea how to optimize this?
 			classes_to_manage = []
@@ -66,10 +67,13 @@ class MockDatabase < ::FlexMock
 					classes_to_manage << c
 				end
 			end
-			$log.info "Og auto manages the following classes:"
-			$log.info "#{classes_to_manage.inspect}"
+			Logger.info "Og auto manages the following classes:"
+			Logger.info "#{classes_to_manage.inspect}"
 			manage_classes(*classes_to_manage)
 		end
+
+		# use the newly created database.
+		Og.use(self)
 	end
 		
 	# Shutdown the database interface.
@@ -78,6 +82,20 @@ class MockDatabase < ::FlexMock
 	end
 	alias_method :close, :shutdown
 
+	# Get a connection from the pool to access the database.
+	# Stores the connection in a thread-local variable.
+	#
+	def get_connection
+		# nop
+	end
+	alias_method :connection, :get_connection
+	
+	# Restore an unused connection to the pool.
+	#
+	def put_connection
+		# nop
+	end	
+
 	# Register a standard Ruby class as managed.
 	#
 	def manage(klass)
@@ -89,7 +107,7 @@ class MockDatabase < ::FlexMock
 		convert(klass)
 		
 		# Add helper methods to the class.
-		enchant(klass) if $og_enchant_managed_classes 
+		enchant(klass) if Og.enchant_managed_classes 
 	end
 	
 	# Helper method to set multiple managed classes.
@@ -116,72 +134,14 @@ class MockDatabase < ::FlexMock
 	#
 	def convert(klass)
 		klass.class_eval %{
-			DBTABLE = "#{Og::Utils.table(klass)}"
-			DBSEQ = "#{Og::Utils.table(klass)}_oids_seq" 
+			DBTABLE = "#{Og::Backend.table(klass)}"
+			DBSEQ = "#{Og::Backend.table(klass)}_oids_seq" 
 			
 			def to_i()
 				@oid
 			end			
 		}
 	end
-	
-	# Enchant a managed class. Add useful DB related methods to the 
-	# class and its instances. 
-	#
-	def enchant(klass)
-		klass.class_eval %{
-			def self.save(obj)
-				$og << obj
-			end
-			
-			def self.load(oid_or_name)
-				$og.load(oid_or_name, #{klass})
-			end
-
-			def self.[](oid_or_name)
-				$og.load(oid_or_name, #{klass})
-			end
-			
-			def self.load_all(extra_sql = nil)
-				$og.load_all(#{klass}, extra_sql)
-			end
-			
-			def self.all(extra_sql = nil)
-				$og.load_all(#{klass}, extra_sql)
-			end
-
-			def self.count(sql = "SELECT COUNT(*) FROM #{klass::DBTABLE}")
-				$og.count(sql, #{klass})
-			end
-
-			def self.select(sql)
-				$og.select(sql, #{klass})
-			end
-
-			def self.select_one(sql)
-				$og.select_one(sql, #{klass})
-			end
-			
-			def self.delete(obj_or_oid)
-				$og.delete(obj_or_oid, #{klass})
-			end
-			
-			def save
-				$og << self
-				return self
-			end
-			alias_method :save!, :save
-			
-			def update_properties(updatesql)
-				$og.pupdate(updatesql, self.oid, #{klass})
-			end
-			alias_method :pupdate!, :update_properties
-			
-			def delete!
-				$og.delete(@oid, #{klass})
-			end
-		}
-	end
 
 	# Automatically wrap connection methods.
 	#
@@ -193,31 +153,14 @@ class MockDatabase < ::FlexMock
 			end
 		}
 	end
-=begin	
-	wrap_method :create_table, "klass"
-	wrap_method :drop_table, "klass"
-	wrap_method :save, "obj";	alias_method :<<, :save; alias_method :put, :save
-	wrap_method :insert, "obj"
-	wrap_method :update, "obj"
-	wrap_method :update_properties, "update_sql, obj_or_oid, klass = nil"
-	wrap_method :pupdate, "update_sql, obj_or_oid, klass = nil"
-	wrap_method :load, "oid, klass"; alias_method :get, :load	
-	wrap_method :load_by_oid, "oid, klass"
-	wrap_method :load_by_name, "name, klass"	
-	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"
-=end	
+
 	def self.create_db!(config)
+		# nop
 	end
 
 	def self.drop_db!(config)
+		# nop
 	end
 end
 
-end # module
-
+end # namespace 

data/lib/og/version.rb

@@ -1,8 +1,9 @@
-# code: 
-# * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+#-- 
+# George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: version.rb 198 2004-12-22 11:26:59Z gmosx $
+#++
 
 # The version of Og.
-$og_version = '0.7.0'
+
+$og_version = '0.8.0'