glue 0.13.0 → 0.14.0

data/CHANGELOG

@@ -1,5 +1,24 @@
+24-03-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/glue/tc_property.rb: added more tests.
+
+	* lib/glue/property.rb (#enchant): moved inheritance code
+	here, 
+	Totaly recoded __props/__meta inhertiance implementation,
+	it works now!
+
+20-03-2005  George Moschovitis  <gm@navel.gr>
+
+	* moved vendor directory here (to be removed soon).
+
+19-03-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/glue/logger.rb (Logging): added.
+
 17-03-2005  George Moschovitis  <gm@navel.gr>
 
+	* --- VERSION 0.13.0 ---
+
 	* Rakefile: updated and fixed bugs.
 
 	* test/*: changes to make the tests pass again.

data/README

@@ -1,3 +1,3 @@
-= Glue
+= Glue 0.14.0 
 
 Useful utilites and methods.

data/Rakefile

@@ -12,7 +12,7 @@ task :default => :package
 
 Rake::TestTask.new(:test_all) do |t|
 	t.libs << 'test'
-	t.test_files = FileList['test/**/tc*.rb']
+	t.test_files = FileList['test/**/*.rb']
 	t.verbose = true
 end
 

data/doc/RELEASES

@@ -1,3 +1,7 @@
+== Version 0.14.0 was released on 28/03/2005.
+
+Fixes nasty property inheritance bug.
+
 == Version 0.13.0 was released on 17/03/2005.
 
 The first release as a standalone gem.

data/lib/glue.rb

@@ -4,7 +4,7 @@
 #
 # George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: glue.rb 300 2005-03-16 13:23:10Z gmosx $
+# $Id: glue.rb 326 2005-03-28 11:07:17Z gmosx $
 
 require 'English'
 require 'pp'
@@ -57,6 +57,10 @@ module Glue
 
 	# The version.
 
-	Version = '0.13.0'
+	Version = '0.14.0'
+	
+	# Library path.
+
+	LibPath = File.dirname(__FILE__)
 
 end

data/lib/glue/attribute.rb

@@ -11,7 +11,10 @@
 # Example:
 #
 # mattr_accessor :my_attr, 'Default value'
+#
+# FIXME: I think those methods do *not* work as expected.
 #++
+
 class Module # :nodoc:
 	
   def mattr_reader(*params)

data/lib/glue/inflector.rb

@@ -1,5 +1,5 @@
 # Code from RubyOnRails (http://www.rubyonrails.com)
-# Copyright (c) 2004 David Heinemeier Hansson.
+# Copyright (c) 2004-2005 David Heinemeier Hansson.
 
 module N
 

data/lib/glue/logger.rb

@@ -1,11 +1,15 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: logger.rb 282 2005-03-10 12:24:53Z gmosx $
+# $Id: logger.rb 316 2005-03-21 10:14:03Z gmosx $
 
 require 'logger'
 
 # A simple wrapper arround the Ruby logger. Mainly for 
 # compatibility purposes.
+#
+#--
+# TODO: implement as mixin that can be added to Log4R.
+#++
 
 class Logger
 	alias_method :devel, :debug
@@ -63,16 +67,20 @@ class Logger
       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 )
+  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)
@@ -145,3 +153,20 @@ class Logger
 
 end
 
+module N
+
+# Add logging capabilities to the including class.
+# When using the log/logger variables always check 
+# for nil:
+#
+# log.info "your #{expensive_calculation} comes here" if @log
+#
+# This way the expensive calculation is avoided if the 
+# logger is dissabled (@log == nil).
+
+module Logging 
+	attr_accessor :logger
+	alias_method :log, :logger
+end
+
+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 282 2005-03-10 12:24:53Z gmosx $
+# $Id: property.rb 326 2005-03-28 11:07:17Z gmosx $
 
 require 'glue/attribute'
 require 'glue/array'
@@ -90,27 +90,65 @@ module PropertyUtils
 	#++
 
 	def self.enchant(target, force = false)
-		unless target.singleton_methods.include?('__props')
+		unless target.instance_variables.include?('@__props')
+			target.instance_variable_set('@__meta', N::SafeHash.new)
+			target.instance_variable_set('@__props', N::SafeArray.new)
+
+			# gmosx: Ruby surprises and amazes me! We are in the Metaclass
+			# when defining methods and attributes so @__props is really
+			# a class scoped variable that unlike @@__props is not shared
+			# through the hierarchy.
+			
 			target.module_eval %{  
-				@@__meta = N::SafeHash.new
-				@@__props = N::SafeArray.new
-				
 				def self.__props
-					@@__props
+					@__props
 				end
 
 				def self.__props=(props)
-					@@__props = props
+					@__props = props
 				end
 				
 				def self.__meta
-					@@__meta
+					@__meta
 				end
 
 				def self.__meta=(meta)
-					@@__meta = meta
+					@__meta = meta
 				end
 			}
+
+			if target.is_a?(Class)
+
+				# Add some extra code to append features to 
+				# subclasses.
+
+				target.module_eval %{ 
+					def self.inherited(child)
+						N::PropertyUtils.enchant(child)
+						N::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
+					end
+				}
+
+			else
+
+				# Add some extra code for modules to append
+				# their features to classes that include it.
+				
+				target.module_eval %{ 
+					def self.append_features(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.
+						N::PropertyUtils.include_meta_mixins(base)
+						super
+					end
+				}
+
+			end
 		end
 	end
 
@@ -281,40 +319,6 @@ class Module
 		
 		N::PropertyUtils.enchant(self)
 
-		if self.is_a?(Class)
-
-			# Add some extra code to append features to 
-			# subclasses.
-
-			self.module_eval %{ 
-				def self.inherited(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
-				end
-			}
-		else
-
-			# Add some extra code for modules to append
-			# their features to classes that include it.
-			
-			self.module_eval %{ 
-				def self.append_features(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.
-			
-					N::PropertyUtils.include_meta_mixins(base)
-					
-					super
-				end
-			}
-		end
-		
 		property = N::Property.new(symbol, klass, meta)
 		
 		reader = meta[:reader] || true
@@ -399,9 +403,9 @@ class Module
 		N::PropertyUtils.enchant(self)
 
 		self.module_eval %{  
-			@@__meta[key] ||= [] 
-			@@__meta[key].delete_if { |v| val == v }
-			@@__meta[key] << val			
+			@__meta[key] ||= [] 
+			@__meta[key].delete_if { |v| val == v }
+			@__meta[key] << val			
 		}
 	end
 

data/test/glue/tc_property.rb

@@ -47,6 +47,9 @@ class SubMsg < Msg
 	
 	# duplicate definition with different type!
 	prop_accessor :count, Float
+
+	# another property
+	prop_accessor :another, Fixnum
 end
 
 class TC_N_Properties < Test::Unit::TestCase
@@ -62,9 +65,13 @@ class TC_N_Properties < Test::Unit::TestCase
 	def test_props
 		
 		# bug: props for subclasses.
+		# bug: props propagated to base classes.
 
 		assert(SubMsg.__props)
-		assert_equal(Msg.__props.size(), SubMsg.__props.size())
+		assert_equal(Msg.__props.size(), SubMsg.__props.size() - 1)
+
+		assert_equal(11, Msg.__props.size)
+		assert_equal(12, SubMsg.__props.size)
 
 		# bug: duplicate definition 			
 		

data/vendor/README

@@ -0,0 +1,11 @@
+= Extensions and Libraries from other vendors.
+
+Libraries from other vendors belong here. This file
+
+=== Included libraries
+
+* extensions
+* breakpointer
+* dev-utils
+* postgres-pr
+

data/vendor/binding_of_caller.rb

@@ -0,0 +1,81 @@
+begin
+  require 'simplecc'
+rescue LoadError
+  def Continuation.create(*args, &block)
+    cc = nil; result = callcc {|c| cc = c; block.call(cc) if block and args.empty?}
+    result ||= args
+    return *[cc, *result]
+  end
+end
+
+# This method returns the binding of the method that called your
+# method. It will raise an Exception when you're not inside a method.
+#
+# It's used like this:
+#   def inc_counter(amount = 1)
+#     Binding.of_caller do |binding|
+#       # Create a lambda that will increase the variable 'counter'
+#       # in the caller of this method when called.
+#       inc = eval("lambda { |arg| counter += arg }", binding)
+#       # We can refer to amount from inside this block safely.
+#       inc.call(amount)
+#     end
+#     # No other statements can go here. Put them inside the block.
+#   end
+#   counter = 0
+#   2.times { inc_counter }
+#   counter # => 2
+#
+# Binding.of_caller must be the last statement in the method.
+# This means that you will have to put everything you want to
+# do after the call to Binding.of_caller into the block of it.
+# This should be no problem however, because Ruby has closures.
+# If you don't do this an Exception will be raised. Because of
+# the way that Binding.of_caller is implemented it has to be
+# done this way.
+def Binding.of_caller(&block)
+  old_critical = Thread.critical
+  Thread.critical = true
+  count = 0
+  cc, result, error, extra_data = Continuation.create(nil, nil)
+  error.call if error
+
+  tracer = lambda do |*args|
+    type, context, extra_data = args[0], args[4], args
+    if type == "return"
+      count += 1
+      # First this method and then calling one will return --
+      # the trace event of the second event gets the context
+      # of the method which called the method that called this
+      # method.
+      if count == 2
+        # It would be nice if we could restore the trace_func
+        # that was set before we swapped in our own one, but
+        # this is impossible without overloading set_trace_func
+        # in current Ruby.
+        set_trace_func(nil)
+        cc.call(eval("binding", context), nil, extra_data)
+      end
+    elsif type == "line" then
+      nil
+    elsif type == "c-return" and extra_data[3] == :set_trace_func then
+      nil
+    else
+      set_trace_func(nil)
+      error_msg = "Binding.of_caller used in non-method context or " +
+        "trailing statements of method using it aren't in the block."
+      cc.call(nil, lambda { raise(ArgumentError, error_msg) }, nil)
+    end
+  end
+
+  unless result
+    set_trace_func(tracer)
+    return nil
+  else
+    Thread.critical = old_critical
+    case block.arity
+      when 1 then yield(result)
+      else yield(result, extra_data)        
+    end
+  end
+end

data/vendor/blankslate.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+#--
+# Copyright 2004 by Jim Weirich (jim@weirichhouse.org).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+module Builder #:nodoc:
+
+  # BlankSlate provides an abstract base class with no predefined
+  # methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
+  # BlankSlate is useful as a base class when writing classes that
+  # depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
+  class BlankSlate #:nodoc:
+    class << self
+      def hide(name)
+	      undef_method name if
+	        instance_methods.include?(name.to_s) and
+	        name !~ /^(__|instance_eval)/
+      end
+    end
+
+    instance_methods.each { |m| hide(m) }
+  end
+end
+
+# Since Ruby is very dynamic, methods added to the ancestors of
+# BlankSlate <em>after BlankSlate is defined</em> will show up in the
+# list of available BlankSlate methods.  We handle this by defining a hook in the Object and Kernel classes that will hide any defined 
+module Kernel #:nodoc:
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+    def method_added(name)
+      blank_slate_method_added(name)
+      return if self != Kernel
+      Builder::BlankSlate.hide(name)
+    end
+  end
+end
+
+class Object #:nodoc:
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+    def method_added(name)
+      blank_slate_method_added(name)
+      return  if self != Object
+      Builder::BlankSlate.hide(name)
+    end
+  end
+end