mongoid 7.4.3 → 7.5.0

data/spec/mongoid/contextual/none_spec.rb

@@ -63,12 +63,58 @@ describe Mongoid::Contextual::None do
     it "returns nil" do
       expect(context.first).to be_nil
     end
+
+    it "doen't raise when passing options" do
+      expect do
+        context.first(id_sort: :none)
+      end.to_not raise_error
+    end
+
+    it "returns nil when passing a hash" do
+      expect(context.first(id_sort: :none)).to be_nil
+    end
+
+    it "returns [] when passing a limit" do
+      expect(context.first(1)).to eq([])
+    end
   end
 
   describe "#last" do
     it "returns nil" do
       expect(context.last).to be_nil
     end
+
+    it "doen't raise when passing options" do
+      expect do
+        context.last(id_sort: :none)
+      end.to_not raise_error
+    end
+
+    it "returns nil when passing a hash" do
+      expect(context.last(id_sort: :none)).to be_nil
+    end
+
+    it "returns [] when passing a limit" do
+      expect(context.last(1)).to eq([])
+    end
+  end
+
+  describe "#take" do
+    it "returns nil" do
+      expect(context.take).to be_nil
+    end
+
+    it "returns nil with params" do
+      expect(context.take(1)).to eq([])
+    end
+  end
+
+  describe "#take!" do
+    it "raises an error" do
+      expect do
+        context.take!
+      end.to raise_error(Mongoid::Errors::DocumentNotFound, /Could not find a document of class Band./)
+    end
   end
 
   describe "#length" do

data/spec/mongoid/criteria/queryable/selectable_spec.rb

@@ -479,10 +479,24 @@ describe Mongoid::Criteria::Queryable::Selectable do
           query.elem_match(users: { name: "value" })
         end
 
-        it "adds the $elemMatch expression" do
-          expect(selection.selector).to eq({
-            "users" => { "$elemMatch" => { name: "value" }}
-          })
+        context "when overwrite_chained_operators is false" do
+          config_override :overwrite_chained_operators, false
+
+          it "adds the $elemMatch expression" do
+            expect(selection.selector).to eq({
+              "users" => { "$elemMatch" => { "name" => "value" }}
+            })
+          end
+        end
+
+        context "when overwrite_chained_operators is true" do
+          config_override :overwrite_chained_operators, true
+
+          it "adds the $elemMatch expression" do
+            expect(selection.selector).to eq({
+              "users" => { "$elemMatch" => { name: "value" }}
+            })
+          end
         end
 
         it "returns a cloned query" do
@@ -523,11 +537,26 @@ describe Mongoid::Criteria::Queryable::Selectable do
           )
         end
 
-        it "adds the $elemMatch expression" do
-          expect(selection.selector).to eq({
-            "users" => { "$elemMatch" => { name: "value" }},
-            "comments" => { "$elemMatch" => { text: "value" }}
-          })
+        context "when overwrite_chained_operators is false" do
+          config_override :overwrite_chained_operators, false
+
+          it "adds the $elemMatch expression" do
+            expect(selection.selector).to eq({
+              "users" => { "$elemMatch" => { "name" => "value" }},
+              "comments" => { "$elemMatch" => { "text" => "value" }}
+            })
+          end
+        end
+
+        context "when overwrite_chained_operators is true" do
+          config_override :overwrite_chained_operators, true
+
+          it "adds the $elemMatch expression" do
+            expect(selection.selector).to eq({
+              "users" => { "$elemMatch" => { name: "value" }},
+              "comments" => { "$elemMatch" => { text: "value" }}
+            })
+          end
         end
 
         it "returns a cloned query" do
@@ -546,11 +575,26 @@ describe Mongoid::Criteria::Queryable::Selectable do
             elem_match(comments: { text: "value" })
         end
 
-        it "adds the $elemMatch expression" do
-          expect(selection.selector).to eq({
-            "users" => { "$elemMatch" => { name: "value" }},
-            "comments" => { "$elemMatch" => { text: "value" }}
-          })
+        context "when overwrite_chained_operators is false" do
+          config_override :overwrite_chained_operators, false
+
+          it "adds the $elemMatch expression" do
+            expect(selection.selector).to eq({
+              "users" => { "$elemMatch" => { "name" => "value" }},
+              "comments" => { "$elemMatch" => { "text" => "value" }}
+            })
+          end
+        end
+
+        context "when overwrite_chained_operators is true" do
+          config_override :overwrite_chained_operators, true
+
+          it "adds the $elemMatch expression" do
+            expect(selection.selector).to eq({
+              "users" => { "$elemMatch" => { name: "value" }},
+              "comments" => { "$elemMatch" => { text: "value" }}
+            })
+          end
         end
 
         it "returns a cloned query" do
@@ -566,10 +610,25 @@ describe Mongoid::Criteria::Queryable::Selectable do
             elem_match(users: { state: "new" })
         end
 
-        it "overrides the $elemMatch expression" do
-          expect(selection.selector).to eq({
-            "users" => { "$elemMatch" => { state: "new" }}
-          })
+        context "when overwrite_chained_operators is false" do
+          config_override :overwrite_chained_operators, false
+
+          it "adds an $elemMatch expression" do
+            expect(selection.selector).to eq({
+              "users" => { "$elemMatch" => { "name" => "value" } },
+              "$and" => [ { "users" => { "$elemMatch" => { "state" => "new" } } } ],
+            })
+          end
+        end
+
+        context "when overwrite_chained_operators is true" do
+          config_override :overwrite_chained_operators, true
+
+          it "overrides the $elemMatch expression" do
+            expect(selection.selector).to eq({
+              "users" => { "$elemMatch" => { state: "new" }}
+            })
+          end
         end
 
         it "returns a cloned query" do
@@ -887,18 +946,40 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
       context "when the criterion are on the same field" do
 
-        let(:selection) do
-          query.gt(first: 10).gt(first: 15)
-        end
+        context "when overwrite_chained_operators is true" do
+          config_override :overwrite_chained_operators, true
 
-        it "overwrites the first $gt selector" do
-          expect(selection.selector).to eq({
-            "first" => { "$gt" => 15 }
-          })
+          let(:selection) do
+            query.gt(first: 10).gt(first: 15)
+          end
+
+          it "overwrites the first $gt selector" do
+            expect(selection.selector).to eq({
+              "first" => { "$gt" => 15 },
+              })
+          end
+
+          it "returns a cloned query" do
+            expect(selection).to_not equal(query)
+          end
         end
 
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
+        context "when overwrite_chained_operators is false" do
+          config_override :overwrite_chained_operators, false
+          let(:selection) do
+            query.gt(first: 10).gt(first: 15)
+          end
+
+          it "overwrites the first $gt selector" do
+            expect(selection.selector).to eq({
+              "first" => { "$gt" => 10 },
+              "$and" => [{ "first" => { "$gt" => 15 } }]
+              })
+          end
+
+          it "returns a cloned query" do
+            expect(selection).to_not equal(query)
+          end
         end
       end
     end
@@ -975,10 +1056,25 @@ describe Mongoid::Criteria::Queryable::Selectable do
           query.gte(first: 10).gte(first: 15)
         end
 
-        it "overwrites the first $gte selector" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$gte" => 15 }
-          })
+        context "when overwrite_chained_operators is false" do
+          config_override :overwrite_chained_operators, false
+
+          it "adds a second $gte selector" do
+            expect(selection.selector).to eq({
+              "first" =>  { "$gte" => 10 },
+              "$and" => [ { "first" => { "$gte" => 15 } } ]
+            })
+          end
+        end
+
+        context "when overwrite_chained_operators is true" do
+          config_override :overwrite_chained_operators, true
+
+          it "overwrites the first $gte selector" do
+            expect(selection.selector).to eq({
+              "first" =>  { "$gte" => 15 }
+            })
+          end
         end
 
         it "returns a cloned query" do
@@ -1152,10 +1248,25 @@ describe Mongoid::Criteria::Queryable::Selectable do
           query.lt(first: 10).lt(first: 15)
         end
 
-        it "overwrites the first $lt selector" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$lt" => 15 }
-          })
+        context "when overwrite_chained_operators is false" do
+          config_override :overwrite_chained_operators, false
+
+          it "adds a second $lt selector" do
+            expect(selection.selector).to eq({
+              "first" =>  { "$lt" => 10 },
+              "$and" => [ { "first" => { "$lt" => 15 } } ]
+            })
+          end
+        end
+
+        context "when overwrite_chained_operators is true" do
+          config_override :overwrite_chained_operators, true
+
+          it "overwrites the first $lt selector" do
+            expect(selection.selector).to eq({
+              "first" =>  { "$lt" => 15 }
+            })
+          end
         end
 
         it "returns a cloned query" do
@@ -1236,10 +1347,25 @@ describe Mongoid::Criteria::Queryable::Selectable do
           query.lte(first: 10).lte(first: 15)
         end
 
-        it "overwrites the first $lte selector" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$lte" => 15 }
-          })
+        context "when overwrite_chained_operators is false" do
+          config_override :overwrite_chained_operators, false
+
+          it "adds a second $lte selector" do
+            expect(selection.selector).to eq({
+              "first" =>  { "$lte" => 10 },
+              "$and" => [ { "first" => { "$lte" => 15 } } ]
+            })
+          end
+        end
+
+        context "when overwrite_chained_operators is true" do
+          config_override :overwrite_chained_operators, true
+
+          it "overwrites the first $lte selector" do
+            expect(selection.selector).to eq({
+              "first" =>  { "$lte" => 15 }
+            })
+          end
         end
 
         it "returns a cloned query" do
@@ -2294,4 +2420,51 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
   end
+
+  describe "Mongoid.overwrite_chained_operators" do
+    [ :eq, :elem_match, :gt, :gte, :lt, :lte, :mod, :ne, :near, :near_sphere ].each do |meth|
+
+      context "when chaining the #{meth} method when using the same field" do
+        let(:op) do
+          {
+            eq: "$eq",
+            elem_match: "$elemMatch",
+            gt: "$gt",
+            gte: "$gte",
+            lt: "$lt",
+            lte: "$lte",
+            mod: "$mod",
+            ne: "$ne",
+            near: "$near",
+            near_sphere: "$nearSphere"
+          }[meth]
+        end
+
+        let(:criteria) do
+          Band.send(meth, {views: 1}).send(meth, {views:2})
+        end
+
+        context "when overwrite_chained_operators is true" do
+          config_override :overwrite_chained_operators, true
+
+          it "overrides the previous operators" do
+            expect(criteria.selector).to eq({
+              "views" => { op => 2 },
+            })
+          end
+        end
+
+        context "when overwrite_chained_operators is false" do
+          config_override :overwrite_chained_operators, false
+
+          it "overrides the previous operators" do
+            expect(criteria.selector).to eq({
+              "views" => { op => 1 },
+              "$and" => [{ "views" => { op => 2 } }]
+            })
+          end
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/criteria_spec.rb

@@ -3183,6 +3183,10 @@ describe Mongoid::Criteria do
           I18n.fallbacks = prev_fallbacks
         end
 
+        after do
+          I18n.locale = :en
+        end
+
         let(:plucked) do
           Dictionary.all.pluck(:description).first
         end
@@ -3218,6 +3222,10 @@ describe Mongoid::Criteria do
           Person.create!(passport: p, employer_id: 12345)
         end
 
+        after do
+          I18n.locale = :en
+        end
+
         let(:plucked) do
           Person.where(employer_id: 12345).pluck("pass.name").first
         end

data/spec/mongoid/equality_spec.rb

@@ -85,8 +85,8 @@ describe Mongoid::Equality do
 
   describe ".===" do
 
-    context "when legacy_triple_equals is not set" do
-      config_override :legacy_triple_equals, false
+    context "when legacy_triple_equals is set" do
+      config_override :legacy_triple_equals, true
 
       context "when comparable is an instance of this document" do
 
@@ -128,8 +128,8 @@ describe Mongoid::Equality do
       end
     end
 
-    context "when legacy_triple_equals is set" do
-      config_override :legacy_triple_equals, true
+    context "when legacy_triple_equals is not set" do
+      config_override :legacy_triple_equals, false
 
       context "when comparable is an instance of this document" do
 
@@ -205,8 +205,8 @@ describe Mongoid::Equality do
 
         context "when the class is the same" do
 
-          it "returns true" do
-            expect(person === Person).to be true
+          it "returns false" do
+            expect(person === Person).to be false
           end
         end
 
@@ -219,8 +219,8 @@ describe Mongoid::Equality do
 
         context "when the class is a superclass" do
 
-          it "returns true" do
-            expect(Doctor.new === Person).to be true
+          it "returns false" do
+            expect(Doctor.new === Person).to be false
           end
         end
       end
@@ -256,8 +256,8 @@ describe Mongoid::Equality do
       context "when comparing to a class" do
         context "when the class is the same" do
 
-          it "returns false" do
-            expect(person === Person).to be false
+          it "returns true" do
+            expect(person === Person).to be true
           end
         end
 
@@ -270,8 +270,8 @@ describe Mongoid::Equality do
 
         context "when the class is a superclass" do
 
-          it "returns false" do
-            expect(Doctor.new === Person).to be false
+          it "returns true" do
+            expect(Doctor.new === Person).to be true
           end
         end
       end

data/spec/mongoid/errors/document_not_found_spec.rb

@@ -80,6 +80,55 @@ describe Mongoid::Errors::DocumentNotFound do
         )
       end
     end
+
+    context "when providing an id in a hash without a shard key" do
+
+      let(:error) do
+        described_class.new(Person, 1, 1)
+      end
+
+      it "contains the problem in the message" do
+        expect(error.message).to include(
+          "Document(s) not found for class Person with id(s) 1."
+        )
+      end
+
+      it "contains the summary in the message" do
+        expect(error.message).to include(
+          "When calling Person.find with an id or array of ids"
+        )
+      end
+
+      it "contains the resolution in the message" do
+        expect(error.message).to include(
+          "Search for an id that is in the database or set the"
+        )
+      end
+    end
+
+    context "when not providing params or unmatched" do
+      let(:error) do
+        described_class.new(Person, nil, nil)
+      end
+
+      it "contains the problem in the message" do
+        expect(error.message).to include(
+          "Could not find a document of class Person."
+        )
+      end
+
+      it "contains the summary in the message" do
+        expect(error.message).to include(
+          "Mongoid attempted to find a document of the class Person but none exist."
+        )
+      end
+
+      it "contains the resolution in the message" do
+        expect(error.message).to include(
+          "Create a document of class Person or use a finder method that returns nil when no documents are found instead of raising an exception."
+        )
+      end
+    end
   end
 
   describe "#params" do

data/spec/mongoid/findable_spec.rb

@@ -229,6 +229,36 @@ describe Mongoid::Findable do
       it "returns the first matching document" do
         expect(Person.send(method)).to eq(person)
       end
+
+      it "doen't raise when passing options" do
+        expect do
+          Person.first(id_sort: :none)
+        end.to_not raise_error
+      end
+
+      it "passes the limit through" do
+        Person.first(1).length.should == 1
+      end
+    end
+  end
+
+  describe "#last" do
+    let!(:person) do
+      Person.create!
+    end
+
+    it "returns the first matching document" do
+      expect(Person.last).to eq(person)
+    end
+
+    it "doen't raise when passing options" do
+      expect do
+        Person.last(id_sort: :none)
+      end.to_not raise_error
+    end
+
+    it "passes the limit through" do
+      Person.last(1).length.should == 1
     end
   end
 

data/spec/support/models/code.rb

@@ -10,4 +10,6 @@ end
 class Deepest
   include Mongoid::Document
   embedded_in :code
+
+  field :array, type: Array
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 7.4.3
+  version: 7.5.0
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   +WyKQ+QTIdtDiyf2LQmxWnxt/W1CmScjdLS7/yXGkkB/D9Uy+sJD747O/B9P238Q
   XnerrtyOu04RsWDvaZkCwSDVzoqfICh4CP1mlde73Ts=
   -----END CERTIFICATE-----
-date: 2022-07-23 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -452,6 +452,7 @@ files:
 - lib/mongoid/validatable/queryable.rb
 - lib/mongoid/validatable/uniqueness.rb
 - lib/mongoid/version.rb
+- lib/mongoid/warnings.rb
 - lib/rails/generators/mongoid/config/config_generator.rb
 - lib/rails/generators/mongoid/config/templates/mongoid.yml
 - lib/rails/generators/mongoid/model/model_generator.rb