glue 0.15.0 → 0.16.0

data/lib/glue/attribute.rb

@@ -1,7 +1,7 @@
 # * George Moschovitis  <gm@navel.gr>
 # Original code from Rails distribution.
 # http://www.rubyonrails.com
-# $Id$
+# $Id: attribute.rb 1 2005-04-11 11:04:30Z gmosx $
 
 #--
 # Extends the module object with module and instance accessors 
@@ -37,15 +37,6 @@ class Module # :nodoc:
           @@#{sym}
         end
 
-        def call_#{sym.id2name}
-          case @@#{sym.id2name}
-            when Symbol then send(@@#{sym})
-            when Proc   then @@#{sym}.call(self)
-            when String then @@#{sym}
-            else nil
-          end
-        end
-				
       end_eval
     end
   end

data/lib/glue/cache.rb

@@ -1,9 +1,9 @@
 # * George Moschovitis  <gm@navel.gr>
 # * Anastasios Koutoumanos  <ak@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: cache.rb 282 2005-03-10 12:24:53Z gmosx $
+# $Id: cache.rb 1 2005-04-11 11:04:30Z gmosx $
 
-module N
+module Glue
 
 # A cache utilizing a simple LRU (Least Recently Used) policy.
 # The items managed by this cache must respond to the #key method.

data/lib/glue/dynamic_include.rb

@@ -1,4 +1,4 @@
-# Dynamic include
+# = Dynamic include
 #
 # Allows you to include dyanamic mixins.
 #
@@ -23,9 +23,10 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: dynamic_include.rb 338 2005-03-31 16:26:10Z gmosx $
+# $Id: dynamic_include.rb 1 2005-04-11 11:04:30Z gmosx $
 
 class Module 
+
 	alias_method :__include_without_options__, :include
 
 	def include(*args)
@@ -39,4 +40,6 @@ class Module
 
 		__include_without_options__(*args)
 	end
+	alias_method :dynamic_include, :include
+	
 end

data/lib/glue/flexob.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: flexob.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'ostruct'
 
@@ -9,4 +9,11 @@ require 'ostruct'
 
 class Flexob < OpenStruct
 
+	def update(hash)
+		hash.each do |k, v|
+			send("#{k}=", v)
+		end
+	end
+	alias_method :set, :update
+	
 end

data/lib/glue/hash.rb

@@ -1,10 +1,10 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: hash.rb 282 2005-03-10 12:24:53Z gmosx $
+# $Id: hash.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'sync'
 
-module N
+module Glue 
 
 # A thread-safe hash. We use a sync object instead of a mutex,
 # because it is re-entrant. An exclusive lock is needed when 

data/lib/glue/inflector.rb

@@ -1,7 +1,7 @@
 # Code from RubyOnRails (http://www.rubyonrails.com)
 # Copyright (c) 2004-2005 David Heinemeier Hansson.
 
-module N
+module Glue
 
 # The Inflector transforms words from singular to plural, 
 # class names to table names, modulized class names to ones without,

data/lib/glue/logger.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: logger.rb 316 2005-03-21 10:14:03Z gmosx $
+# $Id: logger.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'logger'
 
@@ -153,7 +153,7 @@ class Logger
 
 end
 
-module N
+module Glue
 
 # Add logging capabilities to the including class.
 # When using the log/logger variables always check 

data/lib/glue/misc.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: misc.rb 1 2005-04-11 11:04:30Z gmosx $
 
 # Executes a Ruby block without warnings.
 
@@ -13,17 +13,3 @@ def silence_warnings
 	end
 end
 
-# 
-
-def execution_root
-	for c in caller.reverse
-		path = c.split(':')[-2]
-
-		if path == $0
-			return File.dirname(path)
-		end
-
-		raise 'Cannot find execution root directory'
-	end
-end
-

data/lib/glue/mixins.rb

@@ -1,8 +1,8 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: mixins.rb 1 2005-04-11 11:04:30Z gmosx $
 
-module N
+module Glue 
 
 # Generic expiring functionality mixin. 
 

data/lib/glue/number.rb

@@ -1,8 +1,8 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: number.rb 282 2005-03-10 12:24:53Z gmosx $
+# $Id: number.rb 1 2005-04-11 11:04:30Z gmosx $
 
-module N;
+module Glue;
 
 # Implement as a module to avoid class polution. You can
 # still use Ruby's advanced features to include the module in your

data/lib/glue/object.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: object.rb 282 2005-03-10 12:24:53Z gmosx $
+# $Id: object.rb 1 2005-04-11 11:04:30Z gmosx $
 
 # Code from RubyOnRails (http://www.rubyonrails.com)
 

data/lib/glue/pool.rb

@@ -1,11 +1,11 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: pool.rb 282 2005-03-10 12:24:53Z gmosx $
+# $Id: pool.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'thread'
 require 'monitor'
 
-module N
+module Glue 
 
 # Generalized object pool implementation. Implemented as a thread 
 # safe stack. Exclusive locking is needed both for push and pop. 

data/lib/glue/property.rb

@@ -1,13 +1,13 @@
 # * George Moschovitis  <gm@navel.gr>
 # * Michael Neumann  <mneumann@ntecs.de>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: property.rb 326 2005-03-28 11:07:17Z gmosx $
+# $Id: property.rb 20 2005-04-15 15:18:36Z gmosx $
 
 require 'glue/attribute'
 require 'glue/array'
 require 'glue/hash'
 
-module N
+module Glue
 
 # Ruby attributes are typeless and generally this is good. 
 # Some times we need extra metadata though, for example in 
@@ -91,8 +91,8 @@ module PropertyUtils
 
 	def self.enchant(target, force = false)
 		unless target.instance_variables.include?('@__props')
-			target.instance_variable_set('@__meta', N::SafeHash.new)
-			target.instance_variable_set('@__props', N::SafeArray.new)
+			target.instance_variable_set('@__meta', Glue::SafeHash.new)
+			target.instance_variable_set('@__props', Glue::SafeArray.new)
 
 			# gmosx: Ruby surprises and amazes me! We are in the Metaclass
 			# when defining methods and attributes so @__props is really
@@ -124,8 +124,8 @@ module PropertyUtils
 
 				target.module_eval %{ 
 					def self.inherited(child)
-						N::PropertyUtils.enchant(child)
-						N::PropertyUtils.copy_props(self, child)
+						Glue::PropertyUtils.enchant(child)
+						Glue::PropertyUtils.copy_props(self, child)
 						# gmosx: We have to define @@__props first to avoid reusing
 						# the hash from the module. super must stay at the end.
 						super
@@ -139,11 +139,11 @@ module PropertyUtils
 				
 				target.module_eval %{ 
 					def self.append_features(base)
-						N::PropertyUtils.enchant(base)
-						N::PropertyUtils.copy_props(self, base)
+						Glue::PropertyUtils.enchant(base)
+						Glue::PropertyUtils.copy_props(self, base)
 						# gmosx: We have to define @@__props first to avoid reusing
 						# the hash from the module. super must stay at the end.
-						N::PropertyUtils.include_meta_mixins(base)
+						Glue::PropertyUtils.include_meta_mixins(base)
 						super
 					end
 				}
@@ -230,7 +230,7 @@ module PropertyUtils
 			def #{s}=(val)
 		}
 	
-		if N::Property.type_checking
+		if Glue::Property.type_checking
 			code << %{
 				unless #{prop.klass} == val.class
 					raise "Invalid type, expected '#{prop.klass}', is '\#\{val.class\}'."
@@ -255,9 +255,10 @@ module PropertyUtils
 	# Include meta-language mixins
 	
 	def self.include_meta_mixins(target)
-		target.module_eval %{ include N::Validation } if defined?(N::Validation)
+		target.module_eval %{ include Glue::Validation } if defined?(Glue::Validation)
 		# gmosx: TODO, make Og::MetaLanguage equivalent to Validation.
 		target.module_eval %{ extend Og::MetaLanguage } if defined?(Og::MetaLanguage)
+		target.module_eval %{ include Glue::Aspects } if defined?(Glue::Aspects)
 	end
 
 	# Resolves the parameters passed to the propxxx macros
@@ -314,12 +315,12 @@ class Module
 	#	--> creates reader and writer.
 	 
 	def prop(*params)
-		meta, klass, symbols = N::PropertyUtils.resolve_prop_params(params) 	
+		meta, klass, symbols = Glue::PropertyUtils.resolve_prop_params(params) 	
 		symbol = symbols.first
 		
-		N::PropertyUtils.enchant(self)
+		Glue::PropertyUtils.enchant(self)
 
-		property = N::Property.new(symbol, klass, meta)
+		property = Glue::Property.new(symbol, klass, meta)
 		
 		reader = meta[:reader] || true
 		writer = writer || meta[:writer] || false
@@ -331,11 +332,11 @@ class Module
 			meta[:writer] = true if meta[:writer].nil?
 		end
 
-		N::PropertyUtils.add_prop(self, property)
+		Glue::PropertyUtils.add_prop(self, property)
 
 		# gmosx: should be placed AFTER enchant!
 		
-		N::PropertyUtils.include_meta_mixins(self)
+		Glue::PropertyUtils.include_meta_mixins(self)
 	end
 
 	# Helper method. Accepts a collection of symbols and generates
@@ -345,7 +346,7 @@ class Module
 	#	prop_reader String, :name, :title, :body, :sql => "char(32)"
 	
 	def prop_reader(*params)
-		meta, klass, symbols = N::PropertyUtils.resolve_prop_params(params) 	
+		meta, klass, symbols = Glue::PropertyUtils.resolve_prop_params(params) 	
 		
 		meta[:reader] = true
 		meta[:writer] = false
@@ -362,7 +363,7 @@ class Module
 	#	prop_writer String, :name, :title, :body, :sql => "char(32)"
 	
 	def prop_writer(*params)
-		meta, klass, symbols = N::PropertyUtils.resolve_prop_params(params) 	
+		meta, klass, symbols = Glue::PropertyUtils.resolve_prop_params(params) 	
 
 		meta[:reader] = false
 		meta[:writer] = true
@@ -379,7 +380,7 @@ class Module
 	#	prop_accessor String, :name, :title, :body, :sql => "char(32)"
 	
 	def prop_accessor(*params)
-		meta, klass, symbols = N::PropertyUtils.resolve_prop_params(params) 	
+		meta, klass, symbols = Glue::PropertyUtils.resolve_prop_params(params) 	
 
 		meta[:reader] = true
 		meta[:writer] = true
@@ -400,7 +401,7 @@ class Module
 	def meta(key, *val)
 		val = val.first if val.size == 1
 
-		N::PropertyUtils.enchant(self)
+		Glue::PropertyUtils.enchant(self)
 
 		self.module_eval %{  
 			@__meta[key] ||= [] 

data/lib/glue/string.rb

@@ -2,11 +2,11 @@
 # * Anastasios Koutoumanos  <ak@navel.gr>
 # * Elias Karakoulakis  <ekarak@ktismata.com>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: string.rb 282 2005-03-10 12:24:53Z gmosx $
+# $Id: string.rb 1 2005-04-11 11:04:30Z gmosx $
 
-require "uri"
+require 'uri'
 
-module N;
+module Glue;
 
 # General string utilities collection.
 #

data/lib/glue/time.rb

@@ -1,10 +1,10 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: time.rb 282 2005-03-10 12:24:53Z gmosx $
+# $Id: time.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'time.rb'
 
-module N;
+module Glue;
 
 # General time utilities collection
 #

data/lib/glue/validation.rb

@@ -1,8 +1,8 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: validation.rb 1 2005-04-11 11:04:30Z gmosx $
 
-module N 
+module Glue 
 
 # Implements a meta-language for validating managed
 # objects. Typically used in Validator objects but can be
@@ -30,8 +30,8 @@ module N
 #		validate_format :name, :format => /[a-z]*/, :msg => 'invalid format', :on => :create 
 #	end
 #
-#	class N::CustomUserValidator 
-#		include N::Validation
+#	class CustomUserValidator 
+#		include Validation
 #		validate_length :name, :range => 2..6, :msg_short => :name_too_short, :msg_long => :name_too_long 
 #	end
 #
@@ -48,7 +48,7 @@ module N
 #		p user.errors.on(:name)
 #	end
 #
-#	unless errors = N::CustomUserValidator.errors(user)
+#	unless errors = CustomUserValidator.errors(user)
 #		user.save
 #	else
 #		p errors[:name]
@@ -127,7 +127,7 @@ module Validation
 			return @errors.empty?
 		rescue NoMethodError => e
 			# gmosx: hmm this is potentially dangerous.
-			N::Validation.eval_validate(self.class)
+			Glue::Validation.eval_validate(self.class)
 			retry 
 		end
 	end
@@ -185,7 +185,7 @@ module Validation
 		
 		def validate_value(*params)
 			c = { 
-				:msg => N::Validation::Errors.no_value, 
+				:msg => Glue::Validation::Errors.no_value, 
 				:on => :save 
 			}
 			c.update(params.pop) if params.last.is_a?(Hash)
@@ -212,8 +212,8 @@ module Validation
 		
 		def validate_confirmation(*params)
 			c = { 
-				:msg => N::Validation::Errors.no_confirmation, 
-				:postfix => N::Validation::MetaLanguage.confirmation_postfix,
+				:msg => Glue::Validation::Errors.no_confirmation, 
+				:postfix => Glue::Validation::MetaLanguage.confirmation_postfix,
 				:on => :save 
 			}
 			c.update(params.pop) if params.last.is_a?(Hash)
@@ -247,8 +247,8 @@ module Validation
 		def validate_format(*params)
 			c = { 
 				:format => nil, 
-				:msg_no_value => N::Validation::Errors.no_value,
-				:msg => N::Validation::Errors.invalid_format, 
+				:msg_no_value => Glue::Validation::Errors.no_value,
+				:msg => Glue::Validation::Errors.invalid_format, 
 				:on => :save 
 			}
 			c.update(params.pop) if params.last.is_a?(Hash)
@@ -286,9 +286,9 @@ module Validation
 			c = { 
 				:min => nil, :max => nil, :range => nil, :length => nil, 
 				:msg => nil, 
-				:msg_no_value => N::Validation::Errors.no_value,
-				:msg_short => N::Validation::Errors.too_short,
-				:msg_long => N::Validation::Errors.too_long,
+				:msg_no_value => Glue::Validation::Errors.no_value,
+				:msg_short => Glue::Validation::Errors.too_short,
+				:msg_long => Glue::Validation::Errors.too_long,
 				:on => :save 
 			}
 			c.update(params.pop) if params.last.is_a?(Hash)
@@ -311,7 +311,7 @@ module Validation
 
 			for name in params
 				if min
-					c[:msg] ||= N::Validation::Errors.too_short 
+					c[:msg] ||= Glue::Validation::Errors.too_short 
 					code = %{
 						if obj.#{name}.nil?
 							errors.add(:#{name}, '#{c[:msg_no_value]}')
@@ -322,7 +322,7 @@ module Validation
 						end;
 					}
 				elsif max 
-					c[:msg] ||= N::Validation::Errors.too_long
+					c[:msg] ||= Glue::Validation::Errors.too_long
 					code = %{
 						if obj.#{name}.nil?
 							errors.add(:#{name}, '#{c[:msg_no_value]}')
@@ -347,7 +347,7 @@ module Validation
 						end;
 					}
 				elsif length
-					c[:msg] ||= N::Validation::Errors.invalid_length
+					c[:msg] ||= Glue::Validation::Errors.invalid_length
 					code = %{
 						if obj.#{name}.nil?
 							errors.add(:#{name}, '#{c[:msg_no_value]}')
@@ -374,7 +374,7 @@ module Validation
 		def validate_inclusion(*params)
 			c = { 
 				:in => nil, 
-				:msg => N::Validation::Errors.no_inclusion, 
+				:msg => Glue::Validation::Errors.no_inclusion, 
 				:allow_nil => false,
 				:on => :save 
 			}
@@ -422,7 +422,7 @@ module Validation
 		def validate_numeric(*params)
 			c = { 
 				:integer => false,
-				:msg => N::Validation::Errors.no_numeric, 
+				:msg => Glue::Validation::Errors.no_numeric, 
 				:on => :save 
 			}
 			c.update(params.pop) if params.last.is_a?(Hash)
@@ -456,6 +456,6 @@ end
 end
 
 class Module # :nodoc: all
-	include N::Validation::MetaLanguage
+	include Glue::Validation::MetaLanguage
 end