mongoid 7.2.0.rc1 → 7.3.0

data/spec/mongoid/matcher/extract_attribute_data/traversal.yml

@@ -3,9 +3,8 @@
     name: foo
   key: name
   
-  exists: true
-  value: foo
-  expanded: false
+  result: 
+    - foo
 
 - name: scalar leaf
   document: &foo-bar-foo-bar-2
@@ -16,20 +15,26 @@
             2
   key: foo.bar.foo.bar
   
-  exists: true
-  value: 2
-  expanded: false
+  result:
+    - 2
 
 - name: scalar non-leaf
   document: *foo-bar-foo-bar-2
   key: foo.bar
   
-  exists: true
-  value:
-    foo:
-      bar:
-        2
-  expanded: false
+  result:
+    -
+      foo:
+        bar:
+          2
+
+- name: null leaf
+  document:
+    name:
+  key: name
+  
+  result: 
+    - ~
 
 - name: array leaf
   document: &foo-bar-foo-bar-array-2
@@ -40,21 +45,18 @@
             - 2
   key: foo.bar.foo.bar
   
-  exists: true
-  value:
-    - 2
-  expanded: false
+  result:
+    - [2]
 
 - name: scalar non-leaf
   document: *foo-bar-foo-bar-array-2
   key: foo.bar
   
-  exists: true
-  value:
-    foo:
-      bar:
-        - 2
-  expanded: false
+  result:
+    -
+      foo:
+        bar:
+          - 2
 
 - name: array non-leaf
   document: &foo-bar-array-foo-bar-2
@@ -66,30 +68,24 @@
               2
   key: foo.bar.foo.bar
   
-  exists: true
-  value:
+  result:
     - 2
-  expanded: true
 
 - name: array non-leaf with non-leaf query
   document: *foo-bar-array-foo-bar-2
   key: foo.bar
   
-  exists: true
-  value:
+  result:
     -
       foo:
         bar:
           2
-  expanded: true
 
 - name: array non-leaf with query for missing non-leaf key
   document: *foo-bar-array-foo-bar-2
   key: foo.missing
   
-  exists: false
-  value: []
-  expanded: true
+  result: []
 
 - name: path past end of document
   document: &foo-hello-world
@@ -97,17 +93,23 @@
       hello: world
   key: foo.bar.foo.bar
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
 
 - name: query for missing leaf key
   document: *foo-hello-world
   key: foo.bar
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
+
+- name: numeric path component when traversing hash
+  document:
+    foo:
+      "10":
+        42
+  key: "foo.10"
+
+  result: 
+    - 42
 
 - name: array index - hash leaf
   document: &foo-one-two
@@ -117,42 +119,35 @@
     bar: [3, 4]
   key: foo.1.two
   
-  exists: true
-  value: 2
-  expanded: false
+  result: 
+    - 2
 
 - name: array index - hash non-leaf
   document: *foo-one-two
   key: foo.1
   
-  exists: true
-  value:
-    two: 2
-  expanded: false
+  result:
+    -
+      two: 2
 
 - name: array index - scalar leaf
   document: *foo-one-two
   key: bar.1
   
-  exists: true
-  value: 4
-  expanded: false
+  result: 
+    - 4
 
 - name: array index - scalar leaf - missing
   document: *foo-one-two
   key: bar.2
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
 
 - name: array index - scalar leaf - missing with further hash subscription
   document: *foo-one-two
   key: bar.2.any
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
 
 - name: non-sequential nested arrays - hash leaf - one value
   document: &books-authors
@@ -166,30 +161,27 @@
           - name: Pasha
   key: books.0.authors.name
   
-  exists: true
-  value: [Steve]
-  expanded: true
+  result:
+    - Steve
 
 - name: non-sequential nested arrays - hash non-leaf - one value
   document: *books-authors
   key: books.0
   
-  exists: true
-  value:
-    authors:
-      - name: Steve
-  expanded: false
+  result:
+    -
+      authors:
+        - name: Steve
 
 - name: non-sequential nested arrays - hash non-leaf - multiple values
   document: *books-authors
   key: books.1
   
-  exists: true
-  value:
-    authors:
-      - name: Boris
-      - name: Pasha
-  expanded: false
+  result:
+    -
+      authors:
+        - name: Boris
+        - name: Pasha
 
 - name: sequential nested arrays - numerically indexed leaf
   document: &groups
@@ -197,41 +189,32 @@
       - [1]
   key: groups.0.0
   
-  exists: true
-  value: 1
-  expanded: false
+  result: 
+    - 1
 
 - name: sequential nested arrays - numerically indexed leaf - missing
   document: *groups
   key: groups.0.1
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
 
 - name: sequential nested arrays - missing hash path through non-leaf
   document: *groups
   key: groups.missing
   
-  exists: false
-  value: []
-  expanded: true
+  result: []
 
 - name: sequential nested arrays - missing hash path through leaf
   document: *groups
   key: groups.0.missing
   
-  exists: false
-  value: []
-  expanded: true
+  result: []
 
 - name: sequential nested arrays - missing hash path past leaf
   document: *groups
   key: groups.0.0.missing
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
 
 - name: mix of arrays and hashes in an array
   document:
@@ -242,9 +225,8 @@
       - bar: 2
   key: foo.bar
   
-  exists: true
-  value: [2]
-  expanded: true
+  result: 
+    - 2
 
 - name: numeric index through a primitive value not supporting subscription operator
   document:
@@ -254,6 +236,4 @@
   key:
     occupants.0.age.0
     
-  exists: false
-  value: ~
-  expanded: false
+  result: []

data/spec/mongoid/matcher/extract_attribute_spec.rb

@@ -25,20 +25,10 @@ describe 'Matcher.extract_attribute' do
             Mongoid::Matcher.extract_attribute(document, key)
           end
 
-          let(:expected_exists) { spec['exists'] }
-          let(:expected_value) { spec['value'] }
-          let(:expected_expanded) { spec['expanded'] }
+          let(:expected) { spec.fetch('result') }
 
-          it 'has the expected exists flag' do
-            actual[0].should == expected_exists
-          end
-
-          it 'has the expected value' do
-            actual[1].should == expected_value
-          end
-
-          it 'has the expected expanded flag' do
-            actual[2].should == expected_expanded
+          it 'has the expected result' do
+            actual.should == expected
           end
         end
       end

data/spec/mongoid/persistable/deletable_spec.rb

@@ -8,7 +8,7 @@ describe Mongoid::Persistable::Deletable do
   describe "#delete" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     context "when deleting a readonly document" do
@@ -24,6 +24,20 @@ describe Mongoid::Persistable::Deletable do
       end
     end
 
+    context 'when deleting a document that was not saved' do
+      let(:unsaved_person) { Person.new(id: person.id) }
+
+      before do
+        unsaved_person.delete
+      end
+
+      it 'deletes the matching document from the database' do
+        lambda do
+          person.reload
+        end.should raise_error(Mongoid::Errors::DocumentNotFound)
+      end
+    end
+
     context "when removing a root document" do
 
       let!(:deleted) do
@@ -259,6 +273,86 @@ describe Mongoid::Persistable::Deletable do
         expect(Browser.count).to eq(1)
       end
     end
+
+    context 'when there are dependent documents' do
+      context 'has_one' do
+
+        context 'dependent: :destroy' do
+          let!(:parent) do
+            Hole.create!(bolt: Bolt.create!)
+          end
+
+          it 'does not destroy dependent documents' do
+            Bolt.count.should == 1
+            parent.delete
+            Bolt.count.should == 1
+          end
+        end
+
+        context 'dependent: :delete_all' do
+          let!(:parent) do
+            Hole.create!(threadlocker: Threadlocker.create!)
+          end
+
+          it 'does not destroy dependent documents' do
+            Threadlocker.count.should == 1
+            parent.delete
+            Threadlocker.count.should == 1
+          end
+        end
+
+        context 'dependent: :restrict_with_exception' do
+          let!(:parent) do
+            Hole.create!(sealer: Sealer.create!)
+          end
+
+          it 'does not destroy dependent documents' do
+            Sealer.count.should == 1
+            parent.delete
+            Sealer.count.should == 1
+          end
+        end
+      end
+
+      context 'has_many' do
+
+        context 'dependent: :destroy' do
+          let!(:parent) do
+            Hole.create!(nuts: [Nut.create!])
+          end
+
+          it 'does not destroy dependent documents' do
+            Nut.count.should == 1
+            parent.delete
+            Nut.count.should == 1
+          end
+        end
+
+        context 'dependent: :delete_all' do
+          let!(:parent) do
+            Hole.create!(washers: [Washer.create!])
+          end
+
+          it 'does not destroy dependent documents' do
+            Washer.count.should == 1
+            parent.delete
+            Washer.count.should == 1
+          end
+        end
+
+        context 'dependent: :restrict_with_exception' do
+          let!(:parent) do
+            Hole.create!(spacers: [Spacer.create!])
+          end
+
+          it 'does not destroy dependent documents' do
+            Spacer.count.should == 1
+            parent.delete
+            Spacer.count.should == 1
+          end
+        end
+      end
+    end
   end
 
   describe "#delete_all" do
@@ -337,5 +431,85 @@ describe Mongoid::Persistable::Deletable do
         end
       end
     end
+
+    context 'when there are dependent documents' do
+      context 'has_one' do
+
+        context 'dependent: :destroy' do
+          let!(:parent) do
+            Hole.create!(bolt: Bolt.create!)
+          end
+
+          it 'does not destroy dependent documents' do
+            Bolt.count.should == 1
+            Hole.delete_all
+            Bolt.count.should == 1
+          end
+        end
+
+        context 'dependent: :delete_all' do
+          let!(:parent) do
+            Hole.create!(threadlocker: Threadlocker.create!)
+          end
+
+          it 'does not destroy dependent documents' do
+            Threadlocker.count.should == 1
+            Hole.delete_all
+            Threadlocker.count.should == 1
+          end
+        end
+
+        context 'dependent: :restrict_with_exception' do
+          let!(:parent) do
+            Hole.create!(sealer: Sealer.create!)
+          end
+
+          it 'does not destroy dependent documents' do
+            Sealer.count.should == 1
+            Hole.delete_all
+            Sealer.count.should == 1
+          end
+        end
+      end
+
+      context 'has_many' do
+
+        context 'dependent: :destroy' do
+          let!(:parent) do
+            Hole.create!(nuts: [Nut.create!])
+          end
+
+          it 'does not destroy dependent documents' do
+            Nut.count.should == 1
+            Hole.delete_all
+            Nut.count.should == 1
+          end
+        end
+
+        context 'dependent: :delete_all' do
+          let!(:parent) do
+            Hole.create!(washers: [Washer.create!])
+          end
+
+          it 'does not destroy dependent documents' do
+            Washer.count.should == 1
+            Hole.delete_all
+            Washer.count.should == 1
+          end
+        end
+
+        context 'dependent: :restrict_with_exception' do
+          let!(:parent) do
+            Hole.create!(spacers: [Spacer.create!])
+          end
+
+          it 'does not destroy dependent documents' do
+            Spacer.count.should == 1
+            Hole.delete_all
+            Spacer.count.should == 1
+          end
+        end
+      end
+    end
   end
 end