mongoid 7.1.1 → 7.1.2

data/spec/mongoid/criteria/queryable/extensions/regexp_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
     context "when provided a regexp" do
 
       let(:regexp) do
-        /^[123]/
+        /\A[123]/
       end
 
       let(:evolved) do
@@ -26,7 +26,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
     context "when provided a string" do
 
       let(:regexp) do
-        "^[123]"
+        "\\A[123]"
       end
 
       let(:evolved) do
@@ -34,7 +34,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
       end
 
       it "returns the converted regexp" do
-        expect(evolved).to eq(/^[123]/)
+        expect(evolved).to eq(/\A[123]/)
       end
     end
 
@@ -43,7 +43,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
       context "when the elements are regexps" do
 
         let(:regexp) do
-          /^[123]/
+          /\A[123]/
         end
 
         let(:array) do
@@ -66,7 +66,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
       context "when the elements are strings" do
 
         let(:regexp) do
-          "^[123]"
+          "\\A[123]"
         end
 
         let(:evolved) do
@@ -74,7 +74,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
         end
 
         it "returns the regexps" do
-          expect(evolved).to eq([ /^[123]/ ])
+          expect(evolved).to eq([ /\A[123]/ ])
         end
       end
     end
@@ -83,7 +83,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
   describe "#regexp?" do
 
     let(:regexp) do
-      /^[123]/
+      /\A[123]/
     end
 
     it "returns true" do

data/spec/mongoid/criteria/queryable/extensions/string_spec.rb

@@ -318,7 +318,7 @@ describe String do
     context "when provided a regex" do
 
       let(:regex) do
-        /^[123]/
+        /\A[123]/.freeze
       end
 
       let(:evolved) do

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

@@ -5,11 +5,11 @@ require "spec_helper"
 
 describe Mongoid::Criteria::Queryable::Mergeable do
 
-  describe "#intersect" do
+  let(:query) do
+    Mongoid::Query.new
+  end
 
-    let(:query) do
-      Mongoid::Query.new
-    end
+  describe "#intersect" do
 
     before do
       query.intersect
@@ -22,10 +22,6 @@ describe Mongoid::Criteria::Queryable::Mergeable do
 
   describe "#override" do
 
-    let(:query) do
-      Mongoid::Query.new
-    end
-
     before do
       query.override
     end
@@ -37,10 +33,6 @@ describe Mongoid::Criteria::Queryable::Mergeable do
 
   describe "#union" do
 
-    let(:query) do
-      Mongoid::Query.new
-    end
-
     before do
       query.union
     end
@@ -49,4 +41,45 @@ describe Mongoid::Criteria::Queryable::Mergeable do
       expect(query.strategy).to eq(:__union__)
     end
   end
+
+  describe '#_mongoid_expand_keys' do
+    it 'expands simple keys' do
+      query.send(:_mongoid_expand_keys, {a: 1}).should == {a: 1}
+    end
+
+    let(:gt) do
+      Mongoid::Criteria::Queryable::Key.new("age", :__override__, "$gt")
+    end
+
+    let(:gtp) do
+      Mongoid::Criteria::Queryable::Key.new("age", :__override__, "$gt")
+    end
+
+    let(:lt) do
+      Mongoid::Criteria::Queryable::Key.new("age", :__override__, "$lt")
+    end
+
+    it 'expands Key instances' do
+      query.send(:_mongoid_expand_keys, {gt => 42}).should == {'age' => {'$gt' => 42}}
+    end
+
+    it 'expands multiple Key instances on the same field' do
+      query.send(:_mongoid_expand_keys, {gt => 42, lt => 50}).should == {
+        'age' => {'$gt' => 42, '$lt' => 50}}
+    end
+
+    it 'expands simple and Key instances on the same field' do
+      query.send(:_mongoid_expand_keys, {'age' => 42, lt => 50}).should == {
+        'age' => {'$eq' => 42, '$lt' => 50}}
+    end
+
+    it 'expands Key and simple instances on the same field' do
+      query.send(:_mongoid_expand_keys, {gt => 42, 'age' => 50}).should == {
+        'age' => {'$gt' => 42, '$eq' => 50}}
+    end
+
+    it 'Ruby does not allow same symbol operator with different values' do
+      {gt => 42, gtp => 50}.should == {gtp => 50}
+    end
+  end
 end

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

@@ -85,7 +85,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
         it "adds the conditions to top level" do
           expect(selection.selector).to eq({
-            "field" => {'$gt' => 3 },
+            "field" => {'$gt' => 3},
           })
         end
 
@@ -113,6 +113,54 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
         it_behaves_like 'adds the conditions to top level'
       end
+
+      context 'when the criterion is a time' do
+        let(:selection) do
+          query.send(tested_method, :field.gte => Time.new(2020, 1, 1))
+        end
+
+        it 'adds the conditions' do
+          expect(selection.selector).to eq({
+            "field" => {'$gte' => Time.new(2020, 1, 1)},
+          })
+        end
+
+        it 'keeps argument type' do
+          selection.selector['field']['$gte'].should be_a(Time)
+        end
+      end
+
+      context 'when the criterion is a datetime' do
+        let(:selection) do
+          query.send(tested_method, :field.gte => DateTime.new(2020, 1, 1))
+        end
+
+        it 'adds the conditions' do
+          expect(selection.selector).to eq({
+            "field" => {'$gte' => Time.utc(2020, 1, 1)},
+          })
+        end
+
+        it 'converts argument to a time' do
+          selection.selector['field']['$gte'].should be_a(Time)
+        end
+      end
+
+      context 'when the criterion is a date' do
+        let(:selection) do
+          query.send(tested_method, :field.gte => Date.new(2020, 1, 1))
+        end
+
+        it 'adds the conditions' do
+          expect(selection.selector).to eq({
+            "field" => {'$gte' => Time.utc(2020, 1, 1)},
+          })
+        end
+
+        it 'converts argument to a time' do
+          selection.selector['field']['$gte'].should be_a(Time)
+        end
+      end
     end
 
     context "when provided a nested criterion" do
@@ -283,25 +331,58 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
     context "when provided multiple criteria" do
 
-      context "when the criteria is already included" do
+      context "when the criterion is already included" do
 
-        let(:selection) do
-          query.and({ first: [ 1, 2 ] }).and({ first: [ 1, 2 ] })
+        context 'simple criterion' do
+          let(:selection) do
+            query.and({ first: [ 1, 2 ] }).and({ first: [ 1, 2 ] })
+          end
+
+          it "adds all conditions" do
+            expect(selection.selector).to eq({
+              'first' => [1, 2],
+              "$and" => [
+                { "first" => [ 1, 2 ] }
+              ]
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
         end
 
-        it "adds all conditions" do
-          expect(selection.selector).to eq({
-            'first' => [1, 2],
-            "$and" => [
-              { "first" => [ 1, 2 ] }
-            ]
-          })
+        context 'Key criterion' do
+          let(:selection) do
+            query.and({ first: [ 1, 2 ] }).and(:first.gt => 3)
+          end
+
+          it "adds all conditions" do
+            expect(selection.selector).to eq({
+              'first' => [1, 2],
+              "$and" => [
+                { "first" => {'$gt' => 3} }
+              ]
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
         end
 
-        it_behaves_like 'returns a cloned query'
+        context 'Key criterion when existing criterion is an operator' do
+          let(:selection) do
+            query.and(:first.lt => 5).and(:first.gt => 3)
+          end
+
+          it "adds all conditions" do
+            expect(selection.selector).to eq({
+              'first' => {'$lt' => 5, '$gt' => 3},
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
+        end
       end
 
-      context "when the new criterion is for different fields" do
+      context "when the new criteria are for different fields" do
 
         let(:selection) do
           query.and({ first: [ 1, 2 ] }, { second: [ 3, 4 ] })
@@ -317,22 +398,137 @@ describe Mongoid::Criteria::Queryable::Selectable do
         it_behaves_like 'returns a cloned query'
       end
 
-      context "when the new criterion is for the same field" do
+      context "when the new criteria are for the same field" do
 
-        let(:selection) do
-          query.and({ first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+        context 'when criteria are simple' do
+          let(:selection) do
+            query.and({ first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+          end
+
+          it "combines via $and operator" do
+            expect(selection.selector).to eq({
+              "first" => [ 1, 2 ],
+              "$and" => [
+                { "first" => [ 3, 4 ] }
+              ]
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
         end
 
-        it "combines via $and operator" do
-          expect(selection.selector).to eq({
-            "first" => [ 1, 2 ],
-            "$and" => [
-              { "first" => [ 3, 4 ] }
-            ]
-          })
+        context 'when criteria are handled via Key' do
+          shared_examples_for 'adds the conditions to top level' do
+
+            it "adds the conditions to top level" do
+              expect(selection.selector).to eq({
+                "field" => {'$gt' => 3, '$lt' => 5},
+              })
+            end
+
+            it_behaves_like 'returns a cloned query'
+          end
+
+          context 'criteria are provided in the same hash' do
+            let(:selection) do
+              query.send(tested_method, :field.gt => 3, :field.lt => 5)
+            end
+
+            it_behaves_like 'adds the conditions to top level'
+          end
+
+          context 'criteria are provided in separate hashes' do
+            let(:selection) do
+              query.send(tested_method, {:field.gt => 3}, {:field.lt => 5})
+            end
+
+            it_behaves_like 'adds the conditions to top level'
+          end
+
+          context 'when the criterion is wrapped in an array' do
+            let(:selection) do
+              query.send(tested_method, [:field.gt => 3], [:field.lt => 5])
+            end
+
+            it_behaves_like 'adds the conditions to top level'
+          end
         end
 
-        it_behaves_like 'returns a cloned query'
+        context 'when criteria are simple and handled via Key' do
+          shared_examples_for 'combines conditions with $and' do
+
+            it "combines conditions with $and" do
+              expect(selection.selector).to eq({
+                "field" => 3,
+                '$and' => ['field' => {'$lt' => 5}],
+              })
+            end
+
+            it_behaves_like 'returns a cloned query'
+          end
+
+          context 'criteria are provided in the same hash' do
+            let(:selection) do
+              query.send(tested_method, :field => 3, :field.lt => 5)
+            end
+
+            it_behaves_like 'combines conditions with $and'
+          end
+
+          context 'criteria are provided in separate hashes' do
+            let(:selection) do
+              query.send(tested_method, {:field => 3}, {:field.lt => 5})
+            end
+
+            it_behaves_like 'combines conditions with $and'
+          end
+
+          context 'when the criterion is wrapped in an array' do
+            let(:selection) do
+              query.send(tested_method, [:field => 3], [:field.lt => 5])
+            end
+
+            it_behaves_like 'combines conditions with $and'
+          end
+        end
+
+        context 'when criteria are handled via Key and simple' do
+          shared_examples_for 'combines conditions with $and' do
+
+            it "combines conditions with $and" do
+              expect(selection.selector).to eq({
+                "field" => {'$gt' => 3},
+                '$and' => ['field' => 5],
+              })
+            end
+
+            it_behaves_like 'returns a cloned query'
+          end
+
+          context 'criteria are provided in the same hash' do
+            let(:selection) do
+              query.send(tested_method, :field.gt => 3, :field => 5)
+            end
+
+            it_behaves_like 'combines conditions with $and'
+          end
+
+          context 'criteria are provided in separate hashes' do
+            let(:selection) do
+              query.send(tested_method, {:field.gt => 3}, {:field => 5})
+            end
+
+            it_behaves_like 'combines conditions with $and'
+          end
+
+          context 'when the criterion is wrapped in an array' do
+            let(:selection) do
+              query.send(tested_method, [:field.gt => 3], [:field => 5])
+            end
+
+            it_behaves_like 'combines conditions with $and'
+          end
+        end
       end
     end
 
@@ -509,17 +705,14 @@ describe Mongoid::Criteria::Queryable::Selectable do
     end
   end
 
-  describe "#or" do
-
-    let(:tested_method) { :or }
-    let(:expected_operator) { '$or' }
+  shared_examples '$or/$nor' do
 
     it_behaves_like 'a non-hoisting logical operation'
 
     context "when provided no arguments" do
 
       let(:selection) do
-        query.or
+        query.send(tested_method)
       end
 
       it_behaves_like 'returns a cloned query'
@@ -536,7 +729,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
     context "when provided nil" do
 
       let(:selection) do
-        query.or(nil)
+        query.send(tested_method, nil)
       end
 
       it_behaves_like 'returns a cloned query'
@@ -553,42 +746,42 @@ describe Mongoid::Criteria::Queryable::Selectable do
     context "when provided a single criterion" do
 
       let(:selection) do
-        query.or(field: [ 1, 2 ])
+        query.send(tested_method, field: [ 1, 2 ])
       end
 
       it_behaves_like 'returns a cloned query'
 
-      it "adds the $or selector" do
+      it "adds the $or/$nor selector" do
         expect(selection.selector).to eq({
-          "$or" => [{ "field" => [ 1, 2 ] }]
+          expected_operator => [{ "field" => [ 1, 2 ] }]
         })
       end
 
       context 'when the criterion is wrapped in array' do
 
         let(:selection) do
-          query.or([{ field: [ 1, 2 ] }])
+          query.send(tested_method, [{ field: [ 1, 2 ] }])
         end
 
         it_behaves_like 'returns a cloned query'
 
-        it "adds the $or selector" do
+        it "adds the $or/$nor selector" do
           expect(selection.selector).to eq({
-            "$or" => [{ "field" => [ 1, 2 ] }]
+            expected_operator => [{ "field" => [ 1, 2 ] }]
           })
         end
 
         context 'when the array has nil as one of the elements' do
 
           let(:selection) do
-            query.or([{ field: [ 1, 2 ] }, nil])
+            query.send(tested_method, [{ field: [ 1, 2 ] }, nil])
           end
 
           it_behaves_like 'returns a cloned query'
 
-          it "adds the $or selector ignoring the nil element" do
+          it "adds the $or/$nor selector ignoring the nil element" do
             expect(selection.selector).to eq({
-              "$or" => [{ "field" => [ 1, 2 ] }]
+              expected_operator => [{ "field" => [ 1, 2 ] }]
             })
           end
         end
@@ -597,27 +790,27 @@ describe Mongoid::Criteria::Queryable::Selectable do
       context 'when query already has a condition on another field' do
 
         let(:selection) do
-          query.where(foo: 'bar').or(field: [ 1, 2 ])
+          query.where(foo: 'bar').send(tested_method, field: [ 1, 2 ])
         end
 
-        it 'moves original conditions under $or' do
+        it 'moves original conditions under $or/$nor' do
           expect(selection.selector).to eq({
-            "$or" => [{'foo' => 'bar'}, { "field" => [ 1, 2 ] }]
+            expected_operator => [{'foo' => 'bar'}, { "field" => [ 1, 2 ] }]
           })
         end
       end
 
-      context 'when query already has an $or condition and another condition' do
+      context 'when query already has an $or/$nor condition and another condition' do
 
         let(:selection) do
-          query.or(field: [ 1, 2 ]).where(foo: 'bar').or(test: 1)
+          query.send(tested_method, field: [ 1, 2 ]).where(foo: 'bar').send(tested_method, test: 1)
         end
 
         it 'unions existing conditions' do
           expect(selection.selector).to eq(
-            '$or' => [
+            expected_operator => [
               {
-                "$or" => [{ "field" => [ 1, 2 ] }],
+                expected_operator => [{ "field" => [ 1, 2 ] }],
                 'foo' => 'bar',
               },
               {'test' => 1},
@@ -632,14 +825,14 @@ describe Mongoid::Criteria::Queryable::Selectable do
       context "when the criteria are for different fields" do
 
         let(:selection) do
-          query.or({ first: [ 1, 2 ] }, { second: [ 3, 4 ] })
+          query.send(tested_method, { first: [ 1, 2 ] }, { second: [ 3, 4 ] })
         end
 
         it_behaves_like 'returns a cloned query'
 
-        it "adds the $or selector" do
+        it "adds the $or/$nor selector" do
           expect(selection.selector).to eq({
-            "$or" => [
+            expected_operator => [
               { "first" => [ 1, 2 ] },
               { "second" => [ 3, 4 ] }
             ]
@@ -650,12 +843,12 @@ describe Mongoid::Criteria::Queryable::Selectable do
       context "when the criteria uses a Key instance" do
 
         let(:selection) do
-          query.or({ first: [ 1, 2 ] }, { :second.gt => 3 })
+          query.send(tested_method, { first: [ 1, 2 ] }, { :second.gt => 3 })
         end
 
-        it "adds the $or selector" do
+        it "adds the $or/$nor selector" do
           expect(selection.selector).to eq({
-            "$or" => [
+            expected_operator => [
               { "first" => [ 1, 2 ] },
               { "second" => { "$gt" => 3 }}
             ]
@@ -663,233 +856,197 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
 
         it_behaves_like 'returns a cloned query'
-      end
 
-      context "when a criterion has an aliased field" do
+        context 'when the criterion is a time' do
+          let(:selection) do
+            query.send(tested_method, :field.gte => Time.new(2020, 1, 1))
+          end
 
-        let(:selection) do
-          query.or({ id: 1 })
-        end
+          it 'adds the conditions' do
+            expect(selection.selector).to eq(expected_operator => [
+              "field" => {'$gte' => Time.new(2020, 1, 1)},
+            ])
+          end
 
-        it "adds the $or selector and aliases the field" do
-          expect(selection.selector).to eq({
-            "$or" => [ { "_id" => 1 } ]
-          })
+          it 'keeps the type' do
+            selection.selector[expected_operator].first['field']['$gte'].should be_a(Time)
+          end
         end
 
-        it_behaves_like 'returns a cloned query'
-      end
+        context 'when the criterion is a datetime' do
+          let(:selection) do
+            query.send(tested_method, :field.gte => DateTime.new(2020, 1, 1))
+          end
 
-      context "when a criterion is wrapped in an array" do
+          it 'adds the conditions' do
+            expect(selection.selector).to eq(expected_operator => [
+              "field" => {'$gte' => Time.utc(2020, 1, 1)},
+            ])
+          end
 
-        let(:selection) do
-          query.or([{ first: [ 1, 2 ] }, { :second.gt => 3 }])
+          it 'converts argument to a time' do
+            selection.selector[expected_operator].first['field']['$gte'].should be_a(Time)
+          end
         end
 
-        it_behaves_like 'returns a cloned query'
+        context 'when the criterion is a date' do
+          let(:selection) do
+            query.send(tested_method, :field.gte => Date.new(2020, 1, 1))
+          end
 
-        it "adds the $or selector" do
-          expect(selection.selector).to eq({
-            "$or" => [
-              { "first" => [ 1, 2 ] },
-              { "second" => { "$gt" => 3 }}
-            ]
-          })
+          it 'adds the conditions' do
+            expect(selection.selector).to eq(expected_operator => [
+              "field" => {'$gte' => Time.utc(2020, 1, 1)},
+            ])
+          end
+
+          it 'converts argument to a time' do
+            selection.selector[expected_operator].first['field']['$gte'].should be_a(Time)
+          end
         end
       end
 
-      context "when the criteria are on the same field" do
+      context "when a criterion has an aliased field" do
 
         let(:selection) do
-          query.or({ first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+          query.send(tested_method, { id: 1 })
         end
 
-        it_behaves_like 'returns a cloned query'
-
-        it "appends both $or expressions" do
+        it "adds the $or/$nor selector and aliases the field" do
           expect(selection.selector).to eq({
-            "$or" => [
-              { "first" => [ 1, 2 ] },
-              { "first" => [ 3, 4 ] }
-            ]
+            expected_operator => [ { "_id" => 1 } ]
           })
         end
-      end
-    end
-
-    context "when chaining the criterion" do
-
-      context "when the criterion are for different fields" do
-
-        let(:selection) do
-          query.or(first: [ 1, 2 ]).or(second: [ 3, 4 ])
-        end
 
         it_behaves_like 'returns a cloned query'
-
-        it "adds the $or selectors" do
-          expect(selection.selector).to eq({
-            "$or" => [
-              { "first" => [ 1, 2 ] },
-              { "second" => [ 3, 4 ] }
-            ]
-          })
-        end
       end
 
-      context "when the criterion are on the same field" do
+      context "when a criterion is wrapped in an array" do
 
         let(:selection) do
-          query.or(first: [ 1, 2 ]).or(first: [ 3, 4 ])
+          query.send(tested_method, [{ first: [ 1, 2 ] }, { :second.gt => 3 }])
         end
 
         it_behaves_like 'returns a cloned query'
 
-        it "appends both $or expressions" do
+        it "adds the $or/$nor selector" do
           expect(selection.selector).to eq({
-            "$or" => [
+            expected_operator => [
               { "first" => [ 1, 2 ] },
-              { "first" => [ 3, 4 ] }
+              { "second" => { "$gt" => 3 }}
             ]
           })
         end
       end
-    end
-  end
 
-  describe "#nor" do
-
-    let(:tested_method) { :nor }
-    let(:expected_operator) { '$nor' }
-
-    it_behaves_like 'a non-hoisting logical operation'
-
-    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
+      context "when the criteria are on the same field" do
 
-      it_behaves_like 'returns a cloned query'
-    end
+        context 'simple criteria' do
+          let(:selection) do
+            query.send(tested_method, { first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+          end
 
-    context "when provided nil" do
+          it_behaves_like 'returns a cloned query'
 
-      let(:selection) do
-        query.nor(nil)
-      end
+          it "appends both $or/$nor expressions" do
+            expect(selection.selector).to eq({
+              expected_operator => [
+                { "first" => [ 1, 2 ] },
+                { "first" => [ 3, 4 ] }
+              ]
+            })
+          end
+        end
 
-      it "does not add any criterion" do
-        expect(selection.selector).to eq({})
-      end
+        context 'Key criteria as one argument' do
+          let(:selection) do
+            query.send(tested_method, :first.gt => 3, :first.lt => 5)
+          end
 
-      it "returns the query" do
-        expect(selection).to eq(query)
-      end
+          it_behaves_like 'returns a cloned query'
 
-      it_behaves_like 'returns a cloned query'
-    end
+          it "adds all criteria" do
+            expect(selection.selector).to eq({
+              expected_operator => [
+                { "first" => {'$gt' => 3, '$lt' => 5} },
+              ]
+            })
+          end
+        end
 
-    context "when provided a single criterion" do
+        context 'Key criteria as multiple arguments' do
+          let(:selection) do
+            query.send(tested_method, {:first.gt => 3}, {:first.lt => 5})
+          end
 
-      let(:selection) do
-        query.nor(field: [ 1, 2 ])
-      end
+          it_behaves_like 'returns a cloned query'
 
-      it "adds the $nor selector" do
-        expect(selection.selector).to eq({
-          "$nor" => [{"field" => [ 1, 2 ] }]
-        })
+          it "adds all criteria" do
+            expect(selection.selector).to eq({
+              expected_operator => [
+                { "first" => {'$gt' => 3} },
+                { "first" => {'$lt' => 5} },
+              ]
+            })
+          end
+        end
       end
-
-      it_behaves_like 'returns a cloned query'
     end
 
-    context "when provided multiple criterion" 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 ] }, { second: [ 3, 4 ] })
+          query.send(tested_method, first: [ 1, 2 ]).send(tested_method, second: [ 3, 4 ])
         end
 
-        it "adds the $nor selector" do
+        it_behaves_like 'returns a cloned query'
+
+        it "adds the $or/$nor selectors" do
           expect(selection.selector).to eq({
-            "$nor" => [
+            expected_operator => [
               { "first" => [ 1, 2 ] },
               { "second" => [ 3, 4 ] }
             ]
           })
         end
-
-        it_behaves_like 'returns a cloned query'
       end
 
       context "when the criterion are on the same field" do
 
         let(:selection) do
-          query.nor({ first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+          query.send(tested_method, first: [ 1, 2 ]).send(tested_method, first: [ 3, 4 ])
         end
 
-        it "appends both $nor expressions" do
+        it_behaves_like 'returns a cloned query'
+
+        it "appends both $or/$nor expressions" do
           expect(selection.selector).to eq({
-            "$nor" => [
+            expected_operator => [
               { "first" => [ 1, 2 ] },
               { "first" => [ 3, 4 ] }
             ]
           })
         end
-
-        it_behaves_like 'returns a cloned query'
       end
     end
+  end
 
-    context "when chaining the criterion" do
-
-      context "when the criterion are fnor different fields" do
-
-        let(:selection) do
-          query.nor(first: [ 1, 2 ]).nor(second: [ 3, 4 ])
-        end
-
-        it "adds the $nor selectors" do
-          expect(selection.selector).to eq({
-            "$nor" => [
-              { "first" => [ 1, 2 ] },
-              { "second" => [ 3, 4 ] }
-            ]
-          })
-        end
+  describe "#or" do
 
-        it_behaves_like 'returns a cloned query'
-      end
+    let(:tested_method) { :or }
+    let(:expected_operator) { '$or' }
 
-      context "when the criterion are on the same field" do
+    it_behaves_like '$or/$nor'
+  end
 
-        let(:selection) do
-          query.nor(first: [ 1, 2 ]).nor(first: [ 3, 4 ])
-        end
+  describe "#nor" do
 
-        it "appends both $nor expressions" do
-          expect(selection.selector).to eq({
-            "$nor" => [
-              { "first" => [ 1, 2 ] },
-              { "first" => [ 3, 4 ] }
-            ]
-          })
-        end
+    let(:tested_method) { :nor }
+    let(:expected_operator) { '$nor' }
 
-        it_behaves_like 'returns a cloned query'
-      end
-    end
+    it_behaves_like '$or/$nor'
   end
 
   describe "#any_of" do
@@ -1098,6 +1255,112 @@ describe Mongoid::Criteria::Queryable::Selectable do
         it_behaves_like 'returns a cloned query'
       end
 
+      context 'when criteria are simple and handled via Key' do
+        shared_examples_for 'adds conditions with $or' do
+
+          it "adds conditions with $or" do
+            expect(selection.selector).to eq({
+              '$or' => [
+                {'field' => 3},
+                {'field' => {'$lt' => 5}},
+              ],
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
+        end
+
+        shared_examples_for 'adds one condition' do
+
+          it "adds one condition" do
+            expect(selection.selector).to eq({
+              'field' => 3,
+              '$and' => [
+                {'field' => {'$lt' => 5}},
+              ],
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
+        end
+
+        context 'criteria are provided in the same hash' do
+          let(:selection) do
+            query.send(tested_method, :field => 3, :field.lt => 5)
+          end
+
+          it_behaves_like 'adds one condition'
+        end
+
+        context 'criteria are provided in separate hashes' do
+          let(:selection) do
+            query.send(tested_method, {:field => 3}, {:field.lt => 5})
+          end
+
+          it_behaves_like 'adds conditions with $or'
+        end
+
+        context 'when the criterion is wrapped in an array' do
+          let(:selection) do
+            query.send(tested_method, [:field => 3], [:field.lt => 5])
+          end
+
+          it_behaves_like 'adds conditions with $or'
+        end
+      end
+
+      context 'when criteria are handled via Key and simple' do
+        shared_examples_for 'adds conditions with $or' do
+
+          it "adds conditions with $or" do
+            expect(selection.selector).to eq({
+              '$or' => [
+                {'field' => {'$gt' => 3}},
+                {'field' => 5},
+              ],
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
+        end
+
+        shared_examples_for 'adds one condition' do
+
+          it "adds one condition" do
+            expect(selection.selector).to eq({
+              'field' => {'$gt' => 3},
+              '$and' => ['field' => 5],
+            })
+          end
+
+          it_behaves_like 'returns a cloned query'
+        end
+
+        context 'criteria are provided in the same hash' do
+          let(:selection) do
+            query.send(tested_method, :field.gt => 3, :field => 5)
+          end
+
+          it_behaves_like 'adds one condition'
+        end
+
+        context 'criteria are provided in separate hashes' do
+          let(:selection) do
+            query.send(tested_method, {:field.gt => 3}, {:field => 5})
+          end
+
+          it_behaves_like 'adds conditions with $or'
+        end
+
+        context 'when the criterion is wrapped in an array' do
+          let(:selection) do
+            query.send(tested_method, [:field.gt => 3], [:field => 5])
+          end
+
+          it_behaves_like 'adds conditions with $or'
+        end
+      end
+
       context "when a criterion has an aliased field" do
 
         let(:selection) do
@@ -1271,6 +1534,25 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
       end
 
+      context "when the criteria uses Key" do
+
+        let(:selection) do
+          query.not(:age.gt => 50)
+        end
+
+        it "negates the gt selection" do
+          expect(selection.selector).to eq(
+            '$and' => ['$nor' => ['age' => {'$gt' => 50}]]
+          )
+        end
+
+        it_behaves_like 'returns a cloned query'
+
+        it "removes the negation on the clone" do
+          expect(selection).to_not be_negating
+        end
+      end
+
       context "when the following criteria is a where" do
 
         let(:selection) do