mongoid-tree 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caf4b036f06eefaca63f1c88fd04f4acb8d17173
-  data.tar.gz: 32a71b36f7e617c50a0bed809a5cc0229abe6ce6
+  metadata.gz: 5137d0df514633dff660618929df94658352c576
+  data.tar.gz: cc8bc0884e0d028b762d364ede0fca32b07e1e53
 SHA512:
-  metadata.gz: 1a57abc31fc56609eb406ed5278870945e48b666652dbf2cb824ce71f9cd0d0ba104945bbab8cfa2222e343e06b159d484dd14bc30facc3ec09fe4a8284cb71d
-  data.tar.gz: dbfd2350fbdeae186273be215fffbaca14a747b14ca07cb5200ae75a169964a47e706d9b8e9238b1f092ddc2a279d75d596e9bc83df8621323382578e3349e1f
+  metadata.gz: 6533082d31a625ccb70529cdd4391ce9f0a934239efe3c45c1299a9e2762db2d4af26933a2b48bc3852b982b1f9a63174e486dedd714fba872a58e46f4f60699
+  data.tar.gz: cd4b110278a8b0cf46be05a721eafc9428e0a3260e7434b72668ceea2a4f2327051967df4739c78f678a60fb19cc8b76f8c6223e73591b6f49faf5b3222bffd8

data/README.md

@@ -23,6 +23,9 @@ You might want to remove the `:require => 'mongoid/tree'` option and explicitly
 
     bundle install
 
+### Upgrade from mongoid-tree 1.0.x
+
+To fix issues with the ordering of ancestors, mongoid-tree 1.1 introduces a new depth field to the documents that include the Mongoid::Tree module. In case your project uses its own depth field, you can now rely on mongoid-tree to handle this.
 
 ## Usage
 

data/lib/mongoid/tree.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module Mongoid
   ##
   # = Mongoid::Tree
@@ -90,6 +92,9 @@ module Mongoid
       field :parent_ids, :type => Array, :default => []
       index :parent_ids => 1
 
+      field :depth, :type => Integer
+      index :depth => 1
+
       set_callback :save, :after, :rearrange_children, :if => :rearrange_children?
       set_callback :validation, :before do
         run_callbacks(:rearrange) { rearrange }
@@ -222,6 +227,18 @@ module Mongoid
     #
     #   @return [Array<BSON::ObjectId>] The ids of the document's ancestors
 
+    ##
+    # Returns the depth of this document (number of ancestors)
+    #
+    # @example
+    #   Node.root.depth # => 0
+    #   Node.root.children.first.depth # => 1
+    #
+    # @return [Fixnum] Depth of this document
+    def depth
+      super || parent_ids.count
+    end
+
     ##
     # Is this document a root node (has no parent)?
     #
@@ -238,18 +255,6 @@ module Mongoid
       children.empty?
     end
 
-    ##
-    # Returns the depth of this document (number of ancestors)
-    #
-    # @example
-    #   Node.root.depth # => 0
-    #   Node.root.children.first.depth # => 1
-    #
-    # @return [Fixnum] Depth of this document
-    def depth
-      parent_ids.count
-    end
-
     ##
     # Returns this document's root node. Returns `self` if the
     # current document is a root node
@@ -272,13 +277,7 @@ module Mongoid
     #
     # @return [Mongoid::Criteria] Mongoid criteria to retrieve the documents ancestors
     def ancestors
-      if parent_ids.any?
-        base_class.and({
-          '$or' => parent_ids.map { |id| { :_id => id } }
-        })
-      else
-        base_class.where(:_id.in => [])
-      end
+      base_class.where(:_id.in => parent_ids).asc(:depth)
     end
 
     ##
@@ -428,6 +427,8 @@ module Mongoid
         self.parent_ids = []
       end
 
+      self.depth = parent_ids.size
+
       rearrange_children! if self.parent_ids_changed?
     end
 

data/spec/mongoid/tree_spec.rb

@@ -29,6 +29,13 @@ describe Mongoid::Tree do
     expect(Node.index_options).to have_key(:parent_ids => 1)
   end
 
+  it "should store the depth as Integer with index" do
+    f = Node.fields['depth']
+    expect(f).to be
+    expect(f.options[:type]).to eq(Integer)
+    expect(Node.index_options).to have_key(:depth => 1)
+  end
+
   describe 'when new' do
     it "should not require a saved parent when adding children" do
       root = Node.new(:name => 'root'); child = Node.new(:name => 'child')
@@ -254,6 +261,15 @@ describe Mongoid::Tree do
         expect(node(:child).depth).to eq(1)
         expect(node(:subchild).depth).to eq(2)
       end
+
+      it "should be updated when the nodes ancestors change" do
+        node(:child).update_attributes!(:parent => nil)
+
+        puts node(:child).inspect
+
+        expect(node(:child).reload.depth).to eq(0)
+        expect(node(:subchild).depth).to eq(1)
+      end
     end
 
     describe '#root' do

data/spec/support/models/node.rb

@@ -5,7 +5,7 @@ class Node
 
   field :name
 
-  attr_accessible :name
+  attr_accessible :name, :parent
 end
 
 class SubclassedNode < Node

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-tree
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Benedikt Deicke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
         version: '4.0'
     - - '>='
@@ -24,7 +24,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
         version: '4.0'
     - - '>='