mongo_mapper_acts_as_tree 0.2 → 0.3

data/lib/mongo_mapper/plugins/acts_as_tree.rb

@@ -12,8 +12,13 @@ module MongoMapper
           configuration = { :foreign_key => :parent_id, :order => nil, :counter_cache => nil }
           configuration.update(options) if options.is_a?(Hash)
 
+          # automatically create needed keys if they don't already exist
+          key configuration[:foreign_key], ObjectId unless keys.key?(configuration[:foreign_key])
+          key configuration[:foreign_key].to_s.pluralize.to_sym, Array unless keys.key?(configuration[:foreign_key].to_s.pluralize.to_sym)
+
           belongs_to :parent, :class_name => name, :foreign_key => configuration[:foreign_key], :counter_cache => configuration[:counter_cache]
           many :children, :class_name => name, :foreign_key => configuration[:foreign_key], :order => configuration[:order], :dependent => :destroy
+          before_save :set_parents
 
           class_eval <<-EOV
             def self.roots
@@ -23,6 +28,23 @@ module MongoMapper
             def self.root
               where("#{configuration[:foreign_key]}".to_sym => nil).sort("#{configuration[:order]}").first
             end
+
+            def set_parents
+              self.#{configuration[:foreign_key].to_s.pluralize} = parent.#{configuration[:foreign_key].to_s.pluralize}.dup << #{configuration[:foreign_key]} if parent?
+            end
+            
+            def ancestors
+              self.class.where(:id => { '$in' => self.#{configuration[:foreign_key].to_s.pluralize} }).all.reverse || []
+            end
+            
+            def root
+              self.class.find(self.#{configuration[:foreign_key].to_s.pluralize}.first) || self
+            end
+            
+            def descendants
+              self.class.where('#{configuration[:foreign_key].to_s.pluralize}' => self.id).all
+            end
+            
           EOV
         end
       end
@@ -31,32 +53,11 @@ module MongoMapper
       
       # --------------------------------------------------------------------------------
       module InstanceMethods
-        # Returns list of ancestors, starting from parent until root.
-        #
-        #   subchild1.ancestors # => [child1, root]
-        def ancestors
-          node, nodes = self, []
-          nodes << node = node.parent while node.parent?
-          nodes
-        end
-
-        # Returns the root node of the tree.
-        def root
-          node = self
-          node = node.parent while node.parent?
-          node
-        end
 
-        # Returns all siblings of the current node.
-        #
-        #   subchild1.siblings # => [subchild2]
         def siblings
           self_and_siblings - [self]
         end
 
-        # Returns all siblings and a reference to the current node.
-        #
-        #   subchild1.self_and_siblings # => [subchild1, subchild2]
         def self_and_siblings
           parent? ? parent.children : self.class.roots
         end

data/lib/mongo_mapper/plugins/version.rb

@@ -2,7 +2,7 @@
 module MongoMapper
   module Plugins
     module ActsAsTree
-      Version = '0.2'
+      Version = '0.3'
     end
   end
 end

data/test/acts_as_tree_test.rb

@@ -2,41 +2,23 @@ require 'test_helper'
 
 
 
-# SETUP TEST
-
-# class ActiveSupport::TestCase
-#   def assert_queries(num = 1)
-#     $query_count = 0
-#     yield
-#   ensure
-#     assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
-#   end
-# 
-#   def assert_no_queries(&block)
-#     assert_queries(0, &block)
-#   end
-# end
-
-
-
 # SETUP CLASSES
 
 class Mixin
   include MongoMapper::Document
   plugin MongoMapper::Plugins::ActsAsTree
-  key :parent_id, ObjectId
 end
 
 class TreeMixin < Mixin 
-  acts_as_tree :foreign_key => :parent_id, :order => :id
+  acts_as_tree
 end
 
 class TreeMixinWithoutOrder < Mixin
-  acts_as_tree :foreign_key => :parent_id
+  acts_as_tree
 end
 
 class RecursivelyCascadedTreeMixin < Mixin
-  acts_as_tree :foreign_key => :parent_id
+  acts_as_tree
   has_one :first_child, :class_name => 'RecursivelyCascadedTreeMixin', :foreign_key => :parent_id
 end
 
@@ -100,6 +82,14 @@ class TreeTest < ActiveSupport::TestCase
     assert_equal [], @root3.ancestors
   end
   
+  def test_descendants
+    assert_equal [@root_child1, @child1_child, @root_child2], @root1.descendants
+    assert_equal [@child1_child], @root_child1.descendants
+    assert_equal [], @root_child2.descendants
+    assert_equal [], @root2.descendants
+    assert_equal [], @root3.descendants
+  end
+  
   def test_root
     assert_equal @root1, TreeMixin.root
     assert_equal @root1, @root1.root

data/test/test_helper.rb

@@ -4,6 +4,7 @@ $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'mongo_mapper'
 require 'mongo_mapper/plugins/acts_as_tree'
 require 'test/unit'
+require 'ruby-debug'
 
 
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper_acts_as_tree
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Tomas Celizna
@@ -14,12 +14,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +01:00
+date: 2011-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: mongo_mapper
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: rake
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,7 +43,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
   version_requirements: *id002
 description: 
 email: