og 0.7.0 → 0.8.0

data/AUTHORS

@@ -1,8 +1,8 @@
 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:
 
@@ -12,8 +12,18 @@ IDEAS, ADDITIONAL CODING, SUPPORT:
 * Elias Athanasopoulos  <elathan@navel.gr>
 	Additional coding.
 
-* Elias Karakoulakis  <ekarak@navel.gr>
-	Additional design.
+* Gavin Sinclair <gsinclair@soyabean.com.au>
+	Logger#trace method.
+
+* Thomas Quas  <tquas@yahoo.com>
+	Ideas, bug reports, unit tests.
+
+* Michael Neumann  <mneumann@ntecs.de>
+	Ideas and bug reports.
 
 * Kostas Nasis  <kostas@nasis.com>
 	Ideas and bug reports.
+
+* Elias Karakoulakis  <ekarak@navel.gr>
+	Additional design.
+

data/ChangeLog

@@ -1,5 +1,196 @@
+
+12-01-2005  George Moschovitis  <gm@navel.gr>
+
+	* RELEASES.og: updated.
+
+	* RELEASES: updated.
+
+	* README: updated.
+
+	* README.og: updated.
+
+	* lib/glue/property.rb (#prop): include N::Validation when appending
+	a managed module.
+
+	* examples/blog/root/entr_form.xhtml: added error reporting.
+	
+	* found out NASTY reload bug, temporarily dissabled!
+
+	* lib/glue/logger.rb: (Logger#error): added.
+
+	* lib/server/render.rb: improved source,
+	(#render): dissabled reloading.
+	(#redirect_referer): optional postfix.
+
+	* lib/nitro/markup.rb: fixed namespace,
+	(#expand/#compact): excluded wiki markup from default.
+
+	* examples/blog/config.rb: require markup, validation.
+
+	* examples/blog/root/style.xsl: <x:error> introduced.
+
+	* examples/blog/lib/blog.rb: extend from content,
+	use auto markup functionality,
+	thanks for the magic of auto markup, comments get 
+	expanded correctly now, for free :),
+	(#new_entry): added validation/error reporting!
+	(#get_errors): useful prefilter,
+	(Common): made this a module (mixin).
+
+11-01-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/glue/tc_validation.rb (#test_validate_length): implemented.
+	cooler, all tests pass.
+
+	* lib/glue/validation.rb (#validate_length): implemented,
+	allow sprintf style error messages,
+	(#validate_inclusion): implemented.
+
+10-01-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/nitro/builders/tx_xhtml.rb: introduced,
+	yeah, cases pass :)
+
+	* lib/og/enchant.rb (#enchant): #one alias for #select_one [mneumann].
+
+	* lib/nitro/builders/xhtml.rb: introduced.
+	(#options): implemented,
+	(#select): implemented.
+
+	* lib/nitro/builders/xml.rb (#method_missing): added support
+	for blocks in tags,
+	(#comment): implemented.
+
+09-01-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/nitro/builders/tc_xml.rb: introduced,
+	(#test_missing): implemented.
+
+	* lib/nitro/builders/xml.rb: introduced,
+	(#start_tag, #end_tag): implemented.
+	(#method_missing): implemented,
+	(XmlBuilder): implemented.
+
+	* vendor/blankslate.rb: integrated blankslate lib by
+	Jim Weirich <jim@weirichhouse.org> [jweirich].
+
+08-01-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/glue/vaildation.rb (#validate_confirmation): implemented,
+	(MetaLanguage): customization options,
+	(#validate_value): implemented,
+
+07-01-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/glue/tc_validation.rb: implemented many tests.
+
+	* lib/glue/property.rb (#prop): auto include the N::Validation module
+	in the parent class if defined!
+	(PropertyUtils#get_prop): implemented.
+
+	* lib/glue/validation.rb (Validation::Errors): introduced,
+	empty, size, add methods.
+	recoded validation code and now works!
+	(eval_validate): fixed for multiple objects.
+	(Validation::Errors): keep error strings here.
+	(MetaLanguage): introduced.
+	MEGA: use meta :validations to store validations!
+	(Validation::Errors): each, clear.
+
+05-01-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/*: cleaned up some unit tests.
+
+	* lib/*: removed all $log references!
+
+	* lib/glue/*: use N:: prefix for all files.
+
+04-01-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/glue/tc_attribute.rb: implemented.
+	
+	* lib/glue/attribute.rb: introduced,
+	default value for module/class attributes.
+
+	* lib/glue/validation.rb: introduced,
+	(Validation#validate_format): implemented.
+	(Validator): introduced,
+	(Validator#eval_validation_method): introduced.
+
+	* README: running units section.
+
+03-01-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/builders/form.rb (#render): emmit id's to make
+	the generated forms more style-able.
+
+	* lib/glue.rb: removed EMPTY_STRING constant [mneumann].
+
+	* Rakefile: include vendor in Og distribution.
+
+02-01-2005  George Moschovitis  <gm@navel.gr>
+
+	* vendor/extensions: integrated extensions library by
+	Gavin Sinclair <gsinclair@soyabean.com.au>
+
+	* test/glue/tc_logger.rb: introduced.
+
+	* lib/og.rb: removed logger methods.
+
+	* lib/glue/logger.rb: added static methods and global logger,
+	(#i, #d): removed.
+	(#trace): added trace method from dev-utils by 
+	Gavin Sinclair <gsinclair@soyabean.com.au>,
+	fixed Binding.of_caller bug.
+	(#get): implemented.
+
+01-01-2005  George Moschovitis  <gm@navel.gr>
+
+	* started using the $:.unshift File.join trick.
+
+30-12-2004  George Moschovitis  <gm@navel.gr>
+
+	* lib/og/mock.rb: include Og::Enchant,
+	some more fixes to make this work.
+
+	* lib/og/enchant.rb: introduced, factors out some code used
+	by the MockDatabase.
+
+	* lib/og/*: converted to new code.
+
+	* lib/og/meta.rb: dont use $og. [mneumann]
+
+	* lib/og.rb: made Og a class,
+	removed $og_xx_xx options, use class methods [mneumann]
+	(Og##use): introduced.
+	(#enchant): use Og.db.connection.
+	(Database): create!/drop! aliases,
+	include Og::Enchant.
+	introduced Og.log.
+
+29-12-2004  George Moschovitis  <gm@navel.gr>
+
+	* lib/og/mysql.rb: removed Og::Utils, integrated methods in Backend.  
+
+	* lib/og/psql.rb: removed Og::Utils, integrated methods in Backend.  
+
+	* lib/og/backend.rb: removed Og::Utils, integrated methods in Backend, 
+	to allow for multiple backend is one App [bcandler].
+
+	* lib/og.rb (#enchant): enchant methods DONT use $og anymmore. [mneumann]
+
+	* AUTHORS: updated.
+
+	* examples/og/mysql_to_psql.rb: introduced and implemented.
+
 27-12-2004  George Moschovitis  <gm@navel.gr>
 
+	* lib/parts/content.rb (CreateTime): introduced.
+
+	* lib/parts/README: introduced.
+
+	* --- VERSION 0.7.0 ---
+	
 	* lib/og/mock.rb: fix, dont wrap methods.
 
 	* Rakefile: fix.
@@ -9,7 +200,7 @@
 	* lib/nitro/server/render.rb (#compile_xxx_method): better handling
 	of redirects,
 	(RenderExit): introduced,
-	(#redirect): rewritem, raise RenderExit.
+	(#redirect): rewritten, raise RenderExit.
 
 	* lib/nitro/markup.rb (PropertyUtils#prop_setter): override.
 	(#markup): removed.

data/README.og

@@ -1,4 +1,4 @@
-= Og 0.6.0
+= Og 0.8.0
 
 Nitro integrates the Og (ObjectGraph) object-relational mapping 
 library. Og	provides transparent serialization of object graphs to a RDBMS 
@@ -40,6 +40,7 @@ The library provides the following features:
 + Transparent support for cascading deletes for all backends.
 + Hierarchical structures (preorder traversal, materialized paths)
 + Works safely as part of distributed application.
++ Automatic Validation/Constraints.
 + Simple implementation < 2k lines of code.
 
 == Download

data/RELEASES.og

@@ -1,3 +1,38 @@
+== Version 0.8 was released on 12/01/2005.
+
+A snapshot of the latest code. Cool new features,
+many fixes and improvements in older features. Many thanks
+to Michael Neumann for giving intelligent suggestions
+and finding small bugs.
+
+Most notable additions:
+
+* New automatic validation system:
+
+	class User
+		prop_accessor :name, :password, String
+		validate_confirmation :password
+		validate_length :name, :range => 2..12
+	end
+
+	u = User.new(...)
+	unless u.valid?
+		p u.errors.on(:name)
+		p u.errors[:password]
+	end
+
+* No global variables in Og. 
+
+* Recoded Og to allow for future support of multiple databases 
+	(even on different RDBMS systems) on a single application.
+
+* cleaned up backend code.
+
+* More unit tests.
+
+* Supports Ruby 1.8.2
+	
+
 == Version 0.7 was released on 27/12/2004.
 
 A snapshot of the latest code. Many fixes and new features result

data/Rakefile

@@ -91,7 +91,7 @@ else
 	PKG_FILES = FileList[
 		"README.og", "RELEASES.og", "LICENSE", "AUTHORS", "Rakefile", "ChangeLog*", 
 		"examples/og/*", "lib/glue.rb", "lib/glue/**/*", "lib/og/**/*", "lib/og.rb",
-		"test/*og*.rb", "test/og/*"
+		"test/*og*.rb", "test/og/*", "vendor/extensions/**/*"
 	].exclude(".svn/**/*").exclude("**/*.log")
 	
 	spec = Gem::Specification.new do |s|

data/examples/og/mock_example.rb

@@ -9,15 +9,12 @@
 # (c) 2004 Navel, all rights reserved.
 # $Id: run.rb 185 2004-12-10 13:29:09Z gmosx $
 
-$LOAD_PATH.unshift '../../lib'
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
 require 'rubygems'
 require 'flexmock'
 require 'og'
 require 'og/mock'
-require 'logger'
-
-$log = Logger.new($stderr)
 
 class Article
 	prop_accessor :body, String
@@ -30,11 +27,11 @@ end
 class SimpleTest < Test::Unit::TestCase
 
 	def setup
-		$og = Og::MockDatabase.new
+		@og = Og::MockDatabase.new
 	end
 
 	def teardown
-		$og = nil
+		@og = nil
 	end
 
 	def test_me
@@ -43,15 +40,15 @@ class SimpleTest < Test::Unit::TestCase
 			Article.new('body2'),
 			Article.new('body3')
 		]
-		$og.mock_handle(:load_all) { |klass, extrasql| mocks }
+		@og.mock_handle(:load_all) { |klass, extrasql| mocks }
 
 		# differnt ways to call the mocked method...
 		puts 'Here are the articles:', Article.all
 		puts 'Here are the articles:', Article.load_all
-		puts 'Here are the articles:', $og.load_all(Article)
+		puts 'Here are the articles:', @og.load_all(Article)
 
 		# 3 times called
-		assert_equal(3, $og.mock_count(:load_all))
+		assert_equal(3, @og.mock_count(:load_all))
 	end
 
 end

data/examples/og/mysql_to_psql.rb

@@ -0,0 +1,100 @@
+# = Og Mysql to PostgreSQL copy example 
+#
+# A simple example to demonstrate the flexibility of
+# Og. Two connections to different databases are 
+# created and data is copied from a MySQL database
+# to a PostgreSQL database.
+#
+# Og makes it easier to switch to a REAL database :)
+#
+# code: 
+# * George Moschovitis  <gm@navel.gr>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id$
+
+raise 'WARNING, this example does not work yet, for the moment ' + 
+			'just have a look at the source code.'
+
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'og'
+
+# An example managed object.
+# Looks like an ordinary Ruby object.
+#
+class Article
+	prop_accessor :name, :body, String
+
+	def initialize(name = nil, body = nil)
+		@name, @body = name, body
+	end
+end
+
+# Configure databases.
+
+psql_config = {
+	:address => 'localhost',
+	:database => 'test',
+	:backend => 'psql',
+	:user => 'postgres',
+	:password => 'navelrulez',
+	:connection_count => 1
+}
+
+mysql_config = {
+	:address => 'localhost',
+	:database => 'mysql',
+	:backend => 'psql',
+	:user => 'postgres',
+	:password => 'navelrulez',
+	:connection_count => 1
+}
+=begin
+mysql_config = {
+	:address => 'localhost',
+	:database => 'test',
+	:backend => 'mysql',
+	:user => 'root',
+	:password => 'navelrulez',
+	:connection_count => 1
+}
+=end
+
+# Cleanup the databases, remove data from
+# earlier executions.
+
+Og::Database.drop!(psql_config)
+Og::Database.drop!(mysql_config)
+
+# Initialize Og.
+
+psql = Og::Database.new(psql_config)
+mysql = Og::Database.new(mysql_config)
+
+# First populate the mysql database.
+
+Og.use(mysql)
+
+a1 = Article.create('name1', 'body1')
+a1 = Article.create('name1', 'body1')
+a1 = Article.create('name1', 'body1')
+
+# Read all articles from Mysql.
+
+articles = Article.all
+
+# Switch to PostgreSQL.
+
+Og.use(psql)
+
+# Store all articles.
+
+for article in articles
+	article.save!
+end
+
+# Fetch an article from PostgreSQL
+# as an example. Lookup by name.
+
+article = Article['name1']

data/examples/og/run.rb

@@ -8,10 +8,9 @@
 # (c) 2004 Navel, all rights reserved.
 # $Id: run.rb 198 2004-12-22 11:26:59Z gmosx $
 
-$:.unshift "../../lib"
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
-require "glue/logger"
-require "og"
+require 'og'
 
 # Full debug information.
 $DBG = true
@@ -138,9 +137,6 @@ class Part
 	end
 end
 
-# Initialize a logger.
-
-$log = Logger.new(STDERR); 
 # Og configuration.
 config = {
 	:address => "localhost",
@@ -162,23 +158,19 @@ config = {
 =end
 # Cleanup the database for earlier executions
 
-Og::Database.drop_db!(config)
+Og::Database.drop!(config)
 
 # Initialize Og
 
-$og = Og::Database.new(config)
-
-# Get an Og connection for this thread.
-
-$og.get_connection
+db = Og::Database.new(config)
 
 # Create some articles
 
 a1 = Article.new("Title1", "Body1")
 a1.save!
 
-a2 = Article.new("Title2", "Body2")
-a2.save!
+# shortcut
+a2 = Article.create("Title2", "Body2")
 
 puts "\n\n"
 puts "* Get and print all articles:"
@@ -194,9 +186,8 @@ c1.save!
 c2 = ArticleComment.new("Comment 2")
 # alternative way to set the parent.
 c2.article_oid = a1.oid
-# an alternative way to save (add to the $og 'virtal collection' of
-# managed objects).
-$og << c2
+# an alternative way to save 
+db << c2
 
 # an alternative (easier and cooler) way to add children in a 
 # has_many relation:

data/lib/glue/array.rb

@@ -6,7 +6,7 @@
 
 require "sync"
 
-module G
+module N
 
 # == SafeArray
 #

data/lib/glue/attribute.rb

@@ -0,0 +1,86 @@
+# code:
+# * George Moschovitis  <gm@navel.gr>
+#
+# Original code from Rails distribution.
+# http://www.rubyonrails.com
+#
+# $Id$
+
+#--
+# Extends the module object with module and instance accessors 
+# for class attributes, just like the native attr* accessors for 
+# instance attributes. Aliases for classes are also provided.
+#
+# Example:
+#
+# mattr_accessor :my_attr, 'Default value'
+#++
+class Module # :nodoc:
+	
+  def mattr_reader(*params)
+		default = if params.last.is_a?(Symbol) then nil else params.pop end
+		
+		
+    for sym in params
+			module_eval <<-"end_eval", __FILE__, __LINE__
+			
+        if not defined?(@@#{sym.id2name})
+          @@#{sym.id2name} = #{default.inspect}
+        end
+        
+        def self.#{sym.id2name}
+          @@#{sym}
+        end
+
+        def #{sym.id2name}
+          @@#{sym}
+        end
+
+        def call_#{sym.id2name}
+          case @@#{sym.id2name}
+            when Symbol then send(@@#{sym})
+            when Proc   then @@#{sym}.call(self)
+            when String then @@#{sym}
+            else nil
+          end
+        end
+				
+      end_eval
+    end
+  end
+  alias_method :cattr_reader, :mattr_reader
+  
+  def mattr_writer(*params)
+		default = if params.last.is_a?(Symbol) then nil else params.pop end
+		
+    for sym in params
+			module_eval <<-"end_eval", __FILE__, __LINE__
+
+        if not defined?(@@#{sym.id2name})
+          @@#{sym.id2name} = #{default.inspect.inspect}
+        end
+        
+        def self.#{sym.id2name}=(obj)
+          @@#{sym.id2name} = obj
+        end
+
+        def self.set_#{sym.id2name}(obj)
+          @@#{sym.id2name} = obj
+        end
+
+        def #{sym.id2name}=(obj)
+          @@#{sym} = obj
+        end
+
+      end_eval
+    end
+  end
+  alias_method :cattr_writer, :cattr_writer
+  
+  def mattr_accessor(*syms)
+    mattr_reader(*syms)
+    mattr_writer(*syms)
+  end
+  alias_method :cattr_accessor, :mattr_accessor
+	
+end

data/lib/glue/cache.rb

@@ -5,7 +5,7 @@
 # (c) 2004 Navel, all rights reserved.
 # $Id: cache.rb 167 2004-11-23 14:03:10Z gmosx $
 
-module G;
+module N;
 
 # = LRUCache
 #

data/lib/glue/hash.rb

@@ -6,7 +6,7 @@
 
 require "sync"
 
-module G;
+module N;
 
 # == SafeHash
 #

data/lib/glue/inflector.rb

@@ -2,7 +2,7 @@
 # Copyright (c) 2004 David Heinemeier Hansson.
 #
 
-module G
+module N
 
 # The Inflector transforms words from singular to plural, class names to table names, modulized class names to ones without,
 # and class names to foreign keys.