ramdiv-mongo_mapper_acts_as_tree 0.0.0 → 0.0.1

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/mongo_mapper_acts_as_tree.rb

@@ -25,19 +25,20 @@ module MongoMapper
           extend Fields
           extend ClassMethods
           
-          key parent_id_field,  String
-          key path_field,       String,  :default => ""
+          key parent_id_field,  ObjectId
+          key path_field,       Array,  :default => []
           key depth_field,      Integer, :default => 0
           
           after_save      :move_children
           before_save     :will_save_tree
-          # before_destroy  :destroy_descendants
+          before_destroy  :destroy_descendants
+          ensure_index([path_field, 1])
         end
       end
       
       module ClassMethods
         def roots
-          self.find(:all, :conditions => {parent_id_field => nil}, :order => tree_order)
+          self.all(parent_id_field => nil, :order => tree_order)
         end
       end
       
@@ -67,17 +68,17 @@ module MongoMapper
         def fix_position
           if parent.nil?
             self[parent_id_field] = nil
-            self[path_field] = ""
+            self[path_field] = []
             self[depth_field] = 0
           else
-            self[parent_id_field] = parent.id
-            self[path_field] = parent[path_field] + ":" + parent.id.to_s
+            self[parent_id_field] = parent._id
+            self[path_field] = parent[path_field] + [parent._id]
             self[depth_field] = parent[depth_field] + 1
           end
         end
         
         def parent
-          @_parent or (self[parent_id_field] ? self.class.find(self[parent_id_field]) : nil)
+          @_parent or (self[parent_id_field].nil? ? nil : self.class.find(self[parent_id_field]))
         end
         
         def root?
@@ -85,12 +86,12 @@ module MongoMapper
         end
         
         def root
-          self.class.find(self[path_field].split(":")[1]) or self
+          self[path_field].first.nil? ? self : self.class.find(self[path_field].first)
         end
         
         def ancestors
           return [] if root?
-          self.class.find(self[path_field].split(":")[1..-1].collect{|i| Mongo::ObjectID.from_string(i)})
+          self.class.find(self[path_field])
         end
         
         def self_and_ancestors
@@ -98,21 +99,20 @@ module MongoMapper
         end
         
         def siblings
-          self.class.find(:all, :conditions => {:_id => {"$ne" => self._id}, parent_id_field => self[parent_id_field]}, :order => tree_order)
+          self.class.all(:_id => {"$ne" => self._id}, parent_id_field => self[parent_id_field], :order => tree_order)
         end
         
         def self_and_siblings
-          self.class.find(:all, :conditions => {parent_id_field => self[parent_id_field]}, :order => tree_order)
+          self.class.all(parent_id_field => self[parent_id_field], :order => tree_order)
         end
         
         def children
-          self.class.find(:all, :conditions => {parent_id_field => self._id.to_s}, :order => tree_order)
+          self.class.all(parent_id_field => self._id.to_s, :order => tree_order)
         end
         
         def descendents
           return [] if new_record?
-          sorting_options = tree_order.split(",").map(&:strip).map(&:split).map{|item| [item[0], ((item[1].nil? or item[1].downcase == "asc") ? "asc" : "desc")]}.flatten
-          self.class.collection.find({path_field => /#{self._id}/}, {:sort => sorting_options}).map{|i| self.class.new(i)} or []
+          self.class.all(path_field => self._id, :order => tree_order)
         end
         
         def self_and_descendents
@@ -120,7 +120,7 @@ module MongoMapper
         end
         
         def is_ancestor_of?(other)
-          !(other[path_field] =~ /#{self._id}/).nil?
+          other[path_field].include?(self._id)
         end
         
         def is_or_is_ancestor_of?(other)
@@ -128,7 +128,7 @@ module MongoMapper
         end
         
         def is_descendant_of?(other)
-          !(self[path_field] =~ /#{other._id}/).nil?
+          self[path_field].include?(other._id)
         end
         
         def is_or_is_descendant_of?(other)
@@ -153,6 +153,10 @@ module MongoMapper
             @_will_move = true
           end
         end
+        
+        def destroy_descendants
+          self.class.destroy(self.descendents.map(&:_id))
+        end
       end
       
       module Fields

data/ramdiv-mongo_mapper_acts_as_tree.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ramdiv-mongo_mapper_acts_as_tree}
-  s.version = "0.0.0"
+  s.version = "0.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakob Vidmar"]

data/test/test_order.rb

@@ -16,7 +16,7 @@ class TestMongomapperActsAsTree < Test::Unit::TestCase
       assert_equal OrderedCategory.roots, [@root_2, @root_1]
       
       assert_equal @root_1.children, [@child_1, @child_3, @child_2]
-
+  
       assert_equal @root_1.descendents, [@child_1, @child_2_1, @child_3, @child_2]
       assert_equal @root_1.self_and_descendents, [@root_1, @child_1, @child_2_1, @child_3, @child_2]
       

data/test/test_tree.rb

@@ -12,10 +12,11 @@ class TestMongomapperActsAsTree < Test::Unit::TestCase
       @root_2     = Category.create(:name => "Root 2")
     end
     
+    
     should "have roots" do
       assert eql_arrays?(Category.roots, [@root_1, @root_2])
     end
-  
+      
     context "node" do
       should "have a root" do
         assert_equal @root_1.root, @root_1
@@ -111,7 +112,7 @@ class TestMongomapperActsAsTree < Test::Unit::TestCase
           
           @child_2.save
           @child_2_1.reload
-
+    
           assert @root_2.is_or_is_ancestor_of?(@child_2_1)
           assert @child_2_1.is_or_is_descendant_of?(@root_2)
           assert @root_2.descendents.include?(@child_2_1)
@@ -122,6 +123,11 @@ class TestMongomapperActsAsTree < Test::Unit::TestCase
           assert !@root_1.save
         end
       end
+      
+      should "destroy descendents when destroyed" do
+        @child_2.destroy
+        assert_nil Category.find(@child_2_1._id)
+      end
     end
     
     context "root node" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ramdiv-mongo_mapper_acts_as_tree
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Jakob Vidmar