mongoid-tree 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2efbc10260f22d9266cedf4f51ea25db0e7385e0
-  data.tar.gz: e07926dc9a02d5c22f8f49abd91305a94d96e3f3
+  metadata.gz: caf4b036f06eefaca63f1c88fd04f4acb8d17173
+  data.tar.gz: 32a71b36f7e617c50a0bed809a5cc0229abe6ce6
 SHA512:
-  metadata.gz: 0328b760885d2a4442a1f4dedfcf741f6cd18f4a1902924287a06ca41fef76f7c927d8a110dfd869350fc02dc0aefde9381652d7d5f1dd25dad199c5b7b19491
-  data.tar.gz: 24970a25867dc1550a658f569a84c4e596d53748268ab944a8424c2367f9221537f39cb04736aaf944992af541adb7a514fe43e4daddf68b919a8430ae279ee1
+  metadata.gz: 1a57abc31fc56609eb406ed5278870945e48b666652dbf2cb824ce71f9cd0d0ba104945bbab8cfa2222e343e06b159d484dd14bc30facc3ec09fe4a8284cb71d
+  data.tar.gz: dbfd2350fbdeae186273be215fffbaca14a747b14ca07cb5200ae75a169964a47e706d9b8e9238b1f092ddc2a279d75d596e9bc83df8621323382578e3349e1f

data/lib/mongoid/tree.rb

@@ -273,7 +273,9 @@ module Mongoid
     # @return [Mongoid::Criteria] Mongoid criteria to retrieve the documents ancestors
     def ancestors
       if parent_ids.any?
-        base_class.or(parent_ids.map { |id| { :_id => id } })
+        base_class.and({
+          '$or' => parent_ids.map { |id| { :_id => id } }
+        })
       else
         base_class.where(:_id.in => [])
       end
@@ -390,7 +392,7 @@ module Mongoid
     # @return [undefined]
     def move_children_to_parent
       children.each do |c|
-        c.parent_id = self.parent_id
+        c.parent = self.parent
         c.save
       end
     end

data/spec/mongoid/tree_spec.rb

@@ -170,6 +170,11 @@ describe Mongoid::Tree do
         expect(node(:child)).to be_leaf
         expect(node(:root).children.to_a).to match_array([node(:child), node(:other_child), node(:subchild)])
       end
+
+      it "should be able to handle a missing parent" do
+        node(:root).delete
+        expect { node(:child).move_children_to_parent }.to_not raise_error
+      end
     end
 
     describe ':destroy_children' do
@@ -293,6 +298,22 @@ describe Mongoid::Tree do
           root = Node.new(:name => 'root')
           expect(root.ancestors).to be_empty
         end
+
+        it 'should allow chaning of other `or`-criterias' do
+          setup_tree <<-ENDTREE
+            - root:
+              - child:
+                - subchild:
+                  - subsubchild
+          ENDTREE
+
+          filtered_ancestors = node(:subsubchild).ancestors.or(
+              { :name => 'child' },
+              { :name => 'subchild' }
+          )
+
+          expect(filtered_ancestors.to_a).to eq([node(:child), node(:subchild)])
+        end
       end
 
       describe '#ancestors_and_self' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-tree
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Benedikt Deicke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.1.2
 signing_key: 
 specification_version: 4
 summary: A tree structure for Mongoid documents