mongoid 6.4.4 → 7.1.7

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

@@ -1,43 +1,299 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
+class FieldWithSerializer
+  def evolve(object)
+    Integer.evolve(object)
+  end
+
+  def localized?
+    false
+  end
+end
+
 describe Mongoid::Criteria::Queryable::Selectable do
 
   let(:query) do
-   Mongoid::Query.new("id" => "_id")
+    Mongoid::Query.new("id" => "_id")
   end
 
-  shared_examples_for "a cloning selection" do
+  shared_examples_for "returns a cloned query" do
 
     it "returns a cloned query" do
       expect(selection).to_not equal(query)
     end
   end
 
-  describe "#all" do
+  shared_examples_for 'requires an argument' do
+    context "when provided no argument" do
 
-    context "when provided no criterion" do
+      let(:selection) do
+        query.send(query_method)
+      end
+
+      it "raises ArgumentError" do
+        expect do
+          selection.selector
+        end.to raise_error(ArgumentError)
+      end
+    end
+  end
+
+  shared_examples_for 'requires a non-nil argument' do
+    context "when provided nil" do
 
       let(:selection) do
-        query.all
+        query.send(query_method, nil)
       end
 
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
+      it "raises CriteriaArgumentRequired" do
+        expect do
+          selection.selector
+        end.to raise_error(Mongoid::Errors::CriteriaArgumentRequired, /#{query_method}/)
       end
+    end
+  end
 
-      it "returns the query" do
-        expect(selection).to eq(query)
+  shared_examples_for 'supports merge strategies' do
+
+    context 'when the field is not aliased' do
+
+      context "when the strategy is not set" do
+
+        let(:selection) do
+          query.send(query_method, first: [ 1, 2 ]).send(query_method, first: [ 3, 4 ])
+        end
+
+        it "combines the conditions with $and" do
+          expect(selection.selector).to eq({
+            "first" => { operator => [ 1, 2 ] },
+            '$and' => [{'first' => {operator => [3, 4]}}],
+          })
+        end
+
+        it_behaves_like "returns a cloned query"
       end
 
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
+      context "when the strategy is intersect" do
+
+        let(:selection) do
+          query.send(query_method, first: [ 1, 2 ]).intersect.send(query_method, first: [ 2, 3 ])
+        end
+
+        it "intersects the conditions" do
+          expect(selection.selector).to eq({
+            "first" => { operator => [ 2 ] }
+          })
+        end
+
+        it_behaves_like "returns a cloned query"
+      end
+
+      context "when the strategy is override" do
+
+        let(:selection) do
+          query.send(query_method, first: [ 1, 2 ]).override.send(query_method, first: [ 3, 4 ])
+        end
+
+        it "overwrites the first condition" do
+          expect(selection.selector).to eq({
+            "first" => { operator => [ 3, 4 ] }
+          })
+        end
+
+        it_behaves_like "returns a cloned query"
+      end
+
+      context "when the strategy is union" do
+
+        let(:selection) do
+          query.send(query_method, first: [ 1, 2 ]).union.send(query_method, first: [ 3, 4 ])
+        end
+
+        it "unions the conditions" do
+          expect(selection.selector).to eq({
+            "first" => { operator => [ 1, 2, 3, 4 ] }
+          })
+        end
+
+        it_behaves_like "returns a cloned query"
       end
     end
 
-    context "when provided nil" do
+    context 'when the field is aliased' do
+
+      context "when the strategy is not set" do
+
+        let(:selection) do
+          query.send(query_method, id: [ 1, 2 ]).send(query_method, _id: [ 3, 4 ])
+        end
+
+        it "combines the conditions with $and" do
+          expect(selection.selector).to eq({
+            "_id" => { operator => [ 1, 2 ] },
+            '$and' => [{'_id' => {operator => [3, 4]}}],
+          })
+        end
+
+        it_behaves_like "returns a cloned query"
+      end
+
+      context "when the strategy is intersect" do
+
+        let(:selection) do
+          query.send(query_method, id: [ 1, 2 ]).intersect.send(query_method, _id: [ 2, 3 ])
+        end
+
+        it "intersects the conditions" do
+          expect(selection.selector).to eq({
+            "_id" => { operator => [ 2 ] }
+          })
+        end
+
+        it_behaves_like "returns a cloned query"
+      end
+
+      context "when the strategy is override" do
+
+        let(:selection) do
+          query.send(query_method, _id: [ 1, 2 ]).override.send(query_method, id: [ 3, 4 ])
+        end
+
+        it "overwrites the first condition" do
+          expect(selection.selector).to eq({
+            "_id" => { operator => [ 3, 4 ] }
+          })
+        end
+
+        it_behaves_like "returns a cloned query"
+      end
+
+      context "when the strategy is union" do
+
+        let(:selection) do
+          query.send(query_method, _id: [ 1, 2 ]).union.send(query_method, id: [ 3, 4 ])
+        end
+
+        it "unions the conditions" do
+          expect(selection.selector).to eq({
+            "_id" => { operator => [ 1, 2, 3, 4 ] }
+          })
+        end
+
+        it_behaves_like "returns a cloned query"
+      end
+    end
+
+    context 'when the field uses a serializer' do
+
+      let(:query) do
+        Mongoid::Query.new({}, { "field" => FieldWithSerializer.new })
+      end
+
+
+      context "when the strategy is not set" do
+
+        let(:selection) do
+          query.send(query_method, field: [ '1', '2' ]).send(query_method, field: [ '3', '4' ])
+        end
+
+        it "combines the conditions with $and" do
+          expect(selection.selector).to eq({
+            "field" => { operator => [ 1, 2 ] },
+            '$and' => [{'field' => {operator => [3, 4]}}],
+          })
+        end
+
+        it_behaves_like "returns a cloned query"
+      end
+
+      context "when the strategy is set" do
+
+        let(:selection) do
+          query.send(query_method, field: [ '1', '2' ]).intersect.send(query_method, field: [ '2', '3' ])
+        end
+
+        it "intersects the conditions" do
+          expect(selection.selector).to eq({
+            "field" => { operator => [ 2 ] }
+          })
+        end
+
+        it_behaves_like "returns a cloned query"
+      end
+    end
+
+    context 'when operator value is a Range' do
+
+      context "when there is no existing condition and strategy is not specified" do
+
+        let(:selection) do
+          query.send(query_method, foo: 2..4)
+        end
+
+        it 'expands range to array' do
+          expect(selection.selector).to eq({
+            "foo" => { operator => [ 2, 3, 4 ] }
+          })
+
+        end
+      end
+
+      context "when there is no existing condition and strategy is specified" do
+
+        let(:selection) do
+          query.union.send(query_method, foo: 2..4)
+        end
+
+        it 'expands range to array' do
+          expect(selection.selector).to eq({
+            "foo" => { operator => [ 2, 3, 4 ] }
+          })
+
+        end
+      end
+
+      context "when existing condition has Array value" do
+
+        let(:selection) do
+          query.send(query_method, foo: [ 1, 2 ]).union.send(query_method, foo: 2..4)
+        end
+
+        it 'expands range to array' do
+          expect(selection.selector).to eq({
+            "foo" => { operator => [ 1, 2, 3, 4 ] }
+          })
+
+        end
+      end
+
+      context "when existing condition has Range value" do
+
+        let(:selection) do
+          query.send(query_method, foo: 1..2).union.send(query_method, foo: 2..4)
+        end
+
+        it 'expands range to array' do
+          expect(selection.selector).to eq({
+            "foo" => { operator => [ 1, 2, 3, 4 ] }
+          })
+
+        end
+      end
+    end
+  end
+
+  describe "#all" do
+
+    let(:query_method) { :all }
+    let(:operator) { '$all' }
+
+    context "when provided no criterion" do
 
       let(:selection) do
-        query.all(nil)
+        query.all
       end
 
       it "does not add any criterion" do
@@ -53,6 +309,8 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
 
+    it_behaves_like 'requires a non-nil argument'
+
     context "when provided a single criterion" do
 
       context "when no serializers are provided" do
@@ -74,23 +332,6 @@ describe Mongoid::Criteria::Queryable::Selectable do
           end
         end
 
-        context "when providing a range" do
-
-          let(:selection) do
-            query.all(field: 1..3)
-          end
-
-          it "adds the $all selector with converted range" do
-            expect(selection.selector).to eq({
-              "field" => { "$all" => [ 1, 2, 3 ] }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-
         context "when providing a single value" do
 
           let(:selection) do
@@ -147,23 +388,6 @@ describe Mongoid::Criteria::Queryable::Selectable do
           end
         end
 
-        context "when providing a range" do
-
-          let(:selection) do
-            query.all(field: "1".."3")
-          end
-
-          it "adds the $all selector with converted range" do
-            expect(selection.selector).to eq({
-              "field" => { "$all" => [ 1, 2, 3 ] }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-
         context "when providing a single value" do
 
           let(:selection) do
@@ -226,257 +450,120 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
       context "when the criterion are on the same field" do
 
-        context "when no serializers are provided" do
+        it_behaves_like 'supports merge strategies'
+      end
+    end
+  end
 
-          context "when the strategy is the default (union)" do
+  describe "#between" do
 
-            let(:selection) do
-              query.all(first: [ 1, 2 ]).all(first: [ 3, 4 ])
-            end
+    let(:query_method) { :between }
 
-            it "overwrites the first $all selector" do
-              expect(selection.selector).to eq({
-                "first" => { "$all" => [ 1, 2, 3, 4 ] }
-              })
-            end
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
-            it "returns a cloned query" do
-              expect(selection).to_not equal(query)
-            end
-          end
+    context "when provided a single range" do
 
-          context "when the strategy is intersect" do
+      let(:selection) do
+        query.between(field: 1..10)
+      end
 
-            let(:selection) do
-              query.all(first: [ 1, 2 ]).intersect.all(first: [ 2, 3 ])
-            end
+      it "adds the $gte and $lte selectors" do
+        expect(selection.selector).to eq({
+          "field" => { "$gte" => 1, "$lte" => 10 }
+        })
+      end
 
-            it "intersects the $all selectors" do
-              expect(selection.selector).to eq({
-                "first" => { "$all" => [ 2 ] }
-              })
-            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)
-            end
-          end
+    context "when provided multiple ranges" do
 
-          context "when the strategy is override" do
+      context "when the ranges are on different fields" do
 
-            let(:selection) do
-              query.all(first: [ 1, 2 ]).override.all(first: [ 3, 4 ])
-            end
+        let(:selection) do
+          query.between(field: 1..10, key: 5..7)
+        end
 
-            it "overwrites the first $all selector" do
-              expect(selection.selector).to eq({
-                "first" => { "$all" => [ 3, 4 ] }
-              })
-            end
+        it "adds the $gte and $lte selectors" do
+          expect(selection.selector).to eq({
+            "field" => { "$gte" => 1, "$lte" => 10 },
+            "key" => { "$gte" => 5, "$lte" => 7 }
+          })
+        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)
+        end
+      end
+    end
+  end
 
-          context "when the strategy is union" do
+  describe "#elem_match" do
 
-            let(:selection) do
-              query.all(first: [ 1, 2 ]).union.all(first: [ 3, 4 ])
-            end
+    let(:query_method) { :elem_match }
 
-            it "unions the $all selectors" do
-              expect(selection.selector).to eq({
-                "first" => { "$all" => [ 1, 2, 3, 4 ] }
-              })
-            end
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
-            it "returns a cloned query" do
-              expect(selection).to_not equal(query)
-            end
-          end
-        end
-
-        context "when serializers are provided" do
-
-          before(:all) do
-            class Field
-              def evolve(object)
-                Integer.evolve(object)
-              end
-              def localized?
-                false
-              end
-            end
-          end
-
-          after(:all) do
-            Object.send(:remove_const, :Field)
-          end
-
-          let!(:query) do
-            Mongoid::Query.new({}, { "field" => Field.new })
-          end
-
-          context "when the strategy is the default (union)" do
-
-            let(:selection) do
-              query.all(field: [ "1", "2" ]).all(field: [ "3", "4" ])
-            end
-
-            it "overwrites the field $all selector" do
-              expect(selection.selector).to eq({
-                "field" => { "$all" => [ 1, 2, 3, 4 ] }
-              })
-            end
-
-            it "returns a cloned query" do
-              expect(selection).to_not equal(query)
-            end
-          end
-
-          context "when the strategy is intersect" do
-
-            let(:selection) do
-              query.all(field: [ "1", "2" ]).intersect.all(field: [ "2", "3" ])
-            end
-
-            it "intersects the $all selectors" do
-              expect(selection.selector).to eq({
-                "field" => { "$all" => [ 2 ] }
-              })
-            end
-
-            it "returns a cloned query" do
-              expect(selection).to_not equal(query)
-            end
-          end
-
-          context "when the strategy is override" do
-
-            let(:selection) do
-              query.all(field: [ "1", "2" ]).override.all(field: [ "3", "4" ])
-            end
-
-            it "overwrites the field $all selector" do
-              expect(selection.selector).to eq({
-                "field" => { "$all" => [ 3, 4 ] }
-              })
-            end
-
-            it "returns a cloned query" do
-              expect(selection).to_not equal(query)
-            end
-          end
-
-          context "when the strategy is union" do
-
-            let(:selection) do
-              query.all(field: [ "1", "2" ]).union.all(field: [ "3", "4" ])
-            end
+    context "when provided a criterion" do
 
-            it "unions the $all selectors" do
-              expect(selection.selector).to eq({
-                "field" => { "$all" => [ 1, 2, 3, 4 ] }
-              })
-            end
+      context "when there are no nested complex keys" do
 
-            it "returns a cloned query" do
-              expect(selection).to_not equal(query)
-            end
-          end
+        let(:selection) do
+          query.elem_match(users: { name: "value" })
         end
-      end
-    end
-  end
-
-  describe "#and" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.and
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.and(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
 
-    context "when provided a single criterion" do
-
-      let(:selection) do
-        query.and(field: [ 1, 2 ])
-      end
+        it "adds the $elemMatch expression" do
+          expect(selection.selector).to eq({
+            "users" => { "$elemMatch" => { name: "value" }}
+          })
+        end
 
-      it "adds the $and selector" do
-        expect(selection.selector).to eq({
-          "$and" => [{ "field" => [ 1, 2 ] }]
-        })
+        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)
-      end
-    end
+      context "when there are nested complex keys" do
 
-    context "when provided a nested criterion" do
+        let(:time) do
+          Time.now
+        end
 
-      let(:selection) do
-        query.and(:test.elem_match => { :field.in => [ 1, 2 ] })
-      end
+        let(:selection) do
+          query.elem_match(users: { :time.gt => time })
+        end
 
-      it "adds the $and selector" do
-        expect(selection.selector).to eq({
-          "$and" => [{ "test" => { "$elemMatch" => { "field" => { "$in" => [ 1, 2 ] }}}}]
-        })
-      end
+        it "adds the $elemMatch expression" do
+          expect(selection.selector).to eq({
+            "users" => { "$elemMatch" => { "time" => { "$gt" => time }}}
+          })
+        end
 
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
       end
     end
 
-    context "when provided multiple criterion" do
+    context "when providing multiple criteria" do
 
-      context "when the criterion is already included" do
+      context "when the fields differ" do
 
         let(:selection) do
-          query.and({ first: [ 1, 2 ] }).and({ first: [ 1, 2 ] })
+          query.elem_match(
+            users: { name: "value" },
+            comments: { text: "value" }
+          )
         end
 
-        it "does not duplicate the $and selector" do
+        it "adds the $elemMatch expression" do
           expect(selection.selector).to eq({
-            "$and" => [
-              { "first" => [ 1, 2 ] }
-            ]
+            "users" => { "$elemMatch" => { name: "value" }},
+            "comments" => { "$elemMatch" => { text: "value" }}
           })
         end
 
@@ -484,19 +571,22 @@ describe Mongoid::Criteria::Queryable::Selectable do
           expect(selection).to_not equal(query)
         end
       end
+    end
 
-      context "when the criterion are for different fields" do
+    context "when chaining multiple criteria" do
+
+      context "when the fields differ" do
 
         let(:selection) do
-          query.and({ first: [ 1, 2 ] }, { second: [ 3, 4 ] })
+          query.
+            elem_match(users: { name: "value" }).
+            elem_match(comments: { text: "value" })
         end
 
-        it "adds the $and selector" do
+        it "adds the $elemMatch expression" do
           expect(selection.selector).to eq({
-            "$and" => [
-              { "first" => [ 1, 2 ] },
-              { "second" => [ 3, 4 ] }
-            ]
+            "users" => { "$elemMatch" => { name: "value" }},
+            "comments" => { "$elemMatch" => { text: "value" }}
           })
         end
 
@@ -505,18 +595,17 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
       end
 
-      context "when the criterion are on the same field" do
+      context "when the fields are the same" do
 
         let(:selection) do
-          query.and({ first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+          query.
+            elem_match(users: { name: "value" }).
+            elem_match(users: { state: "new" })
         end
 
-        it "appends both $and expressions" do
+        it "overrides the $elemMatch expression" do
           expect(selection.selector).to eq({
-            "$and" => [
-              { "first" => [ 1, 2 ] },
-              { "first" => [ 3, 4 ] }
-            ]
+            "users" => { "$elemMatch" => { state: "new" }}
           })
         end
 
@@ -525,21 +614,26 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
       end
     end
+  end
 
-    context "when chaining the criterion" do
+  describe "#exists" do
 
-      context "when the criterion are for different fields" do
+    let(:query_method) { :exists }
+
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
+
+    context "when provided a criterion" do
+
+      context "when provided a boolean" do
 
         let(:selection) do
-          query.and(first: [ 1, 2 ]).and(second: [ 3, 4 ])
+          query.exists(users: true)
         end
 
-        it "adds the $and selectors" do
+        it "adds the $exists expression" do
           expect(selection.selector).to eq({
-            "$and" => [
-              { "first" => [ 1, 2 ] },
-              { "second" => [ 3, 4 ] }
-            ]
+            "users" => { "$exists" => true }
           })
         end
 
@@ -548,18 +642,15 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
       end
 
-      context "when the criterion are on the same field" do
+      context "when provided a string" do
 
         let(:selection) do
-          query.and(first: [ 1, 2 ]).and(first: [ 3, 4 ])
+          query.exists(users: "yes")
         end
 
-        it "appends both $and expressions" do
+        it "adds the $exists expression" do
           expect(selection.selector).to eq({
-            "$and" => [
-              { "first" => [ 1, 2 ] },
-              { "first" => [ 3, 4 ] }
-            ]
+            "users" => { "$exists" => true }
           })
         end
 
@@ -568,1666 +659,218 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
       end
     end
-  end
 
-  describe "#between" do
+    context "when providing multiple criteria" do
 
-    context "when provided no criterion" do
+      context "when the fields differ" do
 
-      let(:selection) do
-        query.between
-      end
+        context "when providing boolean values" do
 
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
+          let(:selection) do
+            query.exists(
+              users: true,
+              comments: true
+            )
+          end
 
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
+          it "adds the $exists expression" do
+            expect(selection.selector).to eq({
+              "users" => { "$exists" => true },
+              "comments" => { "$exists" => true }
+            })
+          end
 
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
+          it "returns a cloned query" do
+            expect(selection).to_not equal(query)
+          end
+        end
+
+        context "when providing string values" do
+
+          let(:selection) do
+            query.exists(
+              users: "y",
+              comments: "true"
+            )
+          end
+
+          it "adds the $exists expression" do
+            expect(selection.selector).to eq({
+              "users" => { "$exists" => true },
+              "comments" => { "$exists" => true }
+            })
+          end
+
+          it "returns a cloned query" do
+            expect(selection).to_not equal(query)
+          end
+        end
       end
     end
 
-    context "when provided nil" do
+    context "when chaining multiple criteria" do
 
-      let(:selection) do
-        query.between(nil)
-      end
+      context "when the fields differ" do
 
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
+        let(:selection) do
+          query.
+            exists(users: true).
+            exists(comments: true)
+        end
 
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
+        it "adds the $exists expression" do
+          expect(selection.selector).to eq({
+            "users" => { "$exists" => true },
+            "comments" => { "$exists" => true }
+          })
+        end
 
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
       end
     end
+  end
 
-    context "when provided a single range" do
+  describe "#geo_spacial" do
 
-      let(:selection) do
-        query.between(field: 1..10)
-      end
+    let(:query_method) { :geo_spacial }
 
-      it "adds the $gte and $lte selectors" do
-        expect(selection.selector).to eq({
-          "field" => { "$gte" => 1, "$lte" => 10 }
-        })
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided multiple ranges" do
-
-      context "when the ranges are on different fields" do
-
-        let(:selection) do
-          query.between(field: 1..10, key: 5..7)
-        end
-
-        it "adds the $gte and $lte selectors" do
-          expect(selection.selector).to eq({
-            "field" => { "$gte" => 1, "$lte" => 10 },
-            "key" => { "$gte" => 5, "$lte" => 7 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-  end
-
-  describe "#elem_match" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.elem_match
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.elem_match(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided a criterion" do
-
-      context "when there are no nested complex keys" do
-
-        let(:selection) do
-          query.elem_match(users: { name: "value" })
-        end
-
-        it "adds the $elemMatch expression" do
-          expect(selection.selector).to eq({
-            "users" => { "$elemMatch" => { name: "value" }}
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when there are nested complex keys" do
-
-        let(:time) do
-          Time.now
-        end
-
-        let(:selection) do
-          query.elem_match(users: { :time.gt => time })
-        end
-
-        it "adds the $elemMatch expression" do
-          expect(selection.selector).to eq({
-            "users" => { "$elemMatch" => { "time" => { "$gt" => time }}}
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-
-    context "when providing multiple criteria" do
-
-      context "when the fields differ" do
-
-        let(:selection) do
-          query.elem_match(
-            users: { name: "value" },
-            comments: { text: "value" }
-          )
-        end
-
-        it "adds the $elemMatch expression" do
-          expect(selection.selector).to eq({
-            "users" => { "$elemMatch" => { name: "value" }},
-            "comments" => { "$elemMatch" => { text: "value" }}
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-
-    context "when chaining multiple criteria" do
-
-      context "when the fields differ" do
-
-        let(:selection) do
-          query.
-            elem_match(users: { name: "value" }).
-            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" }}
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when the fields are the same" do
-
-        let(:selection) do
-          query.
-            elem_match(users: { name: "value" }).
-            elem_match(users: { state: "new" })
-        end
-
-        it "overrides the $elemMatch expression" do
-          expect(selection.selector).to eq({
-            "users" => { "$elemMatch" => { state: "new" }}
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-  end
-
-  describe "#exists" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.exists
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.exists(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided a criterion" do
-
-      context "when provided a boolean" do
-
-        let(:selection) do
-          query.exists(users: true)
-        end
-
-        it "adds the $exists expression" do
-          expect(selection.selector).to eq({
-            "users" => { "$exists" => true }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when provided a string" do
-
-        let(:selection) do
-          query.exists(users: "yes")
-        end
-
-        it "adds the $exists expression" do
-          expect(selection.selector).to eq({
-            "users" => { "$exists" => true }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-
-    context "when providing multiple criteria" do
-
-      context "when the fields differ" do
-
-        context "when providing boolean values" do
-
-          let(:selection) do
-            query.exists(
-              users: true,
-              comments: true
-            )
-          end
-
-          it "adds the $exists expression" do
-            expect(selection.selector).to eq({
-              "users" => { "$exists" => true },
-              "comments" => { "$exists" => true }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-
-        context "when providing string values" do
-
-          let(:selection) do
-            query.exists(
-              users: "y",
-              comments: "true"
-            )
-          end
-
-          it "adds the $exists expression" do
-            expect(selection.selector).to eq({
-              "users" => { "$exists" => true },
-              "comments" => { "$exists" => true }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-      end
-    end
-
-    context "when chaining multiple criteria" do
-
-      context "when the fields differ" do
-
-        let(:selection) do
-          query.
-            exists(users: true).
-            exists(comments: true)
-        end
-
-        it "adds the $exists expression" do
-          expect(selection.selector).to eq({
-            "users" => { "$exists" => true },
-            "comments" => { "$exists" => true }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-  end
-
-  describe "#geo_spacial" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.geo_spacial
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to be_empty
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it_behaves_like "a cloning selection"
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.geo_spacial(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to be_empty
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it_behaves_like "a cloning selection"
-    end
-
-    context "when provided a criterion" do
-
-      context "when the geometry is a point intersection" do
-
-        let(:selection) do
-          query.geo_spacial(: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 ]
-                }
-              }
-            }
-          })
-        end
-
-        it_behaves_like "a cloning selection"
-      end
-
-      context "when the geometry is a line intersection" do
-
-        let(:selection) do
-          query.geo_spacial(: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 ]]
-                }
-              }
-            }
-          })
-        end
-
-        it_behaves_like "a cloning selection"
-      end
-
-      context "when the geometry is a polygon intersection" do
-
-        let(:selection) do
-          query.geo_spacial(
-            :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
-
-        it_behaves_like "a cloning selection"
-      end
-
-      context "when the geometry is within a polygon" do
-
-        let(:selection) do
-          query.geo_spacial(
-            :location.within_polygon => [[[ 1, 10 ], [ 2, 10 ], [ 1, 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 ]]]
-                }
-              }
-            }
-          })
-        end
-
-        context "when used with the $box operator ($geoWithin query) " do
-          let(:selection) do
-            query.geo_spacial(
-              :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 "a cloning selection"
-      end
-    end
-  end
-
-  describe "#gt" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.gt
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.gt(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided a single criterion" do
-
-      let(:selection) do
-        query.gt(field: 10)
-      end
-
-      it "adds the $gt selector" do
-        expect(selection.selector).to eq({
-          "field" => { "$gt" => 10 }
-        })
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided multiple criterion" do
-
-      context "when the criterion are for different fields" do
-
-        let(:selection) do
-          query.gt(first: 10, second: 15)
-        end
-
-        it "adds the $gt selectors" do
-          expect(selection.selector).to eq({
-            "first" => { "$gt" => 10 },
-            "second" => { "$gt" => 15 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-
-    context "when chaining the criterion" do
-
-      context "when the criterion are for different fields" do
-
-        let(:selection) do
-          query.gt(first: 10).gt(second: 15)
-        end
-
-        it "adds the $gt selectors" do
-          expect(selection.selector).to eq({
-            "first" => { "$gt" => 10 },
-            "second" => { "$gt" => 15 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when the criterion are on the same field" do
-
-        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
-    end
-  end
-
-  describe "#gte" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.gte
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.gte(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided a single criterion" do
-
-      let(:selection) do
-        query.gte(field: 10)
-      end
-
-      it "adds the $gte selector" do
-        expect(selection.selector).to eq({
-          "field" => { "$gte" => 10 }
-        })
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided multiple criterion" do
-
-      context "when the criterion are for different fields" do
-
-        let(:selection) do
-          query.gte(first: 10, second: 15)
-        end
-
-        it "adds the $gte selectors" do
-          expect(selection.selector).to eq({
-            "first" => { "$gte" => 10 },
-            "second" => { "$gte" => 15 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-
-    context "when chaining the criterion" do
-
-      context "when the criterion are for different fields" do
-
-        let(:selection) do
-          query.gte(first: 10).gte(second: 15)
-        end
-
-        it "adds the $gte selectors" do
-          expect(selection.selector).to eq({
-            "first" => { "$gte" => 10 },
-            "second" => { "$gte" => 15 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when the criterion are on the same field" do
-
-        let(:selection) do
-          query.gte(first: 10).gte(first: 15)
-        end
-
-        it "overwrites the first $gte selector" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$gte" => 15 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-  end
-
-  describe "#in" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.in
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.in(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided a single criterion" do
-
-      context "when providing an array" do
-
-        let(:selection) do
-          query.in(field: [ 1, 2 ])
-        end
-
-        it "adds the $in selector" do
-          expect(selection.selector).to eq({
-            "field" =>  { "$in" => [ 1, 2 ] }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when providing a range" do
-
-        let(:selection) do
-          query.in(field: 1..3)
-        end
-
-        it "adds the $in selector with converted range" do
-          expect(selection.selector).to eq({
-            "field" =>  { "$in" => [ 1, 2, 3 ] }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when providing a single value" do
-
-        let(:selection) do
-          query.in(field: 1)
-        end
-
-        it "adds the $in selector with wrapped value" do
-          expect(selection.selector).to eq({
-            "field" =>  { "$in" => [ 1 ] }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-
-    context "when provided multiple criterion" do
-
-      context "when the criterion are for different fields" do
-
-        let(:selection) do
-          query.in(first: [ 1, 2 ], second: 3..4)
-        end
-
-        it "adds the $in selectors" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$in" => [ 1, 2 ] },
-            "second" =>  { "$in" => [ 3, 4 ] }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-
-    context "when chaining the criterion" do
-
-      context "when the criterion are for different fields" do
-
-        let(:selection) do
-          query.in(first: [ 1, 2 ]).in(second: [ 3, 4 ])
-        end
-
-        it "adds the $in selectors" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$in" => [ 1, 2 ] },
-            "second" =>  { "$in" => [ 3, 4 ] }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when the criterion are on the same field" do
-
-        context "when the strategy is the default (intersection)" do
-
-          let(:selection) do
-            query.in(first: [ 1, 2 ].freeze).in(first: [ 2, 3 ])
-          end
-
-          it "intersects the $in selectors" do
-            expect(selection.selector).to eq({
-              "first" =>  { "$in" => [ 2 ] }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-
-        context 'when the field is aliased' do
-
-          before(:all) do
-            class TestModel
-              include Mongoid::Document
-            end
-          end
-
-          after(:all) do
-            Object.send(:remove_const, :TestModel)
-          end
-
-          let(:bson_object_id) do
-            BSON::ObjectId.new
-          end
-
-          let(:selection) do
-            TestModel.in(id: [bson_object_id.to_s]).in(id: [bson_object_id.to_s])
-          end
-
-          it "intersects the $in selectors" do
-            expect(selection.selector).to eq("_id" =>  { "$in" => [ bson_object_id ] })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-
-        context "when the stretegy is intersect" do
-
-          let(:selection) do
-            query.in(first: [ 1, 2 ]).intersect.in(first: [ 2, 3 ])
-          end
-
-          it "intersects the $in selectors" do
-            expect(selection.selector).to eq({
-              "first" =>  { "$in" => [ 2 ] }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-
-        context "when the strategy is override" do
-
-          let(:selection) do
-            query.in(first: [ 1, 2 ]).override.in(first: [ 3, 4 ])
-          end
-
-          it "overwrites the first $in selector" do
-            expect(selection.selector).to eq({
-              "first" =>  { "$in" => [ 3, 4 ] }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-
-        context "when the strategy is union" do
-
-          let(:selection) do
-            query.in(first: [ 1, 2 ]).union.in(first: [ 3, 4 ])
-          end
-
-          it "unions the $in selectors" do
-            expect(selection.selector).to eq({
-              "first" =>  { "$in" => [ 1, 2, 3, 4 ] }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-      end
-    end
-  end
-
-  describe "#lt" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.lt
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.lt(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided a single criterion" do
-
-      let(:selection) do
-        query.lt(field: 10)
-      end
-
-      it "adds the $lt selector" do
-        expect(selection.selector).to eq({
-          "field" =>  { "$lt" => 10 }
-        })
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided multiple criterion" do
-
-      context "when the criterion are for different fields" do
-
-        let(:selection) do
-          query.lt(first: 10, second: 15)
-        end
-
-        it "adds the $lt selectors" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$lt" => 10 },
-            "second" =>  { "$lt" => 15 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-
-    context "when chaining the criterion" do
-
-      context "when the criterion are for different fields" do
-
-        let(:selection) do
-          query.lt(first: 10).lt(second: 15)
-        end
-
-        it "adds the $lt selectors" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$lt" => 10 },
-            "second" =>  { "$lt" => 15 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when the criterion are on the same field" do
-
-        let(:selection) do
-          query.lt(first: 10).lt(first: 15)
-        end
-
-        it "overwrites the first $lt selector" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$lt" => 15 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-  end
-
-  describe "#lte" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.lte
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.lte(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided a single criterion" do
-
-      let(:selection) do
-        query.lte(field: 10)
-      end
-
-      it "adds the $lte selector" do
-        expect(selection.selector).to eq({
-          "field" =>  { "$lte" => 10 }
-        })
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided multiple criterion" do
-
-      context "when the criterion are for different fields" do
-
-        let(:selection) do
-          query.lte(first: 10, second: 15)
-        end
-
-        it "adds the $lte selectors" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$lte" => 10 },
-            "second" =>  { "$lte" => 15 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-
-    context "when chaining the criterion" do
-
-      context "when the criterion are for different fields" do
-
-        let(:selection) do
-          query.lte(first: 10).lte(second: 15)
-        end
-
-        it "adds the $lte selectors" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$lte" => 10 },
-            "second" =>  { "$lte" => 15 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when the criterion are on the same field" do
-
-        let(:selection) do
-          query.lte(first: 10).lte(first: 15)
-        end
-
-        it "overwrites the first $lte selector" do
-          expect(selection.selector).to eq({
-            "first" =>  { "$lte" => 15 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-  end
-
-  describe "#max_distance" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.max_distance
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.max_distance(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided a criterion" do
-
-      context "when a $near criterion exists on the same field" do
-
-        let(:selection) do
-          query.near(location: [ 1, 1 ]).max_distance(location: 50)
-        end
-
-        it "adds the $maxDistance expression" do
-          expect(selection.selector).to eq({
-            "location" =>  { "$near" => [ 1, 1 ], "$maxDistance" => 50 }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-  end
-
-  describe "#mod" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.mod
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.mod(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided a criterion" do
-
-      let(:selection) do
-        query.mod(value: [ 10, 1 ])
-      end
-
-      it "adds the $mod expression" do
-        expect(selection.selector).to eq({
-          "value" =>  { "$mod" => [ 10, 1 ] }
-        })
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when providing multiple criteria" do
-
-      context "when the fields differ" do
-
-        let(:selection) do
-          query.mod(
-            value: [ 10, 1 ],
-            comments: [ 10, 1 ]
-          )
-        end
-
-        it "adds the $mod expression" do
-          expect(selection.selector).to eq({
-            "value" =>  { "$mod" => [ 10, 1 ] },
-            "comments" =>  { "$mod" => [ 10, 1 ] }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-
-    context "when chaining multiple criteria" do
-
-      context "when the fields differ" do
-
-        let(:selection) do
-          query.
-            mod(value: [ 10, 1 ]).
-            mod(result: [ 10, 1 ])
-        end
-
-        it "adds the $mod expression" do
-          expect(selection.selector).to eq({
-            "value" =>  { "$mod" => [ 10, 1 ] },
-            "result" =>  { "$mod" => [ 10, 1 ] }
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-  end
-
-  describe "#ne" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.ne
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.ne(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
     context "when provided a criterion" do
 
-      let(:selection) do
-        query.ne(value: 10)
-      end
-
-      it "adds the $ne expression" do
-        expect(selection.selector).to eq({
-          "value" =>  { "$ne" => 10 }
-        })
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when providing multiple criteria" do
-
-      context "when the fields differ" do
+      context "when the geometry is a point intersection" do
 
         let(:selection) do
-          query.ne(
-            value: 10,
-            comments: 10
-          )
+          query.geo_spacial(:location.intersects_point => [ 1, 10 ])
         end
 
-        it "adds the $ne expression" do
+        it "adds the $geoIntersects expression" do
           expect(selection.selector).to eq({
-            "value" =>  { "$ne" => 10 },
-            "comments" =>  { "$ne" => 10 }
+            "location" => {
+              "$geoIntersects" => {
+                "$geometry" => {
+                  "type" => "Point",
+                  "coordinates" => [ 1, 10 ]
+                }
+              }
+            }
           })
         end
 
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
+        it_behaves_like "returns a cloned query"
       end
-    end
 
-    context "when chaining multiple criteria" do
-
-      context "when the fields differ" do
+      context "when the geometry is a line intersection" do
 
         let(:selection) do
-          query.
-            ne(value: 10).
-            ne(result: 10)
+          query.geo_spacial(:location.intersects_line => [[ 1, 10 ], [ 2, 10 ]])
         end
 
-        it "adds the $ne expression" do
+        it "adds the $geoIntersects expression" do
           expect(selection.selector).to eq({
-            "value" =>  { "$ne" => 10 },
-            "result" =>  { "$ne" => 10 }
+            "location" => {
+              "$geoIntersects" => {
+                "$geometry" => {
+                  "type" => "LineString",
+                  "coordinates" => [[ 1, 10 ], [ 2, 10 ]]
+                }
+              }
+            }
           })
         end
 
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-  end
-
-  describe "#near" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.near
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.near(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided a criterion" do
-
-      let(:selection) do
-        query.near(location: [ 20, 21 ])
-      end
-
-      it "adds the $near expression" do
-        expect(selection.selector).to eq({
-          "location" =>  { "$near" => [ 20, 21 ] }
-        })
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
+        it_behaves_like "returns a cloned query"
       end
-    end
 
-    context "when providing multiple criteria" do
-
-      context "when the fields differ" do
+      context "when the geometry is a polygon intersection" do
 
         let(:selection) do
-          query.near(
-            location: [ 20, 21 ],
-            comments: [ 20, 21 ]
+          query.geo_spacial(
+            :location.intersects_polygon => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]]
           )
         end
 
-        it "adds the $near expression" do
+        it "adds the $geoIntersects expression" do
           expect(selection.selector).to eq({
-            "location" =>  { "$near" => [ 20, 21 ] },
-            "comments" =>  { "$near" => [ 20, 21 ] }
+            "location" => {
+              "$geoIntersects" => {
+                "$geometry" => {
+                  "type" => "Polygon",
+                  "coordinates" => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]]
+                }
+              }
+            }
           })
         end
 
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
+        it_behaves_like "returns a cloned query"
       end
-    end
-
-    context "when chaining multiple criteria" do
 
-      context "when the fields differ" do
+      context "when the geometry is within a polygon" do
 
         let(:selection) do
-          query.
-            near(location: [ 20, 21 ]).
-            near(comments: [ 20, 21 ])
+          query.geo_spacial(
+            :location.within_polygon => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]]
+          )
         end
 
-        it "adds the $near expression" do
+        it "adds the $geoIntersects expression" do
           expect(selection.selector).to eq({
-            "location" =>  { "$near" => [ 20, 21 ] },
-            "comments" =>  { "$near" => [ 20, 21 ] }
+            "location" => {
+              "$geoWithin" => {
+                "$geometry" => {
+                  "type" => "Polygon",
+                  "coordinates" => [[[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]]]
+                }
+              }
+            }
           })
         end
 
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-    end
-  end
-
-  describe "#near_sphere" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.near_sphere
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
+        context "when used with the $box operator ($geoWithin query) " do
+          let(:selection) do
+            query.geo_spacial(
+              :location.within_box => [[ 1, 10 ], [ 2, 10 ]]
+            )
+          end
 
-    context "when provided nil" do
+          it "adds the $geoIntersects expression" do
+            expect(selection.selector).to eq({
+              "location" => {
+                "$geoWithin" => {
+                  "$box" => [
+                    [ 1, 10 ], [ 2, 10 ]
+                  ]
+                }
+              }
+            })
+          end
+        end
 
-      let(:selection) do
-        query.near_sphere(nil)
+        it_behaves_like "returns a cloned query"
       end
+    end
+  end
 
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
+  describe "#gt" do
 
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
+    let(:query_method) { :gt }
 
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
-    context "when provided a criterion" do
+    context "when provided a single criterion" do
 
       let(:selection) do
-        query.near_sphere(location: [ 20, 21 ])
+        query.gt(field: 10)
       end
 
-      it "adds the $nearSphere expression" do
+      it "adds the $gt selector" do
         expect(selection.selector).to eq({
-          "location" =>  { "$nearSphere" => [ 20, 21 ] }
+          "field" => { "$gt" => 10 }
         })
       end
 
@@ -2236,21 +879,18 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
 
-    context "when providing multiple criteria" do
+    context "when provided multiple criterion" do
 
-      context "when the fields differ" do
+      context "when the criterion are for different fields" do
 
         let(:selection) do
-          query.near_sphere(
-            location: [ 20, 21 ],
-            comments: [ 20, 21 ]
-          )
+          query.gt(first: 10, second: 15)
         end
 
-        it "adds the $nearSphere expression" do
+        it "adds the $gt selectors" do
           expect(selection.selector).to eq({
-            "location" =>  { "$nearSphere" => [ 20, 21 ] },
-            "comments" =>  { "$nearSphere" => [ 20, 21 ] }
+            "first" => { "$gt" => 10 },
+            "second" => { "$gt" => 15 }
           })
         end
 
@@ -2260,20 +900,18 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
 
-    context "when chaining multiple criteria" do
+    context "when chaining the criterion" do
 
-      context "when the fields differ" do
+      context "when the criterion are for different fields" do
 
         let(:selection) do
-          query.
-            near_sphere(location: [ 20, 21 ]).
-            near_sphere(comments: [ 20, 21 ])
+          query.gt(first: 10).gt(second: 15)
         end
 
-        it "adds the $nearSphere expression" do
+        it "adds the $gt selectors" do
           expect(selection.selector).to eq({
-            "location" =>  { "$nearSphere" => [ 20, 21 ] },
-            "comments" =>  { "$nearSphere" => [ 20, 21 ] }
+            "first" => { "$gt" => 10 },
+            "second" => { "$gt" => 15 }
           })
         end
 
@@ -2281,42 +919,43 @@ describe Mongoid::Criteria::Queryable::Selectable do
           expect(selection).to_not equal(query)
         end
       end
-    end
-  end
 
-  describe "#nin" do
+      context "when the criterion are on the same field" do
 
-    context "when provided no criterion" do
+        let(:selection) do
+          query.gt(first: 10).gt(first: 15)
+        end
 
-      let(:selection) do
-        query.nin
-      end
+        it "overwrites the first $gt selector" do
+          expect(selection.selector).to eq({
+            "first" => { "$gt" => 15 }
+          })
+        end
 
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
       end
+    end
+  end
 
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
+  describe "#gte" do
 
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
+    let(:query_method) { :gte }
 
-    context "when provided nil" do
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
-      let(:selection) do
-        query.nin(nil)
-      end
+    context "when provided a single criterion" do
 
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
+      let(:selection) do
+        query.gte(field: 10)
       end
 
-      it "returns the query" do
-        expect(selection).to eq(query)
+      it "adds the $gte selector" do
+        expect(selection.selector).to eq({
+          "field" => { "$gte" => 10 }
+        })
       end
 
       it "returns a cloned query" do
@@ -2324,17 +963,18 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
 
-    context "when provided a single criterion" do
+    context "when provided multiple criterion" do
 
-      context "when providing an array" do
+      context "when the criterion are for different fields" do
 
         let(:selection) do
-          query.nin(field: [ 1, 2 ])
+          query.gte(first: 10, second: 15)
         end
 
-        it "adds the $nin selector" do
+        it "adds the $gte selectors" do
           expect(selection.selector).to eq({
-            "field" =>  { "$nin" => [ 1, 2 ] }
+            "first" => { "$gte" => 10 },
+            "second" => { "$gte" => 15 }
           })
         end
 
@@ -2342,16 +982,20 @@ describe Mongoid::Criteria::Queryable::Selectable do
           expect(selection).to_not equal(query)
         end
       end
+    end
+
+    context "when chaining the criterion" do
 
-      context "when providing a range" do
+      context "when the criterion are for different fields" do
 
         let(:selection) do
-          query.nin(field: 1..3)
+          query.gte(first: 10).gte(second: 15)
         end
 
-        it "adds the $nin selector with converted range" do
+        it "adds the $gte selectors" do
           expect(selection.selector).to eq({
-            "field" =>  { "$nin" => [ 1, 2, 3 ] }
+            "first" => { "$gte" => 10 },
+            "second" => { "$gte" => 15 }
           })
         end
 
@@ -2360,15 +1004,15 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
       end
 
-      context "when providing a single value" do
+      context "when the criterion are on the same field" do
 
         let(:selection) do
-          query.nin(field: 1)
+          query.gte(first: 10).gte(first: 15)
         end
 
-        it "adds the $nin selector with wrapped value" do
+        it "overwrites the first $gte selector" do
           expect(selection.selector).to eq({
-            "field" =>  { "$nin" => [ 1 ] }
+            "first" =>  { "$gte" => 15 }
           })
         end
 
@@ -2377,48 +1021,44 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
       end
     end
+  end
 
-    context "when unioning on the same field" do
+  describe "#in" do
 
-      context "when the field is not aliased" do
+    let(:query_method) { :in }
+    let(:operator) { '$in' }
 
-        let(:selection) do
-          query.nin(first: [ 1, 2 ]).union.nin(first: [ 3, 4 ])
-        end
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
-        it "unions the selection on the field" do
-          expect(selection.selector).to eq(
-            { "first" => { "$nin" => [ 1, 2, 3, 4 ]}}
-          )
-        end
-      end
+    context "when provided a single criterion" do
 
-      context "when the field is aliased" do
+      context "when providing an array" do
 
         let(:selection) do
-          query.nin(id: [ 1, 2 ]).union.nin(id: [ 3, 4 ])
+          query.in(field: [ 1, 2 ])
         end
 
-        it "unions the selection on the field" do
-          expect(selection.selector).to eq(
-            { "_id" => { "$nin" => [ 1, 2, 3, 4 ]}}
-          )
+        it "adds the $in selector" do
+          expect(selection.selector).to eq({
+            "field" =>  { "$in" => [ 1, 2 ] }
+          })
         end
-      end
-    end
 
-    context "when provided multiple criterion" do
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
+      end
 
-      context "when the criterion are for different fields" do
+      context "when providing a single value" do
 
         let(:selection) do
-          query.nin(first: [ 1, 2 ], second: [ 3, 4 ])
+          query.in(field: 1)
         end
 
-        it "adds the $nin selectors" do
+        it "adds the $in selector with wrapped value" do
           expect(selection.selector).to eq({
-            "first" =>  { "$nin" => [ 1, 2 ] },
-            "second" =>  { "$nin" => [ 3, 4 ] }
+            "field" =>  { "$in" => [ 1 ] }
           })
         end
 
@@ -2428,148 +1068,70 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
 
-    context "when chaninning the criterion" do
+    context "when provided multiple criterion" do
 
       context "when the criterion are for different fields" do
 
         let(:selection) do
-          query.nin(first: [ 1, 2 ]).nin(second: [ 3, 4 ])
+          query.in(first: [ 1, 2 ], second: 3..4)
         end
 
-        it "adds the $nin selectors" do
+        it "adds the $in selectors" do
           expect(selection.selector).to eq({
-            "first" => { "$nin" => [ 1, 2 ] },
-            "second" => { "$nin" => [ 3, 4 ] }
+            "first" =>  { "$in" => [ 1, 2 ] },
+            "second" =>  { "$in" => [ 3, 4 ] }
           })
         end
 
         it "returns a cloned query" do
           expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when the criterion are on the same field" do
-
-        context "when the stretegy is the default (intersection)" do
-
-          let(:selection) do
-            query.nin(first: [ 1, 2 ]).nin(first: [ 2, 3 ])
-          end
-
-          it "intersects the $nin selectors" do
-            expect(selection.selector).to eq({
-              "first" => { "$nin" => [ 2 ] }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-
-        context "when the stretegy is intersect" do
-
-          let(:selection) do
-            query.nin(first: [ 1, 2 ]).intersect.nin(first: [ 2, 3 ])
-          end
-
-          it "intersects the $nin selectors" do
-            expect(selection.selector).to eq({
-              "first" => { "$nin" => [ 2 ] }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-
-        context "when the stretegy is override" do
-
-          let(:selection) do
-            query.nin(first: [ 1, 2 ]).override.nin(first: [ 3, 4 ])
-          end
-
-          it "overwrites the first $nin selector" do
-            expect(selection.selector).to eq({
-              "first" => { "$nin" => [ 3, 4 ] }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-
-        context "when the stretegy is union" do
-
-          let(:selection) do
-            query.nin(first: [ 1, 2 ]).union.nin(first: [ 3, 4 ])
-          end
-
-          it "unions the $nin selectors" do
-            expect(selection.selector).to eq({
-              "first" => { "$nin" => [ 1, 2, 3, 4 ] }
-            })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-      end
-    end
-  end
-
-  describe "#nor" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.nor
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
+        end
       end
     end
 
-    context "when provided nil" do
+    context "when chaining the criterion" do
 
-      let(:selection) do
-        query.nor(nil)
-      end
+      context "when the criterion are for different fields" do
 
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
+        let(:selection) do
+          query.in(first: [ 1, 2 ]).in(second: [ 3, 4 ])
+        end
 
-      it "returns the query" do
-        expect(selection).to eq(query)
+        it "adds the $in selectors" do
+          expect(selection.selector).to eq({
+            "first" =>  { "$in" => [ 1, 2 ] },
+            "second" =>  { "$in" => [ 3, 4 ] }
+          })
+        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 the criterion are on the same field" do
+
+        it_behaves_like 'supports merge strategies'
       end
     end
+  end
+
+  describe "#lt" do
+
+    let(:query_method) { :lt }
+
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
     context "when provided a single criterion" do
 
       let(:selection) do
-        query.nor(field: [ 1, 2 ])
+        query.lt(field: 10)
       end
 
-      it "adds the $nor selector" do
+      it "adds the $lt selector" do
         expect(selection.selector).to eq({
-          "$nor" => [{"field" => [ 1, 2 ] }]
+          "field" =>  { "$lt" => 10 }
         })
       end
 
@@ -2580,38 +1142,16 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
     context "when provided multiple criterion" do
 
-      context "when the criterion are fnor different fields" do
-
-        let(:selection) do
-          query.nor({ first: [ 1, 2 ] }, { second: [ 3, 4 ] })
-        end
-
-        it "adds the $nor selector" do
-          expect(selection.selector).to eq({
-            "$nor" => [
-              { "first" => [ 1, 2 ] },
-              { "second" => [ 3, 4 ] }
-            ]
-          })
-        end
-
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
-
-      context "when the criterion are on the same field" do
+      context "when the criterion are for different fields" do
 
         let(:selection) do
-          query.nor({ first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+          query.lt(first: 10, second: 15)
         end
 
-        it "appends both $nor expressions" do
+        it "adds the $lt selectors" do
           expect(selection.selector).to eq({
-            "$nor" => [
-              { "first" => [ 1, 2 ] },
-              { "first" => [ 3, 4 ] }
-            ]
+            "first" =>  { "$lt" => 10 },
+            "second" =>  { "$lt" => 15 }
           })
         end
 
@@ -2623,18 +1163,16 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
     context "when chaining the criterion" do
 
-      context "when the criterion are fnor different fields" do
+      context "when the criterion are for different fields" do
 
         let(:selection) do
-          query.nor(first: [ 1, 2 ]).nor(second: [ 3, 4 ])
+          query.lt(first: 10).lt(second: 15)
         end
 
-        it "adds the $nor selectors" do
+        it "adds the $lt selectors" do
           expect(selection.selector).to eq({
-            "$nor" => [
-              { "first" => [ 1, 2 ] },
-              { "second" => [ 3, 4 ] }
-            ]
+            "first" =>  { "$lt" => 10 },
+            "second" =>  { "$lt" => 15 }
           })
         end
 
@@ -2646,15 +1184,12 @@ describe Mongoid::Criteria::Queryable::Selectable do
       context "when the criterion are on the same field" do
 
         let(:selection) do
-          query.nor(first: [ 1, 2 ]).nor(first: [ 3, 4 ])
+          query.lt(first: 10).lt(first: 15)
         end
 
-        it "appends both $nor expressions" do
+        it "overwrites the first $lt selector" do
           expect(selection.selector).to eq({
-            "$nor" => [
-              { "first" => [ 1, 2 ] },
-              { "first" => [ 3, 4 ] }
-            ]
+            "first" =>  { "$lt" => 15 }
           })
         end
 
@@ -2665,124 +1200,135 @@ describe Mongoid::Criteria::Queryable::Selectable do
     end
   end
 
-  describe "#not" do
+  describe "#lte" do
+
+    let(:query_method) { :lte }
 
-    context "when provided no criterion" do
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
+
+    context "when provided a single criterion" do
 
       let(:selection) do
-        query.not
+        query.lte(field: 10)
       end
 
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
+      it "adds the $lte selector" do
+        expect(selection.selector).to eq({
+          "field" =>  { "$lte" => 10 }
+        })
       end
 
-      it "returns the query" do
-        expect(selection).to eq(query)
+      it "returns a cloned query" do
+        expect(selection).to_not equal(query)
       end
+    end
 
-      it "returns a non cloned query" do
-        expect(selection).to equal(query)
-      end
+    context "when provided multiple criterion" do
 
-      context "when the following criteria is a query method" do
+      context "when the criterion are for different fields" do
 
         let(:selection) do
-          query.not.all(field: [ 1, 2 ])
+          query.lte(first: 10, second: 15)
         end
 
-        it "negates the all selection" do
-          expect(selection.selector).to eq(
-            { "field" => { "$not" => { "$all" => [ 1, 2 ] }}}
-          )
+        it "adds the $lte selectors" do
+          expect(selection.selector).to eq({
+            "first" =>  { "$lte" => 10 },
+            "second" =>  { "$lte" => 15 }
+          })
         end
 
         it "returns a cloned query" do
           expect(selection).to_not equal(query)
         end
-
-        it "removes the negation on the clone" do
-          expect(selection).to_not be_negating
-        end
       end
+    end
 
-      context "when the following criteria is a gt method" do
+    context "when chaining the criterion" do
 
-        let(:selection) do
-          query.not.gt(age: 50)
-        end
+      context "when the criterion are for different fields" do
 
-        it "negates the gt selection" do
-          expect(selection.selector).to eq(
-            { "age" => { "$not" => { "$gt" => 50 }}}
-          )
+        let(:selection) do
+          query.lte(first: 10).lte(second: 15)
         end
 
-        it "returns a coned query" do
-          expect(selection).to_not eq(query)
+        it "adds the $lte selectors" do
+          expect(selection.selector).to eq({
+            "first" =>  { "$lte" => 10 },
+            "second" =>  { "$lte" => 15 }
+          })
         end
 
-        it "removes the negation on the clone" do
-          expect(selection).to_not be_negating
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
         end
       end
 
-      context "when the following criteria is a where" do
+      context "when the criterion are on the same field" do
 
         let(:selection) do
-          query.not.where(field: 1, :other.in => [ 1, 2 ])
+          query.lte(first: 10).lte(first: 15)
         end
 
-        it "negates the selection with an operator" do
-          expect(selection.selector).to eq(
-            { "field" => { "$ne" => 1 }, "other" => { "$not" => { "$in" => [ 1, 2 ] }}}
-          )
+        it "overwrites the first $lte selector" do
+          expect(selection.selector).to eq({
+            "first" =>  { "$lte" => 15 }
+          })
         end
 
         it "returns a cloned query" do
           expect(selection).to_not equal(query)
         end
-
-        it "removes the negation on the clone" do
-          expect(selection).to_not be_negating
-        end
       end
+    end
+  end
+
+  describe "#max_distance" do
+
+    let(:query_method) { :max_distance }
+
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
+
+    context "when provided a criterion" do
 
-      context "when the following criteria is a where with a regexp" do
+      context "when a $near criterion exists on the same field" do
 
         let(:selection) do
-          query.not.where(field: 1, other: /test/)
+          query.near(location: [ 1, 1 ]).max_distance(location: 50)
         end
 
-        it "negates the selection with an operator" do
-          expect(selection.selector).to eq(
-            { "field" => { "$ne" => 1 }, "other" => { "$not" => /test/ } }
-          )
+        it "adds the $maxDistance expression" do
+          expect(selection.selector).to eq({
+            "location" =>  { "$near" => [ 1, 1 ], "$maxDistance" => 50 }
+          })
         end
 
         it "returns a cloned query" do
           expect(selection).to_not equal(query)
         end
-
-        it "removes the negation on the clone" do
-          expect(selection).to_not be_negating
-        end
-
       end
     end
+  end
 
-    context "when provided nil" do
+  describe "#mod" do
 
-      let(:selection) do
-        query.not(nil)
-      end
+    let(:query_method) { :mod }
 
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
+
+    context "when provided a criterion" do
+
+      let(:selection) do
+        query.mod(value: [ 10, 1 ])
       end
 
-      it "returns the query" do
-        expect(selection).to eq(query)
+      it "adds the $mod expression" do
+        expect(selection.selector).to eq({
+          "value" =>  { "$mod" => [ 10, 1 ] }
+        })
       end
 
       it "returns a cloned query" do
@@ -2790,15 +1336,70 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
 
-    context "when provided a single criterion" do
+    context "when providing multiple criteria" do
+
+      context "when the fields differ" do
+
+        let(:selection) do
+          query.mod(
+            value: [ 10, 1 ],
+            comments: [ 10, 1 ]
+          )
+        end
+
+        it "adds the $mod expression" do
+          expect(selection.selector).to eq({
+            "value" =>  { "$mod" => [ 10, 1 ] },
+            "comments" =>  { "$mod" => [ 10, 1 ] }
+          })
+        end
+
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
+      end
+    end
+
+    context "when chaining multiple criteria" do
+
+      context "when the fields differ" do
+
+        let(:selection) do
+          query.
+            mod(value: [ 10, 1 ]).
+            mod(result: [ 10, 1 ])
+        end
+
+        it "adds the $mod expression" do
+          expect(selection.selector).to eq({
+            "value" =>  { "$mod" => [ 10, 1 ] },
+            "result" =>  { "$mod" => [ 10, 1 ] }
+          })
+        end
+
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
+      end
+    end
+  end
+
+  describe "#ne" do
+
+    let(:query_method) { :ne }
+
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
+
+    context "when provided a criterion" do
 
       let(:selection) do
-        query.not(field: /test/)
+        query.ne(value: 10)
       end
 
-      it "adds the $not selector" do
+      it "adds the $ne expression" do
         expect(selection.selector).to eq({
-          "field" => { "$not" => /test/ }
+          "value" =>  { "$ne" => 10 }
         })
       end
 
@@ -2807,18 +1408,21 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
 
-    context "when provided multiple criterion" do
+    context "when providing multiple criteria" do
 
-      context "when the criterion are for different fields" do
+      context "when the fields differ" do
 
         let(:selection) do
-          query.not(first: /1/, second: /2/)
+          query.ne(
+            value: 10,
+            comments: 10
+          )
         end
 
-        it "adds the $not selectors" do
+        it "adds the $ne expression" do
           expect(selection.selector).to eq({
-            "first" => { "$not" => /1/ },
-            "second" => { "$not" => /2/ }
+            "value" =>  { "$ne" => 10 },
+            "comments" =>  { "$ne" => 10 }
           })
         end
 
@@ -2828,18 +1432,20 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
 
-    context "when chaining the criterion" do
+    context "when chaining multiple criteria" do
 
-      context "when the criterion are for different fields" do
+      context "when the fields differ" do
 
         let(:selection) do
-          query.not(first: /1/).not(second: /2/)
+          query.
+            ne(value: 10).
+            ne(result: 10)
         end
 
-        it "adds the $not selectors" do
+        it "adds the $ne expression" do
           expect(selection.selector).to eq({
-            "first" => { "$not" => /1/ },
-            "second" => { "$not" => /2/ }
+            "value" =>  { "$ne" => 10 },
+            "result" =>  { "$ne" => 10 }
           })
         end
 
@@ -2847,16 +1453,48 @@ describe Mongoid::Criteria::Queryable::Selectable do
           expect(selection).to_not equal(query)
         end
       end
+    end
+  end
+
+  describe "#near" do
+
+    let(:query_method) { :near }
+
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
+
+    context "when provided a criterion" do
+
+      let(:selection) do
+        query.near(location: [ 20, 21 ])
+      end
+
+      it "adds the $near expression" do
+        expect(selection.selector).to eq({
+          "location" =>  { "$near" => [ 20, 21 ] }
+        })
+      end
+
+      it "returns a cloned query" do
+        expect(selection).to_not equal(query)
+      end
+    end
 
-      context "when the criterion are on the same field" do
+    context "when providing multiple criteria" do
+
+      context "when the fields differ" do
 
         let(:selection) do
-          query.not(first: /1/).not(first: /2/)
+          query.near(
+            location: [ 20, 21 ],
+            comments: [ 20, 21 ]
+          )
         end
 
-        it "overwrites the first $not selector" do
+        it "adds the $near expression" do
           expect(selection.selector).to eq({
-            "first" =>  { "$not" => /2/ }
+            "location" =>  { "$near" => [ 20, 21 ] },
+            "comments" =>  { "$near" => [ 20, 21 ] }
           })
         end
 
@@ -2864,16 +1502,22 @@ describe Mongoid::Criteria::Queryable::Selectable do
           expect(selection).to_not equal(query)
         end
       end
+    end
+
+    context "when chaining multiple criteria" do
 
-      context "when the criterion are a double negative" do
+      context "when the fields differ" do
 
         let(:selection) do
-          query.not.where(:first.not => /1/)
+          query.
+            near(location: [ 20, 21 ]).
+            near(comments: [ 20, 21 ])
         end
 
-        it "does not double the $not selector" do
+        it "adds the $near expression" do
           expect(selection.selector).to eq({
-            "first" =>  { "$not" => /1/ }
+            "location" =>  { "$near" => [ 20, 21 ] },
+            "comments" =>  { "$near" => [ 20, 21 ] }
           })
         end
 
@@ -2884,55 +1528,22 @@ describe Mongoid::Criteria::Queryable::Selectable do
     end
   end
 
-  describe "#or" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.or
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.or(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
+  describe "#near_sphere" do
 
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
+    let(:query_method) { :near_sphere }
 
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
-    context "when provided a single criterion" do
+    context "when provided a criterion" do
 
       let(:selection) do
-        query.or(field: [ 1, 2 ])
+        query.near_sphere(location: [ 20, 21 ])
       end
 
-      it "adds the $or selector" do
+      it "adds the $nearSphere expression" do
         expect(selection.selector).to eq({
-          "$or" => [{ "field" => [ 1, 2 ] }]
+          "location" =>  { "$nearSphere" => [ 20, 21 ] }
         })
       end
 
@@ -2941,20 +1552,21 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
 
-    context "when provided multiple criterion" do
+    context "when providing multiple criteria" do
 
-      context "when the criterion are for different fields" do
+      context "when the fields differ" do
 
         let(:selection) do
-          query.or({ first: [ 1, 2 ] }, { second: [ 3, 4 ] })
+          query.near_sphere(
+            location: [ 20, 21 ],
+            comments: [ 20, 21 ]
+          )
         end
 
-        it "adds the $or selector" do
+        it "adds the $nearSphere expression" do
           expect(selection.selector).to eq({
-            "$or" => [
-              { "first" => [ 1, 2 ] },
-              { "second" => [ 3, 4 ] }
-            ]
+            "location" =>  { "$nearSphere" => [ 20, 21 ] },
+            "comments" =>  { "$nearSphere" => [ 20, 21 ] }
           })
         end
 
@@ -2962,19 +1574,22 @@ describe Mongoid::Criteria::Queryable::Selectable do
           expect(selection).to_not equal(query)
         end
       end
+    end
+
+    context "when chaining multiple criteria" do
 
-      context "when a criterion has a selectable key" do
+      context "when the fields differ" do
 
         let(:selection) do
-          query.or({ first: [ 1, 2 ] }, { :second.gt => 3 })
+          query.
+            near_sphere(location: [ 20, 21 ]).
+            near_sphere(comments: [ 20, 21 ])
         end
 
-        it "adds the $or selector" do
+        it "adds the $nearSphere expression" do
           expect(selection.selector).to eq({
-            "$or" => [
-              { "first" => [ 1, 2 ] },
-              { "second" => { "$gt" => 3 }}
-            ]
+            "location" =>  { "$nearSphere" => [ 20, 21 ] },
+            "comments" =>  { "$nearSphere" => [ 20, 21 ] }
           })
         end
 
@@ -2982,36 +1597,28 @@ describe Mongoid::Criteria::Queryable::Selectable do
           expect(selection).to_not equal(query)
         end
       end
+    end
+  end
 
-      context "when the criterion has an aliased field" do
+  describe "#nin" do
 
-        let(:selection) do
-          query.or({ id: 1 })
-        end
+    let(:query_method) { :nin }
+    let(:operator) { '$nin' }
 
-        it "adds the $or selector and aliases the field" do
-          expect(selection.selector).to eq({
-            "$or" => [ { "_id" => 1 } ]
-          })
-        end
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
-        it "returns a cloned query" do
-          expect(selection).to_not equal(query)
-        end
-      end
+    context "when provided a single criterion" do
 
-      context "when a criterion is wrapped in an array" do
+      context "when providing an array" do
 
         let(:selection) do
-          query.or([{ first: [ 1, 2 ] }, { :second.gt => 3 }])
+          query.nin(field: [ 1, 2 ])
         end
 
-        it "adds the $or selector" do
+        it "adds the $nin selector" do
           expect(selection.selector).to eq({
-            "$or" => [
-              { "first" => [ 1, 2 ] },
-              { "second" => { "$gt" => 3 }}
-            ]
+            "field" =>  { "$nin" => [ 1, 2 ] }
           })
         end
 
@@ -3020,18 +1627,15 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
       end
 
-      context "when the criterion are on the same field" do
+      context "when providing a single value" do
 
         let(:selection) do
-          query.or({ first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+          query.nin(field: 1)
         end
 
-        it "appends both $or expressions" do
+        it "adds the $nin selector with wrapped value" do
           expect(selection.selector).to eq({
-            "$or" => [
-              { "first" => [ 1, 2 ] },
-              { "first" => [ 3, 4 ] }
-            ]
+            "field" =>  { "$nin" => [ 1 ] }
           })
         end
 
@@ -3041,20 +1645,18 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
 
-    context "when chaining the criterion" do
+    context "when provided multiple criterion" do
 
       context "when the criterion are for different fields" do
 
         let(:selection) do
-          query.or(first: [ 1, 2 ]).or(second: [ 3, 4 ])
+          query.nin(first: [ 1, 2 ], second: [ 3, 4 ])
         end
 
-        it "adds the $or selectors" do
+        it "adds the $nin selectors" do
           expect(selection.selector).to eq({
-            "$or" => [
-              { "first" => [ 1, 2 ] },
-              { "second" => [ 3, 4 ] }
-            ]
+            "first" =>  { "$nin" => [ 1, 2 ] },
+            "second" =>  { "$nin" => [ 3, 4 ] }
           })
         end
 
@@ -3062,19 +1664,20 @@ describe Mongoid::Criteria::Queryable::Selectable do
           expect(selection).to_not equal(query)
         end
       end
+    end
 
-      context "when the criterion are on the same field" do
+    context "when chaining the criterion" do
+
+      context "when the criterion are for different fields" do
 
         let(:selection) do
-          query.or(first: [ 1, 2 ]).or(first: [ 3, 4 ])
+          query.nin(first: [ 1, 2 ]).nin(second: [ 3, 4 ])
         end
 
-        it "appends both $or expressions" do
+        it "adds the $nin selectors" do
           expect(selection.selector).to eq({
-            "$or" => [
-              { "first" => [ 1, 2 ] },
-              { "first" => [ 3, 4 ] }
-            ]
+            "first" => { "$nin" => [ 1, 2 ] },
+            "second" => { "$nin" => [ 3, 4 ] }
           })
         end
 
@@ -3082,48 +1685,20 @@ describe Mongoid::Criteria::Queryable::Selectable do
           expect(selection).to_not equal(query)
         end
       end
-    end
-  end
-
-  describe "#with_size" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.with_size
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
 
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
+      context "when the criterion are on the same field" do
 
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
+        it_behaves_like 'supports merge strategies'
       end
     end
+  end
 
-    context "when provided nil" do
-
-      let(:selection) do
-        query.with_size(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
+  describe "#with_size" do
 
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
+    let(:query_method) { :with_size }
 
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
     context "when provided a single criterion" do
 
@@ -3243,45 +1818,12 @@ describe Mongoid::Criteria::Queryable::Selectable do
     end
   end
 
-  describe "#type" do
-
-    context "when provided no criterion" do
-
-      let(:selection) do
-        query.with_type
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
-
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
-
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
-
-    context "when provided nil" do
-
-      let(:selection) do
-        query.with_type(nil)
-      end
-
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
+  describe "#with_type" do
 
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
+    let(:query_method) { :with_type }
 
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
-      end
-    end
+    it_behaves_like 'requires an argument'
+    it_behaves_like 'requires a non-nil argument'
 
     context "when provided a single criterion" do
 
@@ -3410,7 +1952,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
           expect(selection.selector['$text'][:$language]).to eq("fr")
         end
 
-        it_behaves_like "a cloning selection"
+        it_behaves_like "returns a cloned query"
       end
     end
 
@@ -3436,6 +1978,8 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
   describe "#where" do
 
+    let(:query_method) { :where }
+
     context "when provided no criterion" do
 
       let(:selection) do
@@ -3455,37 +1999,59 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
     end
 
-    context "when provided nil" do
+    it_behaves_like 'requires a non-nil argument'
 
-      let(:selection) do
-        query.where(nil)
-      end
+    context "when provided a string" do
 
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
+      let(:selection) do
+        query.where("this.value = 10")
       end
 
-      it "returns the query" do
-        expect(selection).to eq(query)
+      it "adds the $where criterion" do
+        expect(selection.selector).to eq({ "$where" => "this.value = 10" })
       end
 
       it "returns a cloned query" do
         expect(selection).to_not equal(query)
       end
-    end
 
-    context "when provided a string" do
+      context 'when multiple calls with string argument are made' do
 
-      let(:selection) do
-        query.where("this.value = 10")
+        let(:selection) do
+          query.where("this.value = 10").where('foo.bar')
+        end
+
+        it 'combines conditions' do
+          expect(selection.selector).to eq(
+            "$where" => "this.value = 10", '$and' => [{'$where' => 'foo.bar'}],
+          )
+        end
       end
 
-      it "adds the $where criterion" do
-        expect(selection.selector).to eq({ "$where" => "this.value = 10" })
+      context 'when called with string argument and with hash argument' do
+
+        let(:selection) do
+          query.where("this.value = 10").where(foo: 'bar')
+        end
+
+        it 'combines conditions' do
+          expect(selection.selector).to eq(
+            "$where" => "this.value = 10", 'foo' => 'bar',
+          )
+        end
       end
 
-      it "returns a cloned query" do
-        expect(selection).to_not equal(query)
+      context 'when called with hash argument and with string argument' do
+
+        let(:selection) do
+          query.where(foo: 'bar').where("this.value = 10")
+        end
+
+        it 'combines conditions' do
+          expect(selection.selector).to eq(
+            'foo' => 'bar', "$where" => "this.value = 10",
+          )
+        end
       end
     end
 
@@ -3884,6 +2450,58 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
       end
     end
+
+    context 'when using an MQL logical operator manually' do
+      let(:base_query) do
+        query.where(test: 1)
+      end
+
+      let(:selection) do
+        base_query.where(mql_operator => ['hello' => 'world'])
+      end
+
+      shared_examples_for 'adds conditions to existing query' do
+        it 'adds conditions to existing query' do
+          selection.selector.should == {
+            'test' => 1,
+            mql_operator => ['hello' => 'world'],
+          }
+        end
+      end
+
+      shared_examples_for 'adds conditions to existing query with an extra $and' do
+        it 'adds conditions to existing query' do
+          selection.selector.should == {
+            'test' => 1,
+            mql_operator => ['hello' => 'world'],
+          }
+        end
+      end
+
+      context '$or' do
+        let(:mql_operator) { '$or' }
+
+        it_behaves_like 'adds conditions to existing query with an extra $and'
+      end
+
+      context '$nor' do
+        let(:mql_operator) { '$nor' }
+
+        it_behaves_like 'adds conditions to existing query with an extra $and'
+      end
+
+      context '$not' do
+        let(:mql_operator) { '$not' }
+
+        it_behaves_like 'adds conditions to existing query'
+      end
+
+      context '$and' do
+        let(:mql_operator) { '$and' }
+
+        it_behaves_like 'adds conditions to existing query'
+      end
+    end
   end
 
   describe Symbol do
@@ -4198,7 +2816,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
     context "when using the strategies via methods" do
 
-      context "when the values are a hash" do
+      context "when different operators are specified" do
 
         let(:selection) do
           query.gt(field: 5).lt(field: 10).ne(field: 7)
@@ -4206,26 +2824,26 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
         it "merges the strategies on the same field" do
           expect(selection.selector).to eq(
-            { "field" => { "$gt" => 5, "$lt" => 10, "$ne" => 7 }}
+            "field" => { "$gt" => 5, "$lt" => 10, "$ne" => 7 }
           )
         end
       end
 
-      context "when the values are not hashes" do
+      context "when the same operator is specified" do
 
         let(:selection) do
           query.where(field: 5).where(field: 10)
         end
 
-        it "overrides the previous field" do
-          expect(selection.selector).to eq({ "field" => 10 })
+        it "combines conditions" do
+          expect(selection.selector).to eq("field" => 5, '$and' => [{'field' => 10}] )
         end
       end
     end
 
     context "when using the strategies via #where" do
 
-      context "when the values are a hash" do
+      context "when using complex keys with different operators" do
 
         let(:selection) do
           query.where(:field.gt => 5, :field.lt => 10, :field.ne => 7)
@@ -4233,7 +2851,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
         it "merges the strategies on the same field" do
           expect(selection.selector).to eq(
-            { "field" => { "$gt" => 5, "$lt" => 10, "$ne" => 7 }}
+            "field" => { "$gt" => 5, "$lt" => 10, "$ne" => 7 }
           )
         end
       end