mongoid 7.1.1 → 8.1.0

data/spec/mongoid/clients/transactions_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -55,15 +54,19 @@ describe Mongoid::Clients::Sessions do
 
   context 'when a transaction is used on a model class' do
 
-    context 'when transactions are supported', if: testing_transactions? do
+    context 'when transactions are supported' do
+      require_transaction_support
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         Mongoid::Clients.with_name(:other).command(create: :people)
         Mongoid::Clients.with_name(:other).command(create: :posts)
+        Mongoid::Clients.with_name(:other).command(create: :canvases)
         subscriber.clear_events!
-        Person.with(client: :other) do
-          example.run
+        Canvas.with(client: :other) do
+          Person.with(client: :other) do
+            example.run
+          end
         end
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
       end
@@ -73,9 +76,9 @@ describe Mongoid::Clients::Sessions do
         let!(:last_use_diff) do
           Person.with_session do |s|
             s.start_transaction
-            Person.create
-            Person.create
-            Thread.new { Person.create }.value
+            Person.create!
+            Person.create!
+            Thread.new { Person.create! }.value
             s.commit_transaction
           end
         end
@@ -93,8 +96,8 @@ describe Mongoid::Clients::Sessions do
         before do
           Person.with_session do |s|
             s.start_transaction
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
             s.commit_transaction
           end
         end
@@ -114,9 +117,9 @@ describe Mongoid::Clients::Sessions do
             Post.with(client: :other) do
               Person.with_session do |s|
                 s.start_transaction
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             end
@@ -136,9 +139,9 @@ describe Mongoid::Clients::Sessions do
             begin
               Person.with_session do |s|
                 s.start_transaction
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -168,8 +171,8 @@ describe Mongoid::Clients::Sessions do
               Person.with_session do |s|
                 s.start_transaction
                 s.start_transaction
-                Person.create
-                Post.create
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -189,16 +192,39 @@ describe Mongoid::Clients::Sessions do
           end
         end
       end
+
+      context 'When reloading an embedded document created inside a transaction' do
+        it 'does not raise an error and has the correct document' do
+          Canvas.with_session do |s|
+            s.start_transaction
+
+            p = Palette.new
+            c = Canvas.new(palette: p)
+            c.save!
+
+            expect do
+              p.reload
+            end.to_not raise_error
+
+            expect(c.palette).to eq(p)
+
+            s.commit_transaction
+          end
+        end
+      end
     end
 
-    context 'when sessions are supported but transactions are not', if: sessions_supported? && !testing_transactions? do
+    context 'when sessions are supported but transactions are not' do
+      min_server_version '3.6'
+      # Could also test 4.0 in sharded cluster
+      max_server_version '3.6'
 
       let!(:error) do
         e = nil
         begin
           Person.with_session do |s|
             s.start_transaction
-            Person.create
+            Person.create!
             s.commit_transaction
           end
         rescue => ex
@@ -218,11 +244,12 @@ describe Mongoid::Clients::Sessions do
 
     let!(:person) do
       Person.with(client: :other) do |klass|
-        klass.create
+        klass.create!
       end
     end
 
-    context 'when transactions are supported', if: testing_transactions? do
+    context 'when transactions are supported' do
+      require_transaction_support
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -241,9 +268,9 @@ describe Mongoid::Clients::Sessions do
           person.with_session do |s|
             s.start_transaction
             person.username = 'Emily'
-            person.save
+            person.save!
             person.age = 80
-            person.save
+            person.save!
             s.commit_transaction
           end
         end
@@ -265,8 +292,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do |s|
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             end
@@ -291,8 +318,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do |s|
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -322,8 +349,8 @@ describe Mongoid::Clients::Sessions do
                 s.start_transaction
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -345,16 +372,23 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported but transactions are not', if: sessions_supported? && !testing_transactions? do
+    context 'when sessions are supported but transactions are not' do
+      min_server_version '3.6'
+      # Could also test 4.0 in sharded cluster
+      max_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         Mongoid::Clients.with_name(:other).command(create: :people)
-        subscriber.clear_events!
-        person.with(client: :other) do
-          example.run
+
+        begin
+          subscriber.clear_events!
+          person.with(client: :other) do
+            example.run
+          end
+        ensure
+          Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         end
-        Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
       end
 
       let!(:error) do
@@ -363,7 +397,7 @@ describe Mongoid::Clients::Sessions do
           person.with_session do |s|
             s.start_transaction
             person.username = 'Emily'
-            person.save
+            person.save!
             s.commit_transaction
           end
         rescue => ex

data/spec/mongoid/clients_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -728,7 +727,7 @@ describe Mongoid::Clients do
     end
   end
 
-  describe ".store_in", if: non_legacy_server? do
+  describe ".store_in" do
 
     context "when provided a non hash" do
 
@@ -739,19 +738,6 @@ describe Mongoid::Clients do
       end
     end
 
-    context "when provided a class that extends another document" do
-
-      let(:klass) do
-        Class.new(Band)
-      end
-
-      it "raises an error" do
-        expect {
-          klass.store_in(database: :artists)
-        }.to raise_error(Mongoid::Errors::InvalidStorageParent)
-      end
-    end
-
     context "when provided a hash" do
 
       context "when the hash is not valid" do
@@ -763,9 +749,131 @@ describe Mongoid::Clients do
         end
       end
     end
+
+    context "when it is called on a subclass" do
+
+      let(:client) { StoreParent.collection.client }
+      let(:parent) { StoreParent.create! }
+      let(:child1) { StoreChild1.create! }
+      let(:child2) { StoreChild2.create! }
+
+      before do
+        class StoreParent
+          include Mongoid::Document
+        end
+
+        class StoreChild1 < StoreParent
+        end
+
+        class StoreChild2 < StoreParent
+        end
+      end
+
+      after do
+        Object.send(:remove_const, :StoreParent)
+        Object.send(:remove_const, :StoreChild1)
+        Object.send(:remove_const, :StoreChild2)
+      end
+
+      context "when it is not called on the parent" do
+
+        context "when it is called on all subclasses" do
+
+          before do
+            StoreChild1.store_in collection: :store_ones
+            StoreChild2.store_in collection: :store_twos
+            [ parent, child1, child2 ]
+          end
+
+          let(:db_parent) { client['store_parents'].find.first }
+          let(:db_child1) { client['store_ones'].find.first }
+          let(:db_child2) { client['store_twos'].find.first }
+
+          it "stores the documents in the correct collections" do
+            expect(db_parent).to eq({ "_id" => parent.id, "_type" => "StoreParent" })
+            expect(db_child1).to eq({ "_id" => child1.id, "_type" => "StoreChild1" })
+            expect(db_child2).to eq({ "_id" => child2.id, "_type" => "StoreChild2" })
+          end
+
+          it "only queries from its own collections" do
+            expect(StoreParent.count).to eq(1)
+            expect(StoreChild1.count).to eq(1)
+            expect(StoreChild2.count).to eq(1)
+          end
+        end
+
+        context "when it is called on one of the subclasses" do
+
+          before do
+            StoreChild1.store_in collection: :store_ones
+            [ parent, child1, child2 ]
+          end
+
+          let(:db_parent) { client['store_parents'].find.first }
+          let(:db_child1) { client['store_ones'].find.first }
+          let(:db_child2) { client['store_parents'].find.to_a.last }
+
+          it "stores the documents in the correct collections" do
+            expect(db_parent).to eq({ "_id" => parent.id, "_type" => "StoreParent" })
+            expect(db_child1).to eq({ "_id" => child1.id, "_type" => "StoreChild1" })
+            expect(db_child2).to eq({ "_id" => child2.id, "_type" => "StoreChild2" })
+          end
+
+          it "queries from its own collections" do
+            expect(StoreParent.count).to eq(2)
+            expect(StoreChild1.count).to eq(1)
+            expect(StoreChild2.count).to eq(1)
+          end
+        end
+      end
+
+      context "when it is called on the parent" do
+
+        before do
+          StoreParent.store_in collection: :st_parents
+        end
+
+        context "when it is called on all subclasses" do
+
+          before do
+            StoreChild1.store_in collection: :store_ones
+            StoreChild2.store_in collection: :store_twos
+            [ parent, child1, child2 ]
+          end
+
+          let(:db_parent) { client['st_parents'].find.first }
+          let(:db_child1) { client['store_ones'].find.first }
+          let(:db_child2) { client['store_twos'].find.first }
+
+          it "stores the documents in the correct collections" do
+            expect(db_parent).to eq({ "_id" => parent.id, "_type" => "StoreParent" })
+            expect(db_child1).to eq({ "_id" => child1.id, "_type" => "StoreChild1" })
+            expect(db_child2).to eq({ "_id" => child2.id, "_type" => "StoreChild2" })
+          end
+        end
+
+        context "when it is called on one of the subclasses" do
+
+          before do
+            StoreChild1.store_in collection: :store_ones
+            [ parent, child1, child2 ]
+          end
+
+          let(:db_parent) { client['st_parents'].find.first }
+          let(:db_child1) { client['store_ones'].find.first }
+          let(:db_child2) { client['st_parents'].find.to_a.last }
+
+          it "stores the documents in the correct collections" do
+            expect(db_parent).to eq({ "_id" => parent.id, "_type" => "StoreParent" })
+            expect(db_child1).to eq({ "_id" => child1.id, "_type" => "StoreChild1" })
+            expect(db_child2).to eq({ "_id" => child2.id, "_type" => "StoreChild2" })
+          end
+        end
+      end
+    end
   end
 
-  describe ".with", if: non_legacy_server? do
+  describe ".with" do
 
     context "when changing write concern options" do
 
@@ -792,18 +900,18 @@ describe Mongoid::Clients do
         end
       end
 
-      describe ".create" do
+      describe ".create!" do
 
         let!(:band) do
           Band.with(database: database_id_alt) do |klass|
-            klass.create
+            klass.create!
           end
         end
 
         it "does not persist to the default database" do
           expect {
             Band.find(band.id)
-          }.to raise_error(Mongoid::Errors::DocumentNotFound)
+          }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
         end
 
         let(:from_db) do
@@ -830,18 +938,18 @@ describe Mongoid::Clients do
 
     context "when sending operations to a different collection" do
 
-      describe ".create" do
+      describe ".create!" do
 
         let!(:band) do
           Band.with(collection: "artists") do |klass|
-            klass.create
+            klass.create!
           end
         end
 
         it "does not persist to the default database" do
           expect {
             Band.find(band.id)
-          }.to raise_error(Mongoid::Errors::DocumentNotFound)
+          }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
         end
 
         let(:from_db) do
@@ -945,7 +1053,7 @@ describe Mongoid::Clients do
       describe ".save" do
 
         before do
-          Person.create(ssn: "432-97-1113")
+          Person.create!(ssn: "432-97-1113")
         end
 
         context "when a mongodb error occurs" do
@@ -1013,6 +1121,61 @@ describe Mongoid::Clients do
         end
       end
     end
+
+    context 'when requesting named client' do
+      let(:secondary_client) do
+        double(Mongo::Client).tap do |client|
+          allow(client).to receive(:cluster).and_return(double("cluster"))
+        end
+      end
+
+      before do
+        expect(Mongoid::Clients::Factory).to receive(:create)
+          .with(:secondary)
+          .and_return(secondary_client)
+      end
+
+      after do
+        Mongoid::Clients.clients.delete(:secondary)
+      end
+
+      it 'does not close the client' do
+        expect(secondary_client).not_to receive(:close)
+
+        Band.with(client: :default) do |klass|
+          klass.mongo_client
+        end
+
+        Band.with(client: :secondary) do |klass|
+          klass.mongo_client
+        end
+      end
+    end
+
+    context 'when using on different objects' do
+      require_mri
+
+      let(:first_band) do
+        Band.create!(name: "The Beatles")
+      end
+
+      let(:second_band) do
+        Band.create!(name: 'Led Zeppelin')
+      end
+
+      it 'does not create extra symbols symbols' do
+        first_band.with(write: { w: 0, j: false }) do |band|
+          band.set(active: false)
+        end
+        initial_symbols_count = Symbol.all_symbols.size
+        second_band.with(write: { w: 0, j: false }) do |band|
+          band.set(active: false)
+        end
+        expect(Symbol.all_symbols.size).to eq(initial_symbols_count)
+      end
+
+    end
+
   end
 
   context "when overriding the default database" do
@@ -1038,7 +1201,7 @@ describe Mongoid::Clients do
       end
 
       let!(:band) do
-        Band.create(name: "Tool")
+        Band.create!(name: "Tool")
       end
 
       it "persists to the overridden database" do

data/spec/mongoid/collection_configurable_spec.rb

@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongoid::CollectionConfigurable do
+
+  before(:all) do
+    class CollectionConfigurableValidOptions
+      include Mongoid::Document
+
+      store_in collection_options: {
+        capped: true,
+        size: 2560
+      }
+    end
+
+    class CollectionConfigurableUnknownOptions
+      include Mongoid::Document
+
+      store_in collection_options: {
+        i_am_not_an_option: true,
+        let_me: { fail: true }
+      }
+    end
+
+    class CollectionConfigurableInvalidOptions
+      include Mongoid::Document
+
+      store_in collection_options: {
+        capped: true
+        # Creating a capped collection requires `size` field; therefore,
+        # an attempt to create a collection with only `capped : true` option
+        # fails.
+      }
+    end
+  end
+
+  after(:all) do
+    Mongoid.deregister_model(CollectionConfigurableValidOptions)
+    Object.send(:remove_const, :CollectionConfigurableValidOptions)
+    Mongoid.deregister_model(CollectionConfigurableUnknownOptions)
+    Object.send(:remove_const, :CollectionConfigurableUnknownOptions)
+    Mongoid.deregister_model(CollectionConfigurableInvalidOptions)
+    Object.send(:remove_const, :CollectionConfigurableInvalidOptions)
+  end
+
+  after(:each) do
+    [
+      CollectionConfigurableValidOptions,
+      CollectionConfigurableUnknownOptions
+    ].each do |klazz|
+      klazz.collection.drop
+    end
+  end
+
+  context 'when collection does not exist' do
+    context 'with valid options' do
+      let(:subject) do
+        CollectionConfigurableValidOptions
+      end
+
+      before(:each) do
+        subject.create_collection
+      end
+
+      let(:coll_options) do
+        subject.collection.database.list_collections(filter: { name: subject.collection_name.to_s }).first
+      end
+
+      it 'creates the collection' do
+        expect(coll_options).not_to be_nil
+      end
+
+      it 'passes collection options' do
+        expect(coll_options.dig('options', 'capped')).to eq(true)
+        expect(coll_options.dig('options', 'size')).to eq(2560)
+      end
+    end
+
+    context 'with an unknown collection options' do
+      let(:subject) do
+        CollectionConfigurableUnknownOptions
+      end
+
+      it 'raises an error' do
+        expect do
+          subject.create_collection
+        end.to raise_error(Mongoid::Errors::CreateCollectionFailure)
+      end
+    end
+
+    context 'with invalid options' do
+      let(:subject) do
+        CollectionConfigurableInvalidOptions
+      end
+
+      it 'raises an error' do
+        expect do
+          subject.create_collection
+        end.to raise_error(Mongoid::Errors::CreateCollectionFailure)
+      end
+    end
+  end
+
+  context 'when collection exists' do
+    let(:subject) do
+      CollectionConfigurableValidOptions
+    end
+
+    context 'when force is false' do
+      let(:logger) do
+        double("logger").tap do |log|
+          expect(log).to receive(:debug).once.with(/Collection '#{subject.collection_name}' already exist/)
+        end
+      end
+
+      before do
+        allow(subject).to receive(:logger).and_return(logger)
+        subject.collection.create
+      end
+
+      it 'logs a message' do
+        subject.create_collection
+      end
+    end
+
+    context 'when force is true' do
+      let(:logger) do
+        double("logger")
+      end
+
+      let(:coll_options) do
+        subject.collection.database.list_collections(filter: { name: subject.collection_name.to_s }).first
+      end
+
+      before do
+        allow(subject).to receive(:logger).and_return(logger)
+        subject.collection.create
+      end
+
+      it 'does not log a message' do
+        expect(logger).to receive(:debug).never.with(/Collection '#{subject.collection_name}' already exist/)
+        subject.create_collection(force: true)
+      end
+
+      it 'creates the collection' do
+        subject.create_collection(force: true)
+        expect(coll_options).not_to be_nil
+      end
+
+      it 'passes collection options' do
+        subject.create_collection(force: true)
+        expect(coll_options.dig('options', 'capped')).to eq(true)
+        expect(coll_options.dig('options', 'size')).to eq(2560)
+      end
+    end
+  end
+end

data/spec/mongoid/composable_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"