og 0.14.0 → 0.15.0

data/lib/og/meta.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: meta.rb 326 2005-03-28 11:07:17Z gmosx $
+# $Id: meta.rb 337 2005-03-31 16:20:40Z gmosx $
 #--
 # TODO:
 # - precreate the meta sql statements as much as possible to 
@@ -11,8 +11,6 @@ require 'glue/inflector'
 require 'og/adapter'
 require 'og/typemacros'
 
-require 'og/mixins/list'
-
 module Og
 
 class Relation < N::Property
@@ -395,7 +393,6 @@ end
 if Og.include_meta_language
 	class Module # :nodoc: all
 		include Og::MetaLanguage
-		include Og::List
 =begin
 		A hack to avoid forward references. Does not work
 		with namespave modules though. Any idea?

data/lib/og/mixins/hierarchical.rb

@@ -0,0 +1,134 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: hierarchical.rb 341 2005-04-04 08:28:54Z gmosx $
+
+require 'glue/dynamic_include'
+
+module Og
+
+# Implements the Nested Sets pattern for hierarchical 
+# SQL queries.
+
+module NestedSets
+
+	def self.append_dynamic_features(base, options)
+		c = { 
+			:left => 'lft', 
+			:right => 'rgt', 
+			:type => Fixnum, 
+			:scope => '"1 = 1"',
+			:parent => N::Inflector.name(base),
+			:children => N::Inflector.plural_name(base)  
+		}
+		c.update(options) if options
+
+		parent = "#{c[:parent]}_oid"
+		left = c[:left]
+		right = c[:right]
+		children = c[:children]
+		child = N::Inflector.singularize(children)
+
+	 	if c[:scope].is_a?(Symbol) && c[:scope].to_s !~ /_oid$/
+			c[:scope] = "#{c[:scope]}_oid".intern
+		end
+		scope = c[:scope]
+		if scope.is_a?(Symbol)
+			scope = %{(#{scope} ? "#{scope} = \#{@#{scope}}" : "#{scope} IS NULL")}
+		end
+		
+		base.module_eval <<-EOE, __FILE__, __LINE__		
+			property :#{parent}, Fixnum, :sql_index => true
+			property :#{left}, :#{right}, #{c[:type]}
+
+			def root?
+				(@#{parent}.nil? || @#{parent} == 0) && (@#{left} == 1) && (@#{right} > @#{left})			
+			end
+		
+			def child?
+				(@#{parent} &&  @#{parent} != 0) && (@#{left} > 1) && (@#{right} > @#{left})			
+			end
+                                   
+			def #{children}_count
+				return (@#{right} - @#{left} - 1)/2
+			end
+
+			def full_#{children}(extrasql = nil)
+				#{base}.all("WHERE " + #{scope} + " AND (#{left} BETWEEN \#\{@#{left}\} AND \#{@#{right}}) \#{extrasql}")
+			end
+
+			def #{children}(extrasql = nil)
+				#{base}.all("WHERE " + #{scope} + " AND (#{left} > \#\{@#{left}\}) AND (#{right} < \#{@#{right}}) \#{extrasql}")
+			end
+														
+			def direct_#{children}(extrasql = nil)
+				#{base}.all("WHERE " + #{scope} + " AND #{parent} = \#{@oid} \#{extrasql}")
+			end
+
+			def add_#{child}(child)
+				self.reload if @oid
+				child.reload if child.oid
+				
+				if @#{left}.nil? || @#{left} == 0 || @#{right}.nil? || @#{right} == 0
+					@#{left} = 1
+					@#{right} = 2 
+				end
+			
+				child.#{parent} = @oid
+				child.#{left} = pivot = @#{right}
+				child.#{right} = pivot + 1
+				@#{right} = pivot + 2
+
+				self.class.transaction do
+					self.class.update("#{left} = (#{left} + 2)",  "WHERE " + #{scope} + " AND #{left} >= \#{pivot}")
+					self.class.update("#{right} = (#{right} + 2)",  "WHERE " + #{scope} + " AND #{right} >= \#{pivot}")
+				end
+			
+				self.save
+				child.save
+			end
+			
+			def self.og_pre_delete(conn, obj)
+				return unless (obj.#{left} and obj.#{right})
+
+				span = obj.#{right} - obj.#{left} + 1
+				
+				(klass = obj.class).transaction do 
+					klass.delete(#{scope} + " AND #{left} > \#{obj.#{left}} AND (#{right} < \#{obj.#{right}})")
+					klass.update("#{left} = (#{left} - \#{span})",  "WHERE " + #{scope} + " AND #{left} >= \#{obj.#{right}}")
+					klass.update("#{right} = (#{right} - \#{span})",  "WHERE " + #{scope} + " AND #{right} >= \#{obj.#{right}}")
+				end
+			end
+		EOE
+	end
+
+end
+
+# Transform the base class to a hierarchical node.
+# A selection of different implementation strategies
+# are provided.
+#
+# === Example
+#
+# class Comment
+#		include Hierarchical, :method => :nested_sets
+# end
+#
+# [+:method+]
+# 	:simple
+# 	:nested_sets
+# 	:nested_intervals
+
+module Hierarchical
+
+	def self.append_dynamic_features(base, options)
+		c = { 
+			:method => :nested_sets, 
+		}
+		c.update(options) if options
+
+		base.include(NestedSets)
+	end
+
+end
+
+end 

data/lib/og/mixins/{list.rb → orderable.rb}

@@ -1,24 +1,26 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: list.rb 326 2005-03-28 11:07:17Z gmosx $
+# $Id: orderable.rb 340 2005-04-04 08:26:58Z gmosx $
+
+require 'glue/dynamic_include'
 
 module Og
 
 # Attach list/ordering methods to the enchanted class.
-#--
-# TODO:
-# Convert to new Og filter system.
-# Implement as super-mixin.
-#++
 
-module List 
+module Orderable
 
-	# The enchanted object acts as a list item.
+	def self.append_dynamic_features(base, options)
+		c = { 
+			:position => 'position', 
+			:type => Fixnum, 
+			:scope => '"1 = 1"' 
+		}
+		c.update(options) if options
 
-	def acts_as_list(options = {})
-		c = { :position => 'position', :type => Fixnum, :scope => '1 = 1' }
-		c.update(options) if options.is_a?(Hash)
-		c[:scope] = "#{c[:scope]}_oid".intern if c[:scope].is_a?(Symbol) && c[:scope].to_s !~ /_oid$/
+		if c[:scope].is_a?(Symbol) && c[:scope].to_s !~ /_oid$/		
+			c[:scope] = "#{c[:scope]}_oid".intern 
+		end
 
 		position = c[:position]
 		scope = c[:scope]
@@ -27,7 +29,7 @@ module List
 			scope = %{(#{scope} ? "#{scope} = \#{@#{scope}}" : "#{scope} IS NULL")}
 		end
 		
-		module_eval <<-EOE, __FILE__, __LINE__		
+		base.module_eval <<-EOE, __FILE__, __LINE__		
 			property :#{position}, #{c[:type]}
 		
 			def og_pre_insert(conn)
@@ -40,7 +42,7 @@ module List
 			
 			def move_higher
 				if higher = higher_item
-					#{self}.transaction do
+					#{base}.transaction do
 						higher.increment_position
 						decrement_position
 					end
@@ -49,7 +51,7 @@ module List
 
 			def move_lower
 				if lower = lower_item
-					#{self}.transaction do
+					#{base}.transaction do
 						lower.decrement_position
 						increment_position
 					end
@@ -57,14 +59,14 @@ module List
 			end
 
 			def move_to_top
-				#{self}.transaction do
+				#{base}.transaction do
 					increment_position_of_higher_items
 					set_top_position
 				end
 			end
 
 			def move_to_bottom
-				#{self}.transaction do
+				#{base}.transaction do
 					decrement_position_of_lower_items
 					set_bottom_position
 				end											
@@ -85,12 +87,12 @@ module List
 			end
 
 			def higher_item
-				#{self}.one(#{scope} + " AND #{position}=\#\{@#{position} - 1\}")
+				#{base}.one(#{scope} + " AND #{position}=\#\{@#{position} - 1\}")
 			end
 			alias_method :previous_item, :higher_item
 
 			def lower_item
-				#{self}.one(#{scope} + " AND #{position}=\#\{@#{position} + 1\}")
+				#{base}.one(#{scope} + " AND #{position}=\#\{@#{position} + 1\}")
 			end
 			alias_method :next_item, :lower_item
 
@@ -99,7 +101,7 @@ module List
 			alias_method :first_item, :top_item
 
 			def bottom_item
-				#{self}.one(#{scope} + " ORDER BY #{position} DESC")
+				#{base}.one(#{scope} + " ORDER BY #{position} DESC")
 			end
 			alias_method :last_item, :last_item
 
@@ -139,15 +141,15 @@ module List
 			end
 
 			def increment_position_of_higher_items
-				#{self}.update("#{position}=(#{position} + 1)", "WHERE " + #{scope} + " AND #{position} < \#\{@#{position}\}")
+				#{base}.update("#{position}=(#{position} + 1)", "WHERE " + #{scope} + " AND #{position} < \#\{@#{position}\}")
 			end
 
 			def increment_position_of_all_items
-				#{self}.update("#{position}=(#{position} + 1)", "WHERE " + #{scope})
+				#{base}.update("#{position}=(#{position} + 1)", "WHERE " + #{scope})
 			end
 			
 			def decrement_position_of_lower_items
-				#{self}.update("#{position}=(#{position} - 1)", "WHERE " + #{scope} + " AND #{position} > \#\{@#{position}\}")
+				#{base}.update("#{position}=(#{position} - 1)", "WHERE " + #{scope} + " AND #{position} > \#\{@#{position}\}")
 			end
 		EOE
 	end

data/lib/og/typemacros.rb

@@ -1,6 +1,7 @@
 # * George Moschovitis  <gm@navel.gr>
+# * Michael Neumann  <mneumann@ntecs.de>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: typemacros.rb 281 2005-03-10 12:24:14Z gmosx $
+# $Id: typemacros.rb 340 2005-04-04 08:26:58Z gmosx $
 
 module Og
 
@@ -16,8 +17,8 @@ def VarChar(size)
 	return String, :sql => "VARCHAR(#{size})"
 end
 
-NotNull = {:sql => "NOT NULL"}.freeze
+NotNull = { :sql => 'NOT NULL' }.freeze
 
-Null = {:sql => "NULL"}.freeze
+Null = { :sql => 'NULL' }.freeze
 
 end

data/test/og/mixins/tc_hierarchical.rb

@@ -0,0 +1,79 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'og/mixins/hierarchical'
+
+require 'og'
+
+$og = Og::Database.new(
+	:adapter => 'psql',
+	:database => 'test',
+	:user => 'postgres',
+	:password => 'navelrulez',
+	:drop => true
+)
+
+class TestCaseOgHierarchical < Test::Unit::TestCase # :nodoc: all
+	include N
+
+	class Comment 
+		property :body, String
+		property :create_time, Time
+		
+		include Og::NestedSets
+
+		def initialize(body = nil)
+			@body = body
+			@create_time = Time.now
+		end
+
+		def to_s
+			sprintf("%3d %3d %s", @lft, @rgt, @body)
+		end
+	end
+
+	def test_all
+		$og.auto_manage_classes		
+
+		root = Comment.create('root')
+		c1 = Comment.new('1')
+		root.add_comment(c1)
+		c2 = Comment.new('1.1')
+		c1.add_comment(c2)
+		c3 = Comment.new('1.2')
+		c1.add_comment(c3)
+		c4 = Comment.new('1.1.1')
+		c2.add_comment(c4)
+		c5 = Comment.new('1.2.1')
+		c3.add_comment(c5)
+		c6 = Comment.new('1.1.1.1')
+		c4.add_comment(c6)
+		c7 = Comment.new('2')
+		root.add_comment(c7)
+		c8 = Comment.new('3')
+		root.add_comment(c8)
+		c9 = Comment.new('2.1')
+		c7.add_comment(c9)
+
+		c1.reload
+=begin
+		Comment.all("ORDER BY 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 }
+		puts '--2'
+		c1.full_comments("ORDER BY lft, rgt").each { |c| puts c.body }
+		puts '--3'
+		c1.direct_comments("ORDER BY lft, rgt").each { |c| puts c.body }
+=end
+
+		assert_equal 6, c1.full_comments.size
+		assert_equal 5, c1.comments.size
+		assert_equal 2, c1.direct_comments.size
+	end
+
+end

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

@@ -3,6 +3,8 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 require 'test/unit'
 require 'ostruct'
 
+require 'og/mixins/orderable'
+
 require 'og'
 
 $og = Og::Database.new(
@@ -13,7 +15,7 @@ $og = Og::Database.new(
 	:drop => true
 )
 
-class TestCaseOgList < Test::Unit::TestCase # :nodoc: all
+class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
 	include N
 
 	class Comment; end
@@ -30,8 +32,9 @@ class TestCaseOgList < Test::Unit::TestCase # :nodoc: all
 	class Comment 
 		property :body, String
 		belongs_to :article, Article
-		acts_as_list :scope => :article
 		
+		include Og::Orderable, :scope => :article
+
 		def initialize(body = nil)
 			@body = body
 		end

data/test/og/tc_sqlserver.rb

@@ -0,0 +1,93 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'og'
+#require 'og/adapters/sqlserver'
+
+class TC_OgSqlserver < Test::Unit::TestCase # :nodoc: all
+	include N
+
+	# Forward declaration.
+
+	class Comment; end
+	
+	class Article
+		prop_accessor :name, String
+		prop_accessor :age, Fixnum
+		has_many :comments, Comment
+
+		def initialize (name = nil, age = nil)
+			@name, @age = name, age
+		end
+	end
+
+	class Comment
+		prop_accessor :text, String
+		belongs_to :article, Article
+
+		def initialize(text = nil)
+			@text = text
+		end
+	end
+
+	def setup
+		config = {
+			:adapter => 'sqlserver',
+			:address => 'localhost',
+			:database => 'test',
+			:user => 'sa',
+			:password => 'sa',
+			:connection_count => 2
+		}
+		
+		$DBG = true
+
+#		Og::Database.drop_db!(config)
+		@og = Og::Database.new(config)
+	end
+
+	def teardown
+		@og.shutdown
+	end
+
+	def test_all
+	
+		puts Article.all.size
+		Article.each {|a| a.delete!  }
+		puts Article.all.size
+		
+		a = Article.new('gmosx', 30)
+		a.save!
+
+		baseoid = a.oid
+		
+		a1 = Article[baseoid]
+
+		assert_equal 'gmosx', a1.name
+		assert_equal 30, a1.age
+		assert_equal baseoid, a1.oid
+
+		Article.create('drak', 12)
+		Article.create('ekarak', 34)
+		Article.create('mario', 53)
+		Article.create('elathan', 34)
+
+		articles = Article.all
+
+		assert_equal 5, articles.size
+
+		a3 = Article['ekarak']
+
+		assert_equal 'ekarak', a3.name
+
+		c1 = Comment.new('a comment')
+		c1.save!
+		a3.add_comment(c1)
+		
+		a5 = Article['ekarak']
+		assert_equal 1, a5.comments.size
+	end
+
+end