mongoid 9.0.1 → 9.0.2

data/spec/mongoid/model_resolver_spec.rb

@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'support/feature_sandbox'
+
+MONGOID_MODEL_RESOLVER_KEY__ = :__separate_instance_spec_key
+Mongoid::ModelResolver.register_resolver Mongoid::ModelResolver.new, MONGOID_MODEL_RESOLVER_KEY__
+
+def quarantine(context, &block)
+  state = {}
+
+  context.before(:context) do
+    state[:quarantine] = FeatureSandbox.start_quarantine
+    block&.call
+  end
+
+  context.after(:context) do
+    FeatureSandbox.end_quarantine(state[:quarantine])
+  end
+end
+
+describe Mongoid::ModelResolver do
+  shared_examples 'a resolver' do |**kwargs|
+    it 'includes the class name when asked for all keys of the given model' do
+      expect(resolver.keys_for(model_class.new)).to include(model_class.name)
+    end
+
+    if kwargs[:with_aliases].nil?
+      it 'uses the class name as the default key for the given model' do
+        expect(resolver.default_key_for(model_class.new)).to eq model_class.name
+      end
+    elsif kwargs[:with_aliases].is_a?(Array)
+      it 'uses the first alias as the default key for the given model' do
+        expect(resolver.default_key_for(model_class.new)).to eq kwargs[:with_aliases].first
+      end
+    else
+      it 'uses the alias as the default key for the given model' do
+        expect(resolver.default_key_for(model_class.new)).to eq kwargs[:with_aliases]
+      end
+    end
+
+    it 'returns the model class when queried with the class name' do
+      expect(resolver.model_for(model_class.name)).to eq model_class
+    end
+
+    Array(kwargs[:with_aliases]).each do |model_alias|
+      it "includes the alias #{model_alias.inspect} when asked for all keys of the given model" do
+        expect(resolver.keys_for(model_class.new)).to include(model_alias)
+      end
+
+      it "returns the model class when queried with #{model_alias.inspect}" do
+        expect(resolver.model_for(model_alias)).to eq model_class
+      end
+    end
+  end
+
+  context 'when using the default instance' do
+    let(:resolver) { described_class.instance }
+
+    context 'when an alias is not specified' do
+      quarantine(self) do
+        Object.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          module Mongoid; module Specs; module DefaultInstance
+            class Vanilla; include Mongoid::Document; end
+          end; end; end
+        RUBY
+      end
+
+      let(:model_class) { Mongoid::Specs::DefaultInstance::Vanilla }
+
+      it_behaves_like 'a resolver'
+    end
+
+    context 'when one alias is specified' do
+      quarantine(self) do
+        Object.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          module Mongoid; module Specs; module DefaultInstance
+            class Aliased
+              include Mongoid::Document
+              identify_as 'aliased'
+            end
+          end; end; end
+        RUBY
+      end
+
+      let(:model_class) { Mongoid::Specs::DefaultInstance::Aliased }
+
+      it_behaves_like 'a resolver', with_aliases: 'aliased'
+    end
+
+    context 'when multiple aliases are specified' do
+      quarantine(self) do
+        Object.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          module Mongoid; module Specs; module DefaultInstance
+            class AliasedMultiple
+              include Mongoid::Document
+              identify_as 'aliased', 'alias2', 'alias3'
+            end
+          end; end; end
+        RUBY
+      end
+
+      let(:model_class) { Mongoid::Specs::DefaultInstance::AliasedMultiple }
+
+      it_behaves_like 'a resolver', with_aliases: %w[ aliased alias2 alias3 ]
+    end
+  end
+
+  context 'when using a separate instance' do
+    let(:resolver) { described_class.resolver(MONGOID_MODEL_RESOLVER_KEY__) }
+
+    it 'does not refer to the default instance' do
+      expect(resolver).not_to eq described_class.instance
+    end
+
+    context 'when an alias is not specified' do
+      quarantine(self) do
+        Object.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          module Mongoid; module Specs; module SeparateInstance
+            class Vanilla
+              include Mongoid::Document
+              identify_as resolver: MONGOID_MODEL_RESOLVER_KEY__
+            end
+          end; end; end
+        RUBY
+      end
+
+      let(:model_class) { Mongoid::Specs::SeparateInstance::Vanilla }
+
+      it_behaves_like 'a resolver'
+    end
+
+    context 'when one alias is specified' do
+      quarantine(self) do
+        Object.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          module Mongoid; module Specs; module SeparateInstance
+            class Aliased
+              include Mongoid::Document
+              identify_as 'aliased', resolver: MONGOID_MODEL_RESOLVER_KEY__
+            end
+          end; end; end
+        RUBY
+      end
+
+      let(:model_class) { Mongoid::Specs::SeparateInstance::Aliased }
+
+      it_behaves_like 'a resolver', with_aliases: 'aliased'
+    end
+
+    context 'when multiple aliases are specified' do
+      quarantine(self) do
+        Object.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          module Mongoid; module Specs; module SeparateInstance
+            class AliasedMultiple
+              include Mongoid::Document
+              identify_as 'aliased', 'alias2', 'alias3', resolver: MONGOID_MODEL_RESOLVER_KEY__
+            end
+          end; end; end
+        RUBY
+      end
+
+      let(:model_class) { Mongoid::Specs::SeparateInstance::AliasedMultiple }
+
+      it_behaves_like 'a resolver', with_aliases: %w[ aliased alias2 alias3 ]
+    end
+  end
+end

data/spec/mongoid/monkey_patches_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 # @note This test ensures that we do not inadvertently introduce new monkey patches
 # to Mongoid. Existing monkey patch methods which are marked with +Mongoid.deprecated+
 # are excluded from this test.
-RSpec.describe('Do not add monkey patches') do # rubocop:disable RSpec/DescribeClass
+RSpec.describe('Do not add monkey patches') do
   classes = [
     Object,
     Array,

data/spec/mongoid/persistence_context_spec.rb

@@ -206,12 +206,25 @@ describe Mongoid::PersistenceContext do
 
         context 'when the options are valid extra options' do
 
-          let(:options) do
-            { collection: 'other' }
+          context 'collection' do
+
+            let(:options) do
+              { collection: 'other' }
+            end
+
+            it 'sets the options on the persistence context object' do
+              expect(persistence_context.collection_name).to eq(options[:collection].to_sym)
+            end
           end
 
-          it 'sets the options on the persistence context object' do
-            expect(persistence_context.collection_name).to eq(options[:collection].to_sym)
+          context 'collection_options' do
+            let(:options) do
+              { collection_options: { capped: true } }
+            end
+
+            it 'does not propagate to client options' do
+              expect(persistence_context.send(:client_options).key?(:collection_options)).to eq(false)
+            end
           end
         end
 

data/spec/mongoid/serializable_spec.rb

@@ -511,13 +511,15 @@ describe Mongoid::Serializable do
             end
 
             it "includes the first relation" do
-              expect(relation_hash[0]).to include
+              expect(relation_hash[0]).to include(
                 { "_id" => "kudamm", "street" => "Kudamm" }
+              )
             end
 
             it "includes the second relation" do
-              expect(relation_hash[1]).to include
+              expect(relation_hash[1]).to include(
                 { "_id" => "tauentzienstr", "street" => "Tauentzienstr" }
+              )
             end
           end
 
@@ -528,13 +530,15 @@ describe Mongoid::Serializable do
             end
 
             it "includes the first relation" do
-              expect(relation_hash[0]).to include
+              expect(relation_hash[0]).to include(
                 { "_id" => "kudamm", "street" => "Kudamm" }
+              )
             end
 
             it "includes the second relation" do
-              expect(relation_hash[1]).to include
+              expect(relation_hash[1]).to include(
                 { "_id" => "tauentzienstr", "street" => "Tauentzienstr" }
+              )
             end
           end
 
@@ -653,8 +657,9 @@ describe Mongoid::Serializable do
             end
 
             it "includes the specified relation" do
-              expect(relation_hash).to include
-                { "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              expect(relation_hash).to include(
+                { "_id" => "Leo-Marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              )
             end
           end
 
@@ -665,8 +670,9 @@ describe Mongoid::Serializable do
             end
 
             it "includes the specified relation" do
-              expect(relation_hash).to include
-                { "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              expect(relation_hash).to include(
+                { "_id" => "Leo-Marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              )
             end
           end
 
@@ -677,8 +683,9 @@ describe Mongoid::Serializable do
             end
 
             it "includes the specified relation sans exceptions" do
-              expect(relation_hash).to include
+              expect(relation_hash).to include(
                 { "first_name" => "Leo", "last_name" => "Marvin" }
+              )
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.0.2
 platform: ruby
 authors:
 - The MongoDB Ruby Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-29 00:00:00.000000000 Z
+date: 2024-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,7 +19,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.3'
     - - "!="
       - !ruby/object:Gem::Version
         version: 7.0.0
@@ -32,7 +32,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.3'
     - - "!="
       - !ruby/object:Gem::Version
         version: 7.0.0
@@ -168,6 +168,7 @@ files:
 - lib/mongoid/association/referenced/has_one/eager.rb
 - lib/mongoid/association/referenced/has_one/proxy.rb
 - lib/mongoid/association/referenced/syncable.rb
+- lib/mongoid/association/referenced/with_polymorphic_criteria.rb
 - lib/mongoid/association/reflections.rb
 - lib/mongoid/association/relatable.rb
 - lib/mongoid/atomic.rb
@@ -335,6 +336,9 @@ files:
 - lib/mongoid/errors/transactions_not_supported.rb
 - lib/mongoid/errors/unknown_attribute.rb
 - lib/mongoid/errors/unknown_model.rb
+- lib/mongoid/errors/unrecognized_model_alias.rb
+- lib/mongoid/errors/unrecognized_resolver.rb
+- lib/mongoid/errors/unregistered_class.rb
 - lib/mongoid/errors/unsaved_document.rb
 - lib/mongoid/errors/unsupported_javascript.rb
 - lib/mongoid/errors/validations.rb
@@ -373,6 +377,7 @@ files:
 - lib/mongoid/fields/validators.rb
 - lib/mongoid/fields/validators/macro.rb
 - lib/mongoid/findable.rb
+- lib/mongoid/identifiable.rb
 - lib/mongoid/indexable.rb
 - lib/mongoid/indexable/specification.rb
 - lib/mongoid/indexable/validators/options.rb
@@ -413,6 +418,7 @@ files:
 - lib/mongoid/matcher/regex.rb
 - lib/mongoid/matcher/size.rb
 - lib/mongoid/matcher/type.rb
+- lib/mongoid/model_resolver.rb
 - lib/mongoid/persistable.rb
 - lib/mongoid/persistable/creatable.rb
 - lib/mongoid/persistable/deletable.rb
@@ -578,6 +584,7 @@ files:
 - spec/integration/matcher_operator_data/type_undefined.yml
 - spec/integration/matcher_operator_spec.rb
 - spec/integration/matcher_spec.rb
+- spec/integration/persistence/collection_options_spec.rb
 - spec/integration/persistence/range_field_spec.rb
 - spec/integration/server_query_spec.rb
 - spec/integration/shardable_spec.rb
@@ -828,6 +835,7 @@ files:
 - spec/mongoid/matcher/extract_attribute_data/numeric_keys.yml
 - spec/mongoid/matcher/extract_attribute_data/traversal.yml
 - spec/mongoid/matcher/extract_attribute_spec.rb
+- spec/mongoid/model_resolver_spec.rb
 - spec/mongoid/mongoizable_spec.rb
 - spec/mongoid/monkey_patches_spec.rb
 - spec/mongoid/persistable/creatable_spec.rb
@@ -1298,6 +1306,7 @@ test_files:
 - spec/integration/matcher_operator_data/type_undefined.yml
 - spec/integration/matcher_operator_spec.rb
 - spec/integration/matcher_spec.rb
+- spec/integration/persistence/collection_options_spec.rb
 - spec/integration/persistence/range_field_spec.rb
 - spec/integration/server_query_spec.rb
 - spec/integration/shardable_spec.rb
@@ -1548,6 +1557,7 @@ test_files:
 - spec/mongoid/matcher/extract_attribute_data/numeric_keys.yml
 - spec/mongoid/matcher/extract_attribute_data/traversal.yml
 - spec/mongoid/matcher/extract_attribute_spec.rb
+- spec/mongoid/model_resolver_spec.rb
 - spec/mongoid/mongoizable_spec.rb
 - spec/mongoid/monkey_patches_spec.rb
 - spec/mongoid/persistable/creatable_spec.rb