mongoid 7.2.6 → 7.3.0

data/spec/shared/shlib/server.sh

@@ -10,21 +10,21 @@ set_fcv() {
 
 add_uri_option() {
   opt=$1
-
+  
   if ! echo $MONGODB_URI |sed -e s,//,, |grep -q /; then
     MONGODB_URI="$MONGODB_URI/"
   fi
-
+  
   if ! echo $MONGODB_URI |grep -q '?'; then
     MONGODB_URI="$MONGODB_URI?"
   fi
-
+  
   MONGODB_URI="$MONGODB_URI&$opt"
 }
 
 prepare_server() {
   arch=$1
-
+  
   if test -n "$USE_OPT_MONGODB"; then
     export BINDIR=/opt/mongodb/bin
     export PATH=$BINDIR:$PATH
@@ -39,7 +39,7 @@ prepare_server() {
   else
     download_version="$MONGODB_VERSION"
   fi
-
+  
   url=`$(dirname $0)/get-mongodb-download-url $download_version $arch`
 
   prepare_server_from_url $url
@@ -80,7 +80,7 @@ install_mlaunch_pip() {
     # mlaunch is preinstalled in the docker image, do not install it here
     return
   fi
-
+  
   python -V || true
   python3 -V || true
   pythonpath="$MONGO_ORCHESTRATION_HOME"/python
@@ -96,20 +96,20 @@ install_mlaunch_git() {
   python3 -V || true
   which pip || true
   which pip3 || true
-
+  
   if false; then
     if ! virtualenv --version; then
       python3 `which pip3` install --user virtualenv
       export PATH=$HOME/.local/bin:$PATH
       virtualenv --version
     fi
-
+    
     venvpath="$MONGO_ORCHESTRATION_HOME"/venv
     virtualenv -p python3 $venvpath
     . $venvpath/bin/activate
-
+    
     pip3 install psutil pymongo
-
+    
     git clone $repo mlaunch
     cd mlaunch
     git checkout origin/$branch
@@ -118,13 +118,13 @@ install_mlaunch_git() {
   else
     pip install --user 'virtualenv==13'
     export PATH=$HOME/.local/bin:$PATH
-
+    
     venvpath="$MONGO_ORCHESTRATION_HOME"/venv
     virtualenv $venvpath
     . $venvpath/bin/activate
-
+  
     pip install psutil pymongo
-
+    
     git clone $repo mlaunch
     (cd mlaunch &&
       git checkout origin/$branch &&
@@ -133,32 +133,24 @@ install_mlaunch_git() {
   fi
 }
 
-# This function sets followong global variables:
-#   server_cert_path
-#   server_ca_path
-#   server_client_cert_path
-#
-# These variables are used later to connect to processes via mongo client.
 calculate_server_args() {
   local mongo_version=`echo $MONGODB_VERSION |tr -d .`
-
+  
   if test -z "$mongo_version"; then
     echo "$MONGODB_VERSION must be set and not contain only dots" 1>&2
     exit 3
   fi
-
+  
   if test $mongo_version = latest; then
     mongo_version=49
   fi
 
   local args="--setParameter enableTestCommands=1"
-
-  if test $mongo_version -ge 50; then
-    args="$args --setParameter acceptApiVersion2=1"
-  elif test $mongo_version -ge 47; then
+  
+  if test $mongo_version -ge 47; then
     args="$args --setParameter acceptAPIVersion2=1"
   fi
-
+  
   # diagnosticDataCollectionEnabled is a mongod-only parameter on server 3.2,
   # and mlaunch does not support specifying mongod-only parameters:
   # https://github.com/rueckstiess/mtools/issues/696
@@ -168,31 +160,15 @@ calculate_server_args() {
   fi
   local uri_options=
   if test "$TOPOLOGY" = replica-set; then
-    args="$args --replicaset --name test-rs --nodes 2 --arbiter"
+    args="$args --replicaset --name ruby-driver-rs --nodes 2 --arbiter"
     export HAVE_ARBITER=1
   elif test "$TOPOLOGY" = sharded-cluster; then
-    args="$args --replicaset --nodes 2 --sharded 1 --name test-rs"
+    args="$args --replicaset --nodes 2 --sharded 1 --name ruby-driver-rs"
     if test -z "$SINGLE_MONGOS"; then
       args="$args --mongos 2"
     fi
-  elif test "$TOPOLOGY" = standalone; then
-    args="$args --single"
-  elif test "$TOPOLOGY" = load-balanced; then
-    args="$args --replicaset --nodes 2 --sharded 1 --name test-rs --port 27117"
-    if test -z "$MRSS_ROOT"; then
-      echo "Please set MRSS_ROOT" 1>&2
-      exit 2
-    fi
-    if test -n "$SINGLE_MONGOS"; then
-      haproxy_config=$MRSS_ROOT/share/haproxy-1.conf
-    else
-      args="$args --mongos 2"
-      haproxy_config=$MRSS_ROOT/share/haproxy-2.conf
-    fi
-    uri_options="$uri_options&loadBalanced=true"
   else
-    echo "Unknown topology: $TOPOLOGY" 1>&2
-    exit 1
+    args="$args --single"
   fi
   if test -n "$MMAPV1"; then
     args="$args --storageEngine mmapv1 --smallfiles --noprealloc"
@@ -215,6 +191,7 @@ calculate_server_args() {
     fi
   fi
 
+  local server_cert_path server_ca_path server_client_cert_path
   if test "$SSL" = ssl || test -n "$OCSP_ALGORITHM"; then
     if test -n "$OCSP_ALGORITHM"; then
       if test "$OCSP_MUST_STAPLE" = 1; then
@@ -293,7 +270,7 @@ calculate_server_args() {
       ocsp_args="$ocsp_args --fault $OCSP_STATUS"
     fi
   fi
-
+  
   OCSP_ARGS="$ocsp_args"
   SERVER_ARGS="$args"
   URI_OPTIONS="$uri_options"
@@ -310,58 +287,4 @@ launch_ocsp_mock() {
 launch_server() {
   local dbdir="$1"
   python -m mtools.mlaunch.mlaunch --dir "$dbdir" --binarypath "$BINDIR" $SERVER_ARGS
-
-  if test "$TOPOLOGY" = sharded-cluster && test $MONGODB_VERSION = 3.6; then
-    # On 3.6 server the sessions collection is not immediately available,
-    # so we run the refreshLogicalSessionCacheNow command on the config server
-    # and again on each mongos in order for the mongoses
-    # to correctly report logicalSessionTimeoutMinutes.
-    mongos_regex="\s*mongos\s+([0-9]+)\s+running\s+[0-9]+"
-    config_server_regex="\s*config\sserver\s+([0-9]+)\s+running\s+[0-9]+"
-    config_server=""
-    mongoses=()
-    if test "$AUTH" = auth
-    then
-      base_url="mongodb://bob:pwd123@localhost"
-    else
-      base_url="mongodb://localhost"
-    fi
-    if test "$SSL" = "ssl"
-    then
-      mongo_command="${BINDIR}/mongo --ssl --sslPEMKeyFile $server_cert_path --sslCAFile $server_ca_path"
-    else
-      mongo_command="${BINDIR}/mongo"
-    fi
-
-    while read -r line
-    do
-        if [[ $line =~ $config_server_regex ]]
-        then
-            port="${BASH_REMATCH[1]}"
-            config_server="${base_url}:${port}"
-        fi
-        if [[ $line =~ $mongos_regex ]]
-        then
-            port="${BASH_REMATCH[1]}"
-            mongoses+=("${base_url}:${port}")
-        fi
-    done < <(python -m mtools.mlaunch.mlaunch list --dir "$dbdir" --binarypath "$BINDIR")
-
-    if [ -n "$config_server" ]; then
-      ${mongo_command} "$config_server" --eval 'db.adminCommand("refreshLogicalSessionCacheNow")'
-      for mongos in ${mongoses[*]}
-      do
-        ${mongo_command} "$mongos" --eval 'db.adminCommand("refreshLogicalSessionCacheNow")'
-      done
-    fi
-  fi
-
-  if test "$TOPOLOGY" = load-balanced; then
-    if test -z "$haproxy_config"; then
-      echo haproxy_config should have been set 1>&2
-      exit 3
-    fi
-
-    haproxy -D -f $haproxy_config -p $mongodb_dir/haproxy.pid
-  fi
 }

data/spec/shared/shlib/set_env.sh

@@ -68,12 +68,9 @@ set_env_ruby() {
     export PATH=`pwd`/ruby-head/bin:`pwd`/ruby-head/lib/ruby/gems/2.6.0/bin:$PATH
     ruby --version
     ruby --version |grep dev
-  elif test "$SYSTEM_RUBY" = 1; then
-    # Nothing
-    :
   else
     if test "$USE_OPT_TOOLCHAIN" = 1; then
-      # Nothing, also PATH is already set
+      # nothing, also PATH is already set
       :
     elif true; then
 

data/spec/spec_helper.rb

@@ -29,13 +29,17 @@ def database_id_alt
   "mongoid_test_alt"
 end
 
+require 'mrss/cluster_config'
+require 'support/client_registry'
+require 'mrss/constraints'
+
+ClusterConfig = Mrss::ClusterConfig
+
 require 'support/authorization'
 require 'support/expectations'
 require 'support/helpers'
 require 'support/macros'
-require 'support/cluster_config'
 require 'support/constraints'
-require 'mrss/constraints'
 
 # Give MongoDB servers time to start up in CI environments
 if SpecConfig.instance.ci?
@@ -43,7 +47,7 @@ if SpecConfig.instance.ci?
   client = Mongo::Client.new(SpecConfig.instance.addresses)
   while starting
     begin
-      client.command(ping: 1)
+      client.command(Mongo::Server::Monitor::Connection::ISMASTER)
       break
     rescue Mongo::Error::OperationFailure => e
       sleep(2)

data/spec/support/client_registry.rb

@@ -0,0 +1,9 @@
+require 'singleton'
+
+class ClientRegistry
+  include Singleton
+
+  def global_client(name)
+    Mongoid.default_client
+  end
+end

data/spec/support/models/address.rb

@@ -78,9 +78,5 @@ class Address
     def streets
       all.map(&:street)
     end
-
-    def city_and_state(city:, state:)
-      where(city: city, state: state)
-    end
   end
 end

data/spec/support/models/bolt.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Bolt
+  include Mongoid::Document
+
+  belongs_to :hole
+end

data/spec/support/models/hole.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Hole
+  include Mongoid::Document
+
+  has_one :bolt, dependent: :destroy
+  has_one :threadlocker, dependent: :delete_all
+  has_one :sealer, dependent: :restrict_with_exception
+  has_many :nuts, dependent: :destroy
+  has_many :washers, dependent: :delete_all
+  has_many :spacers, dependent: :restrict_with_exception
+end

data/spec/support/models/mop.rb

@@ -23,4 +23,3 @@ class Mop
   field :regexp_field, type: Regexp
   field :bson_regexp_field, type: BSON::Regexp::Raw
 end
-

data/spec/support/models/nut.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Nut
+  include Mongoid::Document
+
+  belongs_to :hole
+end

data/spec/support/models/person.rb

@@ -136,10 +136,6 @@ class Person
   scope :without_ssn, ->{ without(:ssn) }
   scope :search, ->(query){ any_of({ title: query }) }
 
-  def self.older_than(age:)
-    where(:age.gt => age)
-  end
-
   def score_with_rescoring=(score)
     @rescored = score.to_i + 20
     self.score_without_rescoring = score
@@ -210,15 +206,16 @@ class Person
     self.map_with_default["key"] = value
   end
 
-  def set_personal_data(ssn:, age:)
-    self.ssn = ssn
-    self.age = age
-  end
-
   reset_callbacks(:validate)
   reset_callbacks(:create)
   reset_callbacks(:save)
   reset_callbacks(:destroy)
+
+  private
+
+  def secret_name
+    "secret"
+  end
 end
 
 require "support/models/doctor"

data/spec/support/models/sealer.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Sealer
+  include Mongoid::Document
+
+  belongs_to :hole
+end

data/spec/support/models/shirt.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Shirt
+  include Mongoid::Document
+
+  field :color, type: String
+
+  unalias_attribute :id
+
+  field :id, type: String
+end

data/spec/support/models/spacer.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Spacer
+  include Mongoid::Document
+
+  belongs_to :hole
+end

data/spec/support/models/threadlocker.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Threadlocker
+  include Mongoid::Document
+
+  belongs_to :hole
+end

data/spec/support/models/washer.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Washer
+  include Mongoid::Document
+
+  belongs_to :hole
+end