og 0.20.0 → 0.21.0

data/INSTALL

@@ -2,27 +2,27 @@
 
 1. Download and install RubyGems: 
 
-	http://rubygems.rubyforge.org
+  http://rubygems.rubyforge.org
 
 2. Install the distribution:
 
-	gem install og
+  gem install og
 
-	(make sure you have the latest stable versions of Ruby and RubyGems
-	installed)
+  (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.
+  When asked about the dependencies to include, only accept
+  the dependencies for the RDBMS backends you are planning
+  to use.
 
 3. Set environment variable (required to load RubyGems):
 
-	export RUBYOPT=-rubygems
+  export RUBYOPT=-rubygems
 
-	You can add this in you .bashrc in Unix.
+  You can add this in you .bashrc in Unix.
 
-	Alternatively you can run your applications with the -rubygem 
-	option:
+  Alternatively you can run your applications with the -rubygem 
+  option:
 
   ruby -rubygem xxx.rb
 
@@ -34,13 +34,13 @@ a standard installation script is provided.
 
 1. Switch to an administrator account 
 
-	For example in Unix:
+  For example in Unix:
 
-	$ su -
+  $ su -
 
 2. Run the installation script.
 
-	$ ruby install.rb
+  $ ruby install.rb
 
 This installation script also installs some vendor libraries
 that you possibly have allready installed. Use with caution.
@@ -69,17 +69,17 @@ installs most of them, but here is the complete
 list for your reference:
 
 * Ruby-psql 
-	http://www.postgresql.jp/interfaces/ruby/archive/ruby-postgres-0.7.1.tar.gz
-	Ruby interface to the PostgreSQL RDBMS.
+  http://www.postgresql.jp/interfaces/ruby/archive/ruby-postgres-0.7.1.tar.gz
+  Ruby interface to the PostgreSQL RDBMS.
 
 * Ruby-mysql 
-	http://tmtm.org/ja/ruby/mysql/README_en.html
-	Ruby interface to the MySQL RDBMS.
-	
+  http://tmtm.org/ja/ruby/mysql/README_en.html
+  Ruby interface to the MySQL RDBMS.
+  
 * PostgreSQL 
-	http://www.postgres.org
-	Used for the Database Backend.
-	
+  http://www.postgres.org
+  Used for the Database Backend.
+  
 * MySQL 
-	http://www.mysql.org
-	Used for the Database Backend.
+  http://www.mysql.org
+  Used for the Database Backend.

data/README

@@ -1,20 +1,23 @@
-= Og 0.19.0 README
-
-Og (ObjectGraph) is a powerfull object-relational mapping library. Og provides 
-transparent serialization of object graphs to a RDBMS 
-backend. Unlike other similar libraries Og maps standard Ruby
-objects to SQL tables and not vice versa. Og provides a meta language
-to describe the relations between objects, a flexible	and intuitive api 
-for querieng the database, raw access to the SQL language if needed 
-(for example to fine tune the automatically generated SQL tables, or 
-for custom queries), suports deserialization to Ruby objects or tuples,
+= Og 0.21.0 README
+
+Og (ObjectGraph) is a powerful and elegant object-relational mapping 
+library. Og manages the lifecycle of Ruby objects and  provides 
+transparent serialization of object graphs to stores (typically
+RDBM systems)/.
+
+Unlike other similar solutions Og maps standard Ruby objects 
+to SQL tables and not vice versa. Og provides a domain specific 
+language to describe the relations between objects, a flexible 
+and intuitive api for querieng the database, raw access to the 
+SQL language if needed (for example to fine tune the automatically 
+generated SQL tables, or for custom queries), provides automatic 
+validation, suports deserialization to Ruby objects or tuples, 
 automatically generates join tables for many_to_many relations 
-and provides a collection of usefull Mixins to synthesize common 
-Entities.
+and provides a collection of usefull Mixins to synthesize 
+common Entities.
 
-Og is a combination of the best features of Active Record and the
-former O-R mapping library included in Nitro (NDB). Adapters for
-PostgreSQL, MySQL and SQLite are included.
+Adapters for PostgreSQL, MySQL, SQLite3, Memory, Filesystem,
+Oracle and SQL Server are included.
 
 Og is part of the Nitro project, released as a stand-alone library
 due to popular demand. You can find the ChangeLog in the Nitro 
@@ -29,7 +32,11 @@ The library provides the following features:
 * Absolutely no configuration files.
 * Multiple stores (PostgreSQL, MySQL, SQLite, Oraclei, SqlServer, ..).
 * Supports non SQL stores.
-* ActiveRecord-style meta language and db aware methods.
+* ActiveRecord-style domain specific language and db synchronized
+  collections.
+* Transforms resultsets from arbitrary sql queries to Ruby objects.
+* Automatically generate join tables for many to many relations.
+* Can use any Ruby object to join other Ruby objects.
 * Deserialize to Ruby Objects.
 * Deserialize sql join queries to Ruby Objects.
 * Eager associations.
@@ -79,30 +86,30 @@ of new features have been added in the meantime.
 Og requires the following applications or libraries:
 
 * Ruby 1.8.1 and greater 
-	http://www.ruby-lang.org
-	Version 1.8.2 is recomended.
+  http://www.ruby-lang.org
+  Version 1.8.2 is recomended.
 
 * Ruby-psql 
-	http://www.postgresql.jp/interfaces/ruby/archive/ruby-postgres-0.7.1.tar.gz
-	Ruby interface to the PostgreSQL RDBMS.
+  http://www.postgresql.jp/interfaces/ruby/archive/ruby-postgres-0.7.1.tar.gz
+  Ruby interface to the PostgreSQL RDBMS.
 
 * Ruby-mysql 
-	http://tmtm.org/ja/ruby/mysql/README_en.html
-	Ruby interface to the MySQL RDBMS.
-	Pure Ruby Mysql interface:
-	http://www.tmtm.org/ruby/mysql/
-	
+  http://tmtm.org/ja/ruby/mysql/README_en.html
+  Ruby interface to the MySQL RDBMS.
+  Pure Ruby Mysql interface:
+  http://www.tmtm.org/ruby/mysql/
+  
 * PostgreSQL 
-	http://www.postgres.org
-	Used for the Database Backend.
-	
+  http://www.postgres.org
+  Used for the Database Backend.
+  
 * MySQL 
-	http://www.mysql.org
-	Used for the Database Backend.
+  http://www.mysql.org
+  Used for the Database Backend.
 
 * SQLite
-	http://www.sqlite.org/download.html
-	WARNING: you need sqlite3-ruby > 1.1.0
+  http://www.sqlite.org/download.html
+  WARNING: you need sqlite3-ruby > 1.1.0
 
 Please install the required applications and libraries before continuing
 with the installation of Og. Only install the libraries needed for

data/Rakefile

@@ -23,64 +23,63 @@ VersionFile = MainFile = File.join("lib", Name + '.rb')
 
 RubyForgeProject = 'nitro' 
 RubyForgeUser = 'gmosx'
-Homepage = "http://#{RubyForgeProject}.rubyforge.org/"
+Homepage = "http://www.nitrohq.com/"
 
 task :default => :package
 
 # Run the tests.
 
 Rake::TestTask.new do |t|
-	t.libs << 'test'
-	t.test_files = FileList['test/**/tc*.rb']
-	t.verbose = true
+  t.libs << 'test'
+  t.test_files = FileList['test/**/tc*.rb']
+  t.verbose = true
 end
 
 # Generate RDoc documentation.
 
 Rake::RDocTask.new do |rd|
-	rd.main = 'README'
-	rd.rdoc_dir = 'rdoc'
-	rd.rdoc_files.include('README', 'INSTALL', 'doc/config.txt', 'doc/tutorial.txt', 'lib/**/*.rb')
-	rd.options << '--all --inline-source'
+  rd.main = 'README'
+  rd.rdoc_dir = 'rdoc'
+  rd.rdoc_files.include('README', 'INSTALL', 'doc/tutorial.txt', 'lib/**/*.rb')
+  rd.options << '--all --inline-source'
 end
 
 # Build gem.
 
 spec = Gem::Specification.new do |s|
-	s.name = 'og'
-	if File.read('lib/og.rb') =~ /Version\s+=\s+'(\d+\.\d+\.\d+)'/
-		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', "= #{s.version}"
-	s.add_dependency 'facets', '>= 0.7.1'
-	#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.2'
-
-	s.files = FileList[
-		'[A-Z]*', 'install.rb', '{bin,benchmark,examples,doc,lib,test,vendor}/**/*' 
-	].exclude('.svn/**/*').exclude('**/*.log').to_a
-
-	s.require_path = 'lib'
-	s.autorequire = 'og'
-	
-	s.has_rdoc = true
-	s.extra_rdoc_files = FileList['README', 'doc/RELEASES', 'doc/LICENSE', 'doc/AUTHORS'].to_a
-	s.rdoc_options << '--main' << 'README' << '--title' << 'Og Documentation'
-	s.rdoc_options << '--all' << '--inline-source'
-
-	s.author = 'George Moschovitis'
-	s.email = 'gm@navel.gr'
-	s.homepage = 'http://nitro.rubyforge.org'
-	s.rubyforge_project = 'nitro'
+  s.name = 'og'
+  if File.read('lib/og.rb') =~ /Version\s+=\s+'(\d+\.\d+\.\d+)'/
+    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', "= #{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.2'
+
+  s.files = FileList[
+    '[A-Z]*', 'install.rb', '{bin,benchmark,examples,doc,lib,test,vendor}/**/*' 
+  ].exclude('.svn/**/*').exclude('**/*.log').to_a
+
+  s.require_path = 'lib'
+  s.autorequire = 'og'
+  
+  s.has_rdoc = true
+  s.extra_rdoc_files = FileList['README', 'INSTALL', 'doc/tutorial.txt'].to_a
+  s.rdoc_options << '--main' << 'README' << '--title' << 'Og Documentation'
+  s.rdoc_options << '--all' << '--inline-source'
+
+  s.author = 'George Moschovitis'
+  s.email = 'gm@navel.gr'
+  s.homepage = 'http://www.nitrohq.com'
+  s.rubyforge_project = 'nitro'
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/benchmark/bench.rb

@@ -1,28 +1,28 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: bench.rb 34 2005-04-26 09:07:39Z gmosx $
+# $Id: bench.rb 182 2005-07-22 10:07:50Z gmosx $
 
 require 'og'; include Og
 
 
 config = {
-	:adapter => 'sqlite',
-	:database => 'test',
-	:connection_count => 5 
+  :adapter => 'sqlite',
+  :database => 'test',
+  :connection_count => 5 
 }
 
 class Article
-	prop_accessor :title, String
-	prop_accessor :body, String
-	prop_accessor :hits, Fixnum
-	prop_accessor :rate, Fixnum
-
-	def initialize(title = nil, body = nil)
-		@title = title
-		@body = body
-		@hits = rand(5)
-		@rate = rand(100)
-	end
+  prop_accessor :title, String
+  prop_accessor :body, String
+  prop_accessor :hits, Fixnum
+  prop_accessor :rate, Fixnum
+
+  def initialize(title = nil, body = nil)
+    @title = title
+    @body = body
+    @hits = rand(5)
+    @rate = rand(100)
+  end
 end
 
 Database.drop_db!(config)
@@ -34,7 +34,7 @@ db = Database.new(config)
 articles = []
 
 500.times do |i|
-	articles << Article.new("Title#{i}", "Body#{i}")
+  articles << Article.new("Title#{i}", "Body#{i}")
 end
 
 sum = 0
@@ -45,26 +45,26 @@ GC.disable
 
 10.times do |i|
 
-	db.exec "DELETE FROM #{Article::DBTABLE}"
-
-	for article in articles
-		article.oid = nil
-	end
-
-	Article.create("Dummy", "Dummy")
-	
-	t1 = Time.now
-	articles.each do |a|
-		a.save!
-	end
-	t2 = Time.now
-
-	d = t2 - t1
-	sum += d
-	min = d if d < min
-	max = d if d > max
-	
-	puts "Insert test #{i}: #{d} seconds"
+  db.exec "DELETE FROM #{Article::DBTABLE}"
+
+  for article in articles
+    article.oid = nil
+  end
+
+  Article.create("Dummy", "Dummy")
+  
+  t1 = Time.now
+  articles.each do |a|
+    a.save!
+  end
+  t2 = Time.now
+
+  d = t2 - t1
+  sum += d
+  min = d if d < min
+  max = d if d > max
+  
+  puts "Insert test #{i}: #{d} seconds"
 
 end
 

data/doc/AUTHORS

@@ -1,28 +1,31 @@
 MAIN DEVELOPER:
 
 * George Moschovitis <gm@navel.gr>
-	Project leader, architecture and design, main coder, 
-	documentation, maintainer.
-	
+  Project leader, architecture and design, main coder, 
+  documentation, maintainer.
+  
 IDEAS, ADDITIONAL CODING, SUPPORT:
 
 * Michael Neumann <mneumann@ntecs.de>
-	Design, additional coding and bug reports.
+  Design, additional coding and bug reports.
 
 * Anastasios Koutoumanos <ak@navel.gr>
-	Design, additional coding.
+  Design, additional coding.
 
-*	Matt Bowen <matt.bowen@farweststeel.com>
-	Oracle dirver, documentation.
+*  Matt Bowen <matt.bowen@farweststeel.com>
+  Oracle driver, documentation.
 
+* Ysabel <deb@ysabel.org>
+  Refactoring, patches.
+  
 * Aleksi Niemela <Aleksi.Niemela@cs.helsinki.fi>
-	Bug reports and patches.
+  Bug reports and patches.
 
-*	Julien Perrot <jperrot@exosec.fr>
-	Bug reports and patches.
+*  Julien Perrot <jperrot@exosec.fr>
+  Bug reports and patches.
 
 * Ghislain Mary <gmary@lunacymaze.org>
-	Bug reports and patches (sqlite3 driver).
+  Bug reports and patches (sqlite3 driver).
 
 * Thomas Quas <tquas@yahoo.com>
-	Ideas, bug reports, unit tests.
+  Ideas, bug reports, unit tests.

data/doc/LICENSE

@@ -1,6 +1,6 @@
 The BSD License
 
-Copyright (c) 2004-2005, George 'tml' Moschovitis.
+Copyright (c) 2004-2005, George 'gmosx' Moschovitis. (http://www.gmosx.com)
 Copyright (c) 2004-2005, Navel Ltd. (http://www.navel.gr)
 All rights reserved.
 
@@ -10,11 +10,11 @@ met:
 
 * Redistributions of source code must retain the above copyright 
 notice, this list of conditions and the following disclaimer.
-	
+  
 * Redistributions in binary form must reproduce the above copyright 
 notice, this list of conditions and the following disclaimer in the 
 documentation and/or other materials provided with the distribution.
-	
+  
 * Neither the name of Navel nor the names of its contributors may be 
 used to endorse or promote products derived from this software 
 without specific prior written permission.