og 0.15.0 → 0.16.0

data/CHANGELOG

@@ -1,5 +1,82 @@
+16-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/og/mixins/timestamped.rb: implemented with aspects.
+
+15-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/og/observer.rb: removed, use Aspects instead.
+
+	* lib/og/observer.rb: removed, use Aspects instead.
+
+14-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* lb/og/adapters/*: converted to the latest adapter interface.
+
+	* lib/og/adapters/base.rb (#eval_og_update): use aspects instead of
+	callbacks/observers,
+	(#eval_og_insert): use aspects,
+	set aspects in the base adapter code,
+	(#eval_og_read): use aspects.
+
+13-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/og/adapters/*: use klass.allocate instead of klass.new to avoid
+	restrictions on initialize methods. [jamesb]
+
+	* test/og/*: moved adapter test code to the adapters dir.
+
+12-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* Rakefile: updated to support autoupload to Rubyforge. [flgr]
+
+11-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* created new public SVN repository, to allow for easier
+	patching by the community.
+
+	* lib/og/mixins/timestamped.rb: introduced.
+
+	* lib/og/database.rb: set default connection_count > 1 to avoid
+	deadlocks.
+
+10-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/*: many changes to make all run again.
+
+	* lib/og/adapters/sqlserver.rb: fix.
+
+	* lib/og/database.rb (Og##connect): added helper.
+
+	* lib/og/meta.rb: small fix.
+
+08-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* hack-fixed dynamic require bug that used to fuckup RDoc.
+
+	* Rakefile: bumped required ruby version,
+	VERSION fix.
+
+	* code cleanup.
+
+	* MAJOR: fixed refs to  N.
+
+06-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/og/adapters/*: all reuse the base now.
+
+	* lib/og/connection.rb: removed.
+
+	* lib/og/adapter.rb: removed.
+
+	* lib/og/adapters/base.rb: introduced, 
+		copied code from adapter.rb and connection.rb
+
+	* lib/og/errors.rb: introduced, moved SqlException here.
+
 04-04-2005  George Moschovitis  <gm@navel.gr>
 
+	* --- VERSION 0.15.0 ---
+
 	* examples/run.rb: small fix.
 
 	* test/og/mixins/tc_tree.rb: removed.

data/INSTALL

@@ -8,6 +8,9 @@
 
 	gem install og
 
+	(make sure you have the latest stable versions of Ruby and RubyGems
+	installed)
+
 	When asked about the dependencies to include, only accept
 	the dependencies for the RDBMS backends you are planning
 	to use.

data/README

@@ -1,4 +1,4 @@
-= Og 0.15.0
+= Og 0.16.0 README
 
 Og (ObjectGraph) is a powerfull object-relational mapping library. Og provides 
 transparent serialization of object graphs to a RDBMS 
@@ -35,8 +35,7 @@ The library provides the following features:
 + Connection pooling.
 + Thread safety.
 + SQL transactions.
-+ Lifecycle callbacks.
-+ Lifecycle observers.
++ Lifecycle event interception and Observers.
 + Transparent support for cascading deletes for all backends.
 + Dynamic db related mixins (Orderable, etc).
 + Hierarchical structures (nested sets, more coming soon).
@@ -91,6 +90,9 @@ installed RubyGems on your system. Then run the following command:
 
 gem install og
 
+(make sure you have the latest stable versions of Ruby and RubyGems
+installed)
+
 Then try to run the examples in the examples directory.
 
 A tar.gz distribution is also available on http://www.rubyforge.com/projects/nitro.

data/Rakefile

@@ -1,11 +1,34 @@
 # * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
+# (c) 2005 Navel, all rights reserved.
 # $Id$
 
 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 the tests.
@@ -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', 'doc/config.txt', 'doc/tutorial.txt', 'lib/**/*.rb')
 	rd.options << '--all --inline-source'
 end
@@ -30,20 +53,20 @@ end
 spec = Gem::Specification.new do |s|
 	s.name = 'og'
 	if File.read('lib/og.rb') =~ /Version\s+=\s+'(\d+\.\d+\.\d+)'/
-		VERSION = s.version = $1 
+		s.version = $1 
 	else
 		raise 'No version found'
 	end
 	s.summary = 'Og (ObjectGraph)'
 	s.description = 'An efficient and transparent Object-Relational mapping library'
 	
-	s.add_dependency 'glue', "= #{VERSION}"
+	s.add_dependency 'glue', "= #{s.version}"
 	# s.add_dependency 'postgres-pr', '>= 0.3.0'
 	# s.add_dependency 'postgres', '>= 0.7.1'
 	# s.add_dependency 'sqlite3-ruby', '>= 1.0.0'
 	#s.add_dependency 'mysql', '>= 2.5.1'
 
-	s.required_ruby_version = '>= 1.8.1'
+	s.required_ruby_version = '>= 1.8.2'
 
 	s.files = FileList[
 		'[A-Z]*', 'install.rb', '{bin,benchmark,examples,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/benchmark/bench.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: bench.rb 288 2005-03-10 12:47:03Z gmosx $
+# $Id: bench.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'og'; include Og
 

data/doc/AUTHORS

@@ -1,19 +1,19 @@
 MAIN DEVELOPER:
 
 * George Moschovitis  <gm@navel.gr>
-	Project leader, architecture and design, code, 
+	Project leader, architecture and design, main coder, 
 	documentation, maintainer.
 	
 IDEAS, ADDITIONAL CODING, SUPPORT:
 
+*	Matt Bowen  <matt.bowen@farweststeel.com>
+	Additional code and documentation.
+
 * Anastasios Koutoumanos  <ak@navel.gr>
 	Design, additional coding.
 
 * Michael Neumann  <mneumann@ntecs.de>
 	Design, additional coding and bug reports.
 
-*	Matt Bowen  <matt.bowen@farweststeel.com>
-	Additional code and documentation.
-
 * Thomas Quas  <tquas@yahoo.com>
 	Ideas, bug reports, unit tests.

data/doc/RELEASES

@@ -1,4 +1,44 @@
-== Version 0.15.0 was released on 4/03/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.
+
+* Major cleanup of the source. Converted the N namespace to
+	Nitro. 
+
+* Add Og Timestamped mixin.
+
+* Og improvements.
+
+* Improved the Gem installation process.
+
+* Fixed all reported bugs.
+
+
+== Version 0.15.0 was released on 04/04/2005.
 
 A great release. Many cool new features and tons of subtle 
 improvements. We also welcome a new core developer, Anastastios 

data/examples/mock_example.rb

@@ -5,7 +5,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: mock_example.rb 280 2005-03-10 11:39:23Z gmosx $
+# $Id: mock_example.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'rubygems'
 require 'flexmock'

data/examples/mysql_to_psql.rb

@@ -9,7 +9,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: mysql_to_psql.rb 280 2005-03-10 11:39:23Z gmosx $
+# $Id: mysql_to_psql.rb 1 2005-04-11 11:04:30Z gmosx $
 
 raise 'WARNING, this example does not work yet, for the moment ' + 
 			'just have a look at the source code.'

data/examples/run.rb

@@ -2,7 +2,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004 Navel, all rights reserved.
-# $Id: run.rb 280 2005-03-10 11:39:23Z gmosx $
+# $Id: run.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'og'
 

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/og.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: og.rb 340 2005-04-04 08:26:58Z gmosx $
+# $Id: og.rb 20 2005-04-15 15:18:36Z gmosx $
 
 require 'glue'
 require 'glue/logger'
@@ -10,7 +10,9 @@ require 'glue/array'
 require 'glue/hash'
 require 'glue/time'
 require 'glue/pool'
+require 'glue/inflector'
 require 'glue/validation'
+require 'glue/aspects'
 
 # Og (ObjectGraph) is an efficient, yet simple Object-Relational 
 # mapping library. 
@@ -107,7 +109,7 @@ module Og
 
 	# The version.
 
-	Version = '0.15.0'
+	Version = '0.16.0'
 
 	# Library path.