og 0.10.0 → 0.11.0

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 require 'rake/gempackagetask'
 
-og = true 
+og = true
 
 task :default => :package
 
@@ -14,7 +14,7 @@ task :default => :package
 
 Rake::TestTask.new do |t|
 	t.libs << 'test'
-	t.test_files = FileList['test/**/tc*.rb'].exclude('**/tc*og*.rb')
+	t.test_files = FileList['test/**/tc*.rb'].exclude('**/tc*og*.rb').exclude('test/og/**/*')
 	t.verbose = true
 end
 
@@ -30,8 +30,8 @@ end
 
 Rake::RDocTask.new do |rd|
 	rd.main = 'README'
-	rd.rdoc_dir = 'rdoc'
-	rd.rdoc_files.include('README', 'INSTALL', 'lib/**/*.rb')
+	rd.rdoc_dir = 'doc/rdoc'
+	rd.rdoc_files.include('README', 'INSTALL', 'doc/og_config.txt', 'doc/og_tutorial.txt', 'lib/**/*.rb')
 	rd.options << '--all --inline-source'
 end
 
@@ -91,11 +91,11 @@ spec = Gem::Specification.new do |s|
 	s.summary = 'Nitro Web Engine'
 	s.description = 
 		'An efficient, multiparadigm and flexible platform for rapid ' +
-		'web application development. Implements a full development stack ' +
-		'(Model, View, Controller).'
-	
+		'web application development. Implements a full development stack.'
+
 	# s.add_dependency 'postgres-pr', '>= 0.3.0'
 	# s.add_dependency 'postgres', '>= 0.7.1'
+	# s.add_dependency 'ParseTree', '>= 1.3.3'
 	s.add_dependency 'extensions', '>= 0.5'
 	# s.add_dependency 'sqlite3-ruby', '>= 1.0.0'
 	# s.add_dependency 'mysql', '>= 2.5.1'

data/examples/og/run.rb

@@ -2,7 +2,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004 Navel, all rights reserved.
-# $Id: run.rb 256 2005-02-11 16:22:33Z gmosx $
+# $Id: run.rb 263 2005-02-23 13:45:08Z gmosx $
 
 require 'og'
 

data/lib/glue/array.rb

@@ -1,15 +1,14 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2002-2005 Navel, all rights reserved.
-# $Id: array.rb 259 2005-02-15 08:54:54Z gmosx $
+# $Id: array.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'sync'
 
 module N
 
-# A thread-safe array. We use a sync object instead of a mutex,
-# because it is re-entrant.
-# An exclusive lock is needed when writing, a shared lock IS NEEDED
-# when reading
+# A thread-safe array. We use a sync object instead of a 
+# mutex, because it is re-entrant. An exclusive lock is 
+# needed when writing, a shared lock IS NEEDED when reading.
 
 class SafeArray < Array
 	
@@ -18,61 +17,43 @@ class SafeArray < Array
 	# gmosx: delegator is not used.
 	
 	def initialize(delegator = nil)
-		@sync = ::Sync.new()
+		@sync = Sync.new()
 	end
 
 	def << (value)
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}		
+		return @sync.synchronize(Sync::SH) { super }		
 	end
 	
 	def delete_if(&block) 
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}				
+		return @sync.synchronize(Sync::SH) { super }				
 	end
 	
 	def [](key)
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		return @sync.synchronize(Sync::SH) { super }
 	end
 
 	def []=(key, value)
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		return @sync.synchronize(Sync::EX) { super }
 	end
 
 	def delete(key)
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		return @sync.synchronize(Sync::EX) { super }
 	end
 
 	def clear
-		@sync.synchronize(::Sync::EX) {
-			super
-		}
+		@sync.synchronize(Sync::EX) {	super }
 	end
 
 	def size
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		return @sync.synchronize(Sync::SH) { super }
 	end
 
 	def shift
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		return @sync.synchronize(::Sync::EX) { super }
 	end
 
 	def unshift(el)
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		return @sync.synchronize(::Sync::EX) { super }
 	end
 		
 end

data/lib/glue/hash.rb

@@ -1,22 +1,17 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: hash.rb 202 2005-01-17 10:44:13Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: hash.rb 263 2005-02-23 13:45:08Z gmosx $
 
-require "sync"
+require 'sync'
 
-module N;
+module N
 
-# == SafeHash
-#
 # A thread-safe hash. We use a sync object instead of a mutex,
-# because it is re-entrant.
-# An exclusive lock is needed when writing, a shared lock IS NEEDED
-# when reading
+# because it is re-entrant. An exclusive lock is needed when 
+# writing, a shared lock IS NEEDED when reading
 # uses the delegator pattern to allow for multiple
 # implementations!
-#
+
 class SafeHash < Hash
 	attr :sync
 
@@ -27,63 +22,47 @@ class SafeHash < Hash
 	end
 
 	def [](key)
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		@sync.synchronize(::Sync::SH) { super }
 	end
 
 	def []=(key, value)
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		@sync.synchronize(::Sync::EX) { super }
 	end
 
 	def delete(key)
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		@sync.synchronize(::Sync::EX) { super }
 	end
 
 	def clear
-		@sync.synchronize(::Sync::EX) {
-			super
-		}
+		@sync.synchronize(::Sync::EX) {	super }
 	end
 
 	def size
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		@sync.synchronize(::Sync::SH) {	super }
 	end
 
 	def values
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		@sync.synchronize(::Sync::SH) { super }
 	end
 
 	def keys
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		@sync.synchronize(::Sync::SH) { super }
 	end
 
-end # SafeHash
+end 
 
-# == SafeHashDelegator
-#
 # A thread-safe hash. We use a sync object instead of a mutex,
-# because it is re-entrant.
-# An exclusive lock is needed when writing, a shared lock IS NEEDED
-# when reading
+# because it is re-entrant. An exclusive lock is needed when 
+# writing, a shared lock IS NEEDED when reading.
+#
+# === Design
 #
-# Design:
 # This class uses the delegator pattern. However we dont use rubys
 # delegation facilities, they are more general and powerfull than we
 # need here (and slower). Instead a custom (but simple) solution is
 # used.
 #
-# Example:
+# === Example
 #
 # hash = SafeHashDelegator.new(Hash.new)
 # hash = SafeHashDelegator.new(Hash.new)
@@ -96,20 +75,20 @@ class SafeHashDelegator < Hash
 		@sync = ::Sync.new
 	end
 
-    def [](key)
-		return @sync.synchronize(::Sync::SH) {
+	def [](key)
+		@sync.synchronize(::Sync::SH) {
 			@delegate[key]
 		}
-    end
+  end
 
-    def []=(key, value)
-		return @sync.synchronize(::Sync::EX) {
+  def []=(key, value)
+		@sync.synchronize(::Sync::EX) {
 			@delegate[key] = value
 		}
-    end
+  end
 
 	def delete(key)
-		return @sync.synchronize(::Sync::EX) {
+		@sync.synchronize(::Sync::EX) {
 			@delegate.delete(key)
 		}
 	end
@@ -121,23 +100,23 @@ class SafeHashDelegator < Hash
 	end
 
 	def size
-		return @sync.synchronize(::Sync::SH) {
+		@sync.synchronize(::Sync::SH) {
 			@delegate.size()
 		}
 	end
 
 	def values
-		return @sync.synchronize(::Sync::SH) {
+		@sync.synchronize(::Sync::SH) {
 			@delegate.values()
 		}
 	end
 
 	def keys
-		return @sync.synchronize(::Sync::SH) {
+		@sync.synchronize(::Sync::SH) {
 			@delegate.keys()
 		}
 	end
 
-end # SafeHashDelegator
+end
 
-end # module
+end 

data/lib/glue/pool.rb

@@ -1,21 +1,17 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: pool.rb 202 2005-01-17 10:44:13Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: pool.rb 266 2005-02-28 14:50:48Z gmosx $
 
-require "thread"
-require "monitor"
+require 'thread'
+require 'monitor'
 
 module N
 
-# = Pool
-#
 # Generalized object pool implementation. Implemented as a thread 
 # safe stack. Exclusive locking is needed both for push and pop. 
 #
 # INVESTIGATE: Could use the SizedQueue/Queue.
-#
+
 class Pool < Array
 	include MonitorMixin
 	
@@ -25,7 +21,7 @@ class Pool < Array
 	end
 
 	# Add, restore an object to the pool.
-	#
+	
 	def push(obj)
 		synchronize do
 			super
@@ -34,7 +30,7 @@ class Pool < Array
 	end
 	
 	# Obtain an object from the pool.
-	#
+	
 	def pop
 		synchronize do
 			@cv.wait_while { empty? }
@@ -44,6 +40,7 @@ class Pool < Array
 
 	# Obtains an object, passes it to a block for processing
 	# and restores it to the pool.
+
 	def obtain
 		result = nil
 		
@@ -60,4 +57,4 @@ class Pool < Array
 	
 end
 
-end # module
+end

data/lib/glue/property.rb

@@ -1,7 +1,7 @@
 # * George Moschovitis  <gm@navel.gr>
 # * Michael Neumann  <mneumann@ntecs.de>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: property.rb 254 2005-02-10 12:44:05Z gmosx $
+# $Id: property.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'glue/attribute'
 require 'glue/array'
@@ -30,22 +30,35 @@ class Property
 
 	cattr_accessor :type_checking, false
 
-	# the symbol of the property
+	# The symbol of the property.
 	
 	attr_accessor :symbol
 	
-	# the string representation of the symbol
+	# The string representation of the symbol.
 	
 	attr_accessor :name
 	
-	# the class of the property
+	# The class of the property.
 	
 	attr_accessor :klass
-	
-	# additional metadata (like sql declaration, sql index, etc)
+
+	# Additional metadata (like sql declaration, sql index, etc)
+	# Here is a list of predefined metadata:
+	#
+	# [+:reader+]
+	#		create reader?
+	#
+	#	[+:writer+]
+	#		create writer?
+	#
+	#	[+:sql_index+]
+	#		create an sql index for the column this poperty maps to?
+	#
+	# You can use this mechanism to add your own, custom,
+	# metadata.
 	
 	attr_accessor :meta
-	
+
 	def initialize(symbol, klass, meta = {})
 		@symbol, @klass = symbol, klass
 		@meta = meta
@@ -124,6 +137,11 @@ module PropertyUtils
 		else
 			target.__props << prop
 		end
+
+		# Store the property in the :props_and_relations
+		# metadata array.
+
+		target.meta :props_and_relations, prop
 		
 		# Precompile the property read/write methods
 
@@ -366,7 +384,7 @@ class Module
 			prop(klass, symbol, meta)
 		end
 	end
-	
+	alias_method :property, :prop_accessor
 	
 	# Attach metadata. 
 	# Guard against duplicates, no need to keep order.
@@ -375,7 +393,11 @@ class Module
 	# gmosx: crappy implementation, recode.
 	#++
 	
-	def meta(key, val)
+	def meta(key, *val)
+		val = val.first if val.size == 1
+
+		N::PropertyUtils.enchant(self)
+
 		self.module_eval %{  
 			@@__meta[key] ||= [] 
 			@@__meta[key].delete_if { |v| val == v }

data/lib/og.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: og.rb 259 2005-02-15 08:54:54Z gmosx $
+# $Id: og.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'glue'
 require 'glue/logger'
@@ -89,7 +89,7 @@ require 'glue/validation'
 # * Deserialize to OpenStruct.
 # * Better documentation.
 
-class Og
+module Og
 
 	# The name.
 
@@ -97,7 +97,7 @@ class Og
 
 	# The version.
 
-	Version = '0.10.0'
+	Version = '0.11.0'
 
 	# Library path.
 
@@ -106,37 +106,45 @@ class Og
 	# If true, only allow reading from the database. Usefull
 	# for maintainance.
 	
-	cattr_accessor :read_only_mode, false
+	mattr_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.
+	# If false, Og enchants only classes that define properties.
 	
-	cattr_accessor :enchant_managed_classes, true
+	mattr_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
+	mattr_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
+	# If false, the polution of the Module object is avoided. 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
+	mattr_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.
 	
-	cattr_accessor :table_prefix, nil
+	mattr_accessor :table_prefix, nil
 
+	# If true, Og tries to create/update the schema in the
+	# data store. For production/live environments set this to false
+	# and only set to true when the object model is upadated.
+	# For debug/development environments this should stay true
+	# for convienience.
+	
+	mattr_accessor :create_schema, true
+	
 	# The active database. Og allows you to access multiple
 	# databases from a single application.
 	
-	cattr_accessor :db
+	mattr_accessor :db
 
 	# Set the active database.