glue 0.15.0 → 0.16.0

data/CHANGELOG

@@ -1,5 +1,71 @@
+15-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/glue/aspects.rb (#append_features): fixed stupid include bug!
+	improved inherited code,
+	fix: use __meta to keep the advices.
+
+	* lib/glue/property.rb: include Aspects if calling property.
+
+14-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/glue/aspects.rb: fixed proc aspect,
+	handle Module inclusion.
+
+13-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/glue/aspects.rb (#include_advice_modules): iplemented.
+	cooler, added support for Aspects as modules,
+	added some aliases.
+
+12-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* Rakefile: updated to support autoupload to Rubyforge. [flgr]
+
+11-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/glue/tc_aspects.rb: introduced and implemented tests.
+
+	* lib/glue/aspects.rb: introduced,
+	copied code from /lib/nitro/filters.rb
+	(Aspect): introduced.
+	(Advice): introduced,
+	it works :)
+	(#wrap): handle methods with any arity.
+	use join instead of when.
+	(##wrap): recoded implementation.
+	allow for instance and class aspects,
+	many small fixes.
+
+	* created new public SVN repository, to allow for easier
+	patching by the community.
+
+09-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/*: fixes to pass again.
+
+	* lib/glue/flexob.rb (#update): added.
+
+08-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* Rakefile: removed flexob, extensions, ruby-breakpointer dependencies [james_b],
+	bumped required Ruby version.
+
+	* test/*: many small fixes.
+
+	* Rakefile: fixed to run tests.
+
+	* lib/glue.rb: include in TOPLEVEL binding for easy access.
+
+	* lib/glue/dynamic_include.rb: added alias.
+
+	* lib/glue/attribute.rb: removed call_xx method.
+
+	* MAJOR: changed the namespace from N to Glue.
+
 01-04-2005  George Moschovitis  <gm@navel.gr>
 
+	* --- VERSION 0.15.0 ---
+
 	* doc/RELEASES: updated.
 
 	* README: updated.

data/README

@@ -1,4 +1,4 @@
-= Glue 0.15.0 
+= Glue 0.16.0 README
 
 Useful utilites and methods.
 

data/Rakefile

@@ -6,11 +6,34 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 require 'rake/gempackagetask'
 
+# Initialize some variables.
+
+readme = File.read('README')
+Release = (readme[/^= (.+) README$/, 1] || 'unknown').downcase.tr(" ", "-")
+Name = Release[/\D+/].sub(/\-+$/, '') || 'unknown'
+Version = Release[/[\d.]+/] || 'unknown'
+
+AuthorName, AuthorMail = 'George Moschovitis', 'gm@navel.gr'
+RubyVersion = '1.8.2' 
+
+# Description = (readme[/README\s+(.+?)\n\n/m, 1] || "unknown").gsub(/\s+/, " ")
+# Summary = Description[/^.+?>/] || "unknown"
+
+# DocFiles = %w(README NEWS TODO COPYING GPL)
+# RDocFiles = DocFiles - %w(GPL)
+RDocOpts = ["--inline-source", "--line-numbers","--title", Name ]
+# AdditionalFiles = DocFiles + %w(setup.rb)
+VersionFile = MainFile = File.join("lib", Name + '.rb')
+
+RubyForgeProject = 'nitro' 
+RubyForgeUser = 'gmosx'
+Homepage = "http://#{RubyForgeProject}.rubyforge.org/"
+
 task :default => :package
 
 # Run all tests.
 
-Rake::TestTask.new(:test_all) do |t|
+Rake::TestTask.new do |t|
 	t.libs << 'test'
 	t.test_files = FileList['test/**/*.rb']
 	t.verbose = true
@@ -20,7 +43,7 @@ end
 
 Rake::RDocTask.new do |rd|
 	rd.main = 'README'
-	rd.rdoc_dir = 'doc/rdoc'
+	rd.rdoc_dir = 'rdoc'
 	rd.rdoc_files.include('README', 'INSTALL', 'lib/**/*.rb')
 	rd.options << '--all --inline-source'
 end
@@ -36,10 +59,10 @@ spec = Gem::Specification.new do |s|
 	end
 	s.summary = 'Glue utilities'
 	s.description = 'A collection of utilities and useful classes'
-	s.add_dependency 'extensions', '>= 0.5'
-	s.add_dependency 'flexmock', '>= 0.0.3'
+	# s.add_dependency 'extensions', '>= 0.5'
+	# s.add_dependency 'flexmock', '>= 0.0.3'
 
-	s.required_ruby_version = '>= 1.8.1'
+	s.required_ruby_version = '>= 1.8.2'
 
 	s.files = FileList[
 		'[A-Z]*', 'install.rb', '{doc,lib,test,vendor}/**/*' 
@@ -75,3 +98,123 @@ task :install do
   ruby 'install.rb'
 end
 
+# Release files to Rubyforge.
+# The code for this task provided by Florian Gross.
+
+desc "Publish the release files to RubyForge."
+task :publish => [:package] do
+  files = ['gem', 'tgz', 'zip'].map { |ext| "dist/#{Release}.#{ext}" }
+
+  if RubyForgeProject then
+    require 'net/http'
+    require 'open-uri'
+
+    changes = ''
+    if File.exist?('doc/RELEASES') then
+      changes_re = /^== \s+ Version \s+ #{Regexp.quote(Version)} \s*
+                    (.+?) (?:==|\Z)/mx
+      changes = File.read('doc/RELEASES')[changes_re, 1] || ''
+    end
+
+    project_uri = "http://rubyforge.org/projects/#{RubyForgeProject}/"
+    project_data = open(project_uri) { |data| data.read }
+    group_id = project_data[/[?&]group_id=(\d+)/, 1]
+    raise "Couldn't get group id" unless group_id
+
+    print "#{RubyForgeUser}@rubyforge.org's password: "
+    password = STDIN.gets.chomp
+
+    login_response = Net::HTTP.start('rubyforge.org', 80) do |http|
+      data = [
+        "login=1",
+        "form_loginname=#{RubyForgeUser}",
+        "form_pw=#{password}"
+      ].join("&")
+      http.post('/account/login.php', data)
+    end
+
+    cookie = login_response['set-cookie']
+    raise 'Login failed' unless cookie
+    headers = { 'Cookie' => cookie }
+
+    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
+    release_data = open(release_uri, headers) { |data| data.read }
+    package_id = release_data[/[?&]package_id=(\d+)/, 1]
+    raise "Couldn't get package id" unless package_id
+
+    first_file = true
+    release_id = ""
+
+    files.each do |filename|
+      basename = File.basename(filename)
+      file_ext = File.extname(filename)
+      file_data = File.open(filename, "rb") { |file| file.read }
+
+      puts "Releasing #{basename}..."
+
+      release_response = Net::HTTP.start('rubyforge.org', 80) do |http|
+        release_date = Time.now.strftime('%Y-%m-%d %H:%M')
+        type_map = {
+          '.zip'    => '3000',
+          '.tgz'    => '3110',
+          '.gz'     => '3110',
+          '.gem'    => '1400',
+          '.md5sum' => '8100'
+        }; type_map.default = '9999'
+        type = type_map[file_ext]
+        boundary = 'rubyqMY6QN9bp6e4kS21H4y0zxcvoor'
+
+        query_hash = if first_file then
+          {
+            'group_id' => group_id,
+            'package_id' => package_id,
+            'release_name' => Release,
+            'release_date' => release_date,
+            'type_id' => type,
+            'processor_id' => '8000', # Any
+            'release_notes' => '',
+            'release_changes' => changes,
+            'preformatted' => '1',
+            'submit' => '1'
+          }
+        else
+          {
+            'group_id' => group_id,
+            'release_id' => release_id,
+            'package_id' => package_id,
+            'step2' => '1',
+            'type_id' => type,
+            'processor_id' => '8000', # Any
+            'submit' => 'Add This File'
+          }
+        end
+
+        query = '?' + query_hash.map do |(name, value)|
+          [name, URI.encode(value)].join('=')
+        end.join('&')
+
+        data = [
+          "--" + boundary,
+          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
+          "Content-Type: application/octet-stream",
+          "Content-Transfer-Encoding: binary",
+          "", file_data, ""
+          ].join("\x0D\x0A")
+
+        release_headers = headers.merge(
+          'Content-Type' => "multipart/form-data; boundary=#{boundary}"
+        )
+
+        target = first_file ? '/frs/admin/qrs.php' : '/frs/admin/editrelease.php'
+        http.post(target + query, data, release_headers)
+      end
+
+      if first_file then
+        release_id = release_response.body[/release_id=(\d+)/, 1]
+        raise("Couldn't get release id") unless release_id
+      end
+
+      first_file = false
+    end
+  end
+end

data/doc/RELEASES

@@ -1,11 +1,42 @@
-== Version 0.15.0 was released on 4/04/2005.
+== Version 0.16.0
+
+A snapshot of the latest developments. Many, many subtle improvements,
+new features and a major cleanup of the source code. 
+
+Most notable attitions:
+
+* Aspect Oriented Programming support. This new system
+	is used to reimplement features such as Controller filters,
+	Og callbacks and Og observers. By using this unified
+	system you can now add Observers to controllers and use
+	a metalanguage for wraping Og object callbacks:
+
+	class Controller
+ 		pre :force_login, :where => :prepend
+ 		wrap Benchmark, :on => :index
+ 		post :taraa, :on => login
+	end
+ 
+	module Timestamped
+ 		pre :on => :og_insert { |this| this.create_time = Time.now }
+		pre :on => :og_update { |this| this.update_time = Time.now }
+		pre :on => [:og_insert, :og_update] { |this| this.create_time = Time.now }
+	end
+
+	This feature will be used extensivelly  in future versions
+	to improve logging, the shaders and more.
+
+
+== Version 0.15.0 was released on 04/04/2005.
 
 * Dynamic include.
 
+
 == 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/install.rb

@@ -2,7 +2,7 @@
 
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: install.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'rbconfig'
 require 'ftools'

data/lib/glue.rb

@@ -4,7 +4,7 @@
 #
 # George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: glue.rb 340 2005-04-04 08:26:58Z gmosx $
+# $Id: glue.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'English'
 require 'pp'
@@ -12,10 +12,6 @@ require 'pp'
 require 'glue/property'
 require 'glue/attribute'
 
-# The standard namespace module.
-
-module N; end
-
 class NilClass
 
 	# quite usefull for error tolerant apps.
@@ -57,10 +53,14 @@ module Glue
 
 	# The version.
 
-	Version = '0.15.0'
+	Version = '0.16.0'
 	
 	# Library path.
 
 	LibPath = File.dirname(__FILE__)
 
 end
+
+# Include in the top level binding for easy access.
+
+include Glue

data/lib/glue/array.rb

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

data/lib/glue/aspects.rb

@@ -0,0 +1,237 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2005 Navel, all rights reserved.
+# $Id: aspects.rb 20 2005-04-15 15:18:36Z gmosx $
+
+require 'glue/property'
+
+module Glue
+
+# An Aspect is a class that defines advices.
+
+class Aspect
+	class << self 
+		def wrap(target, methods = target.instance_methods, pre = :pre, post = :post)
+			target.send(:include, Aspects) unless target.ancestors.include?(Aspects)
+			target.wrap(self, :pre => pre, :post => post)
+		end
+
+		alias_method :observe, :wrap
+	end
+
+	def wrap(target, methods = target.instance_methods, pre = :pre, post = :post)
+		target.send(:include, Aspects) unless target.ancestors.include?(Aspects)
+		target.wrap(self, :pre => pre, :post => post)
+	end
+	alias_method :observe, :wrap
+end
+
+# Add support for Aspect Oriented Programming (AOP).
+#
+# === Examples
+#
+# class Controller
+# 	pre :force_login, :where => :prepend
+# 	wrap Benchmark, :on => :index
+# 	post :taraa, :on => login
+# end
+# 
+# module Timestamped
+# 	pre :on => :og_insert { |this| this.create_time = Time.now }
+#		pre :on => :og_update { |this| this.update_time = Time.now }
+#		pre :on => [:og_insert, :og_update] { |this| this.create_time = Time.now }
+# end
+
+module Aspects
+
+	# Store the code and the metadata (options) for
+	# an Advice.
+
+	Advice = Struct.new(:code, :options)
+
+	# Apply the advices to the target class.
+
+	def self.wrap(target, methods = target.instance_methods)
+		include_advice_modules(target)
+		
+		for m in [methods].flatten
+			args = []
+			target.instance_method(m).arity.times { |i| args << "a#{i}" }
+			args = args.join(',')
+			
+			target.module_eval <<-end_eval, __FILE__, __LINE__ 
+				alias_method :__unwrapped_#{m}, :#{m}
+				def #{m}(#{args})	
+					#{gen_advice_code(m, target.advices, :pre)}
+					__unwrapped_#{m}(#{args})
+					#{gen_advice_code(m, target.advices, :post)}
+				end
+			end_eval
+		end
+	end
+
+	# Include Modules that define advices.
+
+	def self.include_advice_modules(target)
+		for a in target.advices
+			if a.code.is_a?(Module) and (!a.code.class.ancestors.include?(Class))
+				target.module_eval %{ include #{a.code} }
+				
+				options = a.options.reject { |k,v| k == :pre || k == :post }
+
+				method = (a.options[:pre] || 'pre').to_s
+				if a.code.instance_methods.include?(method)
+					options.update(:where => :prepend, :join => :pre)
+					target.advices << Advice.new(method, options)  
+				end
+				
+				method = (a.options[:post] || 'post').to_s
+				if a.code.instance_methods.include?(method)
+					options.update(:where => :append, :join => :post)
+					target.advices << Advice.new(method, options)  
+				end
+			end
+		end
+
+		# Remove the original advice.
+
+		target.advices.delete_if do |a| 
+			a.code.is_a?(Module) and (!a.code.class.ancestors.include?(Class))
+		end
+	end
+
+	# Generates the code to call the aspects.
+	
+	def self.gen_advice_code(method, advices, join = :pre) # :nodoc: 
+		code = '' 
+
+		advices.each_with_index do |advice, idx|
+			o = options = advice.options
+
+			if only = options[:only] || options[:on]
+				next unless [only].flatten.include?(method.to_sym)
+			elsif except = options[:except]
+				next if [except].flatten.include?(method.to_sym)
+			end
+			
+			advice = advice.code
+
+			if advice.is_a?(Symbol) or advice.is_a?(String)
+				next if o[:join] != join
+				code << "#{advice}; "
+			elsif advice.respond_to?('call')
+				next if o[:join] != join 
+				code << "self.class.advices[#{idx}].code.call(self); "
+			elsif advice.is_a?(Class)
+				if advice.class.ancestors.include?(Class)
+					if m = o[join] and advice.methods.include?(m.to_s)
+						code << "#{advice}.#{m}(self); "
+					end
+				else
+					# Module, allready handled.
+				end
+			else
+				if m = o[join] and advice.methods.include?(m.to_s)
+					code << "self.class.advices[#{idx}].code.#{m}(self); "
+				end
+			end
+		end
+		
+		return code
+	end	
+
+	def self.append_features(base)
+		super
+		base.extend(ClassMethods)
+		base.module_eval %{
+			Glue::PropertyUtils.enchant(self)
+
+			def self.advices 
+				__meta[:advices] || []
+			end
+
+			def self.advices=(advices)
+				__meta[:advices] = advices
+			end
+			
+			# def self.inherited(child)
+			#	super
+			#	child.send(:include, Aspects) 
+			# end
+			# 
+			# def self.append_features(base)
+			#	super
+			#	base.send(:include, Aspects)
+			# end
+		}
+	end
+
+	module ClassMethods
+	
+		# Add a pre (before) advice.
+
+		def pre(*args, &block)
+			o = options = { 
+				:join => :pre,
+				:where => :prepend, 
+			}
+			options.update(args.pop) if args.last.is_a?(Hash)
+
+			if block_given?
+				advices = [ Advice.new(block, options) ]
+			else
+				advices = args.collect { |a| Advice.new(a, options) }
+			end
+			
+			if options[:where] == :prepend
+				self.advices = advices + self.advices
+			else
+				self.advices = self.advices + advices
+			end
+		end
+		alias_method :before, :pre
+		
+		# Add a post (after) advice.
+
+		def post(*args, &block)
+			o = options = { 
+				:join => :post,
+				:where => :append, 
+			}
+			options.update(args.pop) if args.last.is_a?(Hash)
+
+			if block_given?
+				advices = [ Advice.new(block, options) ]
+			else
+				advices = args.collect { |a| Advice.new(a, options) }
+			end
+			
+			if options[:where] == :prepend
+				self.advices = advices + self.advices
+			else
+				self.advices = self.advices + advices
+			end
+		end
+		alias_method :after, :post
+
+		# Add a wrap (arround) aspect. An aspect is a class that 
+		# responds to the before and after advices.  
+	
+		def wrap(*args)
+			o = options = {
+				:pre => :pre,
+				:post => :post
+			}
+			options.update(args.pop) if args.last.is_a?(Hash)
+
+			for aspect in args
+				self.advices << Advice.new(aspect, options)
+			end
+		end
+		alias_method :around, :wrap
+		alias_method :observer, :wrap
+
+	end	
+
+end
+
+end