og 0.8.0 → 0.9.3

data/lib/glue/string.rb

@@ -4,7 +4,7 @@
 # * Elias Karakoulakis  <ekarak@ktismata.com>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: string.rb 165 2004-11-18 12:04:04Z gmosx $
+# $Id: string.rb 202 2005-01-17 10:44:13Z gmosx $
 
 require "uri"
 

data/lib/glue/time.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: time.rb 167 2004-11-23 14:03:10Z gmosx $
+# $Id: time.rb 202 2005-01-17 10:44:13Z gmosx $
 
 require "time.rb"
 

data/lib/glue/validation.rb

@@ -216,7 +216,7 @@ module Validation
 
 			for name in params
 				confirm_name = "#{name}#{c[:postfix]}"
-				attr_accessor :"#{confirm_name}"
+				eval "attr_accessor :#{confirm_name}"
 
 				code = %{
 					if obj.#{confirm_name}.nil? or (obj.#{confirm_name} != obj.#{name})

data/lib/og.rb

@@ -1,18 +1,15 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: og.rb 197 2004-12-21 13:50:17Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: og.rb 248 2005-01-31 13:38:34Z gmosx $
 
 require 'glue/logger'
+require 'glue/attribute'
 require 'glue/property'
 require 'glue/array'
 require 'glue/hash'
 require 'glue/time'
 require 'glue/pool'
 
-# = Og
-#
 # Og (ObjectGraph) is an efficient, yet simple Object-Relational 
 # mapping library. 
 #
@@ -36,7 +33,7 @@ require 'glue/pool'
 # + Works safely as part of distributed application.
 # + Simple implementation.
 #
-# === Meta language
+# == Meta language
 #
 # primary_key :pid (NOT IMPLEMENTED)
 # name_key :name (NOT IMPLEMENTED)
@@ -45,7 +42,7 @@ require 'glue/pool'
 # many_to_many Role, :roles
 # sql_index :pid
 #
-# === Design
+# == Design
 #
 # Keep the main classes backend agnostic. 
 #--
@@ -69,7 +66,7 @@ require 'glue/pool'
 # The og.xxx methods are more flexible and allow you to use
 # multiple databases for example.
 # 
-# === Managed Objects Lifecycle Callbacks
+# == Managed Objects Lifecycle Callbacks
 #
 # * og_pre_insert
 # * og_post_insert
@@ -82,53 +79,58 @@ require 'glue/pool'
 # A class level callback is used for delete because typically you call
 # delete with an oid and not an object to avoid a deserialization.
 #
-# === Future 
+# == Future 
 # 
 # * Support prepared statements (pgsql)
 # * Support stored procedures (pgsql)
 # * Support caching.
 # * Deserialize to OpenStruct.
 # * Better documentation.
-#
+
 class Og
-	class << self
-		# If true, only allow reading from the database. Usefull
-		# for maintainance.
-		attr_accessor :read_only_mode
-
-		# If true, the library automatically 'enchants' managed classes.
-		# In enchant mode, special db aware methods are added to 
-		# managed classes and instances.
-		attr_accessor :enchant_managed_classes
-		
-		# If true, use Ruby's advanced introspection capabilities to 
-		# automatically manage classes tha define properties.
-		attr_accessor :auto_manage_classes
 
-		# If true, automatically include the Og meta-language into Module. 
-		attr_accessor :include_meta_language
-		
-		# 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.
-		attr_accessor :table_prefix
-
-		# The active database. Og allows you to access multiple
-		# databases from a single application.
-		attr_accessor :db
-
-		def use(db)
-			@db = db
-			@db.get_connection
-		end
-	end
+	# If true, only allow reading from the database. Usefull
+	# for maintainance.
+	
+	cattr_accessor :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.
+	
+	cattr_accessor :enchant_managed_classes, true
+	
+	# If true, use Ruby's advanced introspection capabilities to 
+	# automatically manage classes tha define properties.
+	
+	cattr_accessor :auto_manage_classes, true
+
+	# If true, automatically include the Og meta-language into Module. 
+	#
+	# By default this is FALSE, to avoid polution of the Module object.
+	# However if you include a prop_accessor or a managed Mixin in your
+	# object MetaLanguage gets automatically extended in the class.
+	
+	cattr_accessor :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.
 	
-	# set default options:
-	self.read_only_mode = false
-	self.enchant_managed_classes = true
-	self.auto_manage_classes = true
-	self.include_meta_language = true
-	self.table_prefix = nil
+	cattr_accessor :table_prefix, nil
+
+	# The active database. Og allows you to access multiple
+	# databases from a single application.
+	
+	cattr_accessor :db
+
+	# Set the active database.
+
+	def self.use(db)
+		@@db = db
+		@@db.get_connection
+	end
+
 end
 
 # gmosx: leave this here.
@@ -137,22 +139,18 @@ require 'og/meta'
 
 class Og
 	
-# = 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
 	include Og::Enchant
 
 	# Managed class metadata
-	#
+	
 	class ManagedClassMeta
 		# The managed class.
 		attr_accessor :klass
@@ -167,16 +165,19 @@ class Database
 	end
 
 	# hash of configuration options.
+
 	attr_accessor :config
 
 	# Pool of connections to the backend.
+	
 	attr_accessor :connection_pool
 
 	# Managed classes.
+	
 	attr_accessor :managed_classes
 
 	# Initialize the database interface.
-	#
+	
 	def initialize(config)
 		@config = config
 
@@ -199,7 +200,7 @@ class Database
 	
 		# 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?
@@ -219,7 +220,7 @@ class Database
 	end
 		
 	# Shutdown the database interface.
-	#
+	
 	def shutdown
 		for con in @connection_pool
 			con.close()
@@ -229,7 +230,7 @@ class Database
 
 	# Get a connection from the pool to access the database.
 	# Stores the connection in a thread-local variable.
-	#
+
 	def get_connection
 		thread = Thread.current
 		
@@ -243,7 +244,7 @@ class Database
 	alias_method :connection, :get_connection
 	
 	# Restore an unused connection to the pool.
-	#
+	
 	def put_connection
 		thread = Thread.current
 		
@@ -254,7 +255,7 @@ class Database
 	end	
 	
 	# Utility method, automatically restores a connection to the pool.
-	#
+	
 	def connect(deserialize = nil, &block)
 		result = nil
 		
@@ -275,7 +276,7 @@ class Database
 	
 	
 	# Register a standard Ruby class as managed.
-	#
+	
 	def manage(klass)
 		return if managed?(klass) or klass.ancestors.include?(Og::Unmanageable)
 		
@@ -289,7 +290,7 @@ class Database
 	end
 	
 	# Helper method to set multiple managed classes.
-	#
+	
 	def manage_classes(*klasses)
 		for klass in klasses
 			manage(klass)
@@ -297,7 +298,7 @@ class Database
 	end
 	
 	# Stop managing a Ruby class
-	#
+	
 	def unmanage(klass)
 		@managed_classes.delete(klass)
 	end
@@ -309,7 +310,7 @@ class Database
 	end
 	
 	# Add standard og functionality to the class
-	#
+	
 	def convert(klass)
 		# Grab backend class
 		backend = @config[:backend]
@@ -393,4 +394,4 @@ class Database
 	end
 end
 
-end # namespace
+end

data/lib/og/backend.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: backend.rb 197 2004-12-21 13:50:17Z gmosx $
+# $Id: backend.rb 202 2005-01-17 10:44:13Z gmosx $
 
 require "yaml"
 

data/lib/og/backends/mysql.rb

@@ -1,39 +1,35 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
 # * Elias Athanasopoulos  <elathan@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: mysql.rb 194 2004-12-20 20:23:57Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: mysql.rb 248 2005-01-31 13:38:34Z gmosx $
 
-require "mysql"
+require 'mysql'
 
-require "og/backend"
+require 'og/backend'
 
 class Og
 
-# = MysqlBackend
-#
 # Implements a MySQL powered backend.
-#
+
 class MysqlBackend < Og::Backend
 
 	# A mapping between Ruby and SQL types.
-	#
+	
 	TYPEMAP = {
-		Integer => "integer",
-		Fixnum => "integer",
-		Float => "float",
-		String => "text",
-		Time => "timestamp",
-		Date => "date",
-		TrueClass => "boolean",
-		Object => "text",
-		Array => "text",
-		Hash => "text"		
+		Integer => 'integer',
+		Fixnum => 'integer',
+		Float => 'float',
+		String => 'text',
+		Time => 'timestamp',
+		Date => 'date',
+		TrueClass => 'tinyint',
+		Object => 'text',
+		Array => 'text',
+		Hash => 'text'		
 	}
 	
 	# Intitialize the connection to the RDBMS.
-	# 		
+	 		
 	def initialize(config)
 		begin
 			@conn = Mysql.connect(config[:address], config[:user], 
@@ -53,7 +49,7 @@ class MysqlBackend < Og::Backend
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 	# Escape an SQL string
-	#
+	
 	def self.escape(str)
 		return nil unless str
 		return Mysql.quote(str)
@@ -61,7 +57,7 @@ class MysqlBackend < Og::Backend
 
 	# Convert a ruby time to an sql timestamp.
 	# TODO: Optimize this
-	# 
+	 
 	def self.timestamp(time = Time.now)
 		return nil unless time
 		return time.strftime("%Y%m%d%H%M%S")
@@ -69,7 +65,7 @@ class MysqlBackend < Og::Backend
 	
 	# Output YYY-mm-dd
 	# TODO: Optimize this
-	#
+	
 	def self.date(date)
 		return nil unless date
 		return "#{date.year}-#{date.month}-#{date.mday}" 
@@ -77,14 +73,14 @@ class MysqlBackend < Og::Backend
 	
 	# Parse sql datetime
 	# TODO: Optimize this
-	#
+	
 	def self.parse_timestamp(str)
 		return Time.parse(str)		
 	end
 	
 	# Input YYYY-mm-dd
 	# TODO: Optimize this
-	#
+	
 	def self.parse_date(str)
 		return nil unless str
 		return Date.strptime(str)
@@ -96,7 +92,7 @@ class MysqlBackend < Og::Backend
 	# portable.
 	#
 	# FIXME: add extra handling for float.
-	#
+	
 	def self.write_prop(p)
 		if p.klass.ancestors.include?(Integer)
 			return "#\{@#{p.symbol} || 'NULL'\}"
@@ -109,7 +105,7 @@ class MysqlBackend < Og::Backend
 		elsif p.klass.ancestors.include?(Date)
 			return %|#\{@#{p.symbol} ? "'#\{Og::MysqlBackend.date(@#{p.symbol})\}'" : 'NULL'\}|
 		elsif p.klass.ancestors.include?(TrueClass)
-			return "#\{@#{p.symbol} || 'NULL'\}"
+			return "#\{@#{p.symbol} ? 1 : 0 \}"
 		else 
 			return %|#\{@#{p.symbol} ? "'#\{Og::MysqlBackend.escape(@#{p.symbol}.to_yaml)\}'" : "''"\}|
 		end
@@ -117,7 +113,7 @@ class MysqlBackend < Og::Backend
 
 	# Return an evaluator for reading the property.
 	# No need to optimize this, used only to precalculate code.
-	#
+	
 	def self.read_prop(p, idx)
 		if p.klass.ancestors.include?(Integer)
 			return "res[#{idx}].to_i()"
@@ -130,7 +126,7 @@ class MysqlBackend < Og::Backend
 		elsif p.klass.ancestors.include?(Date)
 			return "Og::MysqlBackend.parse_date(res[#{idx}])"
 		elsif p.klass.ancestors.include?(TrueClass)
-			return "('true' == res[#{idx}])"
+			return "('0' != res[#{idx}])"
 		else 
 			return "YAML::load(res[#{idx}])"
 		end				
@@ -139,14 +135,14 @@ class MysqlBackend < Og::Backend
 	# Returns the props that will be included in the insert query.
 	# The oid property is rejected because it is mapped to an 
 	# AUTO_INCREMENT column.
-	#
+	
 	def self.props_for_insert(klass)
 		klass.__props.reject { |p| :oid == p.symbol }
 	end
 
-		# Returns the code that actually inserts the object into the
+	# Returns the code that actually inserts the object into the
 	# database. Returns the code as String.
-	#
+	
 	def self.insert_code(klass, sql, pre_cb, post_cb)
 		%{
 			#{pre_cb}
@@ -158,7 +154,7 @@ class MysqlBackend < Og::Backend
 
 	# generate the mapping of the database fields to the
 	# object properties.
-	#
+	
 	def self.calc_field_index(klass, og)
 		res = og.query "SELECT * FROM #{klass::DBTABLE} LIMIT 1"
 		meta = og.managed_classes[klass]
@@ -168,8 +164,8 @@ class MysqlBackend < Og::Backend
 		end
 	end
 	
-	# Generate the property for oid
-	#
+	# Generate the property for oid.
+	
 	def self.eval_og_oid(klass)
 		klass.class_eval %{
 			prop_accessor :oid, Fixnum, :sql => "integer AUTO_INCREMENT PRIMARY KEY"
@@ -181,28 +177,28 @@ class MysqlBackend < Og::Backend
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 	# Create the database.
-	#
+	
 	def self.create_db(database, user = nil, password = nil)
 		Logger.info "Creating database '#{database}'."
 		`mysqladmin -f --user=#{user} --password=#{password} create #{database}`
 	end
 	
 	# Drop the database.
-	#
+	
 	def self.drop_db(database, user = nil, password = nil)
 		Logger.info "Dropping database '#{database}'."
 		`mysqladmin -f --user=#{user} --password=#{password} drop #{database}`
 	end
 
 	# Execute an SQL query and return the result 
-	#
+	
 	def query(sql)
 		Logger.debug sql if $DBG
 		return @conn.query(sql)
 	end
 	
 	# Execute an SQL query, no result returned.
-	#
+	
 	def exec(sql)
 		Logger.debug sql if $DBG
 		@conn.query(sql)
@@ -210,7 +206,7 @@ class MysqlBackend < Og::Backend
 
 	# Execute an SQL query and return the result. Wrapped in a rescue
 	# block.
-	#
+	
 	def safe_query(sql)
 		Logger.debug sql if $DBG
 		begin
@@ -224,7 +220,7 @@ class MysqlBackend < Og::Backend
 	
 	# Execute an SQL query, no result returned. Wrapped in a rescue 
 	# block.
-	#
+	
 	def safe_exec(sql)
 		Logger.debug sql if $DBG
 		begin
@@ -236,25 +232,25 @@ class MysqlBackend < Og::Backend
 	end
 	
 	# Check if it is a valid resultset.
-	#
+	
 	def valid?(res)
 		return !(res.nil? or 0 == res.num_rows)
 	end
 	
 	# Start a new transaction.
-	#
+	
 	def start
 		# no transaction support
 	end
 	
 	# Commit a transaction.
-	#
+	
 	def commit
 		# no transaction support
 	end
 	
 	# Rollback transaction.
-	#
+	
 	def rollback
 		# no transaction support
 	end	
@@ -262,7 +258,7 @@ class MysqlBackend < Og::Backend
 	# 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).
-	#
+	
 	def create_table(klass)
 		fields = create_fields(klass, TYPEMAP)
 
@@ -328,7 +324,7 @@ class MysqlBackend < Og::Backend
 	end
 
 	# Deserialize one row of the resultset.
-	#
+	
 	def deserialize_one(res, klass)	
 		return nil unless valid?(res)
 		
@@ -343,9 +339,9 @@ class MysqlBackend < Og::Backend
 	end
 	
 	# Deserialize all rows of the resultset.
-	#
+	
 	def deserialize_all(res, klass)	
-		return nil unless valid?(res)
+		return [] unless valid?(res)
 
 		entities = []
 
@@ -364,11 +360,11 @@ class MysqlBackend < Og::Backend
 	end
 
 	# Return a single integer value from the resultset.
-	#
+	
 	def get_int(res, idx = 0)	
 		return res.fetch_row[idx].to_i
 	end
 	
 end
 
-end # module
+end