glue 0.18.1 → 0.19.0

data/CHANGELOG

@@ -1,5 +1,33 @@
+17-06-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/glue/autoreload.rb: added.
+
+16-06-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/glue/attribute.rb: only create singleton accessors.
+	
+	* lib/glue/logger.rb (#set): improved API, now accepts String.
+
+07-06-2005  George Moschovitis <gm@navel.gr>
+
+	* lib/glue/property.rb (##copy_features): implemented.
+
+	* lib/glue/flexob.rb: implemented each.
+
+04-06-2005  George Moschovitis <gm@navel.gr>
+
+	* test/glue/flexob.rb: implemented.
+	
+	* lib/glue/flexob.rb: added [] accessors.
+	
+	* lib/glue/property.rb: metadata alias for __meta,
+	made __meta a flexob for extra ..flexibility,
+	added support for boolean metadata.
+
 31-05-2005  George Moschovitis  <gm@navel.gr>
 
+	* --- VERSION 0.19.0 ---
+	
 	* test/*: fixes to pass again.
 
 27-05-2005  George Moschovitis  <gm@navel.gr>

data/doc/RELEASES

@@ -1,4 +1,15 @@
-== Version 0.18.0
+== Version 0.19.0
+
+* Improved Logger.
+
+* Improved mattr_accessor.
+
+* Added autoreload support.
+
+* Improved metadata.
+
+
+== Version 0.18.0 was released on 01/06/2005.
 
 Deprecated many methods. Facet methods are used instead.
 

data/lib/glue.rb

@@ -27,6 +27,7 @@ class NilClass
 	def blank?
 		true
 	end
+	
 end
 
 class Class
@@ -51,7 +52,7 @@ module Kernel
 	# the pretty printed string
 	
 	def pp_exception(ex)
-		return %{#{ex.message}\n  #{ex.backtrace.join("\n  ")}\n  LOGGED FROM: #{caller[0].gsub("#{Nitro::LibPath}/", '')}}
+		return %{#{ex.message}\n  #{ex.backtrace.join("\n  ")}\n  LOGGED FROM: #{caller[0]}}
 	end
 
 end
@@ -60,7 +61,7 @@ module Glue
 
 	# The version.
 
-	Version = '0.18.1'
+	Version = '0.19.0'
 	
 	# Library path.
 

data/lib/glue/attribute.rb

@@ -16,7 +16,10 @@
 #++
 
 class Module # :nodoc:
-	
+
+	# A macro that creates a reader method for class/module 
+	# attributes.
+		
   def mattr_reader(*params)
 		default = if params.last.is_a?(Symbol) then nil else params.pop end
 		
@@ -30,15 +33,20 @@ class Module # :nodoc:
         def self.#{sym.id2name}
           @@#{sym}
         end
-
+=begin
+				# gmosx: NOT NEEDED!
+				
         def #{sym.id2name}
           @@#{sym}
         end
-
+=end
       end_eval
     end
   end
   alias_method :cattr_reader, :mattr_reader
+
+	# A macro that creates a writer method for class/module 
+	# attributes.
   
   def mattr_writer(*params)
 		default = if params.last.is_a?(Symbol) then nil else params.pop end
@@ -57,15 +65,20 @@ class Module # :nodoc:
         def self.set_#{sym.id2name}(obj)
           @@#{sym.id2name} = obj
         end
-
+=begin
+				# gmosx: NOT NEEDED!
+				
         def #{sym.id2name}=(obj)
           @@#{sym} = obj
         end
-
+=end
       end_eval
     end
   end
   alias_method :cattr_writer, :cattr_writer
+
+	# A macro that creates a reader and a writer method for 
+	# class/module attributes.
   
   def mattr_accessor(*syms)
     mattr_reader(*syms)

data/lib/glue/autoreload.rb

@@ -0,0 +1,30 @@
+# Copied from Wee 0.8.0
+# (c) 2004 Michael Neumann.
+
+module Kernel
+
+def autoreload(check_interval=10)
+  Thread.new(Time.now) { |start_time|
+    file_mtime = {}
+    loop do
+      sleep check_interval 
+      $LOADED_FEATURES.each do |feature|
+        $LOAD_PATH.each do |lp|
+          file = File.join(lp, feature)
+          if (File.exists?(file) and 
+            File.stat(file).mtime > (file_mtime[file] || start_time))
+            file_mtime[file] = File.stat(file).mtime
+            STDERR.puts "reload #{ file }"
+            begin
+              load(file)
+            rescue Exception => e
+              STDERR.puts e.inspect
+            end
+          end
+        end
+      end
+    end
+	}
+end
+
+end

data/lib/glue/flexob.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: flexob.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'ostruct'
 
 # A flexible Object.
@@ -15,5 +11,19 @@ class Flexob < OpenStruct
 		end
 	end
 	alias_method :set, :update
+
+	def []=(key, val)
+		@table[key.to_sym] = val
+	end	
+	
+	def [](key)
+		@table[key.to_sym]
+	end
+
+	def each(&block)
+		@table.each(&block)
+	end		
 	
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/glue/logger.rb

@@ -79,8 +79,16 @@ class Logger
 	
 	@@global_logger = Logger.new(STDERR)
 
+	# Set the global Logger.
+	
 	def self.set(logger)
-		@@global_logger = logger
+		if logger.is_a?(String)
+			@@global_logger = Logger.new(logger)
+		elsif logger.is_a?(Logger)
+			@@global_logger = logger
+		else
+			raise ArgumentError.new
+		end
 	end
 
 	def self.get

data/lib/glue/property.rb

@@ -1,4 +1,5 @@
 require 'glue/attribute'
+require 'glue/flexob'
 require 'glue/array'
 require 'glue/hash'
 
@@ -81,8 +82,9 @@ module PropertyUtils
 
 	def self.enchant(target, force = false)
 		unless target.instance_variables.include?('@__props')
-			target.instance_variable_set('@__meta', Glue::SafeHash.new)
-			target.instance_variable_set('@__props', Glue::SafeArray.new)
+			# FIXME: should be thread safe here!
+			target.instance_variable_set('@__meta', Flexob.new)
+			target.instance_variable_set('@__props', SafeArray.new)
 
 			# gmosx: Ruby surprises and amazes me! We are in the Metaclass
 			# when defining methods and attributes so @__props is really
@@ -109,6 +111,10 @@ module PropertyUtils
 				def self.__meta=(meta)
 					@__meta = meta
 				end
+				
+				def self.metadata
+					@__meta
+				end
 			}
 
 			if target.is_a?(Class)
@@ -120,8 +126,9 @@ module PropertyUtils
 					def self.inherited(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.
+						# gmosx: We have to define @@__props first to avoid 
+						# reusing the hash from the module. super must stay 
+						# at the end.
 						super
 					end
 				}
@@ -132,12 +139,11 @@ module PropertyUtils
 				# their features to classes that include it.
 				
 				target.module_eval %{ 
-					def self.append_features(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.
-						Glue::PropertyUtils.include_meta_mixins(base)
+					def self.append_features(base)					
+						# gmosx: We have to define @@__props first to avoid 
+						# reusing the hash from the module. super must stay 
+						# at the end.
+						Glue::PropertyUtils.copy_features(self, base)
 						super
 					end
 				}
@@ -155,7 +161,11 @@ module PropertyUtils
 		
 		# copy the metadata.
 		src.__meta.each do |k, val|
-			dest.__meta[k] = val.dup
+			if val.is_a?(TrueClass)
+				dest.__meta[k] = val
+			else
+				dest.__meta[k] = val.dup
+			end
 			# val.each { |v| dest.meta(k, v) } if val
 		end
 	end
@@ -256,6 +266,12 @@ module PropertyUtils
 		target.send(:include, Og::EntityMixin) if defined?(Og::EntityMixin)
 	end
 
+	def self.copy_features(this, other)
+		Glue::PropertyUtils.enchant(other)
+		Glue::PropertyUtils.copy_props(this, other)
+		Glue::PropertyUtils.include_meta_mixins(other)
+	end
+
 	# Resolves the parameters passed to the propxxx macros
 	# to generate the meta, klass and symbols variables. This
 	# way the common functionality is factored out.
@@ -292,7 +308,7 @@ module PropertyUtils
 
 end
 
-end # module
+end
 
 class Module
 
@@ -303,7 +319,8 @@ class Module
 	# Use the prop_reader, prop_writer, prop_accessor methods 
 	# for multiple properties.
 	#
-	# Examples:
+	# === Examples
+	#
 	#	prop String, :name, :sql => "char(32), :sql_index => "name(32)"
 	# --> creates only writer.
 	# prop Fixnum, :oid, writer = true, :sql => "integer PRIMARY KEY"
@@ -394,15 +411,23 @@ class Module
 	#++
 	
 	def meta(key, *val)
-		val = val.first if val.size == 1
-
 		Glue::PropertyUtils.enchant(self)
 
-		self.module_eval %{  
-			@__meta[key] ||= [] 
-			@__meta[key].delete_if { |v| val == v }
-			@__meta[key] << val			
-		}
+		if val.empty?
+			self.module_eval %{  
+				@__meta[key] = true
+			}
+		else
+			val = val.first if val.size == 1
+			
+			self.module_eval %{  
+				@__meta[key] ||= []
+				@__meta[key].delete_if { |v| val == v }
+				@__meta[key] << val			
+			}
+		end
 	end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/test/glue/tc_flexob.rb

@@ -0,0 +1,19 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'glue/flexob'
+
+class TC_Flexob < Test::Unit::TestCase # :nodoc: all
+
+	def test_all
+		f = Flexob.new
+		f.title = 'Test'
+		f[:another] = 'Another'
+		
+		assert_equal 'Test', f.title
+		assert_equal 'Another', f.another
+		assert_equal 'Another', f[:another]
+		assert_equal 'Another', f['another']		
+	end
+
+end

data/test/glue/tc_logger.rb

@@ -34,6 +34,10 @@ class TC_Logger < Test::Unit::TestCase # :nodoc: all
 
 		# bug:
 		Logger.error 'Have forgotten that :)'
+		
+		# 
+		Logger.set('hello.log')
+		assert_instance_of(Logger, Logger.get)
 	end
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: glue
 version: !ruby/object:Gem::Version 
-  version: 0.18.1
-date: 2005-06-01
+  version: 0.19.0
+date: 2005-06-17
 summary: Glue utilities
 require_paths: 
   - lib
@@ -46,6 +46,7 @@ files:
   - lib/glue/property.rb
   - lib/glue/sanitize.rb
   - lib/glue/number.rb
+  - lib/glue/autoreload.rb
   - lib/glue/aspects.rb
   - lib/glue/misc.rb
   - lib/glue/time.rb
@@ -66,6 +67,7 @@ files:
   - test/glue/tc_logger.rb
   - test/glue/tc_aspects.rb
   - test/glue/tc_property_type_checking.rb
+  - test/glue/tc_flexob.rb
   - test/glue/tc_hash.rb
   - test/glue/tc_attribute.rb
   - test/glue/tc_property.rb