mongoid 9.0.7 → 9.0.9

data/spec/mongoid/clients/transactions_spec_models.rb

@@ -33,6 +33,38 @@ module TransactionsSpecCountable
   def after_rollback_counter=(new_counter)
     @after_rollback_counter = new_counter
   end
+
+  def after_save_commit_counter
+    @after_save_commit_counter ||= TransactionsSpecCounter.new
+  end
+
+  def after_save_commit_counter=(new_counter)
+    @after_save_commit_counter = new_counter
+  end
+
+  def after_create_commit_counter
+    @after_create_commit_counter ||= TransactionsSpecCounter.new
+  end
+
+  def after_create_commit_counter=(new_counter)
+    @after_create_commit_counter = new_counter
+  end
+
+  def after_update_commit_counter
+    @after_update_commit_counter ||= TransactionsSpecCounter.new
+  end
+
+  def after_update_commit_counter=(new_counter)
+    @after_update_commit_counter = new_counter
+  end
+
+  def after_destroy_commit_counter
+    @after_destroy_commit_counter ||= TransactionsSpecCounter.new
+  end
+
+  def after_destroy_commit_counter=(new_counter)
+    @after_destroy_commit_counter = new_counter
+  end
 end
 
 class TransactionsSpecPerson
@@ -65,6 +97,21 @@ class TransactionsSpecPersonWithOnCreate
   end
 end
 
+class TransactionsSpecPersonWithAfterCreateCommit
+  include Mongoid::Document
+  include TransactionsSpecCountable
+
+  field :name, type: String
+
+  after_create_commit do
+    after_commit_counter.inc
+  end
+
+  after_rollback on: :create do
+    after_rollback_counter.inc
+  end
+end
+
 class TransactionsSpecPersonWithOnUpdate
   include Mongoid::Document
   include TransactionsSpecCountable
@@ -80,6 +127,36 @@ class TransactionsSpecPersonWithOnUpdate
   end
 end
 
+class TransactionsSpecPersonWithAfterUpdateCommit
+  include Mongoid::Document
+  include TransactionsSpecCountable
+
+  field :name, type: String
+
+  after_update_commit do
+    after_commit_counter.inc
+  end
+
+  after_rollback on: :create do
+    after_rollback_counter.inc
+  end
+end
+
+class TransactionsSpecPersonWithAfterSaveCommit
+  include Mongoid::Document
+  include TransactionsSpecCountable
+
+  field :name, type: String
+
+  after_save_commit do
+    after_commit_counter.inc
+  end
+
+  after_rollback on: :create do
+    after_rollback_counter.inc
+  end
+end
+
 class TransactionsSpecPersonWithOnDestroy
   include Mongoid::Document
   include TransactionsSpecCountable
@@ -94,6 +171,22 @@ class TransactionsSpecPersonWithOnDestroy
     after_rollback_counter.inc
   end
 end
+
+class TransactionsSpecPersonWithAfterDestroyCommit
+  include Mongoid::Document
+  include TransactionsSpecCountable
+
+  field :name, type: String
+
+  after_destroy_commit do
+    after_commit_counter.inc
+  end
+
+  after_rollback on: :create do
+    after_rollback_counter.inc
+  end
+end
+
 class TransactionSpecRaisesBeforeSave
   include Mongoid::Document
   include TransactionsSpecCountable

data/spec/mongoid/contextual/aggregable/mongo_spec.rb

@@ -244,6 +244,39 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
       end
     end
+
+    context 'regarding hints' do
+      let(:client) { Person.collection.client }
+      let(:subscriber) { Mrss::EventSubscriber.new }
+
+      before do
+        client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+        maybe_hint.aggregates(:age)
+      end
+
+      after do
+        client.unsubscribe(Mongo::Monitoring::COMMAND, subscriber)
+      end
+
+      let(:event) { subscriber.single_command_started_event('aggregate') }
+      let(:command) { event.command }
+
+      context 'when no hint is provided' do
+        let(:maybe_hint) { Person }
+
+        it 'does not include the hint in the command' do
+          expect(command['hint']).to be_nil
+        end
+      end
+
+      context 'when a hint is provided' do
+        let(:maybe_hint) { Person.hint(age: 1) }
+
+        it 'includes the hint with the command' do
+          expect(command['hint']).to eq({ 'age' => 1 })
+        end
+      end
+    end
   end
 
   describe "#avg" do

data/spec/mongoid/reloadable_spec.rb

@@ -134,6 +134,16 @@ describe Mongoid::Reloadable do
 
           agent.title.should == '007'
         end
+
+        it 'sets new_record to false' do
+          expect(agent.new_record?).to be true
+
+          lambda do
+            agent.reload
+          end.should_not raise_error
+
+          expect(agent.new_record?).to be false
+        end
       end
     end
 
@@ -596,6 +606,20 @@ describe Mongoid::Reloadable do
           band.id.should_not == original_id
         end
       end
+
+      context 'when there is no document matching our id' do
+        let(:agent) { Agent.new(id: BSON::ObjectId.new) }
+
+        it 'does not set new_record to false' do
+          expect(agent.new_record?).to be true
+
+          lambda do
+            agent.reload
+          end.should_not raise_error
+
+          expect(agent.new_record?).to be true
+        end
+      end
     end
 
     context 'when document has referenced associations' do

data/spec/shared/CANDIDATE.md

@@ -0,0 +1,28 @@
+# Candidate Tasks
+
+When using the `candidate` rake tasks, you must make sure:
+
+1. You are using at least `git` version 2.49.0.
+2. You have the `gh` CLI tool installed.
+3. You are logged into `gh` with an account that has collaborator access to the repository.
+4. You have run `gh repo set-default` from the root of your local checkout to set the default repository to the canonical MongoDB repo.
+5. The `origin` remote for your local checkout is set to your own fork.
+6. The `upstream` remote for your local checkout is set to the canonical
+   MongoDB repo.
+
+Once configured, you can use the following commands:
+
+1. `rake candidate:prs` - This will list all pull requests that will be included in the next release. Any with `[?]` are unlabelled (or are not labelled with a recognized label). Otherwise, `[b]` means `bug`, `[f]` means `feature`, and `[x]` means `bcbreak`.
+2. `rake candidate:preview` - This will generate and display the release notes for the next release, based on the associated pull requests.
+3. `rake candidate:create` - This will create a new PR against the default repository, using the generated release notes as the description. The new PR will be given the `release-candidate` label.
+
+Then, after the release candidate PR is approved and merged, the release process will automatically bundle, sign, and release the new version.
+
+Once you've merged the PR, you can switch to the "Actions" tab for the repository on GitHub and look for the "Release" workflow (might be named differently), which should have triggered automatically. You can monitor the progress of the release there. If there are any problems, the workflow is generally safe to re-run after you've addressed them.
+
+Things to do after the release succeeds:
+
+1. Copy the release notes from the PR and create a new release announcement on the forums (https://www.mongodb.com/community/forums/c/announcements/driver-releases/110).
+2. If the release was not automatically announced in #ruby, copy a link to the GitHub release or MongoDB forum post there.
+3. Close the release in Jira.
+

data/spec/shared/lib/mrss/spec_organizer.rb

@@ -25,19 +25,19 @@ module Mrss
     end
 
     def initialize(root: nil, classifiers:, priority_order:,
-      spec_root: nil, rspec_json_path: nil, rspec_all_json_path: nil,
-      randomize: false
+      spec_root: nil, rspec_json_path: nil, rspec_all_json_path: nil, rspec_xml_path: nil, randomize: false
     )
       @spec_root = spec_root || File.join(root, 'spec')
       @classifiers = classifiers
       @priority_order = priority_order
       @rspec_json_path = rspec_json_path || File.join(root, 'tmp/rspec.json')
       @rspec_all_json_path = rspec_all_json_path || File.join(root, 'tmp/rspec-all.json')
+      @rspec_xml_path = rspec_xml_path || File.join(root, 'tmp/rspec.xml')
       @randomize = !!randomize
     end
 
     attr_reader :spec_root, :classifiers, :priority_order
-    attr_reader :rspec_json_path, :rspec_all_json_path
+    attr_reader :rspec_json_path, :rspec_all_json_path, :rspec_xml_path
 
     def randomize?
       @randomize
@@ -47,6 +47,25 @@ module Mrss
       @seed ||= (rand * 100_000).to_i
     end
 
+    # Remove all XML files from tmp directory before running tests
+    def cleanup_xml_files
+      xml_pattern = File.join(File.dirname(rspec_xml_path), '*.xml')
+      Dir.glob(xml_pattern).each do |xml_file|
+        FileUtils.rm_f(xml_file)
+      end
+    end
+
+    # Move the XML file to a timestamped version for evergreen upload
+    def archive_xml_file(category)
+      return unless File.exist?(rspec_xml_path)
+
+      timestamp = Time.now.strftime('%Y%m%d_%H%M%S_%3N')
+      archived_path = rspec_xml_path.sub(/\.xml$/, "-#{category}-#{timestamp}.xml")
+
+      FileUtils.mv(rspec_xml_path, archived_path)
+      puts "Archived XML results to #{archived_path}"
+    end
+
     def buckets
       @buckets ||= {}.tap do |buckets|
         Find.find(spec_root) do |path|
@@ -96,6 +115,8 @@ module Mrss
 
     def run_buckets(*buckets)
       FileUtils.rm_f(rspec_all_json_path)
+      # Clean up all XML files before starting test runs
+      cleanup_xml_files
 
       buckets.each do |bucket|
         if bucket && !self.buckets[bucket]
@@ -131,7 +152,12 @@ module Mrss
     def run_files(category, paths)
       puts "Running #{category.to_s.gsub('_', ' ')} tests"
       FileUtils.rm_f(rspec_json_path)
+      FileUtils.rm_f(rspec_xml_path)  # Clean up XML file before running this bucket
+
       cmd = %w(rspec) + paths
+      # Add junit formatter for XML output
+      cmd += ['--format', 'Rfc::Riff', '--format', 'RspecJunitFormatter', '--out', rspec_xml_path]
+
       if randomize?
         cmd += %W(--order rand:#{seed})
       end
@@ -147,6 +173,9 @@ module Mrss
             FileUtils.cp(rspec_json_path, rspec_all_json_path)
           end
         end
+
+        # Archive XML file after running this bucket
+        archive_xml_file(category)
       end
 
       true

data/spec/shared/shlib/server.sh

@@ -78,7 +78,7 @@ install_mlaunch_venv() {
     # Debian11/Ubuntu2204 have venv installed, but it is nonfunctional unless
     # the python3-venv package is also installed (it lacks the ensurepip
     # module).
-    sudo apt-get install --yes python3-venv
+    sudo apt-get update && sudo apt-get install --yes python3-venv
   fi
   if test "$USE_SYSTEM_PYTHON_PACKAGES" = 1 &&
     python3 -m pip list |grep mtools

data/spec/support/models/company.rb

@@ -5,4 +5,6 @@ class Company
   include Mongoid::Document
 
   embeds_many :staffs
+
+  has_many :products
 end

data/spec/support/models/passport.rb

@@ -8,6 +8,7 @@ class Passport
   field :country, type: String
   field :exp, as: :expiration_date, type: Date
   field :name, localize: true
+  field :bp, as: :birthplace, localize: true
   field :localized_translations, localize: true
 
   embedded_in :person, autobuild: true

data/spec/support/models/product.rb

@@ -18,4 +18,6 @@ class Product
   validates :website, format: { with: URI.regexp, allow_blank: true }
 
   embeds_one :seo, as: :seo_tags, cascade_callbacks: true, autobuild: true
+
+  belongs_to :company
 end

data/spec/support/models/seo.rb

@@ -5,6 +5,8 @@ class Seo
   include Mongoid::Document
   include Mongoid::Timestamps
   field :title, type: String
+  field :name, type: String, localize: true
+  field :desc, as: :description, type: String, localize: true
 
   embedded_in :seo_tags, polymorphic: true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 9.0.7
+  version: 9.0.9
 platform: ruby
 authors:
 - The MongoDB Ruby Team
@@ -18,7 +18,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
     - - "!="
       - !ruby/object:Gem::Version
         version: 7.0.0
@@ -31,7 +31,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
     - - "!="
       - !ruby/object:Gem::Version
         version: 7.0.0
@@ -437,6 +437,7 @@ files:
 - lib/mongoid/persistable/updatable.rb
 - lib/mongoid/persistable/upsertable.rb
 - lib/mongoid/persistence_context.rb
+- lib/mongoid/pluckable.rb
 - lib/mongoid/positional.rb
 - lib/mongoid/railtie.rb
 - lib/mongoid/railties/bson_object_id_serializer.rb
@@ -895,6 +896,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
@@ -1229,7 +1231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 4.0.2
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.
 test_files:
@@ -1642,6 +1644,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