og 0.7.0 → 0.8.0

data/lib/glue/logger.rb

@@ -1,45 +1,144 @@
-# = Logger
-#
-# A simple wrapper arround the Ruby logger. Mainly for compatibility
-# purposes.
-#
 # code:
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
 # $Id: logger.rb 161 2004-11-18 10:51:51Z gmosx $
 
-require "logger"
+require 'logger'
 
 # = Logger
 #
-# A simple wrapper arround the Ruby logger. Mainly for compatibility
-# purposes.
+# A simple wrapper arround the Ruby logger. Mainly for 
+# compatibility purposes.
 #
 class Logger
 	alias_method :devel, :debug
 	alias_method :fine, :debug
 	
-	def detach
+	# Prints a trace message to DEBUGLOG (at debug level).  
+	# Useful for emitting the value of variables, etc.  Use 
+	# like this:
+	#
+	#   x = y = 5
+	#   trace 'x'        # -> 'x = 5'
+	#   trace 'x ** y'   # -> 'x ** y = 3125'
+	#
+	# If you have a more complicated value, like an array of 
+	# hashes, then you'll probably want to use an alternative 
+	# output format.  For instance:
+	#
+	#   trace 'value', :yaml
+	#
+	# Valid output format values (the _style_ parameter) are:
+	#
+	#   :p :inspect
+	#   :pp                     (pretty-print, using 'pp' library)
+	#   :s :to_s
+	#   :y :yaml :to_yaml       (using the 'yaml' library')
+	#
+	# The default is <tt>:p</tt>.
+	#
+	# CREDITS:
+	# 
+	# This code comes straight from the dev-utils Gem.
+	# Author: Gavin Sinclair <gsinclair@soyabean.com.au>
+	#
+  def trace(expr, style=:p)
+    unless expr.respond_to? :to_str
+      warn "trace: Can't evaluate the given value: #{caller.first}"
+    else
+			require 'extensions/binding'
+
+      Binding.of_caller do |b|
+        value = b.eval(expr.to_str)
+        formatter = TRACE_STYLES[style] || :inspect
+        case formatter
+        when :pp then require 'pp'
+        when :y, :yaml, :to_yaml then require 'yaml'
+        end
+        value_s = value.send(formatter)
+        message = "#{expr} = #{value_s}"
+        lines = message.split(/\n/)
+        indent = "   "
+        debug(lines.shift)            					
+        lines.each do |line|
+          debug(indent + line)
+        end
+      end
+    end
+  end
+  TRACE_STYLES = {}  # :nodoc:
+  TRACE_STYLES.update( :pp => :pp_s, :s => :to_s, :p => :inspect, :y => :to_yaml,
+                       :yaml => :to_yaml, :inspect => :inspect, :to_yaml => :to_yaml )
+
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	# Global logger interface. 
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	# Override the logger with your custom version.
+	#
+	@@global_logger = Logger.new(STDERR)
+
+	def self.set(logger)
+		@@global_logger = logger
+	end
+
+	def self.get
+		@@global_logger
 	end
 	
-	# Used for debuging, remove this in release code.
-	#
-	def d(str)
-		self << "#{str}\n"
+	def self.warn(str)
+		@@global_logger.warn(str)
 	end
 
-	# Inspect an object. Used for debugging, remove this in release
-	# code.
-	#
-	def i(obj)
-		self << "Inspect #{obj.inspect()}\n"
+	def self.info(str)
+		@@global_logger.info(str)
+	end
+
+	def self.debug(str)
+		@@global_logger.debug(str)
+	end
+	
+	def self.error(str)
+		@@global_logger.error(str)
 	end
 
+	#--
+	# Saddly have to duplicate the code to make
+	# Binding.of_caller work.
+	#++
+  def self.trace(expr, style=:p)
+    unless expr.respond_to? :to_str
+      warn "trace: Can't evaluate the given value: #{caller.first}"
+    else
+			require 'extensions/binding'
+
+      Binding.of_caller do |b|
+        value = b.eval(expr.to_str)
+        formatter = TRACE_STYLES[style] || :inspect
+        case formatter
+        when :pp then require 'pp'
+        when :y, :yaml, :to_yaml then require 'yaml'
+        end
+        value_s = value.send(formatter)
+        message = "#{expr} = #{value_s}"
+        lines = message.split(/\n/)
+        indent = "   "
+        debug(lines.shift)            					
+        lines.each do |line|
+          debug(indent + line)
+        end
+      end
+    end
+  end
+	
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	
 	private
 		
 	# the default Ruby logger has a hardwired silly format.
 	# we use some Ruby magic to fix it!
+
 	remove_const "Format"
 
 	Format = "%5s: %s\n"
@@ -47,5 +146,6 @@ class Logger
 	def format_message(severity, timestamp, msg, progname)
 		Format % [severity, msg]
 	end
+
 end
 

data/lib/glue/mixins.rb

@@ -9,7 +9,7 @@
 # (c) 2004 Navel, all rights reserved.
 # $Id$
 
-module G;
+module N
 
 # = Expirable
 #

data/lib/glue/number.rb

@@ -4,7 +4,7 @@
 # (c) 2004 Navel, all rights reserved.
 # $Id: number.rb 167 2004-11-23 14:03:10Z gmosx $
 
-module G;
+module N;
 
 # = NumberUtils
 #

data/lib/glue/pool.rb

@@ -7,7 +7,7 @@
 require "thread"
 require "monitor"
 
-module G
+module N
 
 # = Pool
 #

data/lib/glue/property.rb

@@ -1,15 +1,13 @@
 # code:
 # * George Moschovitis  <gm@navel.gr>
-# design:
-# * Anastastios Koutoumanos  <ak@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
 # $Id: property.rb 200 2004-12-27 11:24:41Z gmosx $
 
-require "glue/array"
-require "glue/hash"
+require 'glue/array'
+require 'glue/hash'
 
-module G
+module N
 
 # = Property
 #
@@ -61,14 +59,17 @@ module PropertyUtils
 	# Add accessors to the properties to the given target
 	# (Module or Class). For simplicity also create the
 	# meta accessors. 
+	#
+	# [+target+] 
+	#		The target class or module
 	#--
 	# gmosx: Perhaps we 'll optimize this in the future.
 	#++
-	def self.enchant(target)
+	def self.enchant(target, force = false)
 		unless target.singleton_methods.include?('__props')
 			target.module_eval <<-"end_eval", __FILE__, __LINE__ 
-				@@__meta = G::SafeHash.new
-				@@__props = G::SafeArray.new
+				@@__meta = N::SafeHash.new
+				@@__props = N::SafeArray.new
 				
 				def self.__props
 					@@__props
@@ -98,7 +99,8 @@ module PropertyUtils
 		
 		# copy the metadata.
 		src.__meta.each do |k, val|
-			val.each { |v| dest.meta(k, v) } if val
+			dest.__meta[k] = val.dup
+			# val.each { |v| dest.meta(k, v) } if val
 		end
 	end
 
@@ -132,19 +134,19 @@ module PropertyUtils
 				
 				def __force_#{s}(val)
 						self.#{s}=(} + case klass.name
-													when Fixnum.name
-														"val.to_i()"
-													when String.name
-														"val.to_s()"
-													when Float.name
-														"val.to_f()"
-													when Time.name
-														"Time.parse(val.to_s())"
-													when TrueClass.name, FalseClass.name
-														"val.to_i() > 0"
-													else
-														"val"
-												end + %{) 
+							when Fixnum.name
+								"val.to_i()"
+							when String.name
+								"val.to_s()"
+							when Float.name
+								"val.to_f()"
+							when Time.name
+								"Time.parse(val.to_s())"
+							when TrueClass.name, FalseClass.name
+								"val.to_i() > 0"
+							else
+								"val"
+						end + %{) 
 				end
 			}
 		end
@@ -161,7 +163,13 @@ module PropertyUtils
 			end
 		}
 	end
-	
+
+	# Get the property metadata for the given symbol.
+	#
+	def self.get_prop(klass, sym)
+		return klass.__props.find { |p| p.symbol == sym }
+	end
+
 end
 
 end # module
@@ -182,6 +190,7 @@ class Module
 	#	--> creates reader and writer.
 	# 
 	def prop(*params)
+		
 		meta = {}
 		klass = Object
 		
@@ -200,7 +209,7 @@ class Module
 			end
 		end
 
-		G::PropertyUtils.enchant(self)
+		N::PropertyUtils.enchant(self)
 
 		if self.is_a?(Class)
 			
@@ -209,8 +218,8 @@ class Module
 			self.module_eval <<-"end_eval", __FILE__, __LINE__
 
 				def self.inherited(sub)
-					G::PropertyUtils.enchant(sub)
-					G::PropertyUtils.copy_props(self, sub)
+					N::PropertyUtils.enchant(sub)
+					N::PropertyUtils.copy_props(self, sub)
 					# gmosx: We have to define @@__props first to avoid reusing
 					# the hash from the module. super must stay at the end.
 					super
@@ -225,10 +234,15 @@ class Module
 			self.module_eval <<-"end_eval", __FILE__, __LINE__
 
 				def self.append_features(base)
-					G::PropertyUtils.enchant(base)
-					G::PropertyUtils.copy_props(self, base)
+					N::PropertyUtils.enchant(base)
+					N::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.
+					
+					unless base.included_modules.include?(N::Validation)
+						base.module_eval %{ include N::Validation }  
+					end if defined?(N::Validation)
+					
 					super
 				end
 
@@ -236,7 +250,7 @@ class Module
 			
 		end
 		
-		property = G::Property.new(symbol, klass, meta)
+		property = N::Property.new(symbol, klass, meta)
 		
 		reader = meta[:reader] || true
 		writer = writer || meta[:writer] || false
@@ -248,7 +262,10 @@ class Module
 			meta[:writer] = true if meta[:writer].nil?
 		end
 
-		G::PropertyUtils.add_prop(self, property)
+		N::PropertyUtils.add_prop(self, property)
+
+		# gmosx: should be placed AFTER enchant!
+		module_eval %{ include N::Validation } if defined?(N::Validation)
 	end
 
 	# Helper method. Accepts a collection of symbols and generates
@@ -303,7 +320,7 @@ class Module
 				# the meta hash.
 				meta = param
 			else
-				raise "Error when defining property!"
+				raise 'Error when defining property!'
 			end
 		end
 		

data/lib/glue/string.rb

@@ -8,7 +8,7 @@
 
 require "uri"
 
-module G;
+module N;
 
 # = StringUtils
 #

data/lib/glue/time.rb

@@ -6,7 +6,7 @@
 
 require "time.rb"
 
-module G;
+module N;
 
 # = Time
 #
@@ -77,7 +77,7 @@ module TimeUtils
 	#
 	def self.time_in_day_range(time, stime=ZERO, etime=NEVER)
 		if (etime <= stime)
-			$log.debug "Invalid end time (#{etime} < #{stime})" if $DBG
+			Logger.debug "Invalid end time (#{etime} < #{stime})" if $DBG
 			etime = NEVER
 		end