mongoid 5.4.0 → 6.4.8

data/spec/mongoid/matchable_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable do
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when document is embeded" do
 
@@ -26,7 +26,7 @@ describe Mongoid::Matchable do
         end
 
         it "returns false" do
-          expect(document.locations.first.matches?(selector)).to be false
+          expect(document.locations.first._matches?(selector)).to be false
         end
 
         context "when just change the selector order" do
@@ -36,7 +36,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false " do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
       end
@@ -50,7 +50,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.locations.first.matches?(selector)).to be true
+            expect(document.locations.first._matches?(selector)).to be true
           end
         end
 
@@ -61,7 +61,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
 
@@ -72,7 +72,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
       end
@@ -86,9 +86,9 @@ describe Mongoid::Matchable do
           let(:selector) do
             { "occupants.0" => "Tim" }
           end
-          
+
           it "returns true" do
-            expect(document.locations.first.matches?(selector)).to be true
+            expect(document.locations.first._matches?(selector)).to be true
           end
         end
 
@@ -99,7 +99,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
       end
@@ -113,7 +113,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.locations.first.matches?(selector)).to be true
+            expect(document.locations.first._matches?(selector)).to be true
           end
         end
 
@@ -124,7 +124,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
 
@@ -135,11 +135,131 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
       end
 
+      context "when using $elemMatch" do
+
+        context "one predicate" do
+
+          let(:selector) do
+            {
+              "occupants" => {"$elemMatch" => {"name" => "Tim"}}
+            }
+          end
+
+          context "and there is a matching sub document" do
+
+            it "returns true" do
+              expect(document.locations.first._matches?(selector)).to be true
+            end
+
+            context "using $in" do
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Tim", "Alice"]}}}
+                }
+              end
+
+              it "returns true" do
+                expect(document.locations.first._matches?(selector)).to be true
+              end
+            end
+          end
+
+          context "and there is not a matching sub document" do
+
+            let(:selector) do
+              {
+                "occupants" => {"$elemMatch" => {"name" => "Lyle"}}
+              }
+            end
+
+            it "returns false" do
+              expect(document.locations.first._matches?(selector)).to be false
+            end
+
+            context "using $in" do
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Lyfe", "Alice"]}}}
+                }
+              end
+
+              it "returns false" do
+                expect(document.locations.first._matches?(selector)).to be false
+              end
+            end
+          end
+        end
+
+        context "multiple predicates" do
+
+          before do
+            document.locations = [
+              Location.new(
+                name: 'No.1',
+                info: { 'door' => 'Red'},
+                occupants: [{'name' => 'Tim', 'eye_color' => 'brown'}, {'name' => 'Alice', 'eye_color' => 'blue'}]
+              )
+            ]
+          end
+
+          let(:selector) do
+            {
+              "occupants" => {"$elemMatch" => {"name" => "Tim", "eye_color" => "brown"}}
+            }
+          end
+
+          context "and there is a matching sub document" do
+
+            it "returns true" do
+              expect(document.locations.first._matches?(selector)).to be true
+            end
+
+            context "using $in and $ne in the $elemMatch to include the element" do
+
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Tim"]}, "eye_color" => {"$ne" => "blue"}}}
+                }
+              end
+
+              it "returns true" do
+                expect(document.locations.first._matches?(selector)).to be true
+              end
+            end
+          end
+
+          context "and there is not a matching sub document" do
+
+            let(:selector) do
+              {
+                "occupants" => {"$elemMatch" => {"name" => "Tim", "eye_color" => "blue"}}
+              }
+            end
+
+            it "returns false" do
+              expect(document.locations.first._matches?(selector)).to be false
+            end
+
+            context "using $ne in the $elemMatch to exclude the element" do
+
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Tim"]}, "eye_color" => {"$ne" => "brown"}}}
+                }
+              end
+
+              it "returns false" do
+                expect(document.locations.first._matches?(selector)).to be false
+              end
+            end
+          end
+        end
+      end
     end
 
     context "when performing simple matching" do
@@ -155,7 +275,7 @@ describe Mongoid::Matchable do
         end
 
         it "returns true" do
-          expect(document.matches?(selector)).to be true
+          expect(document._matches?(selector)).to be true
         end
       end
 
@@ -166,7 +286,7 @@ describe Mongoid::Matchable do
         end
 
         it "returns false" do
-          expect(document.matches?(selector)).to be false
+          expect(document._matches?(selector)).to be false
         end
       end
 
@@ -177,7 +297,7 @@ describe Mongoid::Matchable do
         end
 
         it "returns true" do
-          expect(document.matches?(selector)).to be true
+          expect(document._matches?(selector)).to be true
         end
       end
 
@@ -188,7 +308,7 @@ describe Mongoid::Matchable do
         end
 
         it "returns true" do
-          expect(document.matches?(selector)).to be true
+          expect(document._matches?(selector)).to be true
         end
       end
     end
@@ -213,7 +333,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -224,7 +344,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -238,7 +358,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -249,7 +369,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -263,7 +383,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -274,7 +394,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -288,7 +408,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -299,7 +419,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -313,7 +433,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -324,7 +444,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -338,7 +458,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -349,7 +469,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -367,7 +487,7 @@ describe Mongoid::Matchable do
             end
 
             it "returns true" do
-              expect(document.matches?(selector)).to be true
+              expect(document._matches?(selector)).to be true
             end
           end
 
@@ -380,7 +500,7 @@ describe Mongoid::Matchable do
             end
 
             it "returns false" do
-              expect(document.matches?(selector)).to be false
+              expect(document._matches?(selector)).to be false
             end
           end
         end
@@ -400,7 +520,7 @@ describe Mongoid::Matchable do
                 end
 
                 it "returns true" do
-                  expect(document.matches?(selector)).to be true
+                  expect(document._matches?(selector)).to be true
                 end
               end
 
@@ -413,7 +533,7 @@ describe Mongoid::Matchable do
                 end
 
                 it "returns false" do
-                  expect(document.matches?(selector)).to be false
+                  expect(document._matches?(selector)).to be false
                 end
               end
             end
@@ -429,7 +549,7 @@ describe Mongoid::Matchable do
                 end
 
                 it "returns true" do
-                  expect(document.matches?(selector)).to be true
+                  expect(document._matches?(selector)).to be true
                 end
               end
 
@@ -442,7 +562,7 @@ describe Mongoid::Matchable do
                 end
 
                 it "returns false" do
-                  expect(document.matches?(selector)).to be false
+                  expect(document._matches?(selector)).to be false
                 end
               end
             end
@@ -460,7 +580,7 @@ describe Mongoid::Matchable do
             end
 
             it "returns true" do
-              expect(document.matches?(selector)).to be true
+              expect(document._matches?(selector)).to be true
             end
           end
 
@@ -473,7 +593,7 @@ describe Mongoid::Matchable do
             end
 
             it "returns false" do
-              expect(document.matches?(selector)).to be false
+              expect(document._matches?(selector)).to be false
             end
           end
         end
@@ -488,7 +608,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -499,7 +619,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -513,7 +633,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -524,7 +644,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -538,7 +658,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -549,7 +669,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -563,7 +683,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -574,7 +694,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -588,7 +708,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -599,7 +719,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -613,7 +733,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -624,7 +744,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -638,7 +758,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -649,7 +769,32 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
+          end
+        end
+      end
+
+      context "with an $nor selector" do
+
+        context "when the attributes match" do
+
+          let(:selector) do
+            { "$nor" => [ { number: 10 }, { number: { "$gt" => 199 } } ] }
+          end
+
+          it "returns true" do
+            expect(document._matches?(selector)).to be true
+          end
+        end
+
+        context "when the attributes do not match" do
+
+          let(:selector) do
+            { "$nor" => [ { number: 10 }, { number: { "$gt" => 99 } } ] }
+          end
+
+          it "returns false" do
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -663,7 +808,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -674,7 +819,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -688,7 +833,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -699,7 +844,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end

data/spec/mongoid/persistable/creatable_spec.rb

@@ -523,13 +523,18 @@ describe Mongoid::Persistable::Creatable do
       context "when a unique index exists" do
 
         before do
+          Person.index({ ssn: 1 }, { unique: true })
           Person.create_indexes
         end
 
+        after do
+          Person.collection.drop
+        end
+
         it "raises an error" do
           expect {
             4.times { Person.create!(ssn: "555-55-1029") }
-          }.to raise_error
+          }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
     end
@@ -562,7 +567,7 @@ describe Mongoid::Persistable::Creatable do
       end
     end
 
-    context "when a callback returns false" do
+    context "when a callback aborts the chain" do
 
       it "raises a callback error" do
         expect { Oscar.create! }.to raise_error(Mongoid::Errors::Callback)

data/spec/mongoid/persistable/deletable_spec.rb

@@ -30,7 +30,7 @@ describe Mongoid::Persistable::Deletable do
       it "deletes the document from the collection" do
         expect {
           Person.find(person.id)
-        }.to raise_error
+        }.to raise_error(Mongoid::Errors::DocumentNotFound)
       end
 
       it "returns true" do
@@ -213,6 +213,40 @@ describe Mongoid::Persistable::Deletable do
           expect(removed).to eq(1)
         end
       end
+
+      context "when the conditions need to be mongoized" do
+
+        let!(:removed) do
+          Person.delete_all(id: person.id)
+        end
+
+        it "removes the matching documents" do
+          expect(Person.count).to eq(1)
+        end
+
+        it "returns the number of documents removed" do
+          expect(removed).to eq(1)
+        end
+      end
+
+      context 'when the write concern is unacknowledged' do
+
+        before do
+          Person.create(title: 'miss')
+        end
+
+        let!(:deleted) do
+          Person.with(write: { w: 0 }) { |klass| klass.delete_all(title: "sir") }
+        end
+
+        it "removes the matching documents" do
+          expect(Person.where(title: 'miss').count).to eq(1)
+        end
+
+        it "returns 0" do
+          expect(deleted).to eq(0)
+        end
+      end
     end
   end
 end