og 0.8.0 → 0.9.3

data/lib/og/mock.rb

@@ -1,8 +1,6 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
 # * Thomas Quas  <tquas@yahoo.com>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
 require 'og'
@@ -12,15 +10,12 @@ require_gem 'flexmock'
 
 class Og
 	
-# = MockDatabase
-#
 # A utility object to Mock a Database in test units.
 # Extends the standard FlexMock object.
-#
 #--
 # TODO: Factor out common functionality with Database
 # to avoid code duplication.
-#++
+
 class MockDatabase < ::FlexMock 
 	include Og::Enchant
 
@@ -40,16 +35,19 @@ class MockDatabase < ::FlexMock
 	end
 
 	# hash of configuration options.
+	
 	attr_accessor :config
 
 	# Pool of connections to the backend.
+	
 	attr_accessor :connection_pool
 
 	# Managed classes.
+
 	attr_accessor :managed_classes
 
 	# Initialize the database interface.
-	#
+	
 	def initialize
 		# Initialize FlexMock
 		super
@@ -61,6 +59,7 @@ class MockDatabase < ::FlexMock
 		if Og.auto_manage_classes
 			# automatically manage classes with properties and metadata.
 			# gmosx: Any idea how to optimize this?
+
 			classes_to_manage = []
 			ObjectSpace.each_object(Class) do |c|
 				if c.respond_to?(:__props) and c.__props
@@ -73,31 +72,32 @@ class MockDatabase < ::FlexMock
 		end
 
 		# use the newly created database.
+
 		Og.use(self)
 	end
 		
 	# Shutdown the database interface.
-	#
+	
 	def shutdown
 	end
 	alias_method :close, :shutdown
 
 	# Get a connection from the pool to access the database.
 	# Stores the connection in a thread-local variable.
-	#
+	
 	def get_connection
 		# nop
 	end
 	alias_method :connection, :get_connection
 	
 	# Restore an unused connection to the pool.
-	#
+	
 	def put_connection
 		# nop
 	end	
 
 	# Register a standard Ruby class as managed.
-	#
+	
 	def manage(klass)
 		return if managed?(klass) or klass.ancestors.include?(Og::Unmanageable)
 		
@@ -111,7 +111,7 @@ class MockDatabase < ::FlexMock
 	end
 	
 	# Helper method to set multiple managed classes.
-	#
+	
 	def manage_classes(*klasses)
 		for klass in klasses
 			manage(klass)
@@ -119,19 +119,19 @@ class MockDatabase < ::FlexMock
 	end
 	
 	# Stop managing a Ruby class
-	#
+	
 	def unmanage(klass)
 		@managed_classes.delete(klass)
 	end
 	
 	# Is this class managed?
-	#	
+		
 	def managed?(klass)
 		return @managed_classes.include?(klass)
 	end
 	
 	# Add standard og functionality to the class
-	#
+	
 	def convert(klass)
 		klass.class_eval %{
 			DBTABLE = "#{Og::Backend.table(klass)}"
@@ -144,7 +144,7 @@ class MockDatabase < ::FlexMock
 	end
 
 	# Automatically wrap connection methods.
-	#
+	
 	def self.wrap_method(method, args)
 		args = args.split(/,/)
 		class_eval %{
@@ -163,4 +163,4 @@ class MockDatabase < ::FlexMock
 	end
 end
 
-end # namespace 
+end 

data/lib/og/version.rb

@@ -1,9 +1,9 @@
-#-- 
-# George Moschovitis  <gm@navel.gr>
+# * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: version.rb 198 2004-12-22 11:26:59Z gmosx $
-#++
+# $Id: version.rb 248 2005-01-31 13:38:34Z gmosx $
 
-# The version of Og.
-
-$og_version = '0.8.0'
+class Og
+	# The version of Og.
+	
+	Version = '0.9.3'
+end

data/test/tc_og.rb

@@ -1,6 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'test/unit'
+
 require 'og'
 
 module Test # :nodoc: all
@@ -9,12 +10,17 @@ module Test # :nodoc: all
 # correctly escaped.
 class User
 	prop_accessor :name, String
-	
+	prop_accessor :banned, TrueClass
+
 	def initialize(name = nil)
 		@name = name
 	end
 end
 
+class Role
+	prop_accessor :title, String
+end
+
 class Comment; end
 
 class Article
@@ -46,10 +52,10 @@ class Article
 end
 
 class Comment
-	belongs_to :article, Test::Article, :extra_sql => 'NOT NULL' 
-	belongs_to :author, Test::User
 	prop_accessor :body, String
 	prop_accessor :create_time, Time
+	belongs_to :article, Test::Article, :extra_sql => 'NOT NULL' 
+	belongs_to :author, Test::User
 	
 	def initialize(body = nil)
 		@create_time = Time.now
@@ -73,6 +79,11 @@ class MyClass
 	include Test::MyMixin
 end
 
+class OrderItem
+	prop_accessor :number, Fixnum
+	refers_to :article, Article
+end
+
 class TC_N_OG < Test::Unit::TestCase
 
 	def setup
@@ -176,9 +187,17 @@ class TC_N_OG < Test::Unit::TestCase
 
 		assert_equal("gmosx", comments[0].author.name)
 
+		article.delete_all_comments
+		assert article.comments.empty?
+
+		# test cascading delete
+
+		article.add_comment(Comment.new("hello"))
+		article.add_comment(Comment.new("world"))
+
 		Article.delete(article)
 		
-		assert_equal(nil, Comment.all)
+		assert Comment.all.empty?
 
 		comment.delete!		
 
@@ -199,6 +218,24 @@ class TC_N_OG < Test::Unit::TestCase
 		# test create
 		article = Article.create("title", "body")
 		assert_equal(3, article.oid)
+
+		# test refers_to
+
+		oi = OrderItem.new
+		oi.article = article
+		oi.save
+
+		assert_equal article.oid, oi.article_oid
+
+		# bug
+
+		user = User['gmosx']
+		user.banned = true
+		user.save!
+
+		user = User['gmosx']
+		assert_equal true, user.banned
+		
 	end
 
 end

metadata

@@ -3,14 +3,14 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: og
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2005-01-12
+  version: 0.9.3
+date: 2005-02-01
 summary: Og (ObjectGraph)
 require_paths: 
   - lib
 email: gm@navel.gr
 homepage: http://www.navel.gr/og
-rubyforge_project: og-rml
+rubyforge_project: nitro
 description: An efficient and transparent Object-Relational mapping library
 autorequire: og
 default_executable: 
@@ -47,9 +47,12 @@ files:
   - lib/glue/number.rb
   - lib/glue/time.rb
   - lib/glue/property.rb
+  - lib/glue/misc.rb
   - lib/glue/macro.rb
+  - lib/glue/flexob.rb
   - lib/glue/cache.rb
   - lib/glue/string.rb
+  - lib/glue/object.rb
   - lib/glue/array.rb
   - lib/glue/validation.rb
   - lib/glue/attribute.rb