mongoid_tree 0.3.3 → 0.3.4

data/README.textile

@@ -6,6 +6,12 @@ Initially I thought of an embedded solution, but this will only be possible once
 
 However this tree is right now on the top of our priority list, means we will put effort into this and release everything in this public gem, as soon as we implement and test it. It will be fully tested with Cucumber and RSpec.
 
+h3. Documentation
+
+An API Documentation can be found here:
+
+"http://rubydoc.info/gems/mongoid_tree/":http://rubydoc.info/gems/mongoid_tree/
+
 h3. Screencasts
 
 I've made a screencast demonstrating our tree gem, where I go over the basic methods provided: 

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/mongoid_tree.rb

@@ -58,31 +58,51 @@ module Mongoid
                 # 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
+                    parents.last
                 end
 
                 def depth
-                    self.parents.count
+                    parent_ids.count
+                end
+                
+                def leaf?
+                   child_ids.empty?
+                end
+
+                def root?
+                  parent_ids.empty?
+                end
+                
+                def root
+                  base_class.find(parent_ids.first)
+                end
+                
+                def ancestors
+                  base_class.where(:id.in => parent_ids)
+                end
+                
+                def ancestors_and_self
+                  ancestors + [self]
                 end
 
                 #Comparable
                 def <=> (another_node)
-                    self.position <=> another_node.position
+                    position <=> another_node.position
                 end
 
                 # Returns the whole subtree including itself as array
                 def depth_first
                     result = [self]
-                    if self.child_ids.empty?
+                    if child_ids.empty?
                         return result
                     else
-                        self.children.sort.each do |child|
+                        children.sort.each do |child|
                             result += child.depth_first
                         end    
                     end
@@ -106,40 +126,41 @@ module Mongoid
                 alias :bfs :breadth_first
 
                 def insert_before( new_child )
-                    new_child.position = self.position
-                    self.parent.children.each do |child|
+                    new_child.position = position
+                    parent.children.each do |child|
                         if child.position >= new_child.position
                             child.update_attributes(:position => child.position + 1)
                         end
                     end
-                    self.parent.reload.children << new_child
+                    parent.children << new_child
                 end
 
                 def insert_after ( new_child )
-                    new_child.position = self.position + 1
-                    self.parent.children.each do |child|
+                    new_child.position = position + 1
+                    parent.children.each do |child|
                         if child.position >= new_child.position
                             child.update_attributes(:position => child.position + 1)
                         end
                     end
-                    self.parent.children << new_child
+                    parent.children << new_child
                 end
 
                 def move_to(target_node)
                     # unhinge - I was getting a nil on another implementation, so this is a bit longer but works
-                    child_ids_array = self.parent.child_ids.clone
-                    child_ids_array.delete(self.id)
+                    child_ids_array = parent.child_ids.clone
+                    child_ids_array.delete(id)
                     parent.update_attributes(:child_ids => child_ids_array )
                     self.update_attributes(:parent_ids => [])
                     # and append
                     target_node.children << self
                     # recurse through subtree
-                    self.rebuild_paths
+                    rebuild_paths
                 end
+                
 
                 def rebuild_paths
-                    self.update_path
-                    self.children.each do |child|
+                    update_path
+                    children.each do |child|
                         child.rebuild_paths
                     end
                 end
@@ -147,6 +168,13 @@ module Mongoid
                 def update_path
                     self.update_attributes(:parent_ids => self.parent.parent_ids + [self.parent.id])
                 end
+                
+                def base_class
+                  @base_class ||= begin
+                    parent_classes = self.class.ancestors
+                    parent_classes[parent_classes.index(Mongoid::Acts::Tree::InstanceMethods) - 1]
+                  end
+                end
 
             end
         end

data/mongoid_tree.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_tree}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rainer Kuhn"]
-  s.date = %q{2010-08-26}
+  s.date = %q{2010-09-09}
   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

@@ -29,6 +29,39 @@ describe "MongoidTree" do
       it "the child should be at position 1" do
         @parent.children.first.position.should eq(1)
       end
+      
+      context "on the parent" do
+        it "should not be a leaf node" do
+          @parent.leaf?.should be(false)
+        end
+        
+        it "should have depth 0" do
+          @parent.depth.should be(0)
+        end
+        
+        it "should be root" do
+          @parent.root?.should be(true)
+        end
+      end
+      
+      context "on the child" do
+        it "should be a leaf node" do
+          @child.leaf?.should be(true)
+        end
+        
+        it "should have depth 1" do
+          @child.depth.should be(1)
+        end
+        
+        it "should return the parent as root" do
+          @child.root.should eq(@parent)
+        end
+        
+        it "should not be root" do
+          @child.root?.should be(false)
+        end
+        
+      end
 
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Rainer Kuhn
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +02:00
+date: 2010-09-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency