mongoid 7.0.4 → 7.0.10

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

@@ -315,7 +315,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/extensions/time_spec.rb

@@ -346,23 +346,35 @@ describe Time do
 
   describe "#__evolve_date__" do
 
-    let(:time) do
-      Time.new(2010, 1, 1, 12, 0, 0)
-    end
-
     let(:evolved) do
       time.__evolve_date__
     end
 
-    it "returns midnight utc" do
-      expect(evolved).to eq(Time.utc(2010, 1, 1, 0, 0, 0))
+    context 'beginning of day' do
+      let(:time) do
+        Time.new(2010, 1, 1, 0, 0, 1).freeze
+      end
+
+      it "returns midnight utc" do
+        expect(evolved).to eq(Time.utc(2010, 1, 1, 0, 0, 0))
+      end
+    end
+
+    context 'end of day' do
+      let(:time) do
+        Time.new(2010, 1, 1, 23, 59, 59).freeze
+      end
+
+      it "returns midnight utc" do
+        expect(evolved).to eq(Time.utc(2010, 1, 1, 0, 0, 0))
+      end
     end
   end
 
   describe "#__evolve_time__" do
 
     let(:time) do
-      Time.new(2010, 1, 1, 12, 0, 0)
+      Time.new(2010, 1, 1, 12, 0, 0).freeze
     end
 
     let(:evolved) do

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

@@ -322,10 +322,37 @@ describe ActiveSupport::TimeWithZone do
     end
   end
 
+  describe "#__evolve_date__" do
+
+    let(:evolved) do
+      time.__evolve_date__
+    end
+
+    context 'beginning of day' do
+      let(:time) do
+        time_zone.local(2010, 1, 1, 0, 0, 1).freeze
+      end
+
+      it "returns midnight utc" do
+        expect(evolved).to eq(Time.utc(2010, 1, 1, 0, 0, 0))
+      end
+    end
+
+    context 'end of day' do
+      let(:time) do
+        time_zone.local(2010, 1, 1, 23, 59, 59).freeze
+      end
+
+      it "returns midnight utc" do
+        expect(evolved).to eq(Time.utc(2010, 1, 1, 0, 0, 0))
+      end
+    end
+  end
+
   describe "#__evolve_time__" do
 
     let(:date) do
-      time_zone.local(2010, 1, 1, 12, 0, 0)
+      time_zone.local(2010, 1, 1, 12, 0, 0).freeze
     end
 
     let(:evolved) do

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

@@ -23,16 +23,58 @@ describe Mongoid::Criteria::Queryable::Key do
 
   describe "#__expr_part__" do
 
-    let(:key) do
-      described_class.new("field", :__union__, "$all")
+    context 'operator only' do
+      let(:key) do
+        described_class.new("field", :__union__, "$all")
+      end
+
+      let(:specified) do
+        key.__expr_part__([ 1, 2 ])
+      end
+
+      it "returns the name plus operator and value" do
+        expect(specified).to eq({ "field" => { "$all" => [ 1, 2 ] }})
+      end
     end
 
-    let(:specified) do
-      key.__expr_part__([ 1, 2 ])
+    context 'operator and expanded only' do
+      let(:key) do
+        described_class.new("field", :__override__, "$geoIntersects", '$geometry')
+      end
+
+      let(:specified) do
+        key.__expr_part__([ 1, 10 ])
+      end
+
+      it "returns the query expression" do
+        expect(specified).to eq({ "field" => {
+          '$geoIntersects' => {
+            '$geometry' => [1, 10],
+          },
+        }})
+      end
     end
 
-    it "returns the name plus operator and value" do
-      expect(specified).to eq({ "field" => { "$all" => [ 1, 2 ] }})
+    context 'operator, expanded and block' do
+      let(:key) do
+        described_class.new("field", :__override__, "$geoIntersects", '$geometry') do |value|
+          { "type" => 'Point', "coordinates" => value }
+        end
+      end
+
+      let(:specified) do
+        key.__expr_part__([ 1, 10 ])
+      end
+
+      it "returns the query expression" do
+        expect(specified).to eq({ "field" => {
+          '$geoIntersects' => {
+            '$geometry' => {
+              'type' => 'Point', 'coordinates' => [1, 10],
+            },
+          },
+        }})
+      end
     end
   end
 

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

@@ -0,0 +1,762 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Mongoid::Criteria::Queryable::Selectable do
+
+  let(:query) do
+    Mongoid::Query.new("id" => "_id")
+  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 $and selector" do
+        expect(selection.selector).to eq({
+          "$and" => [{ "field" => [ 1, 2 ] }]
+        })
+      end
+
+      it "returns a cloned query" do
+        expect(selection).to_not equal(query)
+      end
+    end
+
+    context "when provided a nested criterion" do
+
+      let(:selection) do
+        query.and(:test.elem_match => { :field.in => [ 1, 2 ] })
+      end
+
+      it "adds the $and selector" do
+        expect(selection.selector).to eq({
+          "$and" => [{ "test" => { "$elemMatch" => { "field" => { "$in" => [ 1, 2 ] }}}}]
+        })
+      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 is already included" do
+
+        let(:selection) do
+          query.and({ first: [ 1, 2 ] }).and({ first: [ 1, 2 ] })
+        end
+
+        it "does not duplicate the $and selector" do
+          expect(selection.selector).to eq({
+            "$and" => [
+              { "first" => [ 1, 2 ] }
+            ]
+          })
+        end
+
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
+      end
+
+      context "when the criterion are for different fields" do
+
+        let(:selection) do
+          query.and({ first: [ 1, 2 ] }, { second: [ 3, 4 ] })
+        end
+
+        it "adds the $and selector" do
+          expect(selection.selector).to eq({
+            "$and" => [
+              { "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
+
+        let(:selection) do
+          query.and({ first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+        end
+
+        it "appends both $and expressions" do
+          expect(selection.selector).to eq({
+            "$and" => [
+              { "first" => [ 1, 2 ] },
+              { "first" => [ 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.and(first: [ 1, 2 ]).and(second: [ 3, 4 ])
+        end
+
+        it "adds the $and selectors" do
+          expect(selection.selector).to eq({
+            "$and" => [
+              { "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
+
+        let(:selection) do
+          query.and(first: [ 1, 2 ]).and(first: [ 3, 4 ])
+        end
+
+        it "appends both $and expressions" do
+          expect(selection.selector).to eq({
+            "$and" => [
+              { "first" => [ 1, 2 ] },
+              { "first" => [ 3, 4 ] }
+            ]
+          })
+        end
+
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
+      end
+    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
+
+      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.or(field: [ 1, 2 ])
+      end
+
+      it "adds the $or selector" do
+        expect(selection.selector).to eq({
+          "$or" => [{ "field" => [ 1, 2 ] }]
+        })
+      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.or({ first: [ 1, 2 ] }, { second: [ 3, 4 ] })
+        end
+
+        it "adds the $or selector" do
+          expect(selection.selector).to eq({
+            "$or" => [
+              { "first" => [ 1, 2 ] },
+              { "second" => [ 3, 4 ] }
+            ]
+          })
+        end
+
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
+      end
+
+      context "when a criterion has a selectable key" do
+
+        let(:selection) do
+          query.or({ first: [ 1, 2 ] }, { :second.gt => 3 })
+        end
+
+        it "adds the $or selector" do
+          expect(selection.selector).to eq({
+            "$or" => [
+              { "first" => [ 1, 2 ] },
+              { "second" => { "$gt" => 3 }}
+            ]
+          })
+        end
+
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
+      end
+
+      context "when the criterion has an aliased field" do
+
+        let(:selection) do
+          query.or({ id: 1 })
+        end
+
+        it "adds the $or selector and aliases the field" do
+          expect(selection.selector).to eq({
+            "$or" => [ { "_id" => 1 } ]
+          })
+        end
+
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
+      end
+
+      context "when a criterion is wrapped in an array" do
+
+        let(:selection) do
+          query.or([{ first: [ 1, 2 ] }, { :second.gt => 3 }])
+        end
+
+        it "adds the $or selector" do
+          expect(selection.selector).to eq({
+            "$or" => [
+              { "first" => [ 1, 2 ] },
+              { "second" => { "$gt" => 3 }}
+            ]
+          })
+        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.or({ first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+        end
+
+        it "appends both $or expressions" do
+          expect(selection.selector).to eq({
+            "$or" => [
+              { "first" => [ 1, 2 ] },
+              { "first" => [ 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.or(first: [ 1, 2 ]).or(second: [ 3, 4 ])
+        end
+
+        it "adds the $or selectors" do
+          expect(selection.selector).to eq({
+            "$or" => [
+              { "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
+
+        let(:selection) do
+          query.or(first: [ 1, 2 ]).or(first: [ 3, 4 ])
+        end
+
+        it "appends both $or expressions" do
+          expect(selection.selector).to eq({
+            "$or" => [
+              { "first" => [ 1, 2 ] },
+              { "first" => [ 3, 4 ] }
+            ]
+          })
+        end
+
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        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
+
+    context "when provided nil" do
+
+      let(:selection) do
+        query.nor(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.nor(field: [ 1, 2 ])
+      end
+
+      it "adds the $nor selector" do
+        expect(selection.selector).to eq({
+          "$nor" => [{"field" => [ 1, 2 ] }]
+        })
+      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 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
+
+        let(:selection) do
+          query.nor({ first: [ 1, 2 ] }, { first: [ 3, 4 ] })
+        end
+
+        it "appends both $nor expressions" do
+          expect(selection.selector).to eq({
+            "$nor" => [
+              { "first" => [ 1, 2 ] },
+              { "first" => [ 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 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
+
+        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.nor(first: [ 1, 2 ]).nor(first: [ 3, 4 ])
+        end
+
+        it "appends both $nor expressions" do
+          expect(selection.selector).to eq({
+            "$nor" => [
+              { "first" => [ 1, 2 ] },
+              { "first" => [ 3, 4 ] }
+            ]
+          })
+        end
+
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
+      end
+    end
+  end
+
+  describe "#not" do
+
+    context "when provided no criterion" do
+
+      let(:selection) do
+        query.not
+      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).not_to equal(query)
+      end
+
+      it 'does not mutate receiver' do
+        expect(query.negating).to be nil
+
+        selection
+        expect(query.negating).to be nil
+      end
+
+      context "when the following criteria is a query method" do
+
+        let(:selection) do
+          query.not.all(field: [ 1, 2 ])
+        end
+
+        it "negates the all selection" do
+          expect(selection.selector).to eq(
+            { "field" => { "$not" => { "$all" => [ 1, 2 ] }}}
+          )
+        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
+
+      context "when the following criteria is a gt method" do
+
+        let(:selection) do
+          query.not.gt(age: 50)
+        end
+
+        it "negates the gt selection" do
+          expect(selection.selector).to eq(
+            { "age" => { "$not" => { "$gt" => 50 }}}
+          )
+        end
+
+        it "returns a coned query" do
+          expect(selection).to_not eq(query)
+        end
+
+        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
+          query.not.where(field: 1, :other.in => [ 1, 2 ])
+        end
+
+        it "negates the selection with an operator" do
+          expect(selection.selector).to eq(
+            { "field" => { "$ne" => 1 }, "other" => { "$not" => { "$in" => [ 1, 2 ] }}}
+          )
+        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
+
+      context "when the following criteria is a where with a regexp" do
+
+        let(:selection) do
+          query.not.where(field: 1, other: /test/)
+        end
+
+        it "negates the selection with an operator" do
+          expect(selection.selector).to eq(
+            { "field" => { "$ne" => 1 }, "other" => { "$not" => /test/ } }
+          )
+        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 provided nil" do
+
+      let(:selection) do
+        query.not(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.not(field: /test/)
+      end
+
+      it "adds the $not selector" do
+        expect(selection.selector).to eq({
+          "field" => { "$not" => /test/ }
+        })
+      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.not(first: /1/, second: /2/)
+        end
+
+        it "adds the $not selectors" do
+          expect(selection.selector).to eq({
+            "first" => { "$not" => /1/ },
+            "second" => { "$not" => /2/ }
+          })
+        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.not(first: /1/).not(second: /2/)
+        end
+
+        it "adds the $not selectors" do
+          expect(selection.selector).to eq({
+            "first" => { "$not" => /1/ },
+            "second" => { "$not" => /2/ }
+          })
+        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.not(first: /1/).not(first: /2/)
+        end
+
+        it "overwrites the first $not selector" do
+          expect(selection.selector).to eq({
+            "first" =>  { "$not" => /2/ }
+          })
+        end
+
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
+      end
+
+      context "when the criterion are a double negative" do
+
+        let(:selection) do
+          query.not.where(:first.not => /1/)
+        end
+
+        it "does not double the $not selector" do
+          expect(selection.selector).to eq({
+            "first" =>  { "$not" => /1/ }
+          })
+        end
+
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
+        end
+      end
+    end
+  end
+end