mongoid 6.3.0 → 6.4.5

data/lib/mongoid/relations/many.rb

@@ -213,6 +213,10 @@ module Mongoid
 
       private
 
+      def _session
+        base.send(:_session)
+      end
+
       # Find the first object given the supplied attributes or create/initialize it.
       #
       # @example Find or create|initialize.

data/lib/mongoid/relations/referenced/many.rb

@@ -477,7 +477,7 @@ module Mongoid
         # @since 3.0.0
         def persist_delayed(docs, inserts)
           unless docs.empty?
-            collection.insert_many(inserts)
+            collection.insert_many(inserts, session: _session)
             docs.each do |doc|
               doc.new_record = false
               doc.run_after_callbacks(:create, :save)

data/lib/mongoid/relations/touchable.rb

@@ -31,7 +31,7 @@ module Mongoid
         touches = touch_atomic_updates(field)
         unless touches["$set"].blank?
           selector = atomic_selector
-          _root.collection.find(selector).update_one(positionally(selector, touches))
+          _root.collection.find(selector).update_one(positionally(selector, touches), session: _session)
         end
         run_callbacks(:touch)
         true

data/lib/mongoid/reloadable.rb

@@ -58,7 +58,7 @@ module Mongoid
     #
     # @since 2.3.2
     def reload_root_document
-      {}.merge(collection.find(_id: _id).read(mode: :primary).first || {})
+      {}.merge(collection.find({ _id: _id }, session: _session).read(mode: :primary).first || {})
     end
 
     # Reload the embedded document.

data/lib/mongoid/scopable.rb

@@ -102,7 +102,7 @@ module Mongoid
       #
       # @since 3.0.0
       def default_scopable?
-        default_scoping? && !Threaded.executing?(:without_default_scope)
+        default_scoping? && !Threaded.without_default_scope?(self)
       end
 
       # Get a queryable, either the last one on the scope stack or a fresh one.
@@ -244,10 +244,10 @@ module Mongoid
       #
       # @since 3.0.0
       def without_default_scope
-        Threaded.begin_execution("without_default_scope")
+        Threaded.begin_without_default_scope(self)
         yield
       ensure
-        Threaded.exit_execution("without_default_scope")
+        Threaded.exit_without_default_scope(self)
       end
 
       private

data/lib/mongoid/tasks/database.rb

@@ -44,7 +44,7 @@ module Mongoid
         models.each do |model|
           unless model.embedded?
             begin
-              model.collection.indexes.each do |index|
+              model.collection.indexes(session: model.send(:_session)).each do |index|
                 # ignore default index
                 unless index['name'] == '_id_'
                   key = index['key'].symbolize_keys
@@ -77,7 +77,7 @@ module Mongoid
           indexes.each do |index|
             key = index['key'].symbolize_keys
             collection = model.collection
-            collection.indexes.drop_one(key)
+            collection.indexes(session: model.send(:_session)).drop_one(key)
             logger.info(
               "MONGOID: Removed index '#{index['name']}' on collection " +
               "'#{collection.name}' in database '#{collection.database.name}'."
@@ -107,6 +107,7 @@ module Mongoid
       end
 
       private
+
       def logger
         Mongoid.logger
       end

data/lib/mongoid/threaded.rb

@@ -163,6 +163,30 @@ module Mongoid
       validations_for(document.class).delete_one(document._id)
     end
 
+    # Begin suppressing default scopes for given model on the current thread.
+    #
+    # @example Begin without default scope stack.
+    #   Threaded.begin_without_default_scope(klass)
+    #
+    # @param [ Class ] klass The model to suppress default scoping on.
+    #
+    # @api private
+    def begin_without_default_scope(klass)
+      stack(:without_default_scope).push(klass)
+    end
+
+    # Exit suppressing default scopes for given model on the current thread.
+    #
+    # @example Exit without default scope stack.
+    #   Threaded.exit_without_default_scope(klass)
+    #
+    # @param [ Class ] klass The model to unsuppress default scoping on.
+    #
+    # @api private
+    def exit_without_default_scope(klass)
+      stack(:without_default_scope).delete(klass)
+    end
+
     # Get the global client override.
     #
     # @example Get the global client override.
@@ -247,6 +271,18 @@ module Mongoid
       end
     end
 
+    # Is the given klass' default scope suppressed on the current thread?
+    #
+    # @example Is the given klass' default scope suppressed?
+    #   Threaded.without_default_scope?(klass)
+    #
+    # @param [ Class ] klass The model to check for default scope suppression.
+    #
+    # @api private
+    def without_default_scope?(klass)
+      stack(:without_default_scope).include?(klass)
+    end
+
     # Is the document autosaved on the current thread?
     #
     # @example Is the document autosaved?
@@ -325,5 +361,43 @@ module Mongoid
     def validations_for(klass)
       validations[klass] ||= []
     end
+
+    # Cache a session for this thread.
+    #
+    # @example Save a session for this thread.
+    #   Threaded.set_session(session)
+    #
+    # @param [ Mongo::Session ] session The session to save.
+    #
+    # @since 6.4.0
+    def set_session(session)
+      Thread.current[:session] = session
+    end
+
+    # Get the cached session for this thread.
+    #
+    # @example Get the session for this thread.
+    #   Threaded.get_session
+    #
+    # @return [ Mongo::Session, nil ] The session cached on this thread or nil.
+    #
+    # @since 6.4.0
+    def get_session
+      Thread.current[:session]
+    end
+
+    # Clear the cached session for this thread.
+    #
+    # @example Clear this thread's session.
+    #   Threaded.clear_session
+    #
+    # @return [ nil ]
+    #
+    # @since 6.4.0
+    def clear_session
+      session = get_session
+      session.end_session if session
+      Thread.current[:session] = nil
+    end
   end
 end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "6.3.0"
+  VERSION = "6.4.5"
 end

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -11,6 +11,10 @@ development:
       hosts:
         - localhost:27017
       options:
+        # Note that all options listed below are Ruby driver client options (the mongo gem).
+        # Please refer to the driver documentation of the version of the mongo gem you are using
+        # for the most up-to-date list of options.
+        #
         # Change the default write concern. (default = { w: 1 })
         # write:
         #   w: 1

data/spec/app/models/array_field.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ArrayField
+  include Mongoid::Document
+
+  field :af, type: Array
+end

data/spec/app/models/delegating_patient.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class DelegatingPatient
+  include Mongoid::Document
+
+  embeds_one :email
+
+  # Instance level delegation
+  delegate :address, to: :email
+
+  class << self
+    # Class level delegation
+    delegate :default_client, to: ::Mongoid
+  end
+end

data/spec/integration/document_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Mongoid::Document do
+  context 'when including class uses delegate' do
+    let(:patient) do
+      DelegatingPatient.new(
+        email: Email.new(address: 'test@example.com'),
+      )
+    end
+
+    it 'works for instance level delegation' do
+      patient.address.should == 'test@example.com'
+    end
+
+    it 'works for class level delegation' do
+      DelegatingPatient.default_client.should be Mongoid.default_client
+    end
+  end
+end

data/spec/mongoid/attributes/nested_spec.rb

@@ -205,6 +205,10 @@ describe Mongoid::Attributes::Nested do
         Post.accepts_nested_attributes_for :person
       end
 
+      after do
+        Post.reset_callbacks(:save)
+      end
+
       let(:post) do
         Post.new(person_attributes: { title: "Sir" })
       end

data/spec/mongoid/clients/factory_spec.rb

@@ -1,7 +1,35 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Clients::Factory do
 
+  shared_examples_for 'includes seed address' do
+    let(:configured_address) do
+      address = SpecConfig.instance.addresses.first
+      unless address.include?(':')
+        address = "#{address}:27017"
+      end
+      address
+    end
+
+    let(:expected_addresses) do
+      [
+        configured_address,
+        configured_address.sub(/\Alocalhost:/, '127.0.0.1:'),
+        configured_address.sub(/\A127\.0\.0\.1:/, 'localhost:'),
+      ].uniq
+    end
+
+    it 'includes seed address' do
+      ok = cluster_addresses.any? do |address|
+        expected_addresses.include?(address)
+      end
+      expect(ok).to be true
+    end
+  end
+
   describe ".create" do
 
     context "when provided a name" do
@@ -12,8 +40,8 @@ describe Mongoid::Clients::Factory do
 
           let(:config) do
             {
-              default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-              secondary: { hosts: [ "127.0.0.1:27017" ], database: database_id }
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              secondary: { hosts: SpecConfig.instance.addresses, database: database_id }
             }
           end
 
@@ -37,10 +65,12 @@ describe Mongoid::Clients::Factory do
             expect(client).to be_a(Mongo::Client)
           end
 
-          it "sets the cluster's seeds" do
-            expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+          let(:cluster_addresses) do
+            cluster.addresses.map(&:to_s)
           end
 
+          it_behaves_like 'includes seed address'
+
           it "sets the platform to Mongoid's platform constant" do
             expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
           end
@@ -80,11 +110,11 @@ describe Mongoid::Clients::Factory do
           end
 
           it "sets the cluster's seed ports to 27017" do
-            expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
           end
 
           it "sets ips with no ports to 27017" do
-            expect(default.cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
           end
         end
 
@@ -120,7 +150,7 @@ describe Mongoid::Clients::Factory do
             end
 
             it "sets the cluster's seeds" do
-              expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+              expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
             end
 
             it "sets the database" do
@@ -132,8 +162,8 @@ describe Mongoid::Clients::Factory do
 
             let(:config) do
               {
-                default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-                secondary: { uri: "mongodb://127.0.0.1:27017,127.0.0.1:27018/mongoid_test" }
+                default: { hosts: [ "127.0.0.1:1234" ], database: database_id, server_selection_timeout: 1 },
+                secondary: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/mongoid_test?serverSelectionTimeoutMS=1000" }
               }
             end
 
@@ -162,7 +192,7 @@ describe Mongoid::Clients::Factory do
             end
 
             it "sets the cluster's seeds" do
-              expect(seeds).to eq([ "127.0.0.1:27017", "127.0.0.1:27018" ])
+              expect(seeds).to eq([ "127.0.0.1:1234", "127.0.0.1:5678" ])
             end
           end
         end
@@ -181,7 +211,7 @@ describe Mongoid::Clients::Factory do
     context "when no name is provided" do
 
       let(:config) do
-        { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
+        { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
       end
 
       before do
@@ -200,17 +230,15 @@ describe Mongoid::Clients::Factory do
         client.cluster
       end
 
-      let(:seeds) do
-        cluster.addresses.map{ |address| address.to_s }
+      let(:cluster_addresses) do
+        cluster.addresses.map(&:to_s)
       end
 
       it "returns the default client" do
         expect(client).to be_a(Mongo::Client)
       end
 
-      it "sets the cluster's seeds" do
-        expect(seeds).to eq([ "127.0.0.1:27017" ])
-      end
+      it_behaves_like 'includes seed address'
     end
 
     context "when nil is provided and no default config" do
@@ -230,7 +258,7 @@ describe Mongoid::Clients::Factory do
   describe ".default" do
 
     let(:config) do
-      { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
+      { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
     end
 
     before do
@@ -249,17 +277,15 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:seeds) do
-      cluster.addresses.map{ |address| address.to_s }
+    let(:cluster_addresses) do
+      cluster.addresses.map(&:to_s)
     end
 
     it "returns the default client" do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's seeds" do
-      expect(seeds).to eq([ "127.0.0.1:27017" ])
-    end
+    it_behaves_like 'includes seed address'
   end
 
   context "when options are provided with string keys" do
@@ -267,7 +293,7 @@ describe Mongoid::Clients::Factory do
     let(:config) do
       {
         default: {
-          hosts: [ "127.0.0.1:27017" ],
+          hosts: SpecConfig.instance.addresses,
           database: database_id,
           options: {
             "server_selection_timeout" => 10,
@@ -293,17 +319,15 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:seeds) do
-      cluster.addresses.map{ |address| address.to_s }
+    let(:cluster_addresses) do
+      cluster.addresses.map(&:to_s)
     end
 
     it "returns the default client" do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's seeds" do
-      expect(seeds).to eq([ "127.0.0.1:27017" ])
-    end
+    it_behaves_like 'includes seed address'
 
     it "sets the server selection timeout" do
       expect(cluster.options[:server_selection_timeout]).to eq(10)