mongoid_tree 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/mongoid_tree.rb

@@ -3,33 +3,51 @@ module Mongoid
         module Tree
             extend ActiveSupport::Concern
             include Comparable
-
+            
             included do
-                references_many :children, :class_name => self.name, :stored_as => :array, :inverse_of => :parent do
+                references_many :children, :class_name => self.name, :stored_as => :array, :inverse_of => :parents do
                     def <<(*objects)
                         objects.flatten.each_with_index do |object, index|
+                            reverse_key = reverse_key(object)
                             if object.position == nil
+                                # This one sets the position for a new object added via children << object
                                 object.position = @parent.send(@foreign_key).count + index + 1
                             end
+                            # Stores the parents path into it's own path array.
+                            #raise @parent.inspect
+                            object.send(reverse_key).concat(@parent.send(reverse_key))
                         end
                         super(objects)
+                        
                     end
                 end
                 
-                referenced_in :parent, :class_name  => self.name, :inverse_of => :children
+                #referenced_in :parent, :class_name  => self.name, :inverse_of => :children
+                references_many :parents, :class_name => self.name, :stored_as => :array, :inverse_of => :children
                 
                 # This stores the position in the children array of the parent object.
                 # Makes it easier to flatten / export / import a tree
                 field :position, :type => Integer
+                field :depth, :type => Integer
             end
 
             module InstanceMethods
                 
+                def parent
+                    self.parents.last
+                end
+                
+                def depth
+                    self.parents.count
+                end
+                
                 #Comparable
                 def <=> (another_node)
                     self.position <=> another_node.position
                 end
-
+                
+                
+                # TODO change this into a Mongoid Query
                 def depth_first
                     result = [self]
                     if children.empty?
@@ -42,7 +60,6 @@ module Mongoid
                     return result                    
                 end
 
-
                 def insert_before( new_child )
                     new_child.position = self.position
                     self.parent.children.each do |child|
@@ -50,19 +67,17 @@ module Mongoid
                             child.position += 1
                         end
                     end
-                    self.parent.children << new_child
+                    self.parent.reload.children << new_child
                 end
 
                 def insert_after ( new_child )
-                    self.save
-                    self.parent.save
-                    new_child.position = self.position
+                    new_child.position = self.position + 1
                     self.parent.children.each do |child|
                         if child.position >= new_child.position
                             child.position += 1
                         end
                     end
-                    self.parent.children << new_child 
+                    self.parent.children << new_child
                 end
             end
 

data/mongoid_tree.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_tree}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rainer Kuhn"]
-  s.date = %q{2010-08-10}
+  s.date = %q{2010-08-12}
   s.description = %q{Fully featured tree implementation for Mongoid using materialized paths and relative associations. Featuring Depth and Breadth first search.}
   s.email = %q{rkuhn@littleweblab.com}
   s.extra_rdoc_files = [

data/spec/mongoid_tree_spec.rb

@@ -2,92 +2,128 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "MongoidTree" do
 
-    before do
-        [ Node ].each { |klass| klass.collection.remove }
+  before do
+    [ Node ].each { |klass| klass.collection.remove }
+  end
+
+  describe "A tree of nodes" do
+
+    context "A node with a child" do
+
+      before do
+        @parent = Node.new(:name => "Parent")
+        @child = Node.new(:name => "Child")
+        @parent.children << @child
+        @parent.save
+      end
+
+      it "should have 1 child" do
+        @parent.children.count.should be(1)
+        @parent.children.first.should eq(@child)
+      end        
+
+      it "a child should know it's parent" do
+        @child.parent.should eq(@parent)
+      end
+
+      it "the child should be at position 1" do
+        @parent.children.first.position.should eq(1)
+      end
+
     end
 
-    describe "A tree of nodes" do
-
-        context "A node with a child" do
-            
-            before do
-                @parent = Node.new(:name => "Parent")
-                @child = Node.new(:name => "Child")
-                @parent.children << @child
-                @parent.save
-            end
-            
-            it "should have 1 child" do
-                @parent.children.count.should be(1)
-                @parent.children.first.should eq(@child)
-            end        
-
-            it "a child should know it's parent" do
-                @child.parent.should eq(@parent)
-            end
-            
-            it "the child should be at position 1" do
-              @parent.children.first.position.should eq(1)
-            end
-            
-        end
-
-        context "a node with 2 children" do
-            
-            def reload
-                @parent.reload
-                @child_1.reload
-                @child_2.reload
-                @new_child.reload
-            end
-            
-            before do
-                @parent = Node.new(:name => "Parent")
-                @child_1 = Node.new(:name => "Child_1")
-                @child_2 = Node.new(:name => "Child_2")
-                @new_child = Node.new(:name => "new_child")
-                @parent.children << @child_1
-                @parent.children << @child_2
-                @child_1.position.should eq(1)
-                @child_2.position.should eq(2)
-                @parent.save
-            end
-            
-            it "should add a child before child 1" do
-                @child_1.insert_before(@new_child)
-                reload
-                @parent.children.sort.should eq([@new_child, @child_1, @child_2])
-            end
-
-            it "should add a child after child 1" do
-                @child_1.insert_after(@new_child)
-                reload
-                @parent.children.sort.should eq([@child_1, @new_child, @child_2])
-            end
-
-            it "should add a child before child 2" do
-                @child_2.insert_before(@new_child)
-                reload
-                @parent.children.sort.should eq([@child_1, @new_child, @child_2])
-            end
-
-            it "should add a child after child 2" do
-                @child_2.insert_after(@new_child)
-                reload
-                @parent.children.sort.should eq([@child_1, @child_2, @new_child])
-            end
-
-            it "should append a child to children" do
-                @parent.reload
-                @parent.children << @new_child
-                @parent.children.count.should eq(3)
-                @parent.save
-                @new_child.save
-                reload                
-                @parent.children.sort.should eq([@child_1, @child_2, @new_child])
-            end
-            
-        end
+    context "a node with 2 children" do
+
+      def reload
+        @parent.reload
+        @child_1.reload
+        @child_2.reload
+        @new_child.reload
+      end
+
+      before do
+        @parent = Node.new(:name => "Parent")
+        @child_1 = Node.new(:name => "Child_1")
+        @child_2 = Node.new(:name => "Child_2")
+        @new_child = Node.new(:name => "new_child")
+        @parent.children << @child_1
+        @parent.children << @child_2
+        @child_1.position.should eq(1)
+        @child_2.position.should eq(2)
+        @parent.save
+      end
+
+      it "should add a child before child 1" do
+        @child_1.insert_before(@new_child)
+        reload
+        @parent.children.sort.should eq([@new_child, @child_1, @child_2])
+      end
+
+      it "should add a child after child 1" do
+        @child_1.insert_after(@new_child)
+        reload
+        @parent.children.sort.should eq([@child_1, @new_child, @child_2])
+      end
+
+      it "should add a child before child 2" do
+        @child_2.insert_before(@new_child)
+        reload
+        @parent.children.sort.should eq([@child_1, @new_child, @child_2])
+      end
+
+      it "should add a child after child 2" do
+        @child_2.insert_after(@new_child)
+        reload
+        @parent.children.sort.should eq([@child_1, @child_2, @new_child])
+      end
+
+      it "should append a child to children" do
+        @parent.reload
+        @parent.children << @new_child
+        @parent.children.count.should eq(3)
+        @parent.save
+        @new_child.save
+        reload                
+        @parent.children.sort.should eq([@child_1, @child_2, @new_child])
+      end
 
     end
+
+    context "with full paths" do
+
+      def getNode(number)
+        Node.where(:name  => "Node_#{number}").first
+      end
+
+      before do
+        # Build a tree
+        12.times{ |i| Factory.create(:node, :name => "Node_#{i+1}") }
+
+        Node.where(:name  => "Node_1").first.children << Node.where(:name => "Node_7").first
+        Node.where(:name  => "Node_7").first.insert_before(Node.where(:name => "Node_2").first)
+        Node.where(:name  => "Node_1").first.children << Node.where(:name => "Node_8").first
+        Node.where(:name  => "Node_2").first.children << Node.where(:name => "Node_3").first
+        Node.where(:name  => "Node_3").first.insert_after(Node.where(:name => "Node_6").first)
+        Node.where(:name  => "Node_8").first.children << Node.where(:name => "Node_9").first
+        Node.where(:name  => "Node_9").first.children << Node.where(:name => "Node_11").first
+        Node.where(:name  => "Node_3").first.children << Node.where(:name => "Node_5").first
+        Node.where(:name  => "Node_9").first.insert_after(Node.where(:name => "Node_12").first)
+        Node.where(:name  => "Node_5").first.insert_before(Node.where(:name => "Node_4").first)
+        Node.where(:name  => "Node_11").first.insert_before(Node.where(:name => "Node_10").first)
+
+      end
+
+      # This is not BDD, I know...
+      it "should store the path correctly" do
+        getNode(6).parent_ids.should eql([getNode(1).id, getNode(2).id])
+        getNode(2).parent_ids.should eql([getNode(1).id])
+        getNode(3).parent_ids.should eql([getNode(1).id, getNode(2).id])
+        getNode(4).parent_ids.should eql([getNode(1).id, getNode(2).id, getNode(3).id])
+        getNode(5).parent_ids.should eql([getNode(1).id, getNode(2).id, getNode(3).id])
+        getNode(10).parent_ids.should eql([getNode(1).id, getNode(8).id, getNode(9).id])
+      end
+
+    end
+
+  end
 end

data/spec/spec_helper.rb

@@ -23,5 +23,5 @@ Dir[File.dirname(__FILE__) + '/models/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + "/factories/*.rb"].each {|file| require file } 
 
 RSpec.configure do |config|
-
+    
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Rainer Kuhn
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 +02:00
+date: 2010-08-12 00:00:00 +02:00
 default_executable: 
 dependencies: []