og 0.15.0 → 0.16.0

data/lib/og/mixins/hierarchical.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: hierarchical.rb 341 2005-04-04 08:28:54Z gmosx $
+# $Id: hierarchical.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'glue/dynamic_include'
 
@@ -17,8 +17,8 @@ module NestedSets
 			:right => 'rgt', 
 			:type => Fixnum, 
 			:scope => '"1 = 1"',
-			:parent => N::Inflector.name(base),
-			:children => N::Inflector.plural_name(base)  
+			:parent => Inflector.name(base),
+			:children => Inflector.plural_name(base)  
 		}
 		c.update(options) if options
 
@@ -26,7 +26,7 @@ module NestedSets
 		left = c[:left]
 		right = c[:right]
 		children = c[:children]
-		child = N::Inflector.singularize(children)
+		child = Inflector.singularize(children)
 
 	 	if c[:scope].is_a?(Symbol) && c[:scope].to_s !~ /_oid$/
 			c[:scope] = "#{c[:scope]}_oid".intern

data/lib/og/mixins/orderable.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: orderable.rb 340 2005-04-04 08:26:58Z gmosx $
+# $Id: orderable.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'glue/dynamic_include'
 

data/lib/og/mixins/timestamped.rb

@@ -0,0 +1,24 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2005 Navel, all rights reserved.
+# $Id: timestamped.rb 23 2005-04-16 18:20:00Z gmosx $
+
+module Og
+
+# Adds timestamping functionality.
+
+module Timestamped
+
+	property :create_time, Time
+	property :update_time, Time
+	property :access_time, Time
+
+	pre "@create_time = @update_time = Time.now", :on => :og_insert
+	pre "@update_time = Time.now", :on => :og_update
+
+	def touch!
+		@access_time = Time.now
+	end
+	
+end
+
+end 

data/lib/og/mixins/tree.rb

@@ -1,9 +1,11 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: tree.rb 326 2005-03-28 11:07:17Z gmosx $
+# $Id: tree.rb 1 2005-04-11 11:04:30Z gmosx $
 
 # NOT WORKING YET !!!
 
+raise 'This is not working yet, do not require this file.'
+
 require 'glue/attribute'
 
 module Og

data/lib/og/testing/mock.rb

@@ -1,7 +1,7 @@
 # * George Moschovitis  <gm@navel.gr>
 # * Thomas Quas  <tquas@yahoo.com>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: mock.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'flexmock'
 
@@ -51,7 +51,7 @@ class MockDatabase < ::FlexMock
 		# Initialize FlexMock
 		super
 		
-		@managed_classes = N::SafeHash.new
+		@managed_classes = SafeHash.new
 		
 		Logger.info "Using mock database."
 		

data/lib/og/typemacros.rb

@@ -1,7 +1,7 @@
 # * George Moschovitis  <gm@navel.gr>
 # * Michael Neumann  <mneumann@ntecs.de>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: typemacros.rb 340 2005-04-04 08:26:58Z gmosx $
+# $Id: typemacros.rb 1 2005-04-11 11:04:30Z gmosx $
 
 module Og
 

data/lib/og/validation.rb

@@ -1,10 +1,10 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: validation.rb 301 2005-03-16 13:24:25Z gmosx $
+# $Id: validation.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'glue/validation'
 
-module N 
+module Glue 
 
 # Extend the Validation methods defined in glue/validation.rb with 
 # extra db related options.
@@ -34,7 +34,7 @@ module Validation
 
 		def validate_unique(*params)
 			c = { 
-				:msg => N::Validation::Errors.not_unique, 
+				:msg => Glue::Validation::Errors.not_unique, 
 				:on => :save 
 			}
 			c.update(params.pop) if params.last.is_a?(Hash)
@@ -57,7 +57,7 @@ module Validation
 		
 		def validate_related(*params)
 			c = { 
-				:msg => N::Validation::Errors.invalid_relation, 
+				:msg => Glue::Validation::Errors.invalid_relation, 
 				:on => :save 
 			}
 			c.update(params.pop) if params.last.is_a?(Hash)

data/test/og/{tc_filesys.rb → adapters/tc_filesys.rb}

@@ -7,7 +7,7 @@ require 'og'
 require 'og/adapters/filesys'
 
 class TC_OgFilesys < Test::Unit::TestCase # :nodoc: all
-	include N, Og
+	include Og
 
 	# Forward declaration.
 

data/test/og/{tc_sqlite.rb → adapters/tc_sqlite.rb}

@@ -1,15 +1,14 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
-=begin
-
 require 'test/unit'
 require 'ostruct'
 
 require 'og'
 require 'og/adapters/sqlite'
 
+if defined?(SQLite3)
+
 class TC_OgSqlite3 < Test::Unit::TestCase # :nodoc: all
-	include N
 
 	# Forward declaration.
 
@@ -84,4 +83,4 @@ class TC_OgSqlite3 < Test::Unit::TestCase # :nodoc: all
 
 end
 
-=end
+end

data/test/og/{tc_sqlserver.rb → adapters/tc_sqlserver.rb}

@@ -4,10 +4,11 @@ require 'test/unit'
 require 'ostruct'
 
 require 'og'
-#require 'og/adapters/sqlserver'
+require 'og/adapters/sqlserver'
+
+if defined?(DBI)
 
 class TC_OgSqlserver < Test::Unit::TestCase # :nodoc: all
-	include N
 
 	# Forward declaration.
 
@@ -91,3 +92,5 @@ class TC_OgSqlserver < Test::Unit::TestCase # :nodoc: all
 	end
 
 end
+
+end

data/test/og/mixins/tc_hierarchical.rb

@@ -16,7 +16,6 @@ $og = Og::Database.new(
 )
 
 class TestCaseOgHierarchical < Test::Unit::TestCase # :nodoc: all
-	include N
 
 	class Comment 
 		property :body, String

data/test/og/mixins/tc_orderable.rb

@@ -16,7 +16,6 @@ $og = Og::Database.new(
 )
 
 class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
-	include N
 
 	class Comment; end
 

data/test/og/tc_automanage.rb

@@ -14,15 +14,16 @@ $og = Og::Database.new(
 )
 
 class TestCaseOgObserver < Test::Unit::TestCase # :nodoc: all
-	include N
 
 	# Define a class after the Database is created.
 
+	class Article; end
+
 	class User
 		property :name
 
 		# auto forward ref.
-		has_many :articles, TestCaseOgObserver::Article
+		has_many :articles, Article
 	end
 
 	class Article

data/test/og/tc_lifecycle.rb

@@ -3,35 +3,35 @@
 
 # * Thomas Quas  <tquas@yahoo.com>
 # * George Moschovitis  <gm@navel.gr>
-# $Id$
+# $Id: tc_lifecycle.rb 17 2005-04-14 16:03:40Z gmosx $
 
 $LOAD_PATH.unshift 'lib'
 
 require 'test/unit'
 require 'glue/logger'
-require 'og/mock'
+require 'og/testing/mock'
 
 $DBG = false
 
 class Dummy
-  prop_accessor :date, Time
-  attr_reader :call_stack
+	include Aspects
 
-  def og_pre_insert( oid )
-    @call_stack << 'pre_insert'
-  end
+  prop_accessor :date, Time
+  attr_accessor :call_stack
 
-  def og_post_insert( oid )
-    @call_stack << 'post_insert'
-  end
+	pre(:on => :og_insert) { |this| this.call_stack << 'pre_insert' }
+	post(:on => :og_insert) { |this| this.call_stack << 'post_insert' }
 
-  def og_pre_update( oid )
+  def og_pre_update
     @call_stack << 'pre_update'
   end
+	pre :og_pre_update, :on => :og_update
 
-  def og_post_update( oid )
-    @call_stack << 'post_update'
-  end
+	post(:on => :og_update) { |this| this.call_stack << 'post_update' }
+
+	# faster :) 
+	
+	post "@call_stack << 'post_update2'", :on => :og_update
 
   def self.og_pre_delete( conn, oid )
     raise 'undeletable'
@@ -63,6 +63,7 @@ class TC_CallbackTest < ::Test::Unit::TestCase
     obj.save
     assert( obj.call_stack.shift == "pre_update" )
     assert( obj.call_stack.shift == "post_update" )
+    assert( obj.call_stack.shift == "post_update2" )
     assert( obj.call_stack.empty? )
   end
 

data/test/og/tc_many_to_many.rb

@@ -6,7 +6,6 @@ require 'ostruct'
 require 'og'
 
 class TC_OgManyToMany < Test::Unit::TestCase # :nodoc: all
-	include N
 
 	class Attribute
 		property :name, String

data/test/og/tc_meta.rb

@@ -6,7 +6,7 @@ require 'ostruct'
 require 'og'
 
 class TC_OgMeta < Test::Unit::TestCase # :nodoc: all
-	include N
+	include Og 
 
 	# Forward declaration.
 
@@ -40,13 +40,13 @@ class TC_OgMeta < Test::Unit::TestCase # :nodoc: all
 	def test_all
 		par = Article.__meta[:props_and_relations]
 		assert_equal 3, par.size
-		assert_equal N::Property, par[1].class
-		assert_equal Og::HasMany, par[2].class
+		assert_equal Property, par[1].class
+		assert_equal HasMany, par[2].class
 
 		par = Comment.__meta[:props_and_relations]
 		assert_equal 3, par.size
-		assert_equal N::Property, par[0].class
-		assert_equal Og::BelongsTo, par[1].class
+		assert_equal Property, par[0].class
+		assert_equal BelongsTo, par[1].class
 		assert_equal 'article_oid', par[1].meta[:property].to_s
 		assert_equal String, par[0].klass
 		assert_equal Article, par[1].foreign_class

data/test/og/tc_validation.rb

@@ -5,7 +5,7 @@ require 'test/unit'
 require 'og'
 require 'og/validation'
 
-N::Property.type_checking = false
+Property.type_checking = false
 
 class TC_OgValidation < Test::Unit::TestCase # :nodoc: all
 

data/test/tc_og.rb

@@ -48,18 +48,6 @@ class Article
 		@body = body
 		@options = {"hello" => "world"}
 	end
-	
-	def og_pre_insert(conn)
-		puts "-- PRE INSERT CALLED FOR ARTICLE"
-	end
-	
-	def og_post_insert_update(conn)
-		puts "-- POST INSERT UPDATE CALLED FOR ARTICLE"
-	end
-
-	def og_post_update(conn)
-		puts "-- POST UPDATE CALLED FOR ARTICLE"
-	end
 end
 
 class Comment
@@ -72,14 +60,6 @@ class Comment
 		@create_time = Time.now
 		@body = body
 	end
-	
-	def og_pre_insert(conn)
-		puts "-- PRE INSERT CALLED FOR COMMENT"
-	end
-
-	def og_post_insert(conn)
-		puts "-- POST INSERT CALLED FOR COMMENT"
-	end	
 end
 
 module MyMixin

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: og
 version: !ruby/object:Gem::Version 
-  version: 0.15.0
-date: 2005-04-04
+  version: 0.16.0
+date: 2005-04-18
 summary: Og (ObjectGraph)
 require_paths: 
   - lib
@@ -21,67 +21,66 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
     - 
       - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.1
+        version: 1.8.2
   version: 
 platform: ruby
 authors: 
   - George Moschovitis
 files: 
+  - CHANGELOG
   - Rakefile
   - INSTALL
-  - CHANGELOG
   - README
   - install.rb
-  - benchmark/sqlite-prepare.2.txt
-  - benchmark/sqlite-no-prepare.2.txt
-  - benchmark/sqlite-no-prepare.1.txt
   - benchmark/bench.rb
+  - benchmark/sqlite-no-prepare.1.txt
+  - benchmark/sqlite-no-prepare.2.txt
   - benchmark/sqlite-prepare.1.txt
-  - examples/test.db
-  - examples/mysql_to_psql.rb
-  - examples/run.rb
+  - benchmark/sqlite-prepare.2.txt
   - examples/mock_example.rb
+  - examples/run.rb
+  - examples/mysql_to_psql.rb
   - examples/README
-  - doc/config.txt
+  - doc/tutorial.txt
   - doc/LICENSE
-  - doc/AUTHORS
+  - doc/config.txt
   - doc/RELEASES
-  - doc/tutorial.txt
+  - doc/AUTHORS
   - lib/og
   - lib/og.rb
-  - lib/og/adapter.rb
-  - lib/og/testing
-  - lib/og/mixins
   - lib/og/adapters
+  - lib/og/mixins
+  - lib/og/testing
+  - lib/og/typemacros.rb
   - lib/og/enchant.rb
-  - lib/og/connection.rb
-  - lib/og/observer.rb
   - lib/og/database.rb
   - lib/og/meta.rb
   - lib/og/validation.rb
-  - lib/og/typemacros.rb
-  - lib/og/testing/mock.rb
-  - lib/og/mixins/hierarchical.rb
-  - lib/og/mixins/orderable.rb
-  - lib/og/mixins/tree.rb
-  - lib/og/adapters/oracle.rb
+  - lib/og/errors.rb
   - lib/og/adapters/filesys.rb
-  - lib/og/adapters/mysql.rb
+  - lib/og/adapters/psql.rb
   - lib/og/adapters/sqlite.rb
+  - lib/og/adapters/mysql.rb
+  - lib/og/adapters/oracle.rb
   - lib/og/adapters/sqlserver.rb
-  - lib/og/adapters/psql.rb
-  - test/tc_og.rb
+  - lib/og/adapters/base.rb
+  - lib/og/mixins/hierarchical.rb
+  - lib/og/mixins/tree.rb
+  - lib/og/mixins/orderable.rb
+  - lib/og/mixins/timestamped.rb
+  - lib/og/testing/mock.rb
   - test/og
+  - test/tc_og.rb
+  - test/og/adapters
   - test/og/mixins
-  - test/og/tc_sqlite.rb
+  - test/og/tc_many_to_many.rb
   - test/og/tc_validation.rb
-  - test/og/tc_observer.rb
+  - test/og/tc_lifecycle.rb
   - test/og/tc_automanage.rb
-  - test/og/tc_filesys.rb
-  - test/og/tc_sqlserver.rb
   - test/og/tc_meta.rb
-  - test/og/tc_many_to_many.rb
-  - test/og/tc_lifecycle.rb
+  - test/og/adapters/tc_filesys.rb
+  - test/og/adapters/tc_sqlite.rb
+  - test/og/adapters/tc_sqlserver.rb
   - test/og/mixins/tc_hierarchical.rb
   - test/og/mixins/tc_orderable.rb
 test_files: []
@@ -109,5 +108,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.15.0
+            version: 0.16.0
       version: