mongoid_tree 0.3.4 → 0.3.5

data/Gemfile

@@ -1,14 +1,19 @@
 source :rubygems
 
+# My personal global Gemfile in my work directory
 if File.exist?(file = File.expand_path('../../Gemfile',__FILE__))
   instance_eval(File.read(file))
 end
 
-gem "jeweler"
-gem "mongoid", "= 2.0.0.beta.16"
+group :development do
+  gem "jeweler"
+end
+
+gem "mongoid", ">= 2.0.0.beta.16"
 # Currently used MongoDB version : 1.4.3
 
-gem "rspec", ">= 2.0.0.beta.19"
-gem "cucumber", ">= 0.8.5"
-gem "yard"
-gem "factory_girl"
+group :test do
+  gem "rspec", ">= 2.0.0"
+  gem "cucumber", ">= 0.8.5"
+  gem "factory_girl"
+end

data/Gemfile.lock

@@ -1,56 +1,57 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0.rc)
-      activesupport (= 3.0.0.rc)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activesupport (3.0.0.rc)
+    activesupport (3.0.1)
     awesome_print (0.2.1)
-    bson (1.0.4)
+    bson (1.1.1)
     builder (2.1.2)
-    cucumber (0.8.5)
+    cucumber (0.9.2)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.1.4)
-      json_pure (~> 1.4.3)
-      term-ansicolor (~> 1.0.4)
+      gherkin (~> 2.2.5)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
     diff-lcs (1.1.2)
-    factory_girl (1.3.1)
+    factory_girl (1.3.2)
     gemcutter (0.6.1)
-    gherkin (2.1.4)
-      trollop (~> 1.16.2)
+    gherkin (2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
     git (1.2.5)
     i18n (0.4.1)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
-    json_pure (1.4.3)
-    mongo (1.0.7)
-      bson (>= 1.0.4)
-    mongoid (2.0.0.beta.16)
-      activemodel (= 3.0.0.rc)
-      bson (= 1.0.4)
-      mongo (= 1.0.7)
-      tzinfo (= 0.3.22)
+    json (1.4.6)
+    json_pure (1.4.6)
+    mongo (1.0.9)
+      bson (>= 1.0.5)
+    mongoid (2.0.0.beta.19)
+      activemodel (~> 3.0)
+      mongo (= 1.0.9)
+      tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
-    rspec (2.0.0.beta.19)
-      rspec-core (= 2.0.0.beta.19)
-      rspec-expectations (= 2.0.0.beta.19)
-      rspec-mocks (= 2.0.0.beta.19)
-    rspec-core (2.0.0.beta.19)
-    rspec-expectations (2.0.0.beta.19)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.19)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     term-ansicolor (1.0.5)
-    trollop (1.16.2)
-    tzinfo (0.3.22)
+    tzinfo (0.3.23)
     will_paginate (3.0.pre2)
     wirble (0.1.3)
-    yard (0.5.8)
 
 PLATFORMS
   ruby
@@ -60,7 +61,6 @@ DEPENDENCIES
   cucumber (>= 0.8.5)
   factory_girl
   jeweler
-  mongoid (= 2.0.0.beta.16)
-  rspec (>= 2.0.0.beta.19)
+  mongoid (>= 2.0.0.beta.16)
+  rspec (>= 2.0.0)
   wirble
-  yard

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/mongoid_tree.rb

@@ -80,15 +80,15 @@ module Mongoid
                 end
                 
                 def root
-                  base_class.find(parent_ids.first)
+                  base_class.find(parent_ids.first) unless root?
                 end
                 
                 def ancestors
-                  base_class.where(:id.in => parent_ids)
+                  base_class.where(:_id.in => parent_ids)
                 end
                 
                 def ancestors_and_self
-                  ancestors + [self]
+                  ancestors << self
                 end
 
                 #Comparable
@@ -150,13 +150,30 @@ module Mongoid
                     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 => [])
+                    self.update_attributes(:parent_ids => [], :position => nil )
                     # and append
                     target_node.children << self
                     # recurse through subtree
                     rebuild_paths
                 end
                 
+                def move_to_position(target_node, index)
+                  if index > target_node.child_ids.count
+                    move_to(target_node)
+                  else
+                    # unhinge - I was getting a nil on another implementation, so this is a bit longer but works
+                    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 => [], :position => nil )
+                    
+                    target_node.children.sort[index - 1].insert_before(self)
+                    
+                    # recurse through subtree
+                    rebuild_paths
+                  end
+                end
+                
 
                 def rebuild_paths
                     update_path

data/mongoid_tree.gemspec

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

@@ -1,13 +1,95 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "MongoidTree" do
+describe Mongoid::Acts::Tree do
 
   before do
     [ Node ].each { |klass| klass.collection.remove }
   end
-
+  
+  shared_examples_for "a root node" do
+    its (:parent_ids) {should be_empty}
+    its (:parent) {should be_nil}
+    its (:root) {should be_nil}
+    it {should be_root}
+    its (:ancestors) {should be_empty}
+    specify{subject.ancestors_and_self.should eq([subject])}
+  end
+  
+  shared_examples_for "a parent node" do
+    its (:child_ids) {should_not be_empty}
+    its (:children) {should_not eq([])}
+    specify{subject.depth_first.should_not eq([subject])}
+    specify{subject.breadth_first.should_not eq([subject])}
+  end
+  
+  shared_examples_for "a child node" do
+    its (:parent_ids) {should_not be_empty}
+    its (:parent) {should eq(parent)}
+    its (:root) {should_not be_nil}
+    it {should_not be_root}
+    its (:ancestors) {should_not be_empty}
+    specify{subject.ancestors_and_self.should_not eq([subject])}
+  end
+  
+  shared_examples_for "a leaf node" do
+    its (:child_ids) {should be_empty}
+    its (:children) {should eq([])}
+    specify{subject.depth_first.should eq([subject])}
+    specify{subject.breadth_first.should eq([subject])}
+    it { should be_a_leaf }
+    
+  end
+  
+  describe "A node" do
+    let(:node) { Node.create :name => "A Node" }
+    subject {node}
+    
+    it { should be_valid }
+    it_should_behave_like "a leaf node"
+    it_should_behave_like "a root node"
+    
+    context "when adding a child" do
+      let(:parent){node}
+      let(:child){Node.create(:name => "A Child")}          
+      before do
+        node.children << child
+      end
+      
+      it_should_behave_like "a parent node"
+      it_should_behave_like "a root node"
+      
+      it "should change the children count" do
+        expect{
+          node.children << Node.create(:name => "another child")
+        }.to change{node.child_ids.count}.by(1)
+      end
+      
+      it "should exist 2 nodes" do
+        Node.count.should be(2)
+      end
+      
+      it "should have 1 child" do
+        node.children.count.should be(1)
+      end
+      
+      it "should be able to access the child" do
+        node.children.first.should eq(child)
+      end
+      
+      its (:depth_first) {should eq([parent, child])}
+      its (:breadth_first) {should eq([parent,child])}
+      
+      context "the child" do
+        subject{child}
+        it_should_behave_like "a leaf node"
+        it_should_behave_like "a child node"
+      end
+      
+    end
+    
+  end
+    
   describe "A tree of nodes" do
-
     context "A node with a child" do
 
       before do
@@ -166,7 +248,21 @@ describe "MongoidTree" do
           getNode(9).parent_ids.should eql([getNode(1).id, getNode(2).id, getNode(6).id])
           getNode(10).parent_ids.should eql([getNode(1).id, getNode(2).id, getNode(6).id, getNode(9).id])
           getNode(11).parent_ids.should eql([getNode(1).id, getNode(2).id, getNode(6).id, getNode(9).id])
-          end
+        end
+      end
+
+      it "should fix the position" do
+        getNode(11).move_to(getNode(1))
+        getNode(11).position.should be(4)
+      end
+      
+      it "should move a node to a specific position" do
+        getNode(11).move_to_position(getNode(1),2)
+        getNode(2).position.should be(1)
+        getNode(11).position.should be(2)
+        getNode(7).position.should be(3)
+        getNode(8).position.should be(4)
+        
       end
 
     end

metadata

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