mongoid 8.1.5 → 9.0.0

data/spec/mongoid/touchable_spec_models.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module TouchableSpec
   module Embedded
@@ -16,9 +17,13 @@ module TouchableSpec
       include Mongoid::Document
       include Mongoid::Timestamps
 
+      field :last_used_at, type: Time
+      field :level, type: Integer
+
       embedded_in :building, touch: false, class_name: "TouchableSpec::Embedded::Building"
 
-      field :last_used_at, type: Time
+      embeds_many :keypads, class_name: "TouchableSpec::Embedded::Keypad"
+      embeds_many :cameras, class_name: "TouchableSpec::Embedded::Camera"
     end
 
     class Floor
@@ -26,8 +31,40 @@ module TouchableSpec
       include Mongoid::Timestamps
 
       field :level, type: Integer
+      field :last_used_at, type: Time
 
       embedded_in :building, touch: true, class_name: "TouchableSpec::Embedded::Building"
+
+      embeds_many :chairs, class_name: "TouchableSpec::Embedded::Chair"
+      embeds_many :sofas, class_name: "TouchableSpec::Embedded::Sofa"
+    end
+
+    class Keypad
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      embedded_in :entrance, touch: false, class_name: "TouchableSpec::Embedded::Entrance"
+    end
+
+    class Camera
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      embedded_in :entrance, touch: true, class_name: "TouchableSpec::Embedded::Entrance"
+    end
+
+    class Chair
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      embedded_in :floor, touch: false, class_name: "TouchableSpec::Embedded::Floor"
+    end
+
+    class Sofa
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      embedded_in :floor, touch: true, class_name: "TouchableSpec::Embedded::Floor"
     end
   end
 
@@ -44,7 +81,15 @@ module TouchableSpec
       include Mongoid::Document
       include Mongoid::Timestamps
 
+      field :level, type: Integer
+
       belongs_to :building, touch: false, class_name: "TouchableSpec::Referenced::Building"
+
+      embeds_many :keypads, class_name: "TouchableSpec::Referenced::Keypad"
+      embeds_many :cameras, class_name: "TouchableSpec::Referenced::Camera"
+
+      has_many :plants, class_name: "TouchableSpec::Referenced::Plant"
+      has_many :windows, class_name: "TouchableSpec::Referenced::Window"
     end
 
     class Floor
@@ -54,6 +99,56 @@ module TouchableSpec
       field :level, type: Integer
 
       belongs_to :building, touch: true, class_name: "TouchableSpec::Referenced::Building"
+
+      embeds_many :chairs, class_name: "TouchableSpec::Referenced::Chair"
+      embeds_many :sofas, class_name: "TouchableSpec::Referenced::Sofa"
+
+      has_many :plants, class_name: "TouchableSpec::Referenced::Plant"
+      has_many :windows, class_name: "TouchableSpec::Referenced::Window"
+    end
+
+    class Plant
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      belongs_to :floor, touch: false, class_name: "TouchableSpec::Referenced::Floor"
+      belongs_to :entrance, touch: false, class_name: "TouchableSpec::Referenced::Entrance"
+    end
+
+    class Window
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      belongs_to :floor, touch: true, class_name: "TouchableSpec::Referenced::Floor"
+      belongs_to :entrance, touch: true, class_name: "TouchableSpec::Referenced::Entrance"
+    end
+
+    class Keypad
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      embedded_in :entrance, touch: false, class_name: "TouchableSpec::Referenced::Entrance"
+    end
+
+    class Camera
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      embedded_in :entrance, touch: true, class_name: "TouchableSpec::Referenced::Entrance"
+    end
+
+    class Chair
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      embedded_in :floor, touch: false, class_name: "TouchableSpec::Referenced::Floor"
+    end
+
+    class Sofa
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      embedded_in :floor, touch: true, class_name: "TouchableSpec::Referenced::Floor"
     end
   end
 end

data/spec/mongoid/traversable_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/mongoid/validatable/associated_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/mongoid/validatable/format_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/mongoid/validatable/length_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/mongoid/validatable/numericality_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/mongoid/validatable/presence_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 require_relative '../association/referenced/has_one_models'

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -8,6 +9,28 @@ describe Mongoid::Validatable::UniquenessValidator do
 
     context "when the document is a root document" do
 
+      context "when setting the read preference to non-primary" do
+
+        before do
+          Dictionary.validates_uniqueness_of :name
+        end
+
+        after do
+          Dictionary.reset_callbacks(:validate)
+        end
+
+        it "reads from the primary" do
+          expect_any_instance_of(Mongoid::Criteria).to receive(:read).once.and_wrap_original do |m, *args, **kwargs|
+            crit = m.call(*args, **kwargs)
+            expect(crit.view.options["read"]).to eq({ "mode" => :primary })
+            crit
+          end
+          Dictionary.with(read: { mode: :secondary }) do |klass|
+            klass.create!(name: "Websters")
+          end
+        end
+      end
+
       context "when adding custom persistence options" do
 
         before do
@@ -1634,6 +1657,30 @@ describe Mongoid::Validatable::UniquenessValidator do
         word.definitions.create!(description: "2")
       end
 
+      context "when setting the read preference to non-primary" do
+
+        before do
+          Definition.validates_uniqueness_of :description
+        end
+
+        after do
+          Definition.reset_callbacks(:validate)
+        end
+
+        let(:word) { Word.create! }
+
+        it "reads from the primary" do
+          expect_any_instance_of(Mongoid::Criteria).to receive(:read).once.and_wrap_original do |m, *args, **kwargs|
+            crit = m.call(*args, **kwargs)
+            expect(crit.options[:read]).to eq({ mode: :primary })
+            crit
+          end
+          Definition.with(read: { mode: :secondary }) do |klass|
+            word.definitions.create!
+          end
+        end
+      end
+
       context "when a document is being destroyed" do
 
         before do
@@ -2486,9 +2533,7 @@ describe Mongoid::Validatable::UniquenessValidator do
       end
 
       after do
-        # i18n 1.0 requires +send+ because +translations+ aren't public.
-        # Newer i18n versions have it as public.
-        I18n.backend.send(:translations).delete(:fr)
+        I18n.backend.translations.delete(:fr)
       end
 
       it "correctly translates the error message" do

data/spec/mongoid/validatable_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/mongoid/warnings_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/mongoid_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -80,6 +81,32 @@ describe Mongoid do
       end
       Mongoid.disconnect_clients
     end
+
+    it "returns true" do
+      expect(Mongoid.disconnect_clients).to eq(true)
+    end
+  end
+
+  describe ".reconnect_clients" do
+
+    let(:clients) do
+      Mongoid::Clients.clients.values
+    end
+
+    before do
+      Band.all.entries
+    end
+
+    it "reconnects all active clients" do
+      clients.each do |client|
+        expect(client).to receive(:reconnect).and_call_original
+      end
+      Mongoid.reconnect_clients
+    end
+
+    it "returns true" do
+      expect(Mongoid.reconnect_clients).to eq(true)
+    end
   end
 
   describe ".client" do

data/spec/rails/controller_extension/controller_runtime_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 require "mongoid/railties/controller_runtime"

data/spec/rails/mongoid_spec.rb

@@ -1,48 +1,41 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
+require "support/feature_sandbox"
 
 describe "Rails::Mongoid" do
+  let(:model_root) do
+    File.absolute_path(
+      File.join(
+        File.dirname(__FILE__),
+        "../support/models/sandbox"
+      ))
+  end
 
-  before(:all) do
-    require "rails/mongoid"
-    ::Mongoid.models.delete_if do |model|
-      ![ User, Account, Address, AddressNumber ].include?(model)
+  around :each do |example|
+    FeatureSandbox.quarantine do
+      require "rails/mongoid"
+      $LOAD_PATH.push(model_root)
+      example.run
     end
   end
 
   describe ".preload_models" do
+    let(:app) { double(config: config) }
+    let(:config) { double(paths: paths) }
+    let(:paths) { { "app/models" => path } }
+    let(:path) { double(expanded: [ model_root ]) }
 
-    let(:app) do
-      double(config: config)
-    end
-
-    let(:config) do
-      double(paths: paths)
-    end
-
-    let(:paths) do
-      double('[]' => path)
-    end
-
-    let(:path) do
-      double(expanded: [ "/rails/root/app/models" ])
-    end
+    before { Rails::Mongoid.preload_models(app) }
 
     context "when preload models config is false" do
       config_override :preload_models, false
 
-      let(:files) do
-        [
-          "/rails/root/app/models/user.rb",
-          "/rails/root/app/models/address.rb"
-        ]
-      end
-
       it "does not load any models" do
-        allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        expect(Rails::Mongoid).to receive(:load_model).never
-        Rails::Mongoid.preload_models(app)
+        expect(defined?(SandboxMessage)).to be_nil
+        expect(defined?(SandboxUser)).to be_nil
+        expect(defined?(SandboxComment)).to be_nil
       end
     end
 
@@ -50,96 +43,12 @@ describe "Rails::Mongoid" do
       config_override :preload_models, true
 
       context "when all models are in the models directory" do
-
-        let(:files) do
-          [
-            "/rails/root/app/models/user.rb",
-            "/rails/root/app/models/address.rb"
-          ]
-        end
-
-        before do
-          expect(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        end
-
-        it "requires the models by basename" do
-          expect(Rails::Mongoid).to receive(:load_model).with("address")
-          expect(Rails::Mongoid).to receive(:load_model).with("user")
-          Rails::Mongoid.preload_models(app)
-        end
-      end
-
-      context "when models exist in subdirectories" do
-
-        let(:files) do
-          [ "/rails/root/app/models/mongoid/behavior.rb" ]
-        end
-
-        before do
-          expect(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        end
-
-        it "requires the models by subdirectory and basename" do
-          expect(Rails::Mongoid).to receive(:load_model).with("mongoid/behavior")
-          Rails::Mongoid.preload_models(app)
+        it "requires the models" do
+          expect(SandboxMessage.ancestors).to include(Mongoid::Document)
+          expect(SandboxUser.ancestors).to include(Mongoid::Document)
+          expect(SandboxComment.ancestors).to include(Mongoid::Document)
         end
       end
     end
   end
-
-  describe ".load_models" do
-
-    let(:app) do
-      double(config: config)
-    end
-
-    let(:config) do
-      double(paths: paths)
-    end
-
-    let(:paths) do
-      double('[]' => path)
-    end
-
-    let(:path) do
-      double(expanded: [ "/rails/root/app/models" ])
-    end
-
-    context "even when preload models config is false" do
-      config_override :preload_models, false
-
-      let(:files) do
-        [
-          "/rails/root/app/models/user.rb",
-          "/rails/root/app/models/address.rb"
-        ]
-      end
-
-      it "loads all models" do
-        allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        expect(Rails::Mongoid).to receive(:load_model).with("address")
-        expect(Rails::Mongoid).to receive(:load_model).with("user")
-        Rails::Mongoid.load_models(app)
-      end
-    end
-
-    context "when list of models to load was configured" do
-      config_override :preload_models, %w(user AddressNumber)
-
-      let(:files) do
-        [
-          "/rails/root/app/models/user.rb",
-          "/rails/root/app/models/address.rb"
-        ]
-      end
-
-      it "loads selected models only" do
-        allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        expect(Rails::Mongoid).to receive(:load_model).with("user")
-        expect(Rails::Mongoid).to receive(:load_model).with("address_number")
-        expect(Rails::Mongoid).to receive(:load_model).with("address").never
-        Rails::Mongoid.load_models(app)
-      end
-    end
-  end
 end

data/spec/shared/share/Dockerfile.erb

@@ -13,7 +13,7 @@ server_archive_basename = File.basename(server_url)
 server_extracted_dir = server_archive_basename.sub(/\.(tar\.gz|tgz)$/, '')
 
 # When changing, also update the hash in shlib/set_env.sh.
-TOOLCHAIN_VERSION='e8c60866f54bed7e336a37df3a97d6ae1b971b7d'
+TOOLCHAIN_VERSION='ded7ea845b08cf96f11a747d9540ba3199580dea'
 
 def ruby_toolchain_url(ruby)
   "http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/#{TOOLCHAIN_VERSION}/#{distro}/#{ruby}.tar.xz"
@@ -56,7 +56,7 @@ ENV DOCKER=1
   # Ruby runtime dependencies: libyaml-0-2
   # Compiling ruby libraries: gcc make
   # Compiling python packages: python3-dev
-  # JRuby: openjdk-8-jdk-headless
+  # JRuby: openjdk-17-jdk-headless
   # Server dependencies: libsnmp30 libcurl3/libcurl4
   # Determining OS we are running on: lsb-release
   # Load balancer testing: haproxy
@@ -78,11 +78,12 @@ ENV DOCKER=1
 
   <% packages = %w(
     procps lsb-release bzip2 curl wget gpg zsh
-    git make gcc libyaml-0-2 libgmp-dev zlib1g-dev libsnappy-dev
+    git make gcc g++ libyaml-dev libgmp-dev zlib1g-dev libsnappy-dev
     krb5-user krb5-kdc krb5-admin-server libsasl2-dev libsasl2-modules-gssapi-mit
-    haproxy
+    haproxy libcurl4
     python3-pip
-    tzdata shared-mime-info software-properties-common
+    tzdata shared-mime-info software-properties-common xz-utils nodejs npm
+    openjdk-17-jdk-headless
   ) %>
 
   <% if distro =~ /ubuntu2004/ %>
@@ -101,26 +102,6 @@ ENV DOCKER=1
     <% packages << 'python3-venv' %>
   <% end %>
 
-  <% if distro =~ /debian10|ubuntu2204|debian11/ %>
-    <% packages << 'openjdk-11-jdk-headless' %>
-  <% elsif distro =~ /ubuntu1404/ %>
-    # Ubuntu 14.04 only has openjdk 7, this is too old to be useful
-  <% else %>
-    <% packages << 'openjdk-8-jdk-headless' %>
-  <% end %>
-
-  # ubuntu1404, ubuntu1604: libcurl3
-  # ubuntu1804, ubuntu2004, debian10: libcurl4
-  <% if distro =~ /ubuntu1804|ubuntu2004|ubuntu2204|debian10|debian11/ %>
-    <% packages << 'libcurl4' %>
-  <% else %>
-    <% packages << 'libcurl3' %>
-  <% end %>
-
-  <% if distro =~ /ubuntu1804|ubuntu2004|ubuntu2204/ %>
-    <% packages << 'nodejs' %>
-  <% end %>
-
   <% if distro =~ /ubuntu2004|ubuntu2204/ %>
     <% packages += %w(ruby bundler) %>
   <% end %>
@@ -135,29 +116,6 @@ ENV DOCKER=1
 
 <% else %>
 
-  <% if distro =~ /rhel6/ %>
-
-    # CentOS 6 is dead - to use it retrieve the packages from vault:
-    # https://stackoverflow.com/questions/53562691/error-cannot-retrieve-repository-metadata-repomd-xml-for-repository-base-pl
-
-    <%
-
-      cfg = <<-CFG
-[base]
-name=CentOS-$releasever - Base
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
-#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
-baseurl=http://vault.centos.org/6.10/os/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-CFG
-
-    %>
-
-    RUN printf "<%= cfg.gsub("\n", "\\n") %>" >/etc/yum.repos.d/CentOS-Base.repo
-
-  <% end %>
-
   # Enterprise server: net-snmp
   # lsb_release: redhat-lsb-core
   # our runner scripts: which
@@ -166,15 +124,15 @@ CFG
   # Kerberos tests: krb5-workstation + cyrus-sasl-devel to build the
   # mongo_kerberos gem + cyrus-sasl-gssapi for authentication to work
   # Local Kerberos server: krb5-server
-  # JRuby: java-1.8.0-openjdk
+  # JRuby: java-17-openjdk
   #
   # Note: lacking cyrus-sasl-gssapi produces a cryptic message
   # "SASL(-4): no mechanism available: No worthy mechs found"
   # https://github.com/farorm/python-ad/issues/10
 
-  RUN yum install -y redhat-lsb-core which git gcc libyaml krb5-server \
-    krb5-workstation cyrus-sasl-devel cyrus-sasl-gssapi java-1.8.0-openjdk \
-    net-snmp python38 python38-devel cmake nodejs
+  RUN yum --enablerepo=powertools install -y redhat-lsb-core which git gcc gcc-c++ libyaml-devel krb5-server \
+    krb5-workstation cyrus-sasl-devel cyrus-sasl-gssapi java-17-openjdk \
+    net-snmp python38 python38-devel cmake nodejs npm xz
 
 <% end %>
 
@@ -291,6 +249,8 @@ WORKDIR /app
   ENV DOCKER_PRELOAD=1
 <% end %>
 
+RUN npm install --global yarn
+
 ENV MONGO_ORCHESTRATION_HOME=/tmpfs \
   PROJECT_DIRECTORY=/app \
   <%= @env.map { |k, v| %Q`#{k}="#{v.gsub('$', "\\$").gsub('"', "\\\"")}"` }.join(" \\\n  ") %>

data/spec/shared/shlib/server.sh

@@ -104,6 +104,7 @@ install_mlaunch_venv() {
     #pip install 'mtools==1.7' 'pymongo==4.1' python-dateutil psutil
 
     # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+    pip install --upgrade setuptools
     pip install 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
   fi
 }

data/spec/shared/shlib/set_env.sh

@@ -1,39 +1,16 @@
 # When changing, also update the hash in share/Dockerfile.
-TOOLCHAIN_VERSION=e8c60866f54bed7e336a37df3a97d6ae1b971b7d
+TOOLCHAIN_VERSION=ded7ea845b08cf96f11a747d9540ba3199580dea
+JDK_VERSION=jdk17
 
 set_env_java() {
   ls -l /opt || true
   ls -l /usr/lib/jvm || true
 
   # Use toolchain java if it exists
-  if [ -f /opt/java/jdk8/bin/java ]; then
-    export JAVACMD=/opt/java/jdk8/bin/java
-    #export PATH=$PATH:/opt/java/jdk8/bin
-  fi
-
-  # ppc64le has it in a different place
-  if test -z "$JAVACMD" && [ -f /usr/lib/jvm/java-1.8.0/bin/java ]; then
-    export JAVACMD=/usr/lib/jvm/java-1.8.0/bin/java
-    #export PATH=$PATH:/usr/lib/jvm/java-1.8.0/bin
-  fi
-
-  if true; then
-    # newer
-    # rhel71-ppc, https://jira.mongodb.org/browse/BUILD-9231
-    if test -z "$JAVACMD" &&
-      (ls /opt/java || true) |grep -q java-1.8.0-openjdk-1.8.0 &&
-      test -f /opt/java/java-1.8.0-openjdk-1.8.0*/bin/java;
-    then
-      path=$(cd /opt/java && ls -d java-1.8.0-openjdk-1.8.0* |head -n 1)
-      export JAVACMD=/opt/java/"$path"/bin/java
-    fi
+  if [ -f /opt/java/$JDK_VERSION/bin/java ]; then
+    export JAVACMD=/opt/java/$JDK_VERSION/bin/java
   else
-    # older
-    # rhel71-ppc seems to have an /opt/java/jdk8/bin/java but it doesn't work
-    if test -n "$JAVACMD" && ! exec $JAVACMD -version; then
-      JAVACMD=
-      # we will try the /usr/lib/jvm then
-    fi
+    echo Could not find $JDK_VERSION in /opt/java
   fi
 
   if test -n "$JAVACMD"; then