og 0.20.0 → 0.21.0

data/lib/og/errors.rb

@@ -1,16 +1,16 @@
 # $Id$
 
 module Og
-	
+  
 # This exception is thrown when a low level error happens 
 # in the store. 
 
 class StoreException < Exception
-	attr_accessor :original_exception, :info
+  attr_accessor :original_exception, :info
 
-	def initialize(original_exception, info = nil)
-		@original_exception, @info = original_exception, info
-	end
+  def initialize(original_exception, info = nil)
+    @original_exception, @info = original_exception, info
+  end
 end
 
 end

data/lib/og/manager.rb

@@ -3,197 +3,198 @@ require 'og/store'
 
 module Og
 
-# A Manager defines the relations between entities, ie Objects
+# A Manager defines the relations between entities, ie objects
 # managed by Og.
 
 class Manager
 
-	# Information about an Entity class.
-
-	class EntityInfo
-		attr_accessor :klass
-		attr_accessor :enchanted
-		attr_accessor :options		
-
-		def initialize(klass = nil)
-			@klass = klass
-			@enchanted = false
-			@options = {}
-		end
-	end
-
-	# The configuration options.
-
-	attr_accessor :options
-
-	# The store used for persistence. This is a virtual field
-	# when running in thread_safe mode.
-	
-	attr_accessor :store
-
-	# The collection of Entities managed by this manager.
-
-	attr_accessor :entities
-
-	def initialize(options)
-		@options = options
-		@entities = {}
-		@pool = Glue::Pool.new
-				
-		store_class = Store.for_name(options[:store])
-		store_class.destroy(options) if options[:destroy]
-
-		if Og.thread_safe
-			(options[:connection_count] || 5).times do
-				@pool << store_class.new(options)
-			end		
-		else
-			@store = store_class.new(options)
-		end
-	end
-
-	# Get a store from the pool.
-	
-	def get_store
-		if Og.thread_safe
-			thread = Thread.current
-			
-			unless conn = thread[:og_store]
-				conn = @pool.pop()
-				thread[:og_store] = conn
-			end
-			
-			return conn
-		else
-			return @store
-		end
-	end
-	alias_method :store, :get_store
-
-	# Return a store to the pool.
-	
-	def put_store
-		if Og.thread_safe
-			thread = Thread.current
-			
-			if conn = thread[:og_store]
-				thread[:og_store] = nil
-				return @pool.push(conn)
-			end
-		end
-	end	
-
-	# Resolves the inheritance for a class.
-	
-	def resolve_inheritance(klass)
-		if has_super?(klass)
-			sclass = klass.superclass
-			klass.meta :superclass, sclass
-			klass.meta :schema_inheritance
-			sclass.meta :subclasses, klass
-		end
-	end
-
-	# Resolve polymorphic relations.
-	
-	def resolve_polymorphic(klass)
-		Relations.resolve_polymorphic(klass)
-	end
-
-	# Manage a class. Converts the class to an Entity.
-
-	def manage(klass)
-		return if managed?(klass) or klass.ancestors.include?(Unmanageable)
-		
-		info = EntityInfo.new(klass)
-
-		# ensure that the superclass is managed before the
-		# subclass.
-
-		manage(klass.superclass) if has_super?(klass)
-		
-		klass.module_eval %{
-			def ==(other)
-				other ? @#{klass.primary_key.first} == other.#{klass.primary_key.first} : false
-			end
-		}
-
-		klass.instance_variable_set '@ogmanager', self
-		klass.class.send(:attr_accessor, :ogmanager)
-
-		Relation.enchant(klass)		
-		
-		# FIXME: uggly!
-		store.enchant(klass, self); put_store
-
-		# Call special class enchanting code.
-		
-		klass.enchant if klass.respond_to?(:enchant)
-		
-		@entities[klass] = info
-	end
-
-	# Is this class manageable by Og?
-	
-	def manageable?(klass)
-		klass.respond_to?(:__props) and (!klass.__props.empty?)
-	end
-
-	# Is the class managed by Og? 
-
-	def managed?(klass)
-		@entities.include?(klass)
-	end
-	alias_method :entity?, :managed?
-
-	# Has this class a superclass?
-
-	def has_super?(klass)
-		manageable?(sclass = klass.superclass) and 
-				(klass.metadata.schema_inheritance || sclass.metadata.schema_inheritance)
-	end
-
-	# Use Ruby's advanced reflection features to find
-	# all manageable classes. Managable are all classes that 
-	# define Properties.
-
-	def manageable_classes
-		classes = []
-
-		ObjectSpace.each_object(Class) do |c|
-			if manageable?(c)
-				classes << c
-			end
-		end
-		
-		Logger.debug "Og manageable classes: #{classes.inspect}" if $DBG
-
-		return classes
-	end
-
-	# Manage a collection of classes.
-	
-	def manage_classes(*classes)
-		classes = manageable_classes.flatten if classes.empty?
-		classes.each { |c| resolve_inheritance(c) }
-		classes.each { |c| Relation.resolve(c, :resolve_target) }
-		classes.each { |c| Relation.resolve(c, :resolve_polymorphic) }
-		classes.each { |c| Relation.resolve(c, :resolve_options) }
-		classes.each { |c| manage(c) }
-	end
+  # Information about an Entity class.
+
+  class EntityInfo
+    attr_accessor :klass
+    attr_accessor :enchanted
+    attr_accessor :options    
+
+    def initialize(klass = nil)
+      @klass = klass
+      @enchanted = false
+      @options = {}
+    end
+  end
+
+  # The configuration options.
+
+  attr_accessor :options
+
+  # The store used for persistence. This is a virtual field
+  # when running in thread_safe mode.
+  
+  attr_accessor :store
+
+  # The collection of Entities managed by this manager.
+
+  attr_accessor :entities
+
+  def initialize(options)
+    @options = options
+    @entities = {}
+    @pool = Glue::Pool.new
+        
+    store_class = Store.for_name(options[:store])
+    store_class.destroy(options) if options[:destroy]
+
+    if Og.thread_safe
+      (options[:connection_count] || 5).times do
+        @pool << store_class.new(options)
+      end    
+    else
+      @store = store_class.new(options)
+    end
+  end
+
+  # Get a store from the pool.
+  
+  def get_store
+    if Og.thread_safe
+      thread = Thread.current
+      
+      unless conn = thread[:og_store]
+        conn = @pool.pop()
+        thread[:og_store] = conn
+      end
+      
+      return conn
+    else
+      return @store
+    end
+  end
+  alias_method :store, :get_store
+
+  # Return a store to the pool.
+  
+  def put_store
+    if Og.thread_safe
+      thread = Thread.current
+      
+      if conn = thread[:og_store]
+        thread[:og_store] = nil
+        return @pool.push(conn)
+      end
+    end
+  end  
+
+  # Resolves the inheritance for a class.
+  
+  def resolve_inheritance(klass)
+    if has_super?(klass)
+      sclass = klass.superclass
+      klass.meta :superclass, sclass
+      klass.meta :schema_inheritance
+      sclass.meta :subclasses, klass
+    end
+  end
+
+  # Resolve polymorphic relations.
+  
+  def resolve_polymorphic(klass)
+    Relations.resolve_polymorphic(klass)
+  end
+
+  # Manage a class. Converts the class to an Entity.
+
+  def manage(klass)
+    return if managed?(klass) or klass.ancestors.include?(Unmanageable)
+    
+    info = EntityInfo.new(klass)
+
+    # ensure that the superclass is managed before the
+    # subclass.
+
+    manage(klass.superclass) if has_super?(klass)
+    
+    klass.module_eval %{
+      def ==(other)
+        other ? @#{klass.primary_key.first} == other.#{klass.primary_key.first} : false
+      end
+    }
+
+    klass.instance_variable_set '@ogmanager', self
+    klass.class.send(:attr_accessor, :ogmanager)
+
+    Relation.enchant(klass)    
+    
+    # FIXME: uggly!
+    store.enchant(klass, self); put_store
+
+    # Call special class enchanting code.
+    
+    klass.enchant if klass.respond_to?(:enchant)
+    
+    @entities[klass] = info
+  end
+
+  # Is this class manageable by Og?
+  
+  def manageable?(klass)
+    klass.respond_to?(:__props) and (!klass.__props.empty?)
+  end
+
+  # Is the class managed by Og? 
+
+  def managed?(klass)
+    @entities.include?(klass)
+  end
+  alias_method :entity?, :managed?
+
+  # Has this class a superclass?
+
+  def has_super?(klass)
+    manageable?(sclass = klass.superclass) and 
+        (klass.metadata.schema_inheritance || sclass.metadata.schema_inheritance)
+  end
+
+  # Use Ruby's advanced reflection features to find
+  # all manageable classes. Managable are all classes that 
+  # define Properties.
+
+  def manageable_classes
+    classes = []
+
+    ObjectSpace.each_object(Class) do |c|
+      if manageable?(c)
+        classes << c
+      end
+    end
+    
+    Logger.debug "Og manageable classes: #{classes.inspect}" if $DBG
+
+    return classes
+  end
+
+  # Manage a collection of classes.
+  
+  def manage_classes(*classes)
+    classes = manageable_classes.flatten if classes.empty?
+    classes.each { |c| resolve_inheritance(c) }
+    classes.each { |c| Relation.resolve(c, :resolve_target) }
+    classes.each { |c| Relation.resolve(c, :resolve_polymorphic) }
+    classes.each { |c| Relation.resolve(c, :resolve_options) }
+    classes.each { |c| manage(c) }
+  end
 
 end
 
 class << self
-	
+  
 # Helper method, useful to initialize Og.
 
 def setup(options = {})
-	m = @@manager = Manager.new(options)
-	m.manage_classes
-	return m
+  m = @@manager = Manager.new(options)
+  m.manage_classes
+  return m
 end
 alias_method :connect, :setup
+alias_method :options=, :setup
 
 end
 

data/lib/og/mixin/hierarchical.rb

@@ -14,103 +14,103 @@ module Og
 
 module NestedSets
 
-	def self.append_dynamic_features(base, options)
-		c = { 
-			:left => 'lft', 
-			:right => 'rgt', 
-			:type => Fixnum, 
-			:parent => base.to_s.demodulize.underscore.downcase,
-			:children => base.to_s.demodulize.underscore.downcase.plural  
-		}
-		c.update(options) if options
-
-		parent = "#{c[:parent]}_oid"
-		left = c[:left]
-		right = c[:right]
-		children = c[:children]
-		child = children.singular
-
-	 	if c[:scope].is_a?(Symbol) && c[:scope].to_s !~ /_oid$/
-			c[:scope] = "#{c[:scope]}_oid".intern
-		end
-
-		scope = c[:scope]
-		
-		if scope
-			if scope.is_a?(Symbol)
-				scope = %{(#{scope} ? "#{scope} = \#{@#{scope}}" : "#{scope} IS NULL")}
-			end
-		
-			cond = 'condition => ' + scope
-			cond_and = ':condition => ' + scope + ' + " AND " +'
-		else
-			cond = ':condition => nil'
-			cond_and = ':condition => '
-		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 parent
-				if root?
-					nil
-				else
-					#{base}[@#{parent}]
-				end
-			end
+  def self.append_dynamic_features(base, options)
+    c = { 
+      :left => 'lft', 
+      :right => 'rgt', 
+      :type => Fixnum, 
+      :parent => base.to_s.demodulize.underscore.downcase,
+      :children => base.to_s.demodulize.underscore.downcase.plural  
+    }
+    c.update(options) if options
+
+    parent = "#{c[:parent]}_oid"
+    left = c[:left]
+    right = c[:right]
+    children = c[:children]
+    child = children.singular
+
+     if c[:scope].is_a?(Symbol) && c[:scope].to_s !~ /_oid$/
+      c[:scope] = "#{c[:scope]}_oid".intern
+    end
+
+    scope = c[:scope]
+    
+    if scope
+      if scope.is_a?(Symbol)
+        scope = %{(#{scope} ? "#{scope} = \#{@#{scope}}" : "#{scope} IS NULL")}
+      end
+    
+      cond = 'condition => ' + scope
+      cond_and = ':condition => ' + scope + ' + " AND " +'
+    else
+      cond = ':condition => nil'
+      cond_and = ':condition => '
+    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 parent
+        if root?
+          nil
+        else
+          #{base}[@#{parent}]
+        end
+      end
                                    
-			def #{children}_count
-				return (@#{right} - @#{left} - 1)/2
-			end
-
-			def full_#{children}(options = {})
-				options.update(#{cond_and}"(#{left} BETWEEN \#\{@#{left}\} AND \#{@#{right}})")
-				#{base}.all(options)
-			end
-
-			def #{children}(options = {})
-				options.update(#{cond_and}"(#{left} > \#\{@#{left}\}) AND (#{right} < \#{@#{right}})")
-				#{base}.all(options)
-			end
-														
-			def direct_#{children}(options = {})
-				options.update(#{cond_and}"#{parent} = \#{pk}")
-				#{base}.all(options)
-			end
-
-			def add_#{child}(child)
-				self.reload if pk
-				child.reload if child.pk
-				
-				if @#{left}.nil? || @#{left} == 0 || @#{right}.nil? || @#{right} == 0
-					@#{left} = 1
-					@#{right} = 2 
-				end
-			
-				child.#{parent} = pk
-				child.#{left} = pivot = @#{right}
-				child.#{right} = pivot + 1
-				@#{right} = pivot + 2
-
-				#{base}.transaction do
-					#{base}.update_property("#{left} = (#{left} + 2)",  #{cond_and}"#{left} >= \#{pivot}")
-					#{base}.update_property("#{right} = (#{right} + 2)", #{cond_and}"#{right} >= \#{pivot}")
-				end
-			
-				self.save
-				child.save
-			end
-		EOE
-	end
+      def #{children}_count
+        return (@#{right} - @#{left} - 1)/2
+      end
+
+      def full_#{children}(options = {})
+        options.update(#{cond_and}"(#{left} BETWEEN \#\{@#{left}\} AND \#{@#{right}})")
+        #{base}.all(options)
+      end
+
+      def #{children}(options = {})
+        options.update(#{cond_and}"(#{left} > \#\{@#{left}\}) AND (#{right} < \#{@#{right}})")
+        #{base}.all(options)
+      end
+                            
+      def direct_#{children}(options = {})
+        options.update(#{cond_and}"#{parent} = \#{pk}")
+        #{base}.all(options)
+      end
+
+      def add_#{child}(child)
+        self.reload if pk
+        child.reload if child.pk
+        
+        if @#{left}.nil? || @#{left} == 0 || @#{right}.nil? || @#{right} == 0
+          @#{left} = 1
+          @#{right} = 2 
+        end
+      
+        child.#{parent} = pk
+        child.#{left} = pivot = @#{right}
+        child.#{right} = pivot + 1
+        @#{right} = pivot + 2
+
+        #{base}.transaction do
+          #{base}.update_property("#{left} = (#{left} + 2)",  #{cond_and}"#{left} >= \#{pivot}")
+          #{base}.update_property("#{right} = (#{right} + 2)", #{cond_and}"#{right} >= \#{pivot}")
+        end
+      
+        self.save
+        child.save
+      end
+    EOE
+  end
 
 end
 
@@ -121,24 +121,24 @@ end
 # === Example
 #
 # class Comment
-#		include Hierarchical, :method => :nested_sets
+#    include Hierarchical, :method => :nested_sets
 # end
 #
 # [+:method+]
-# 	:simple
-# 	:nested_sets
-# 	:nested_intervals
+#   :simple
+#   :nested_sets
+#   :nested_intervals
 
 module Hierarchical
 
-	def self.append_dynamic_features(base, options)
-		o = { 
-			:method => :nested_sets, 
-		}
-		o.update(options) if options
+  def self.append_dynamic_features(base, options)
+    o = { 
+      :method => :nested_sets, 
+    }
+    o.update(options) if options
 
-		base.include(NestedSets, o)
-	end
+    base.include(NestedSets, o)
+  end
 
 end