mongoid 7.5.4 → 8.1.6

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

@@ -1344,6 +1344,34 @@ describe Mongoid::Criteria::Queryable::Selectable do
           )
         end
       end
+
+      context 'when any_of has multiple arguments' do
+
+        let(:selection) do
+          query.or(field: [ 1, 2 ]).where(foo: 'bar').any_of({a: 1}, {b: 2})
+        end
+
+        it 'adds the new condition to top level' do
+          expect(selection.selector).to eq(
+            '$or' => [{'field' => [1, 2]}],
+            'foo' => 'bar',
+            '$and' => [{'$or' => [{'a' => 1}, {'b' => 2}]}],
+          )
+        end
+
+        context 'when query already has a top-level $and' do
+          let(:selection) do
+            query.or(field: [ 1, 2 ]).where('$and' => [foo: 'bar']).any_of({a: 1}, {b: 2})
+          end
+
+          it 'adds the new condition to top level $and' do
+            expect(selection.selector).to eq(
+              '$or' => [{'field' => [1, 2]}],
+              '$and' => [{'foo' => 'bar'}, {'$or' => [{'a' => 1}, {'b' => 2}]}],
+            )
+          end
+        end
+      end
     end
 
     context "when provided multiple criteria" do
@@ -2065,5 +2093,446 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
       end
     end
+
+    # This test confirms that MONGOID-5097 has been repaired.
+    context "when using exists on a field of type Time" do
+      let(:criteria) do
+        Dictionary.any_of({:published.exists => true}, published: nil)
+      end
+
+      it "doesn't raise an error" do
+        expect do
+          criteria
+        end.to_not raise_error
+      end
+
+      it "generates the correct selector" do
+        expect(criteria.selector).to eq({
+          "$or" => [ {
+            "published" => { "$exists" => true }
+          }, {
+            "published" => nil
+          } ] } )
+      end
+    end
+  end
+
+  describe "#none_of" do
+    context 'when argument is a mix of Criteria and hashes' do
+      let(:query) { Mongoid::Query.new.where(hello: 'world') }
+      let(:other1) { Mongoid::Query.new.where(foo: 'bar') }
+      let(:other2) { { bar: 42 } }
+      let(:other3) { Mongoid::Query.new.where(a: 2) }
+
+      let(:result) { query.none_of(other1, other2, other3) }
+
+      it 'combines' do
+        expect(result.selector).to eq(
+          'hello' => 'world',
+          '$nor' => [
+            {'foo' => 'bar'},
+            {'bar' => 42},
+            {'a' => 2},
+          ],
+        )
+      end
+    end
+
+    context "when provided no arguments" do
+      let(:selection) { query.none_of }
+
+      it_behaves_like 'returns a cloned query'
+
+      it "does not add any criteria" do
+        expect(selection.selector).to eq({})
+      end
+
+      it "returns the query" do
+        expect(selection).to eq(query)
+      end
+    end
+
+    context "when provided nil" do
+      let(:selection) { query.none_of(nil) }
+
+      it_behaves_like 'returns a cloned query'
+
+      it "does not add any criteria" do
+        expect(selection.selector).to eq({})
+      end
+
+      it "returns the query" do
+        expect(selection).to eq(query)
+      end
+    end
+
+    context "when provided a single criterion" do
+      let(:selection) { query.none_of(field: [ 1, 2 ]) }
+
+      it_behaves_like 'returns a cloned query'
+
+      it 'adds the $nor selector' do
+        expect(selection.selector).to eq(
+          '$nor' => [ { 'field' => [ 1, 2 ] } ],
+        )
+      end
+
+      context 'when the criterion is wrapped in array' do
+        let(:selection) { query.none_of([{ field: [ 1, 2 ] }]) }
+
+        it_behaves_like 'returns a cloned query'
+
+        it 'adds the condition' do
+          expect(selection.selector).to eq(
+            '$nor' => [ { 'field' => [ 1, 2 ] } ],
+          )
+        end
+
+        context 'when the array has nil as one of the elements' do
+          let(:selection) { query.none_of([{ field: [ 1, 2 ] }, nil]) }
+
+          it_behaves_like 'returns a cloned query'
+
+          it 'adds the $nor selector ignoring the nil element' do
+            expect(selection.selector).to eq(
+              '$nor' => [ { 'field' => [ 1, 2 ] } ],
+            )
+          end
+        end
+      end
+
+      context 'when query already has a condition on another field' do
+        context 'when there is one argument' do
+          let(:selection) { query.where(foo: 'bar').none_of(field: [ 1, 2 ]) }
+
+          it 'adds the new condition' do
+            expect(selection.selector).to eq(
+              'foo' => 'bar',
+              '$nor' => [ { 'field' => [1, 2] } ],
+            )
+          end
+        end
+
+        context 'when there are multiple arguments' do
+          let(:selection) do
+            query.where(foo: 'bar').none_of({ field: [ 1, 2 ] }, { hello: 'world' })
+          end
+
+          it 'adds the new condition' do
+            expect(selection.selector).to eq(
+              'foo' => 'bar',
+              '$nor' => [
+                { 'field' => [1, 2] },
+                { 'hello' => 'world' },
+              ],
+            )
+          end
+        end
+      end
+
+      context 'when query already has a $nor condition and another condition' do
+        let(:selection) do
+          query.nor(field: [ 1, 2 ]).where(foo: 'bar').none_of(test: 1)
+        end
+
+        it 'adds the new condition' do
+          expect(selection.selector).to eq(
+            '$nor' => [ { 'field' => [1, 2] } ],
+            'foo' => 'bar',
+            '$and' => [ { '$nor' => [ { 'test' => 1 } ] } ]
+          )
+        end
+      end
+
+      context 'when none_of has multiple arguments' do
+        let(:selection) do
+          query.nor(field: [ 1, 2 ]).where(foo: 'bar').none_of({a: 1}, {b: 2})
+        end
+
+        it 'adds the new condition to top level' do
+          expect(selection.selector).to eq(
+            'foo' => 'bar',
+            '$nor' => [ { 'field' => [1, 2] } ],
+            '$and' => [ { '$nor' => [ { 'a' => 1 }, { 'b' => 2 } ] } ]
+          )
+        end
+
+        context 'when query already has a top-level $and' do
+          let(:selection) do
+            query.nor(field: [ 1, 2 ]).where('$and' => [foo: 'bar']).none_of({a: 1}, {b: 2})
+          end
+
+          it 'adds the new condition to top level $and' do
+            expect(selection.selector).to eq(
+              '$nor' => [ { 'field' => [1, 2] } ],
+              '$and' => [
+                { 'foo' => 'bar' },
+                { '$nor' => [ { 'a' => 1 }, { 'b' => 2 } ] }
+              ],
+            )
+          end
+        end
+      end
+    end
+
+    context "when provided multiple criteria" do
+      context "when the criteria are for different fields" do
+        let(:selection) do
+          query.none_of({ first: [ 1, 2 ] }, { second: [ 3, 4 ] })
+        end
+
+        it_behaves_like 'returns a cloned query'
+
+        it "adds the $nor selector" do
+          expect(selection.selector).to eq({
+            "$nor" => [
+              { "first" => [ 1, 2 ] },
+              { "second" => [ 3, 4 ] }
+            ]
+          })
+        end
+      end
+
+      context "when the criteria uses a Key instance" do
+        let(:selection) do
+          query.none_of({ first: [ 1, 2 ] }, { :second.gt => 3 })
+        end
+
+        it "adds the $nor selector" do
+          expect(selection.selector).to eq({
+            "$nor" => [
+              { "first" => [ 1, 2 ] },
+              { "second" => { "$gt" => 3 }}
+            ]
+          })
+        end
+
+        it_behaves_like 'returns a cloned query'
+      end
+
+      context 'when criteria are simple and handled via Key' do
+        shared_examples_for 'adds conditions with $nor' do
+          it "adds conditions with $nor" do
+            expect(selection.selector).to eq({
+              '$nor' => [
+                {'field' => 3},
+                {'field' => {'$lt' => 5}},
+              ],
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
+        end
+
+        shared_examples_for 'combines conditions with $eq' do
+          it "combines conditions with $eq" do
+            expect(selection.selector).to eq({
+              '$nor' => [ { 'field' => { '$eq' => 3, '$lt' => 5 } } ]
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
+        end
+
+        shared_examples_for 'combines conditions with $regex' do
+          it 'combines conditions with $regex' do
+            expect(selection.selector).to eq({
+              '$nor' => [ { 'field' => { '$regex' => /t/, '$lt' => 5 } } ]
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
+        end
+
+        context 'criteria are provided in the same hash' do
+          context 'non-regexp argument' do
+            let(:selection) { query.none_of(:field => 3, :field.lt => 5) }
+            it_behaves_like 'combines conditions with $eq'
+          end
+
+          context 'regexp argument' do
+            let(:selection) { query.none_of(:field => /t/, :field.lt => 5) }
+            it_behaves_like 'combines conditions with $regex'
+          end
+        end
+
+        context 'criteria are provided in separate hashes' do
+          let(:selection) { query.none_of({:field => 3}, {:field.lt => 5}) }
+          it_behaves_like 'adds conditions with $nor'
+        end
+
+        context 'when the criterion is wrapped in an array' do
+          let(:selection) { query.none_of([:field => 3], [:field.lt => 5]) }
+          it_behaves_like 'adds conditions with $nor'
+        end
+      end
+
+      context 'when criteria are handled via Key and simple' do
+        shared_examples_for 'adds conditions with $nor' do
+          it 'adds conditions with $nor' do
+            expect(selection.selector).to eq({
+              '$nor' => [
+                { 'field' => { '$gt' => 3 } },
+                { 'field' => 5 },
+              ],
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
+        end
+
+        shared_examples_for 'combines conditions with $eq' do
+          it 'combines conditions with $eq' do
+            expect(selection.selector).to eq(
+              '$nor' => [ { 'field' => {'$gt' => 3, '$eq' => 5} } ],
+            )
+          end
+
+          it_behaves_like 'returns a cloned query'
+        end
+
+        shared_examples_for 'combines conditions with $regex' do
+          it 'combines conditions with $regex' do
+            expect(selection.selector).to eq(
+              '$nor' => [ { 'field' => {'$gt' => 3, '$regex' => /t/} } ],
+            )
+          end
+
+          it_behaves_like 'returns a cloned query'
+        end
+
+        context 'criteria are provided in the same hash' do
+          context 'non-regexp argument' do
+            let(:selection) { query.none_of(:field.gt => 3, :field => 5) }
+            it_behaves_like 'combines conditions with $eq'
+          end
+
+          context 'regexp argument' do
+            let(:selection) { query.none_of(:field.gt => 3, :field => /t/) }
+            it_behaves_like 'combines conditions with $regex'
+          end
+        end
+
+        context 'criteria are provided in separate hashes' do
+          let(:selection) { query.none_of({:field.gt => 3}, {:field => 5}) }
+          it_behaves_like 'adds conditions with $nor'
+        end
+
+        context 'when the criterion is wrapped in an array' do
+          let(:selection) { query.none_of([:field.gt => 3], [:field => 5]) }
+          it_behaves_like 'adds conditions with $nor'
+        end
+      end
+
+      context 'when a criterion has an aliased field' do
+        let(:selection) { query.none_of({ id: 1 }) }
+        
+        it 'adds the $nor selector and aliases the field' do
+          expect(selection.selector).to eq('$nor' => [{ '_id' => 1 }])
+        end
+
+        it_behaves_like 'returns a cloned query'
+      end
+
+      context 'when a criterion is wrapped in an array' do
+        let(:selection) do
+          query.none_of([{ first: [ 1, 2 ] }, { :second.gt => 3 }])
+        end
+
+        it_behaves_like 'returns a cloned query'
+
+        it 'adds the $ nor selector' do
+          expect(selection.selector).to eq({
+            '$nor' => [
+              { 'first' => [ 1, 2 ] },
+              { 'second' => { '$gt' => 3 }}
+            ]
+          })
+        end
+      end
+
+      context "when the criteria are on the same field" do
+        let(:selection) do
+          query.none_of({ first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+        end
+
+        it_behaves_like 'returns a cloned query'
+
+        it 'appends both $nor expressions' do
+          expect(selection.selector).to eq({
+            "$nor" => [
+              { "first" => [ 1, 2 ] },
+              { "first" => [ 3, 4 ] }
+            ]
+          })
+        end
+      end
+    end
+
+    context 'when chaining the criteria' do
+      context 'when the criteria are for different fields' do
+        let(:selection) do
+          query.none_of(first: [ 1, 2 ]).none_of(second: [ 3, 4 ])
+        end
+
+        it_behaves_like 'returns a cloned query'
+
+        it 'adds the conditions separately' do
+          expect(selection.selector).to eq(
+            '$nor' => [ { 'first' => [ 1, 2 ] } ],
+            '$and' => [ { '$nor' => [ { 'second' => [ 3, 4 ] } ] } ],
+          )
+        end
+      end
+
+      context "when the criteria are on the same field" do
+        let(:selection) do
+          query.none_of(first: [ 1, 2 ]).none_of(first: [ 3, 4 ])
+        end
+
+        it_behaves_like 'returns a cloned query'
+
+        it 'adds the conditions separately' do
+          expect(selection.selector).to eq(
+            '$nor' => [ { 'first' => [ 1, 2 ] } ],
+            '$and' => [ { '$nor' => [ { 'first' => [ 3, 4 ] } ] } ]
+          )
+        end
+      end
+    end
+
+    context 'when using multiple criteria and symbol operators' do
+      context 'when using fields that meaningfully evolve values' do
+        let(:query) do
+          Dictionary.none_of({a: 1}, :published.gt => Date.new(2020, 2, 3))
+        end
+
+        it 'generates the expected query' do
+          query.selector.should == {'$nor' => [
+            {'a' => 1},
+            # Date instance is converted to a Time instance in local time,
+            # because we are querying on a Time field and dates are interpreted
+            # in local time when assigning to Time fields
+            {'published' => {'$gt' => Time.local(2020, 2, 3) } },
+          ] }
+        end
+      end
+
+      context 'when using fields that do not meaningfully evolve values' do
+        let(:query) do
+          Dictionary.none_of({a: 1}, :submitted_on.gt => Date.new(2020, 2, 3))
+        end
+
+        it 'generates the expected query' do
+          query.selector.should == {'$nor' => [
+            {'a' => 1},
+            # Date instance is converted to a Time instance in UTC,
+            # because we are querying on a Date field and dates are interpreted
+            # in UTC when persisted as dates by Mongoid
+            {'submitted_on' => {'$gt' => Time.utc(2020, 2, 3)}},
+          ]}
+        end
+      end
+    end
   end
 end

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

@@ -754,127 +754,119 @@ describe Mongoid::Criteria::Queryable::Selectable do
     end
   end
 
-  %i(geo_spatial geo_spacial).each do |meth|
-    describe "#geo_spacial" do
+  describe "#geo_spatial" do
 
-      let(:query_method) { meth }
+    let(:query_method) { :geo_spatial }
 
-      it_behaves_like 'requires an argument'
-      it_behaves_like 'requires a non-nil argument'
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
-      context "when provided a criterion" do
+    context "when provided a criterion" do
 
-        context "when the geometry is a point intersection" do
+      context "when the geometry is a point intersection" do
 
-          let(:selection) do
-            query.public_send(query_method, :location.intersects_point => [ 1, 10 ])
-          end
+        let(:selection) do
+          query.geo_spatial(:location.intersects_point => [ 1, 10 ])
+        end
 
-          it "adds the $geoIntersects expression" do
-            expect(selection.selector).to eq({
-              "location" => {
-                "$geoIntersects" => {
-                  "$geometry" => {
-                    "type" => "Point",
-                    "coordinates" => [ 1, 10 ]
-                  }
+        it "adds the $geoIntersects expression" do
+          expect(selection.selector).to eq({
+            "location" => {
+              "$geoIntersects" => {
+                "$geometry" => {
+                  "type" => "Point",
+                  "coordinates" => [ 1, 10 ]
                 }
               }
-            })
-          end
-
-          it_behaves_like "returns a cloned query"
+            }
+          })
         end
 
-        context "when the geometry is a line intersection" do
+        it_behaves_like "returns a cloned query"
+      end
+
+      context "when the geometry is a line intersection" do
 
-          let(:selection) do
-            query.public_send(query_method, :location.intersects_line => [[ 1, 10 ], [ 2, 10 ]])
-          end
+        let(:selection) do
+          query.geo_spatial(:location.intersects_line => [[ 1, 10 ], [ 2, 10 ]])
+        end
 
-          it "adds the $geoIntersects expression" do
-            expect(selection.selector).to eq({
-              "location" => {
-                "$geoIntersects" => {
-                  "$geometry" => {
-                    "type" => "LineString",
-                    "coordinates" => [[ 1, 10 ], [ 2, 10 ]]
-                  }
+        it "adds the $geoIntersects expression" do
+          expect(selection.selector).to eq({
+            "location" => {
+              "$geoIntersects" => {
+                "$geometry" => {
+                  "type" => "LineString",
+                  "coordinates" => [[ 1, 10 ], [ 2, 10 ]]
                 }
               }
-            })
-          end
-
-          it_behaves_like "returns a cloned query"
+            }
+          })
         end
 
-        context "when the geometry is a polygon intersection" do
+        it_behaves_like "returns a cloned query"
+      end
 
-          let(:selection) do
-            query.public_send(query_method,
-              :location.intersects_polygon => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]]
-            )
-          end
+      context "when the geometry is a polygon intersection" do
 
-          it "adds the $geoIntersects expression" do
-            expect(selection.selector).to eq({
-              "location" => {
-                "$geoIntersects" => {
-                  "$geometry" => {
-                    "type" => "Polygon",
-                    "coordinates" => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]]
-                  }
+        let(:selection) do
+          query.geo_spatial(:location.intersects_polygon => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]])
+        end
+
+        it "adds the $geoIntersects expression" do
+          expect(selection.selector).to eq({
+            "location" => {
+              "$geoIntersects" => {
+                "$geometry" => {
+                  "type" => "Polygon",
+                  "coordinates" => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]]
                 }
               }
-            })
-          end
+            }
+          })
+        end
+
+        it_behaves_like "returns a cloned query"
+      end
 
-          it_behaves_like "returns a cloned query"
+      context "when the geometry is within a polygon" do
+
+        let(:selection) do
+          query.geo_spatial(:location.within_polygon => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]])
         end
 
-        context "when the geometry is within a polygon" do
+        it "adds the $geoIntersects expression" do
+          expect(selection.selector).to eq({
+            "location" => {
+              "$geoWithin" => {
+                "$geometry" => {
+                  "type" => "Polygon",
+                  "coordinates" => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]]
+                }
+              }
+            }
+          })
+        end
 
+        context "when used with the $box operator ($geoWithin query) " do
           let(:selection) do
-            query.public_send(query_method,
-              :location.within_polygon => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]]
-            )
+            query.geo_spatial(:location.within_box => [[ 1, 10 ], [ 2, 10 ]])
           end
 
           it "adds the $geoIntersects expression" do
             expect(selection.selector).to eq({
               "location" => {
                 "$geoWithin" => {
-                  "$geometry" => {
-                    "type" => "Polygon",
-                    "coordinates" => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]]
-                  }
+                  "$box" => [
+                    [ 1, 10 ], [ 2, 10 ]
+                  ]
                 }
               }
             })
           end
-
-          context "when used with the $box operator ($geoWithin query) " do
-            let(:selection) do
-              query.public_send(query_method,
-                :location.within_box => [[ 1, 10 ], [ 2, 10 ]]
-              )
-            end
-
-            it "adds the $geoIntersects expression" do
-              expect(selection.selector).to eq({
-                "location" => {
-                  "$geoWithin" => {
-                    "$box" => [
-                      [ 1, 10 ], [ 2, 10 ]
-                    ]
-                  }
-                }
-              })
-            end
-          end
-
-          it_behaves_like "returns a cloned query"
         end
+
+        it_behaves_like "returns a cloned query"
       end
     end
   end
@@ -2053,7 +2045,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
 
       # MongoDB server can only handle one text expression at a time,
-      # per https://docs.mongodb.com/manual/reference/operator/query/text/.
+      # per https://www.mongodb.com/docs/manual/reference/operator/query/text/.
       # Nonetheless we test that the query is built correctly when
       # a user supplies more than one text condition.
       it 'merges conditions' do