og 0.16.0 → 0.17.0

data/lib/og/types.rb

@@ -0,0 +1,19 @@
+module Og
+
+# Some useful type macros to help when defining properties.
+# You can easily code your own type macros. Just return the 
+# array that should be passed to the property macro.
+#
+# === Example
+#
+# property :name, VarChar(30)
+
+def self.VarChar(size)
+	return String, :sql => "VARCHAR(#{size})"
+end
+
+NotNull = { :sql => 'NOT NULL' }.freeze
+
+Null = { :sql => 'NULL' }.freeze
+
+end

data/lib/og/validation.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: validation.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'glue/validation'
 
 module Glue 

data/test/og/{mixins → mixin}/tc_hierarchical.rb

@@ -3,19 +3,18 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 require 'test/unit'
 require 'ostruct'
 
-require 'og/mixins/hierarchical'
-
 require 'og'
+require 'og/mixin/hierarchical'
 
-$og = Og::Database.new(
-	:adapter => 'psql',
-	:database => 'test',
+$og = Og.setup(
+	:store => 'psql',
+	:name => 'test',
 	:user => 'postgres',
 	:password => 'navelrulez',
-	:drop => true
+	:destroy => true
 )
 
-class TestCaseOgHierarchical < Test::Unit::TestCase # :nodoc: all
+class TC_OgHierarchical < Test::Unit::TestCase # :nodoc: all
 
 	class Comment 
 		property :body, String
@@ -34,41 +33,40 @@ class TestCaseOgHierarchical < Test::Unit::TestCase # :nodoc: all
 	end
 
 	def test_all
-		$og.auto_manage_classes		
+		$og.manage_classes		
 
 		root = Comment.create('root')
 		c1 = Comment.new('1')
-		root.add_comment(c1)
+		root.add_comment c1
 		c2 = Comment.new('1.1')
-		c1.add_comment(c2)
+		c1.add_comment c2
 		c3 = Comment.new('1.2')
-		c1.add_comment(c3)
+		c1.add_comment c3
 		c4 = Comment.new('1.1.1')
-		c2.add_comment(c4)
+		c2.add_comment c4
 		c5 = Comment.new('1.2.1')
-		c3.add_comment(c5)
+		c3.add_comment c5
 		c6 = Comment.new('1.1.1.1')
-		c4.add_comment(c6)
+		c4.add_comment c6
 		c7 = Comment.new('2')
-		root.add_comment(c7)
+		root.add_comment c7
 		c8 = Comment.new('3')
-		root.add_comment(c8)
+		root.add_comment c8
 		c9 = Comment.new('2.1')
-		c7.add_comment(c9)
+		c7.add_comment c9
 
 		c1.reload
-=begin
-		Comment.all("ORDER BY lft, rgt").each { |c|
+		
+		Comment.all(:order => "lft, rgt").each { |c|
 			puts sprintf("%3d %3d %s", c.lft, c.rgt, c.body)
 			# p c	
 		}
 		puts '--1'
-		c1.comments("ORDER BY lft, rgt").each { |c| puts c.body }
+		c1.comments(:order => "lft, rgt").each { |c| puts c.body }
 		puts '--2'
-		c1.full_comments("ORDER BY lft, rgt").each { |c| puts c.body }
+		c1.full_comments(:order => "lft, rgt").each { |c| puts c.body }
 		puts '--3'
-		c1.direct_comments("ORDER BY lft, rgt").each { |c| puts c.body }
-=end
+		c1.direct_comments(:order => "lft, rgt").each { |c| puts c.body }
 
 		assert_equal 6, c1.full_comments.size
 		assert_equal 5, c1.comments.size

data/test/og/{mixins → mixin}/tc_orderable.rb

@@ -3,16 +3,16 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 require 'test/unit'
 require 'ostruct'
 
-require 'og/mixins/orderable'
-
 require 'og'
+require 'og/mixin/orderable'
 
-$og = Og::Database.new(
-	:adapter => 'psql',
-	:database => 'test',
+$og = Og.setup(
+	:store => 'psql',
+#	:store => :memory,
+	:name => 'test',
 	:user => 'postgres',
 	:password => 'navelrulez',
-	:drop => true
+	:destroy => true
 )
 
 class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
@@ -32,7 +32,7 @@ class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
 		property :body, String
 		belongs_to :article, Article
 		
-		include Og::Orderable, :scope => :article
+		include Og::Orderable #, :scope => :article
 
 		def initialize(body = nil)
 			@body = body
@@ -40,17 +40,17 @@ class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
 	end
 
 	def test_all
-		$og.auto_manage_classes		
+		$og.manage_classes		
 
 		a = Article.create('article')
 		a.save
 
-		c1 = Comment.new('1')
-		a.add_comment(c1)
-		c2 = Comment.new('2')
-		a.add_comment(c2)
-		c3 = Comment.new('3')
-		a.add_comment(c3)
+		c1 = Comment.create('1')
+		a.comments << c1
+		c2 = Comment.create('2')
+		a.comments << c2
+		c3 = Comment.create('3')
+		a.comments << c3
 
 		assert_equal 1, c1.position
 		assert_equal 2, c2.position
@@ -63,6 +63,7 @@ class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
 		c3.reload
 
 		assert_equal 1, c1.position
+
 		assert_equal 2, c3.position
 		assert_equal 3, c2.position
 

data/test/og/mixin/tc_timestamped.rb

@@ -0,0 +1,38 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'og'
+require 'og/mixin/timestamped'
+
+$og = Og.setup(
+	:store => 'psql',
+	:name => 'test',
+	:user => 'postgres',
+	:password => 'navelrulez',
+	:destroy => true
+)
+
+class TestCaseOgTimestamped < Test::Unit::TestCase # :nodoc: all
+
+	class Article 
+		include Og::Timestamped
+		property :body, String
+
+		def initialize(body = nil)
+			@body = body
+		end
+	end
+
+	def test_all
+		$og.manage_classes		
+
+		a = Article.create('article')
+		a.save
+
+		a = Article[1]
+		assert a.create_time
+	end
+
+end

data/test/og/store/tc_filesys.rb

@@ -0,0 +1,71 @@
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
+
+require 'test/unit'
+
+require 'og'
+
+class TestCaseOgFilesys < Test::Unit::TestCase # :nodoc: all
+	include Og
+
+	class Comment; end
+
+	class Article
+		property :body, String
+		has_many :comment, Comment
+
+		def initialize(body = nil)
+			@body = body
+		end
+	end
+
+	class Comment
+		property :body, String
+		belongs_to :article, Article
+
+		def initialize(body = nil)
+			@body = body
+		end
+	end
+
+	class User
+		property :name, :name_key => true
+	end
+	
+	def setup
+		@og = Og.setup(:store => 'filesys', :name => 'test')
+	end
+
+	def teardown
+		@og = nil
+	end
+
+	def test_all
+		# p Comment.__meta
+		# p Article.__meta
+
+		a1 = Article.new('Article 1')
+		@og.store.save(a1)	
+
+		a2 = @og.store.load(1, Article)
+
+		assert_equal a1.body, a2.body
+
+		a3 = Article.new('Article 3')
+		a3.save	
+	
+		@og.store.delete(a3)
+
+		assert @og.store.load(1, Article)
+		assert !@og.store.load(2, Article)
+
+		a2.delete
+
+		# a.comments << Comment.new('Comment 1')
+		# a.save
+		# a = Article[1]
+
+		@og.store.close
+		@og.store.class.destroy(@og.options)
+	end
+
+end

data/test/og/tc_relation.rb

@@ -0,0 +1,36 @@
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
+
+require 'test/unit'
+
+require 'og'
+require 'og/relation'
+
+class TestCaseOgRelation < Test::Unit::TestCase # :nodoc: all
+	include Og
+
+	class User
+		property :name
+		has_many Dummer
+		has_many Article
+	end
+	
+	class Article
+		property :body, String
+	end
+	
+	def test_all
+		# no-namespace case.
+		rel = User.relation(:dummers)
+		rel.resolve_target
+		assert_equal Dummer, rel.target_class	
+	
+		# namespace case.
+		rel = User.relation(:articles)
+		rel.resolve_target
+		assert_equal TestCaseOgRelation::Article, rel.target_class		
+	end
+end
+
+class Dummer
+	property :dum, String
+end

data/test/og/tc_store.rb

@@ -0,0 +1,290 @@
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
+
+#$DBG = true
+
+require 'test/unit'
+
+require 'og'
+
+class TCOgStore < Test::Unit::TestCase # :nodoc: all
+	include Og
+
+# Not needed thanks to Og's two-pass algorithm.
+#	class Comment; end 
+
+	class User
+		property :name, Og::VarChar(32), :unique => true
+
+		def initialize(name = nil)
+			@name = name
+		end
+	end
+
+	class Category
+		property :title, Og::VarChar(32), :unique => true
+		joins_many Article
+
+		def initialize(title = nil)
+			@title = title
+		end
+	end
+		
+	class Article
+		property :title, :body, String
+		has_many Comment
+		has_one :author, User
+		refers_to :owner, User
+		many_to_many Category
+
+		def initialize(body = nil)
+			@body = body
+		end
+	end
+
+	class Comment
+		property :body, String
+		property :hits, Fixnum
+		# lets define the relation name just for fun.
+		belongs_to :article, Article
+		belongs_to User
+
+		def initialize(body = nil, user = nil)
+			@body = body
+			@user = user
+			@hits = 0
+		end
+	end
+
+	def setup
+		@og = nil
+	end
+	
+	def teardown
+		@og.store.close
+		@og.store.class.destroy(@og.options)
+		@og = nil
+	end
+	
+=begin
+	def test_psql
+		@og = Og.setup(
+			:destroy => true,
+			:store => :psql,
+			:name => 'test',
+			:user => 'postgres',
+			:password => 'navelrulez'
+		)
+		features_test
+		conversions_test
+	end
+=end
+=begin
+	def test_mysql
+		@og = Og.setup(
+			:destroy => true,
+			:store => :mysql,
+			:name => 'test',
+			:user => 'root',
+			:password => 'navelrulez'
+		)
+		features_test
+#		conversions_test
+	end
+=end
+#=begin
+	def test_sqlite
+		@og = Og.setup(
+			:destroy => true,
+			:store => :sqlite,
+			:name => 'test'
+		)		
+		features_test
+		conversions_test
+	end
+#=end
+=begin
+	def test_memory
+		@og = Og.setup(
+			:store => :memory,
+			:name => :test,
+			:destroy => true
+		)	
+		features_test
+	end
+=end
+
+	def features_test
+		u = User.create('gmosx')
+
+		a1 = Article.new('Article 1')
+		@og.store.save(a1)	
+
+		a2 = @og.store.load(1, Article)
+
+		assert_equal a1.body, a2.body
+
+		a3 = Article.create do |a|
+			a.title = 'Title 3'
+			a.body = 'Article 3'
+		end
+
+		a0 = Article.one(:condition => "body='Article 3'")
+		assert_equal 'Article 3', a0.body
+		
+		@og.store.delete(a3)
+
+		assert @og.store.load(1, Article)
+#		assert !Article[2]
+		assert Article.load(1)
+
+		a2.delete
+
+		a4 = Article.new('Article 4')
+		a4.author = u
+		a4.owner = u
+		a4.save
+
+		# add some children.
+
+		a4.comments << Comment.new('Comment 1', u)
+		a4.comments.push(Comment.new('Comment 2', u))
+		a4.comments.add(Comment.new('Comment 3', u))
+
+		assert_equal 3, a4.comments.size
+		
+		assert_not_equal a4.comments[1].body, a4.comments[0].body
+		
+
+		assert_not_equal a4.comments[0].body, a4.comments[1].body
+	
+		c1 = Comment.new('Comment 4')
+		c1.article = a4
+		c1.user = u
+		c1.save
+
+		c1.reload
+		assert_equal 'Comment 4', c1.body
+		
+		# count
+		
+		assert_equal 4, @og.store.count(:class => Comment)
+		assert_equal 1, @og.store.count(:class => Comment, :condition => "body = 'Comment 4'")
+		assert_equal 4, Comment.count
+		assert_equal 1, Comment.count(:condition => "body = 'Comment 2'")
+
+		# update_properties
+
+		Comment.update_properties('@hits = @hits + 1')
+		cc = Comment[1]
+		assert_equal 1, cc.hits
+		Comment.update_properties('@hits = @hits + 1', :condition => 'oid = 1')
+		cc.reload
+		assert_equal 2, cc.hits
+		cc.update_properties('@hits = @hits + 1')
+		cc.reload
+		assert_equal 3, cc.hits
+
+		# update selected properties.
+
+		cc.hits = 5
+		cc.update(:hits)		
+		assert_equal 5, cc.hits
+		cc.reload
+		assert_equal 5, cc.hits
+		
+		cc.hits += 1
+		cc.body = 'Wow!'
+		cc.update(:hits, :body)
+		cc.reload
+		assert_equal 'Wow!', cc.body
+				
+		# join
+
+		c3 = Comment.one(:condition => "body = 'Comment 4'", :include => :user)
+		assert_equal 'Comment 4', c3.body
+		# is eagerly loaded.
+		assert_equal 'gmosx', c3.user.name
+		assert_equal 'Article 4', c3.article.body
+		
+		comments = a4.comments(:reload => true, :include => [:user, :article])
+		assert_equal 'gmosx', comments[0].user.name
+		assert_equal 'Article 4', comments.first.article.body
+		
+		# thanks to reloading detects the manually added
+		# comment.
+
+		assert_equal 4, a4.comments(:reload => true).size
+
+		a4.comments.delete(c1)
+		assert_equal 3, a4.comments.size
+
+		assert_equal 3, @og.store.count(:class => Comment)
+
+		a4.comments.clear
+		assert_equal 0, a4.comments.size
+
+		# has_one
+		
+		assert_equal 'gmosx', a4.author.name
+
+		# refers_to
+		
+		assert_equal 'gmosx', a4.owner.name
+
+		# generated finders
+				
+		assert User.respond_to?(:find_by_name)
+		assert Comment.respond_to?(:find_by_body)
+		
+		u = User.find_by_name('gmosx')
+		assert_equal 'gmosx', u.name
+		
+		# inspection.
+
+		assert_equal 2, Comment.relations.size
+
+		rel = Comment.relation(:article)
+		assert_equal Og::BelongsTo, rel.class
+		
+		# joins_many / many_to_many relations.
+
+		c1 = Category.create('News')
+		c2 = Category.create('Sports')
+		a = Article.create('Hello')
+		a.categories << c1
+		a.save
+		a.categories << c2
+ 		a.save
+ 		
+ 		assert_equal 2, a.categories.size
+ 		
+ 		a = Article.find_by_body('Hello').first
+ 		assert_equal 2, a.categories.size
+ 		assert_equal 'News', a.categories[0].title
+ 		
+ 		c = Category.find_by_title('News')
+ 		assert_equal 1, c.articles.size
+	end
+	
+	def conversions_test
+		store = @og.store
+
+		assert_equal '13', store.quote(13)
+		assert_equal '13.23', store.quote(13.23)
+		assert_equal "'can''t quote'", store.quote("can't quote")
+
+		t = Time.now
+
+		assert_equal t.day, store.parse_timestamp(store.timestamp(t)).day
+		assert_equal t.year, store.parse_timestamp(store.timestamp(t)).year
+		assert_equal t.month, store.parse_timestamp(store.timestamp(t)).month
+		assert_equal t.hour, store.parse_timestamp(store.timestamp(t)).hour
+		assert_equal t.min, store.parse_timestamp(store.timestamp(t)).min
+		assert_equal t.sec, store.parse_timestamp(store.timestamp(t)).sec
+
+		d = Date.new
+
+		assert_equal d, store.parse_date(store.date(d))
+	end
+	
+end