mongoid 8.1.4 → 9.0.0

data/spec/mongoid/association/referenced/has_many_models.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 class HmmCompany
   include Mongoid::Document

data/spec/mongoid/association/referenced/has_many_query_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 require_relative './has_many_models'
@@ -23,7 +24,7 @@ describe Mongoid::Association::Referenced::HasMany do
       # has a default value specified in the model
       expect do
         student.grade
-      end.to raise_error(ActiveModel::MissingAttributeError)
+      end.to raise_error(Mongoid::Errors::AttributeNotLoaded)
       expect(student.attributes.keys).to eq(['_id', 'name'])
     end
 

data/spec/mongoid/association/referenced/has_many_spec.rb

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

data/spec/mongoid/association/referenced/has_one/binding_spec.rb

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

data/spec/mongoid/association/referenced/has_one/buildable_spec.rb

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

data/spec/mongoid/association/referenced/has_one/eager_spec.rb

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

data/spec/mongoid/association/referenced/has_one/proxy_spec.rb

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

data/spec/mongoid/association/referenced/has_one_models.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 class HomCollege
   include Mongoid::Document

data/spec/mongoid/association/referenced/has_one_query_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 require_relative './has_one_models'
@@ -23,7 +24,7 @@ describe Mongoid::Association::Referenced::HasOne do
       # has a default value specified in the model
       expect do
         accreditation.year
-      end.to raise_error(ActiveModel::MissingAttributeError)
+      end.to raise_error(Mongoid::Errors::AttributeNotLoaded)
       expect(legislator.attributes.keys).to eq(['_id', 'degree'])
     end
 

data/spec/mongoid/association/referenced/has_one_spec.rb

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

data/spec/mongoid/association/reflections_spec.rb

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

data/spec/mongoid/association/syncable_spec.rb

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

data/spec/mongoid/association_spec.rb

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

data/spec/mongoid/atomic/modifiers_spec.rb

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

data/spec/mongoid/atomic/paths/embedded/many_spec.rb

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

data/spec/mongoid/atomic/paths/embedded/one_spec.rb

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

data/spec/mongoid/atomic/paths/root_spec.rb

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

data/spec/mongoid/atomic/paths_spec.rb

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

data/spec/mongoid/atomic_spec.rb

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

data/spec/mongoid/atomic_update_preparer_spec.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Mongoid::AtomicUpdatePreparer do
+  describe '#prepare' do
+    let(:prepared) { described_class.prepare(hash, Band) }
+
+    context 'when the hash already contains $set' do
+      context 'when the $set is first' do
+        let(:hash) do
+          { '$set' => { name: 'Tool' }, likes: 10, '$inc' => { plays: 1 } }
+        end
+
+        it 'moves the non hash values under the provided key' do
+          expect(prepared).to eq(
+            '$set' => { 'name' => 'Tool', 'likes' => 10 },
+            '$inc' => { 'plays' => 1 }
+          )
+        end
+      end
+
+      context 'when the $set is not first' do
+        let(:hash) do
+          { likes: 10, '$inc' => { plays: 1 }, '$set' => { name: 'Tool' } }
+        end
+
+        it 'moves the non hash values under the provided key' do
+          expect(prepared).to eq(
+            '$set' => { 'likes' => 10, 'name' => 'Tool' },
+            '$inc' => { 'plays' => 1 }
+          )
+        end
+      end
+    end
+
+    context 'when the hash does not contain $set' do
+      let(:hash) do
+        { likes: 10, '$inc' => { plays: 1 }, name: 'Tool' }
+      end
+
+      it 'moves the non hash values under the provided key' do
+        expect(prepared).to eq(
+          '$set' => { 'likes' => 10, 'name' => 'Tool' },
+          '$inc' => { 'plays' => 1 }
+        )
+      end
+    end
+
+    context 'when the hash contains $rename' do
+      let(:hash) { { likes: 10, '$rename' => { old: 'new' } } }
+
+      it 'preserves the $rename operator' do
+        expect(prepared).to eq(
+          '$set' => { 'likes' => 10 },
+          '$rename' => { 'old' => 'new' }
+        )
+      end
+    end
+
+    context 'when the hash contains $addToSet' do
+      let(:hash) { { likes: 10, '$addToSet' => { list: 'new' } } }
+
+      it 'preserves the $addToSet operator' do
+        expect(prepared).to eq(
+          '$set' => { 'likes' => 10 },
+          '$addToSet' => { 'list' => 'new' }
+        )
+      end
+    end
+
+    context 'when the hash contains $push' do
+      let(:hash) { { likes: 10, '$push' => { list: 14 } } }
+
+      it 'preserves the $push operator' do
+        expect(prepared).to eq(
+          '$set' => { 'likes' => 10 },
+          '$push' => { 'list' => 14 }
+        )
+      end
+    end
+  end
+end

data/spec/mongoid/attributes/dynamic_spec.rb

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

data/spec/mongoid/attributes/embedded_spec.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Mongoid::Attributes::Embedded do
+  describe '.traverse' do
+    subject(:embedded) { described_class.traverse(attributes, path) }
+
+    let(:path) { '100.name' }
+
+    context 'when the attribute key is a string' do
+      let(:attributes) { { '100' => { 'name' => 'hundred' } } }
+
+      it 'retrieves an embedded value under the provided key' do
+        expect(embedded).to eq 'hundred'
+      end
+
+      context 'when the value is false' do
+        let(:attributes) { { '100' => { 'name' => false } } }
+
+        it 'retrieves the embedded value under the provided key' do
+          expect(embedded).to be false
+        end
+      end
+
+      context 'when the value does not exist' do
+        let(:attributes) { { '100' => { 0 => 'Please do not return this value!' } } }
+
+        it 'returns nil' do
+          expect(embedded).to be_nil
+        end
+      end
+    end
+
+    context 'when the attribute key is an integer' do
+      let(:attributes) { { 100 => { 'name' => 'hundred' } } }
+
+      it 'retrieves an embedded value under the provided key' do
+        expect(embedded).to eq 'hundred'
+      end
+    end
+
+    context 'when the attribute value is nil' do
+      let(:attributes) { { 100 => { 'name' => nil } } }
+
+      it 'returns nil' do
+        expect(embedded).to be_nil
+      end
+    end
+
+    context 'when both string and integer keys are present' do
+      let(:attributes) { { '100' => { 'name' => 'Fred' }, 100 => { 'name' => 'Daphne' } } }
+
+      it 'returns the string key value' do
+        expect(embedded).to eq 'Fred'
+      end
+
+      context 'when the string key value is nil' do
+        let(:attributes) { { '100' => nil, 100 => { 'name' => 'Daphne' } } }
+
+        it 'returns nil' do
+          expect(embedded).to be_nil
+        end
+      end
+    end
+
+    context 'when attributes is an array' do
+      let(:attributes) do
+        [ { 'name' => 'Fred' }, { 'name' => 'Daphne' }, { 'name' => 'Velma' }, { 'name' => 'Shaggy' } ]
+      end
+      let(:path) { '2.name' }
+
+      it 'retrieves the nth value' do
+        expect(embedded).to eq 'Velma'
+      end
+
+      context 'when the member does not exist' do
+        let(:attributes) { [ { 'name' => 'Fred' }, { 'name' => 'Daphne' } ] }
+
+        it 'returns nil' do
+          expect(embedded).to be_nil
+        end
+      end
+    end
+
+    context 'when the path includes a scalar value' do
+      let(:attributes) { { '100' => 'name' } }
+
+      it 'returns nil' do
+        expect(embedded).to be_nil
+      end
+    end
+
+    context 'when the parent key is not present' do
+      let(:attributes) { { '101' => { 'name' => 'hundred and one' } } }
+
+      it 'returns nil' do
+        expect(embedded).to be_nil
+      end
+    end
+
+    context 'when the attributes are deeply nested' do
+      let(:attributes) { { '100' => { 'name' => { 300 => %w[a b c] } } } }
+
+      it 'retrieves the embedded subset of attributes' do
+        expect(embedded).to eq(300 => %w[a b c])
+      end
+
+      context 'when the path is deeply nested' do
+        let(:path) { '100.name.300.1' }
+
+        it 'retrieves the embedded value' do
+          expect(embedded).to eq 'b'
+        end
+      end
+    end
+  end
+end

data/spec/mongoid/attributes/nested_spec.rb

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

data/spec/mongoid/attributes/nested_spec_models.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 class NestedAuthor
   include Mongoid::Document

data/spec/mongoid/attributes/projector_spec.rb

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

data/spec/mongoid/attributes/readonly_spec.rb

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

data/spec/mongoid/attributes_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 require_relative './attributes/nested_spec_models'
@@ -166,7 +167,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.title
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
         end
 
         context "accessing via []" do
@@ -174,7 +175,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db["title"]
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
           end
         end
       end
@@ -188,7 +189,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.title
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
         end
       end
     end
@@ -270,7 +271,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:title]
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
           end
         end
 
@@ -283,7 +284,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:title]
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
           end
         end
       end
@@ -299,7 +300,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:undefined_field]
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'undefined_field' on Person which was not loaded/)
           end
         end
 
@@ -312,7 +313,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:title]
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
           end
         end
 
@@ -364,10 +365,10 @@ describe Mongoid::Attributes do
           end
 
           context 'when retrieving a non-projected field' do
-            it 'raises MissingAttributeError' do
+            it 'raises AttributeNotLoaded' do
               expect do
                 from_db['name.first_name']
-              end.to raise_error(ActiveModel::MissingAttributeError)
+              end.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'name.first_name' on Person which was not loaded/)
             end
           end
         end
@@ -487,7 +488,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:undefined_field] = 'x'
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'undefined_field' on Person which was not loaded/)
           end
         end
 
@@ -500,7 +501,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:title] = 'x'
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
           end
         end
 
@@ -1096,7 +1097,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.read_attribute(:undefined_field)
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'undefined_field' on Person which was not loaded/)
         end
       end
 
@@ -1109,7 +1110,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.read_attribute(:title)
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
         end
       end
 
@@ -1590,8 +1591,8 @@ describe Mongoid::Attributes do
         expect(person.map).to be_nil
       end
 
-      it "can set a Hash value" do
-        expect(person.map).to eq( { somekey: "somevalue" } )
+      it "can set a Hash value with stringified keys" do
+        expect(person.map).to eq( { "somekey" => "somevalue" } )
       end
     end
 
@@ -1641,7 +1642,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.write_attribute(:undefined_field, 'x')
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'undefined_field' on Person which was not loaded/)
         end
       end
 
@@ -1654,7 +1655,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.write_attribute(:title, 'x')
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
         end
       end
 
@@ -1672,8 +1673,6 @@ describe Mongoid::Attributes do
     end
 
     context "when comparing the object_ids of the written value" do
-      config_override :legacy_attributes, false
-
       before do
         Person.create!
       end

data/spec/mongoid/cacheable_spec.rb

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

data/spec/mongoid/changeable_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -207,13 +208,13 @@ describe Mongoid::Changeable do
 
         it "returns an array of the original value and new value" do
           expect(person.send(:attribute_change, "map")).to eq(
-            [{ location: "Home" }, { location: "Work" }]
+            [{ "location" => "Home" }, { "location" => "Work" }]
           )
         end
 
         it "allows access via (attribute)_change" do
           expect(person.map_change).to eq(
-            [{ location: "Home" }, { location: "Work" }]
+            [{ "location" => "Home" }, { "location" => "Work" }]
           )
         end
 
@@ -225,7 +226,7 @@ describe Mongoid::Changeable do
 
           it "returns an array of the original value and new value" do
             expect(person.send(:attribute_change, "map")).to eq(
-              [{ location: "Home" }, { location: "Work", lat: 20.0 }]
+              [{ "location" => "Home" }, { "location" => "Work", "lat" => 20.0 }]
             )
           end
         end

data/spec/mongoid/clients/factory_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -245,6 +246,82 @@ describe Mongoid::Clients::Factory do
           }.to raise_error(Mongoid::Errors::NoClientConfig)
         end
       end
+
+      context 'when auto_encryption_options are provided' do
+        require_enterprise
+        require_libmongocrypt
+        restore_config_clients
+        include_context 'with encryption'
+
+        before do
+          Mongoid::Config.send(:clients=, config)
+          key_vault_client[key_vault_collection].drop
+        end
+
+        after do
+          client.close
+        end
+
+        let(:client) do
+          described_class.create(:encrypted)
+        end
+
+        context 'when no key vault client is provided' do
+          let(:config) do
+            {
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              encrypted: {
+                hosts: SpecConfig.instance.addresses,
+                database: database_id,
+                options: {
+                  auto_encryption_options: {
+                    kms_providers: kms_providers,
+                    key_vault_namespace: key_vault_namespace,
+                    extra_options: extra_options
+                  }
+                }
+              }
+            }
+          end
+
+          it "returns a client" do
+            expect(client).to be_a(Mongo::Client)
+          end
+
+          it 'sets schema_map for the client' do
+            expect(client.options[:auto_encryption_options][:schema_map]).not_to be_nil
+          end
+        end
+
+        context 'when a key vault client is provided' do
+          let(:config) do
+            {
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              key_vault: { hosts: SpecConfig.instance.addresses, database: database_id },
+              encrypted: {
+                hosts: SpecConfig.instance.addresses,
+                database: database_id,
+                options: {
+                  auto_encryption_options: {
+                    key_vault_client: :key_vault,
+                    kms_providers: kms_providers,
+                    key_vault_namespace: key_vault_namespace,
+                    extra_options: extra_options
+                  }
+                }
+              }
+            }
+          end
+
+          it "returns a client" do
+            expect(client).to be_a(Mongo::Client)
+          end
+
+          it 'sets key_vault_client option for the client' do
+            expect(client.options[:auto_encryption_options][:key_vault_client]).to eq(Mongoid::Clients.with_name(:key_vault))
+          end
+        end
+      end
     end
 
     context "when no name is provided" do