mongoid 7.0.2 → 8.1.1

data/spec/mongoid/criteria/includable_spec_models.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+class IncUser
+  include Mongoid::Document
+  has_many :posts, class_name: 'IncPost'
+  has_many :comments, class_name: 'IncComment'
+end
+
+class IncPost
+  include Mongoid::Document
+  belongs_to :user, class_name: 'IncUser'
+  has_many :comments, class_name: 'IncComment'
+end
+
+class IncComment
+  include Mongoid::Document
+  belongs_to :posts, class_name: 'IncPost'
+  belongs_to :user, class_name: 'IncUser'
+  belongs_to :thread, class_name: 'IncThread'
+end
+
+class IncThread
+  include Mongoid::Document
+  has_many :comments, class_name: 'IncComment'
+end
+
+class IncBlog
+  include Mongoid::Document
+
+  has_and_belongs_to_many :posts, class_name: "IncBlogPost"
+  belongs_to :highlighted_post, class_name: "IncBlogPost"
+  belongs_to :pinned_post, class_name: "IncBlogPost"
+end
+
+class IncBlogPost
+  include Mongoid::Document
+
+  belongs_to :author, class_name: "IncAuthor"
+end
+
+class IncAuthor
+  include Mongoid::Document
+end
+
+class IncPost
+  include Mongoid::Document
+  belongs_to :person, class_name: "IncPerson"
+end
+
+class IncPerson
+  include Mongoid::Document
+  has_many :posts, class_name: "IncPost"
+  field :name
+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,7 +1,8 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Marshalable do
-
   describe "Marshal.dump" do
 
     let(:criteria) do
@@ -24,5 +25,23 @@ describe Mongoid::Criteria::Marshalable do
     it "loads the proper attributes" do
       expect(Marshal.load(Marshal.dump(criteria))).to eq(criteria)
     end
+
+    context "when it receives driver mongo1x" do
+      let(:dump) { Marshal.dump(criteria) }
+
+      before do
+        expect_any_instance_of(Mongoid::Criteria).to receive(:marshal_dump).and_wrap_original do |m, *args|
+          data = m.call(*args)
+          data[1] = :mongo1x
+          data
+        end
+      end
+
+      it "raises an error" do
+        expect do
+          Marshal.load(dump)
+        end.to raise_error(NotImplementedError, /Mongoid no longer supports marshalling with driver version 1.x./)
+      end
+    end
   end
 end

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
@@ -1643,11 +1645,15 @@ describe Mongoid::Criteria::Modifiable do
         { 'username' => 'Turnip' }
       end
 
-      it 'returns a criteria with the defined attributes' do
-        expect(Person.create_with(attrs).selector).to eq(attrs)
+      it 'does not modify the selector' do
+        expect(Person.create_with(attrs).selector[:username]).to be_nil
       end
 
-      context 'when a method is chained' do
+      it 'create_attrs is modified' do
+        expect(Person.create_with(attrs).create_attrs).to eq(attrs)
+      end
+
+      context 'when a create is chained' do
 
         context 'when a write method is chained' do
 
@@ -1671,6 +1677,25 @@ describe Mongoid::Criteria::Modifiable do
             expect(new_person.age).to eq(50)
           end
 
+          context 'when a matching document is already in the collection' do
+            let(:query) do
+              { 'username' => 'foo', 'age' => 12 }
+            end
+
+            let(:person) do
+              Person.create!(query)
+            end
+
+            let(:found_person) do
+              Person.create_with(attrs).find_or_create_by(query)
+            end
+
+            it 'finds the matching document' do
+              person
+              expect(found_person.id).to eq(person.id)
+            end
+          end
+
           context 'when the attributes are shared with the write method args' do
 
             let(:query) do
@@ -1681,7 +1706,7 @@ describe Mongoid::Criteria::Modifiable do
               Person.create_with(attrs).find_or_create_by(query)
             end
 
-            it 'gives the write method args precedence' do
+            it 'gives the find method args precedence' do
               expect(new_person.username).to eq('Beet')
               expect(new_person.age).to eq(50)
             end
@@ -1708,8 +1733,12 @@ describe Mongoid::Criteria::Modifiable do
             { 'username' => 'Beet', 'age' => 50 }
           end
 
+          it 'does not modify the selector' do
+            expect(criteria.create_with(attrs).selector).to eq(criteria_selector)
+          end
+
           it 'overwrites all the original attributes' do
-            expect(criteria.create_with(attrs).selector).to eq(attrs)
+            expect(criteria.create_with(attrs).create_attrs).to eq(attrs)
           end
         end
       end
@@ -1720,8 +1749,12 @@ describe Mongoid::Criteria::Modifiable do
           { 'username' => 'Beet' }
         end
 
+        it 'does not modify the selector' do
+          expect(criteria.create_with(attrs).selector).to eq(criteria_selector)
+        end
+
         it 'only overwrites the shared attributes' do
-          expect(criteria.create_with(attrs).selector).to eq(criteria_selector.merge!(attrs))
+          expect(criteria.create_with(attrs).create_attrs).to eq(attrs)
         end
       end
 
@@ -1730,12 +1763,11 @@ describe Mongoid::Criteria::Modifiable do
         let(:attrs) do
           { 'username' => 'Turnip' }
         end
-
         let(:query) do
           { 'username' => 'Beet', 'age' => 50 }
         end
 
-        context 'when a write method is chained' do
+        context 'when a create method is chained' do
 
           it 'executes the method' do
             expect(criteria.create_with(attrs).new.username).to eq('Turnip')
@@ -1743,15 +1775,35 @@ 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)
           end
 
-          it 'executes the query' do
+          it 'gives the find method arg precedence' do
             expect(new_person.username).to eq('Beet')
-            expect(new_person.age).to eq(50)
+            expect(new_person.age).to be(50)
+          end
+
+          context 'when a matching document is already in the collection' do
+            let(:query) do
+              { 'username' => 'foo', 'age' => 12 }
+            end
+
+            let(:person) do
+              Person.create!(query)
+            end
+
+            let(:found_person) do
+              criteria.create_with(attrs).find_or_create_by(query)
+            end
+
+            it 'creates a new document' do
+              person
+              expect(found_person.id).not_to eq(person.id)
+              expect(found_person.id > person.id).to be true
+            end
           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
@@ -31,6 +33,13 @@ describe Array do
         expect(described_class.evolve("testing")).to eq("testing")
       end
     end
+
+    context "when providing a set" do
+
+      it "returns an array" do
+        expect(described_class.evolve([ 1, 2, 3 ].to_set)).to eq([ 1, 2, 3 ])
+      end
+    end
   end
 
   describe "#__add__" do
@@ -501,23 +510,4 @@ describe Array do
       end
     end
   end
-
-  describe "#update_values" do
-
-    let(:array) do
-      [ 1, 2, 3 ]
-    end
-
-    let(:updated) do
-      array.update_values(&:to_s)
-    end
-
-    it "replaces each of the values with the result of the block" do
-      expect(updated).to eq([ "1", "2", "3" ])
-    end
-
-    it "returns the same instance of the array" do
-      expect(updated).to equal(array)
-    end
-  end
 end