mongoid 7.5.4 → 7.6.1

data/spec/shared/shlib/set_env.sh

@@ -1,39 +1,15 @@
 # When changing, also update the hash in share/Dockerfile.
-TOOLCHAIN_VERSION=219833abad4d9d3bf43c0fef101a8ca082ac4ae9
+JDK_VERSION=jdk21
 
 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
@@ -53,7 +29,7 @@ set_env_python() {
       curl -fL --retry 3 https://github.com/p-mongodb/deps/raw/main/"$arch"-python37.tar.xz | \
         tar xfJ - -C /opt
     fi
-    
+
     if test -d /opt/python/3.7/bin; then
       # Most Evergreen configurations.
       export PATH=/opt/python/3.7/bin:$PATH
@@ -61,7 +37,7 @@ set_env_python() {
       # Configurations that use Docker in Evergreen - these don't preload.
       export PATH=/opt/python37/bin:$PATH
     fi
-    
+
     python3 -V
   fi
 }
@@ -78,7 +54,7 @@ set_env_node() {
     # Node from toolchain in Evergreen
     export PATH=/opt/node/bin:$PATH
   fi
-  
+
   node -v
 }
 
@@ -113,34 +89,13 @@ set_env_ruby() {
     if test "$USE_OPT_TOOLCHAIN" = 1; then
       # Nothing, also PATH is already set
       :
-    elif true; then
-
-    # For testing toolchains:
-    #toolchain_url=https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/`host_distro`/f11598d091441ffc8d746aacfdc6c26741a3e629/mongo_ruby_driver_toolchain_`host_distro |tr - _`_patch_f11598d091441ffc8d746aacfdc6c26741a3e629_5e46f2793e8e866f36eda2c5_20_02_14_19_18_18.tar.gz
-    toolchain_url=http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/$TOOLCHAIN_VERSION/`host_distro`/$RVM_RUBY.tar.xz
-    curl --retry 3 -fL $toolchain_url |tar Jxf -
-    export PATH=`pwd`/rubies/$RVM_RUBY/bin:$PATH
-    #export PATH=`pwd`/rubies/python/3/bin:$PATH
-
-    # Attempt to get bundler to report all errors - so far unsuccessful
-    #curl --retry 3 -o bundler-openssl.diff https://github.com/bundler/bundler/compare/v2.0.1...p-mongo:report-errors.diff
-    #find . -path \*/lib/bundler/fetcher.rb -exec patch {} bundler-openssl.diff \;
-
     else
+      # For testing unpublished builds:
+      #build_url=https://s3.amazonaws.com/mciuploads/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz
 
-    # Normal operation
-    if ! test -d $HOME/.rubies/$RVM_RUBY/bin; then
-      echo "Ruby directory does not exist: $HOME/.rubies/$RVM_RUBY/bin" 1>&2
-      echo "Contents of /opt:" 1>&2
-      ls -l /opt 1>&2 || true
-      echo ".rubies symlink:" 1>&2
-      ls -ld $HOME/.rubies 1>&2 || true
-      echo "Our rubies:" 1>&2
-      ls -l $HOME/.rubies 1>&2 || true
-      exit 2
-    fi
-    export PATH=$HOME/.rubies/$RVM_RUBY/bin:$PATH
-
+      build_url=http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz
+      curl --retry 3 -fL $build_url |tar Jxf -
+      export PATH=`pwd`/rubies/$RVM_RUBY/bin:$PATH
     fi
 
     ruby --version
@@ -151,19 +106,5 @@ set_env_ruby() {
 
     ruby -v |fgrep $ruby_name
     ruby -v |fgrep $ruby_version
-
-    # We shouldn't need to update rubygems, and there is value in
-    # testing on whatever rubygems came with each supported ruby version
-    #echo 'updating rubygems'
-    #gem update --system
-
-    # Only install bundler when not using ruby-head.
-    # ruby-head comes with bundler and gem complains
-    # because installing bundler would overwrite the bundler binary.
-    # We now install bundler in the toolchain, hence nothing needs to be done
-    # in the tests.
-    if false && echo "$RVM_RUBY" |grep -q jruby; then
-      gem install bundler -v '<2'
-    fi
   fi
 }

data/spec/support/expectations.rb

@@ -2,27 +2,30 @@
 
 module Mongoid
   module Expectations
-
-    def connection_class
-      if defined?(Mongo::Server::ConnectionBase)
-        Mongo::Server::ConnectionBase
-      else
-        # Pre-2.8 drivers
-        Mongo::Server::Connection
+    # Previously this method used RSpec::Mocks with .exactly.times(n).and_call_original,
+    # which stopped working reliably in Ruby 3.3. Now we directly wrap the target method.
+    def expect_query(number)
+      if %i[ sharded load-balanced ].include?(ClusterConfig.instance.topology) && number > 0
+        skip 'This spec requires replica set or standalone topology'
       end
-    end
 
-    def expect_query(number)
-      rv = nil
-      RSpec::Mocks.with_temporary_scope do
-        if number > 0
-          expect_any_instance_of(connection_class).to receive(:command_started).exactly(number).times.and_call_original
-        else
-          expect_any_instance_of(connection_class).not_to receive(:command_started)
+      klass = Mongo::Server::ConnectionBase
+      original_method = klass.instance_method(:command_started)
+      query_count = 0
+
+      begin
+        klass.define_method(:command_started) do |*args, **kwargs|
+          query_count += 1
+          original_method.bind_call(self, *args, **kwargs)
         end
-        rv = yield
+
+        result = yield
+        expect(query_count).to eq(number)
+        result
+      ensure
+        klass.remove_method(:command_started)
+        klass.define_method(:command_started, original_method)
       end
-      rv
     end
 
     def expect_no_queries(&block)

metadata

@@ -1,41 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 7.5.4
+  version: 7.6.1
 platform: ruby
 authors:
 - The MongoDB Ruby Team
-autorequire:
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEeDCCAuCgAwIBAgIBATANBgkqhkiG9w0BAQsFADBBMREwDwYDVQQDDAhkYngt
-  cnVieTEXMBUGCgmSJomT8ixkARkWB21vbmdvZGIxEzARBgoJkiaJk/IsZAEZFgNj
-  b20wHhcNMjMwMTMxMTE1NjM1WhcNMjQwMTMxMTE1NjM1WjBBMREwDwYDVQQDDAhk
-  YngtcnVieTEXMBUGCgmSJomT8ixkARkWB21vbmdvZGIxEzARBgoJkiaJk/IsZAEZ
-  FgNjb20wggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC0/Veq9l47cTfX
-  tQ+kHq2NOCwJuJGt1iXWQ/vH/yp7pZ/bLej7gPDl2CfIngAXRjM7r1FkR9ya7VAm
-  IneBFcVU3HhpIXWi4ByXGjBOXFD1Dfbz4C4zedIWRk/hNzXa+rQY4KPwpOwG/hZg
-  id+rSXWSbNlkyN97XfonweVh7JsIa9X/2JY9ADYjhCfEZF+b0+Wl7+jgwzLWb46I
-  0WH0bZBIZ0BbKAwUXIgvq5mQf9PzukmMVYCwnkJ/P4wrHO22HuwnbMyvJuGjVwqi
-  j1NRp/2vjmKBFWxIfhlSXEIiqAmeEVNXzhPvTVeyo+rma+7R3Bo+4WHkcnPpXJJZ
-  Jd63qXMvTB0GplEcMJPztWhrJOmcxIOVoQyigEPSQT8JpzFVXby4SGioizv2eT7l
-  VYSiCHuc3yEDyq5M+98WGX2etbj6esYtzI3rDevpIAHPB6HQmtoJIA4dSl3gjFb+
-  D+YQSuB2qYu021FI9zeY9sbZyWysEXBxhwrmTk+XUV0qz+OQZkMCAwEAAaN7MHkw
-  CQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFH4nnr4tYlatU57RbExW
-  jG86YM5nMB8GA1UdEQQYMBaBFGRieC1ydWJ5QG1vbmdvZGIuY29tMB8GA1UdEgQY
-  MBaBFGRieC1ydWJ5QG1vbmdvZGIuY29tMA0GCSqGSIb3DQEBCwUAA4IBgQAVSlgM
-  nFDWCCNLOCqG5/Lj4U62XoALkdCI+OZ30+WrA8qiRLSL9ZEziVK9AV7ylez+sriQ
-  m8XKZKsCN5ON4+zXw1S+6Ftz/R4zDg7nTb9Wgw8ibzsoiP6e4pRW3Fls3ZdaG4pW
-  +qMTbae9OiSrgI2bxNTII+v+1FcbQjOlMu8HPZ3ZfXnurXPgN5GxSyyclZI1QONO
-  HbUoKHRirZu0F7JCvQQq4EkSuLWPplRJfYEeJIYm05zhhFeEyqea2B/TTlCtXa42
-  84vxXsxGzumuO8F2Q9m6/p95sNhqCp0B/SkKXIrRGJ7FBzupoORNRXHviS2OC3ty
-  4lwUzOlLTF/yO0wwYYfmtQOALQwKnW838vbYthMXvTjxB0EgVZ5PKto99WbjsXzy
-  wkeAWhd5b+5JS0zgDL4SvGB8/W2IY+y0zELkojBMgJPyrpAWHL/WSsSBMuhyI2Pv
-  xxaBVLklnJJ/qCCOZ3lG2MyVc/Nb0Mmq8ygWNsfwHmKKYuuWcviit0D0Tek=
-  -----END CERTIFICATE-----
-date: 2023-08-24 00:00:00.000000000 Z
+cert_chain: []
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -106,7 +78,7 @@ dependencies:
         version: 4.9.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -116,7 +88,7 @@ dependencies:
         version: 4.9.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email: dbx-ruby@mongodb.com
@@ -841,6 +813,7 @@ files:
 - spec/mongoid_spec.rb
 - spec/rails/controller_extension/controller_runtime_spec.rb
 - spec/rails/mongoid_spec.rb
+- spec/shared/CANDIDATE.md
 - spec/shared/LICENSE
 - spec/shared/bin/get-mongodb-download-url
 - spec/shared/bin/s3-copy
@@ -852,11 +825,14 @@ files:
 - spec/shared/lib/mrss/eg_config_utils.rb
 - spec/shared/lib/mrss/event_subscriber.rb
 - spec/shared/lib/mrss/lite_constraints.rb
+- spec/shared/lib/mrss/release/candidate.rb
+- spec/shared/lib/mrss/release/product_data.rb
 - spec/shared/lib/mrss/server_version_registry.rb
 - spec/shared/lib/mrss/session_registry.rb
 - spec/shared/lib/mrss/session_registry_legacy.rb
 - spec/shared/lib/mrss/spec_organizer.rb
 - spec/shared/lib/mrss/utils.rb
+- spec/shared/lib/tasks/candidate.rake
 - spec/shared/share/Dockerfile.erb
 - spec/shared/share/haproxy-1.conf
 - spec/shared/share/haproxy-2.conf
@@ -1140,7 +1116,6 @@ metadata:
   documentation_uri: https://docs.mongodb.com/mongoid/
   homepage_uri: https://mongoid.org/
   source_code_uri: https://github.com/mongodb/mongoid
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1155,8 +1130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.4.17
-signing_key:
+rubygems_version: 4.0.4
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.
 test_files:
@@ -1537,6 +1511,7 @@ test_files:
 - spec/mongoid_spec.rb
 - spec/rails/controller_extension/controller_runtime_spec.rb
 - spec/rails/mongoid_spec.rb
+- spec/shared/CANDIDATE.md
 - spec/shared/LICENSE
 - spec/shared/bin/get-mongodb-download-url
 - spec/shared/bin/s3-copy
@@ -1548,11 +1523,14 @@ test_files:
 - spec/shared/lib/mrss/eg_config_utils.rb
 - spec/shared/lib/mrss/event_subscriber.rb
 - spec/shared/lib/mrss/lite_constraints.rb
+- spec/shared/lib/mrss/release/candidate.rb
+- spec/shared/lib/mrss/release/product_data.rb
 - spec/shared/lib/mrss/server_version_registry.rb
 - spec/shared/lib/mrss/session_registry.rb
 - spec/shared/lib/mrss/session_registry_legacy.rb
 - spec/shared/lib/mrss/spec_organizer.rb
 - spec/shared/lib/mrss/utils.rb
+- spec/shared/lib/tasks/candidate.rake
 - spec/shared/share/Dockerfile.erb
 - spec/shared/share/haproxy-1.conf
 - spec/shared/share/haproxy-2.conf
@@ -1618,8 +1596,8 @@ test_files:
 - spec/support/models/circuit.rb
 - spec/support/models/circus.rb
 - spec/support/models/code.rb
-- spec/support/models/coding/pull_request.rb
 - spec/support/models/coding.rb
+- spec/support/models/coding/pull_request.rb
 - spec/support/models/comment.rb
 - spec/support/models/company.rb
 - spec/support/models/consumption_period.rb
@@ -1739,9 +1717,9 @@ test_files:
 - spec/support/models/profile.rb
 - spec/support/models/pronunciation.rb
 - spec/support/models/pub.rb
+- spec/support/models/publication.rb
 - spec/support/models/publication/encyclopedia.rb
 - spec/support/models/publication/review.rb
-- spec/support/models/publication.rb
 - spec/support/models/purchase.rb
 - spec/support/models/purchased_item.rb
 - spec/support/models/question.rb

metadata.gz.sig

@@ -1,3 +0,0 @@
-~ʅۙ���:����\��Ѹ�����=4��b�+�.��+�r���[7>��AU��IV���L��wl�c+��pd���亩F��*83���"��~��f�`K�߁�~A�p\�as���a��h����('_-:ph�7M��i&L�E����y��4��qS1�j*�[���_o��<B]�9g_�vn�TáZ����l�'�X�0i�n��I��z( [Y�
-�����?�U�x �P�7P{v�\x�C��9Ϗ���s�r��b�l��k2p͈�.� ��5Ι5�`�u��8��:z׆ޭ��F��t8ê�C2�-ӫ��
-c_
8)���R���C$�\4(�T�;)��|̃��h���t�qK]