mongoid 7.0.10 → 7.4.0

data/spec/mongoid/criteria/findable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Findable do
@@ -7,11 +9,11 @@ describe Mongoid::Criteria::Findable do
     context "when finding by a document" do
 
       let(:band) do
-        Band.create(name: "Tool")
+        Band.create!(name: "Tool")
       end
 
       let!(:record) do
-        band.records.create(name: "Undertow")
+        band.records.create!(name: "Undertow")
       end
 
       context "when the document is the root" do
@@ -35,12 +37,48 @@ describe Mongoid::Criteria::Findable do
           expect(found).to eq(band)
         end
       end
+
+      context 'when criteria has additional conditions' do
+        let(:band) do
+          Band.create!(name: "Tool")
+        end
+
+        let(:found) do
+          Band.where(name: 'Blah').find(band.id)
+        end
+
+        it 'respects conditions' do
+          expect do
+            found
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
+        end
+      end
+
+      context 'when criteria has additional conditions on id' do
+        let(:band) do
+          Band.create!(name: "Tool")
+        end
+
+        let(:other) do
+          Band.create!(name: "Other")
+        end
+
+        let(:found) do
+          Band.where(id: other.id).find(band.id)
+        end
+
+        it 'respects both conditions' do
+          expect do
+            found
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
+        end
+      end
     end
 
     context "when using object ids" do
 
       let!(:band) do
-        Band.create
+        Band.create!
       end
 
       context "when providing a single id" do
@@ -110,7 +148,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a splat of ids" do
 
         let!(:band_two) do
-          Band.create(name: "Tool")
+          Band.create!(name: "Tool")
         end
 
         context "when all ids match" do
@@ -182,7 +220,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing an array of ids" do
 
         let!(:band_two) do
-          Band.create(name: "Tool")
+          Band.create!(name: "Tool")
         end
 
         context "when all ids match" do
@@ -307,7 +345,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a splat of extended json ids" do
 
         let!(:band_two) do
-          Band.create(name: "Tool")
+          Band.create!(name: "Tool")
         end
 
         context "when all ids match" do
@@ -379,7 +417,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing an array of extended json ids" do
 
         let!(:band_two) do
-          Band.create(name: "Tool")
+          Band.create!(name: "Tool")
         end
 
         context "when all ids match" do
@@ -460,7 +498,7 @@ describe Mongoid::Criteria::Findable do
       end
 
       let!(:band) do
-        Band.create do |band|
+        Band.create! do |band|
           band.id = "tool"
         end
       end
@@ -521,7 +559,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a splat of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = "depeche-mode"
           end
         end
@@ -584,7 +622,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing an array of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = "depeche-mode"
           end
         end
@@ -656,7 +694,7 @@ describe Mongoid::Criteria::Findable do
       end
 
       let!(:band) do
-        Band.create do |band|
+        Band.create! do |band|
           band.id = {"new-order" => true, "Depeche Mode" => false}
         end
       end
@@ -717,7 +755,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a splat of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = {"Radiohead" => false, "Nirvana"=> true}
           end
         end
@@ -780,7 +818,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing an array of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = {"Radiohead" => false, "Nirvana"=> true}
           end
         end
@@ -852,7 +890,7 @@ describe Mongoid::Criteria::Findable do
       end
 
       let!(:band) do
-        Band.create do |band|
+        Band.create! do |band|
           band.id = 1
         end
       end
@@ -913,7 +951,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a splat of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = 2
           end
         end
@@ -976,7 +1014,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing an array of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = 2
           end
         end
@@ -1039,7 +1077,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a range" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = 2
           end
         end
@@ -1111,7 +1149,7 @@ describe Mongoid::Criteria::Findable do
     context "when using string and object ids" do
 
       let!(:band) do
-        Band.create
+        Band.create!
       end
 
       context "when providing multiple ids" do
@@ -1151,11 +1189,11 @@ describe Mongoid::Criteria::Findable do
   describe "#multiple_from__db" do
 
     let!(:band) do
-      Band.create(name: "Depeche Mode")
+      Band.create!(name: "Depeche Mode")
     end
 
     let!(:band_two) do
-      Band.create(name: "Tool")
+      Band.create!(name: "Tool")
     end
 
     context "when providing a single id" do
@@ -1196,4 +1234,23 @@ describe Mongoid::Criteria::Findable do
       end
     end
   end
+
+  describe '#from_database_selector' do
+    let(:criteria) { Mongoid::Criteria.new(Band) }
+    let(:result) { criteria.send(:from_database_selector, [1]) }
+
+    context 'when criteria is empty' do
+      it 'adds id' do
+        expect(result.selector).to eq('_id' => 1)
+      end
+    end
+
+    context 'when criteria is restricted by id' do
+      let(:criteria) { Mongoid::Criteria.new(Band).where(id: 2) }
+
+      it 'adds id' do
+        expect(result.selector).to eq('_id' => 2, '$and' => [{'_id' => 1}])
+      end
+    end
+  end
 end

data/spec/mongoid/criteria/inspectable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Inspectable do

data/spec/mongoid/criteria/marshalable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Marshalable do

data/spec/mongoid/criteria/modifiable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Modifiable do
@@ -10,7 +12,7 @@ describe Mongoid::Criteria::Modifiable do
 
     context "when provided valid attributes" do
       let(:band) do
-        criteria.create(genres: [ "electro" ])
+        criteria.create!(genres: [ "electro" ])
       end
 
       it "returns the created document" do
@@ -31,7 +33,7 @@ describe Mongoid::Criteria::Modifiable do
       context "when provided valid attributes & using block" do
 
         let(:band) do
-          criteria.create do |c|
+          criteria.create! do |c|
             c.genres = [ "electro" ]
           end
         end
@@ -61,7 +63,7 @@ describe Mongoid::Criteria::Modifiable do
       end
 
       let(:document) do
-        criteria.create
+        criteria.create!
       end
 
       it 'sets the polymorphic id' do
@@ -130,9 +132,9 @@ describe Mongoid::Criteria::Modifiable do
       end
 
       before do
-        Person.create(title: "Madam")
+        Person.create!(title: "Madam")
         2.times do |n|
-          Person.create(
+          Person.create!(
             title: "Sir",
             name: name,
             addresses: [ address_one, address_two ]
@@ -217,7 +219,7 @@ describe Mongoid::Criteria::Modifiable do
       context "when providing an attribute" do
 
         let!(:person) do
-          Person.create(title: "Senior")
+          Person.create!(title: "Senior")
         end
 
         it "returns the document" do
@@ -230,11 +232,11 @@ describe Mongoid::Criteria::Modifiable do
         context "with an owner with a BSON identity type" do
 
           let!(:person) do
-            Person.create
+            Person.create!
           end
 
           let!(:game) do
-            Game.create(person: person)
+            Game.create!(person: person)
           end
 
           context "when providing the object directly" do
@@ -263,11 +265,11 @@ describe Mongoid::Criteria::Modifiable do
         context "with an owner with an Integer identity type" do
 
           let!(:jar) do
-            Jar.create
+            Jar.create!
           end
 
           let!(:cookie) do
-            Cookie.create(jar: jar)
+            Cookie.create!(jar: jar)
           end
 
           let(:from_db) do
@@ -286,11 +288,11 @@ describe Mongoid::Criteria::Modifiable do
       context "when providing a document" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:game) do
-          Game.create
+          Game.create!
         end
 
         let(:from_db) do
@@ -370,7 +372,7 @@ describe Mongoid::Criteria::Modifiable do
       context "when providing an attribute" do
 
         let!(:person) do
-          Person.create(title: "Senior")
+          Person.create!(title: "Senior")
         end
 
         it "returns the document" do
@@ -383,11 +385,11 @@ describe Mongoid::Criteria::Modifiable do
         context "with an owner with a BSON identity type" do
 
           let!(:person) do
-            Person.create
+            Person.create!
           end
 
           let!(:game) do
-            Game.create(person: person)
+            Game.create!(person: person)
           end
 
           context "when providing the object directly" do
@@ -416,11 +418,11 @@ describe Mongoid::Criteria::Modifiable do
         context "with an owner with an Integer identity type" do
 
           let!(:jar) do
-            Jar.create
+            Jar.create!
           end
 
           let!(:cookie) do
-            Cookie.create(jar: jar)
+            Cookie.create!(jar: jar)
           end
 
           let(:from_db) do
@@ -439,11 +441,11 @@ describe Mongoid::Criteria::Modifiable do
       context "when providing a document" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:game) do
-          Game.create
+          Game.create!
         end
 
         let(:from_db) do
@@ -538,7 +540,7 @@ describe Mongoid::Criteria::Modifiable do
     context "when the document is found" do
 
       let!(:person) do
-        Person.create(title: "Senior")
+        Person.create!(title: "Senior")
       end
 
       it "returns the document" do
@@ -608,7 +610,7 @@ describe Mongoid::Criteria::Modifiable do
   describe "first_or_create" do
 
     let!(:band) do
-      Band.create(name: "Depeche Mode")
+      Band.create!(name: "Depeche Mode")
     end
 
     context "when the document is found" do
@@ -702,7 +704,7 @@ describe Mongoid::Criteria::Modifiable do
           end
 
           it 'uses the values from the attributes' do
-            expect(document.map).to eq({ foo: :bar })
+            expect(document.map).to eq('foo' => :bar )
           end
         end
 
@@ -721,7 +723,7 @@ describe Mongoid::Criteria::Modifiable do
 
           let(:band) do
             record = Record.new(producers: ['testing'])
-            band = Band.create(records: [record])
+            band = Band.create!(records: [record])
           end
 
           let(:document) do
@@ -749,7 +751,7 @@ describe Mongoid::Criteria::Modifiable do
         context 'when the criteria has a deeply-nested selector with query operators' do
 
           let(:criteria) do
-            band = Band.create
+            band = Band.create!
             Mongoid::Criteria.new(Record) do |criteria|
               criteria.embedded = true
               criteria.association = Band.reflect_on_association(:records)
@@ -790,7 +792,7 @@ describe Mongoid::Criteria::Modifiable do
       context "when the criteria is on an embedded relation" do
 
         let!(:band) do
-          Band.create(name: "Placebo")
+          Band.create!(name: "Placebo")
         end
 
         let(:document) do
@@ -1073,7 +1075,7 @@ describe Mongoid::Criteria::Modifiable do
   describe "first_or_initialize" do
 
     let!(:band) do
-      Band.create(name: "Depeche Mode")
+      Band.create!(name: "Depeche Mode")
     end
 
     context "when the document is found" do
@@ -1247,11 +1249,11 @@ describe Mongoid::Criteria::Modifiable do
     end
 
     let!(:address_one) do
-      person.addresses.create(street: "Oranienstr")
+      person.addresses.create!(street: "Oranienstr")
     end
 
     let!(:address_two) do
-      person.addresses.create(street: "Wienerstr")
+      person.addresses.create!(street: "Wienerstr")
     end
 
     context "when updating the root document" do
@@ -1392,11 +1394,11 @@ describe Mongoid::Criteria::Modifiable do
         end
 
         let!(:preference_one) do
-          person.preferences.create(name: "First")
+          person.preferences.create!(name: "First")
         end
 
         let!(:preference_two) do
-          person.preferences.create(name: "Second")
+          person.preferences.create!(name: "Second")
         end
 
         context "when updating the relation directly" do
@@ -1435,15 +1437,15 @@ describe Mongoid::Criteria::Modifiable do
   describe "#update_all" do
 
     let!(:person) do
-      Person.create(title: "Sir")
+      Person.create!(title: "Sir")
     end
 
     let!(:address_one) do
-      person.addresses.create(street: "Oranienstr")
+      person.addresses.create!(street: "Oranienstr")
     end
 
     let!(:address_two) do
-      person.addresses.create(street: "Wienerstr")
+      person.addresses.create!(street: "Wienerstr")
     end
 
     context "when updating the root document" do
@@ -1542,11 +1544,11 @@ describe Mongoid::Criteria::Modifiable do
       context "when the relation is a references many" do
 
         let!(:post_one) do
-          person.posts.create(title: "First")
+          person.posts.create!(title: "First")
         end
 
         let!(:post_two) do
-          person.posts.create(title: "Second")
+          person.posts.create!(title: "Second")
         end
 
         context "when updating the relation directly" do
@@ -1595,11 +1597,11 @@ describe Mongoid::Criteria::Modifiable do
         end
 
         let!(:preference_one) do
-          person.preferences.create(name: "First")
+          person.preferences.create!(name: "First")
         end
 
         let!(:preference_two) do
-          person.preferences.create(name: "Second")
+          person.preferences.create!(name: "Second")
         end
 
         context "when updating the relation directly" do
@@ -1773,7 +1775,7 @@ describe Mongoid::Criteria::Modifiable do
           end
         end
 
-        context 'when a write method is chained' do
+        context 'when a write method is chained producing conflicting criteria' do
 
           let(:new_person) do
             criteria.create_with(attrs).find_or_create_by(query)
@@ -1797,9 +1799,10 @@ describe Mongoid::Criteria::Modifiable do
               criteria.create_with(attrs).find_or_create_by(query)
             end
 
-            it 'finds the matching document' do
+            it 'creates a new document' do
               person
-              expect(found_person.id).to eq(person.id)
+              expect(found_person.id).not_to eq(person.id)
+              expect(found_person.id > person.id).to be true
             end
           end
         end

data/spec/mongoid/criteria/options_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Options do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Queryable::Aggregable do
@@ -12,7 +14,7 @@ describe Mongoid::Criteria::Queryable::Aggregable do
       expect(aggregation).to_not equal(query)
     end
 
-    it "sets the aggrating flag" do
+    it "sets the aggregating flag" do
       expect(aggregation).to be_aggregating
     end
   end

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongoid::Criteria::Queryable::Expandable do
+
+  let(:query) do
+    Mongoid::Query.new
+  end
+
+  describe '#expand_condition_to_array_values' do
+    shared_examples_for 'expands' do
+
+      it 'expands' do
+        query.send(:expand_condition_to_array_values, criterion).should == expected
+      end
+
+      context 'when input is frozen' do
+        before do
+          criterion.freeze
+        end
+
+        it 'expands' do
+          query.send(:expand_condition_to_array_values, criterion).should == expected
+        end
+      end
+
+      it 'does not modify input' do
+        criterion_copy = criterion.dup.freeze
+
+        query.send(:expand_condition_to_array_values, criterion).should == expected
+
+        expect(criterion).to eq(criterion_copy)
+      end
+    end
+
+    context 'literal value' do
+      let(:criterion) do
+        {foo: 4}
+      end
+
+      let(:expected) do
+        {foo: [4]}
+      end
+
+      it_behaves_like 'expands'
+    end
+
+    context 'Range value' do
+      let(:criterion) do
+        {foo: 1..4}
+      end
+
+      let(:expected) do
+        {foo: [1, 2, 3, 4]}
+      end
+
+      it_behaves_like 'expands'
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Array do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe BigDecimal do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Bignum do

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
-describe Boolean do
+describe Mongoid::Boolean do
 
   describe ".evolve" do
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Date do