mongo_mapper_acts_as_tree 0.3.1 → 0.3.2

data/lib/mongo_mapper/plugins/acts_as_tree.rb

@@ -9,16 +9,18 @@ module MongoMapper
       # --------------------------------------------------------------------------------
       module ClassMethods
         def acts_as_tree(options = {})
-          configuration = { :foreign_key => :parent_id, :order => nil, :counter_cache => nil }
+          configuration = { :foreign_key => :parent_id, :order => 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]
+          belongs_to :parent, :class_name => name, :foreign_key => configuration[:foreign_key]
           many :children, :class_name => name, :foreign_key => configuration[:foreign_key], :order => configuration[:order], :dependent => :destroy
+
           before_save :set_parents
+          after_save :update_descendants
 
           class_eval <<-EOV
             def self.roots
@@ -65,6 +67,13 @@ module MongoMapper
         def self_and_siblings
           parent? ? parent.children : self.class.roots
         end
+        
+        # after save, update descendants, so they have correct parent_ids values
+        def update_descendants
+          descendants.each do |descendant|
+            descendant.save unless (descendant.parent_ids - [self.id] == self.parent_ids)
+          end
+        end
       end
       
     end

data/lib/mongo_mapper/plugins/version.rb

@@ -2,7 +2,7 @@
 module MongoMapper
   module Plugins
     module ActsAsTree
-      Version = '0.3.1'
+      Version = '0.3.2'
     end
   end
 end

data/test/acts_as_tree_test.rb

@@ -129,58 +129,18 @@ class TreeTest < ActiveSupport::TestCase
     assert_equal [@root_child1, @root_child2], @root_child2.self_and_siblings
     assert_equal [@root1, @root2, @root3], @root2.self_and_siblings
     assert_equal [@root1, @root2, @root3], @root3.self_and_siblings
-  end           
-end
-
-
-# SKIP THIS AS THERE IS NO EAGER LOADING IN MONGOMAPPER
-
-# class TreeTestWithEagerLoading < Test::Unit::TestCase
-#   
-#   def setup 
-#     teardown_db
-#     setup_db
-#     @root1 = TreeMixin.create!
-#     @root_child1 = TreeMixin.create! :parent_id => @root1.id
-#     @child1_child = TreeMixin.create! :parent_id => @root_child1.id
-#     @root_child2 = TreeMixin.create! :parent_id => @root1.id
-#     @root2 = TreeMixin.create!
-#     @root3 = TreeMixin.create!
-#     
-#     @rc1 = RecursivelyCascadedTreeMixin.create!
-#     @rc2 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc1.id 
-#     @rc3 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc2.id
-#     @rc4 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc3.id
-#   end
-#     
-#   def test_eager_association_loading
-#     roots = TreeMixin.find(:all, :include => :children, :conditions => "mixins.parent_id IS NULL", :order => "mixins.id")
-#     assert_equal [@root1, @root2, @root3], roots                     
-#     assert_no_queries do
-#       assert_equal 2, roots[0].children.size
-#       assert_equal 0, roots[1].children.size
-#       assert_equal 0, roots[2].children.size
-#     end   
-#   end
-#   
-#   def test_eager_association_loading_with_recursive_cascading_three_levels_has_many
-#     root_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :children => { :children => :children } }, :order => 'mixins.id')
-#     assert_equal @rc4, assert_no_queries { root_node.children.first.children.first.children.first }
-#   end
-#   
-#   def test_eager_association_loading_with_recursive_cascading_three_levels_has_one
-#     root_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :first_child => { :first_child => :first_child } }, :order => 'mixins.id')
-#     assert_equal @rc4, assert_no_queries { root_node.first_child.first_child.first_child }
-#   end
-#   
-#   def test_eager_association_loading_with_recursive_cascading_three_levels_belongs_to
-#     leaf_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :parent => { :parent => :parent } }, :order => 'mixins.id DESC')
-#     assert_equal @rc1, assert_no_queries { leaf_node.parent.parent.parent }
-#   end 
-# end
-
-
+  end
+  
+  def test_change_of_parent_id
+    @root_child1.parent = @root2
+    @root_child1.save
 
+    assert_equal [@root_child1], @root2.reload.children
+    assert_equal [@root_child1, @child1_child], @root2.reload.descendants
+    assert_equal [@root2, @root_child1], @child1_child.reload.ancestors
+    assert_equal [@root_child2], @root1.reload.descendants
+  end
+end
 
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper_acts_as_tree
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Tomas Celizna