mongoid 7.2.1 → 7.2.2

data/spec/integration/document_spec.rb

@@ -19,4 +19,25 @@ describe Mongoid::Document do
       DelegatingPatient.default_client.should be Mongoid.default_client
     end
   end
+
+  describe '#reload' do
+    context 'when changing shard key value' do
+      require_topology :sharded
+
+      let(:profile) do
+        # Profile shard_key :name
+        Profile.create!(name: "Alice")
+      end
+
+      it "successfully reloads the document after saving an update to the sharded field" do
+        expect(profile.name).to eq("Alice")
+        profile.name = "Bob"
+        profile.save!
+
+        profile.reload
+
+        expect(profile.name).to eq("Bob")
+      end
+    end
+  end
 end

data/spec/integration/matcher_operator_data/elem_match.yml

@@ -361,3 +361,49 @@
   # https://jira.mongodb.org/browse/MONGOID-4908
   matches: false
   error: [matcher, driver]
+
+- name: $elemMatch given as symbol
+  document:
+    tags:
+      - intelligent
+  query:
+    tags:
+      :$elemMatch:
+        $eq: intelligent
+  matches: true
+
+- name: $elemMatch given as symbol - document does not contain the matched field
+  document:
+  query:
+    tags:
+      :$elemMatch:
+        $eq: intelligent
+  matches: false
+
+- name: $elemMatch argument operator given as symbol - matches
+  document:
+    tags:
+      - intelligent
+  query:
+    tags:
+      $elemMatch:
+        :$eq: intelligent
+  matches: true
+
+- name: $elemMatch argument operator given as symbol - does not match
+  document:
+    tags:
+      - intelligent
+  query:
+    tags:
+      $elemMatch:
+        :$eq: intelli
+  matches: false
+
+- name: $elemMatch argument operator given as symbol - document does not contain the matched field
+  document:
+  query:
+    tags:
+      $elemMatch:
+        :$eq: intelli
+  matches: false

data/spec/integration/matcher_operator_data/implicit_traversal.yml

@@ -14,3 +14,99 @@
   query:
     foo.bar: 2
   matches: true
+
+- name: numeric key - matches
+  document: &numeric-key
+    foo:
+      '42':
+        bar: 1
+  query:
+    foo.42.bar: 1
+  matches: true
+
+- name: numeric key - does not match
+  document: *numeric-key
+  query:
+    foo.142.bar: 1
+  matches: false
+
+- name: array under numeric key - matches
+  document: &numeric-key-array
+    foo:
+      '42':
+        -
+          bar: 1
+  query:
+    foo.42.bar: 1
+  matches: true
+
+- name: array under numeric key - does not match
+  document: *numeric-key-array
+  query:
+    foo.142.bar: 1
+  matches: false
+
+- name: numeric key under array - matches
+  document: &array-numeric-key
+    foo:
+      -
+        '42':
+          bar: 1
+  query:
+    foo.42.bar: 1
+  matches: true
+
+- name: numeric key under array - does not match
+  document: *array-numeric-key
+  query:
+    foo.142.bar: 1
+  matches: false
+
+- name: numeric key eligible as both array index and hash key - matches array index
+  document: &numeric-key-mixed
+    foo:
+      -
+        '1':
+          bar: 1
+      -
+        '1':
+          bar: 2
+  query:
+    foo.1:
+      '1':
+        bar: 2
+  matches: true
+
+- name: numeric key eligible as both array index and hash key - does not match array index
+  document: *numeric-key-mixed
+  query:
+    foo.1:
+      # The second array item has bar: 2, bar: 1 is not matched
+      '1':
+        bar: 1
+  matches: false
+
+- name: numeric key eligible as both array index and hash key - matches hash key
+  document: *numeric-key-mixed
+  query:
+    foo.1:
+      # Both bar: 1 and bar: 2 are ok, 1 in query matches the key under each
+      # array element
+      bar: 2
+  matches: true
+
+- name: numeric key eligible as both array index and hash key - matches hash key again
+  document: *numeric-key-mixed
+  query:
+    foo.1:
+      # Both bar: 1 and bar: 2 are ok, 1 in query matches the key under each
+      # array element
+      bar: 1
+  matches: true
+
+- name: numeric key eligible as both array index and hash key - does not match hash key
+  document: *numeric-key-mixed
+  query:
+    foo.0:
+      bar: 2
+  matches: false

data/spec/lite_spec_helper.rb

@@ -53,9 +53,8 @@ RSpec.configure do |config|
 
   if SpecConfig.instance.ci? && !%w(1 true yes).include?(ENV['INTERACTIVE']&.downcase)
     timeout = if SpecConfig.instance.app_tests?
-      # Allow 5 minutes per test for the app tests, since they install
-      # gems for Rails applications which can take a long time.
-      300
+      # App tests under JRuby take a REALLY long time (over 5 minutes per test).
+      500
     else
       # Allow a max of 30 seconds per test.
       # Tests should take under 10 seconds ideally but it seems

data/spec/mongoid/attributes_spec.rb

@@ -245,6 +245,97 @@ describe Mongoid::Attributes do
         end
       end
 
+      context "when the field was not explicitly defined" do
+
+        context "when excluding with only and the field was not excluded" do
+
+          let(:from_db) do
+            Person.only(:_id).first
+          end
+
+          it "raises an error" do
+            expect {
+              from_db[:undefined_field]
+            }.to raise_error(ActiveModel::MissingAttributeError)
+          end
+        end
+
+        context "when excluding with without and the field was excluded" do
+
+          let(:from_db) do
+            Person.without(:title).first
+          end
+
+          it "raises an error" do
+            expect {
+              from_db[:title]
+            }.to raise_error(ActiveModel::MissingAttributeError)
+          end
+        end
+
+        context "when excluding with without and the field was not excluded" do
+
+          let(:from_db) do
+            Person.without(:title).first
+          end
+
+          it "returns nil" do
+            from_db[:undefined_field].should be nil
+          end
+        end
+      end
+
+      context 'when projecting with #only' do
+        let!(:person) do
+          Person.create(title: 'sir', name: { first_name: 'Jose', language: { name: 'es' } })
+        end
+
+        context 'when projecting an embedded association' do
+          let(:from_db) do
+            Person.only(:name).first
+          end
+
+          context 'when retrieving a field of the association using the dot notation' do
+
+            it 'retrieves the field' do
+              pending 'MONGOID-5032, fixed in 7.3'
+
+              expect(from_db['name.first_name']).to eq 'Jose'
+            end
+          end
+
+          context 'when retrieving a field of a nested association using the dot notation' do
+            it 'retrieves the field' do
+              pending 'MONGOID-5032, fixed in 7.3'
+
+              expect(from_db['name.language.name']).to eq 'es'
+            end
+          end
+        end
+
+        context 'when projecting a sub-association of an embedded association' do
+          let(:from_db) do
+            Person.only('name.language').first
+          end
+
+          context 'when retrieving a field under the projected sub-association' do
+            it 'retrieves the field' do
+              pending 'MONGOID-5032, fixed in 7.3'
+
+              expect(from_db['name.language.name']).to eq 'es'
+            end
+          end
+
+          context 'when retrieving a non-projected field' do
+            it 'raises MissingAttributeError' do
+              expect do
+                from_db['name.first_name']
+              end.to raise_error(ActiveModel::MissingAttributeError)
+            end
+          end
+        end
+      end
+
       context "when the attribute does not exist" do
 
         before do
@@ -329,6 +420,67 @@ describe Mongoid::Attributes do
         expect(terms).to eq(true)
       end
     end
+
+    context 'when the field is not explicitly defined' do
+      let(:bar) { Bar.new }
+
+      before do
+        bar['missing_field'] = 42
+      end
+
+      it 'writes the value into attributes' do
+        bar.attributes.should == {'_id' => bar.id, 'missing_field' => 42}
+      end
+
+      it 'makes the attribute accessible via []' do
+        bar['missing_field'].should == 42
+      end
+
+      context 'when writing fields on a document with projection' do
+
+        let!(:person) do
+          Person.create(title: "sir")
+        end
+
+        context "when excluding with only and the field was not excluded" do
+
+          let(:from_db) do
+            Person.only(:_id).first
+          end
+
+          it "raises an error" do
+            expect {
+              from_db[:undefined_field] = 'x'
+            }.to raise_error(ActiveModel::MissingAttributeError)
+          end
+        end
+
+        context "when excluding with without and the field was excluded" do
+
+          let(:from_db) do
+            Person.without(:title).first
+          end
+
+          it "raises an error" do
+            expect {
+              from_db[:title] = 'x'
+            }.to raise_error(ActiveModel::MissingAttributeError)
+          end
+        end
+
+        context "when excluding with without and the field was not excluded" do
+
+          let(:from_db) do
+            Person.without(:title).first
+          end
+
+          it "writes the value" do
+            from_db[:undefined_field] = 'x'
+            from_db[:undefined_field].should == 'x'
+          end
+        end
+      end
+    end
   end
 
   describe "#_id" do
@@ -893,6 +1045,50 @@ describe Mongoid::Attributes do
         expect(person.age_before_type_cast).to eq("old")
       end
     end
+
+    context 'when reading fields on a document with projection' do
+
+      let!(:person) do
+        Person.create(title: "sir")
+      end
+
+      context "when excluding with only and the field was not excluded" do
+
+        let(:from_db) do
+          Person.only(:_id).first
+        end
+
+        it "raises an error" do
+          expect {
+            from_db.read_attribute(:undefined_field)
+          }.to raise_error(ActiveModel::MissingAttributeError)
+        end
+      end
+
+      context "when excluding with without and the field was excluded" do
+
+        let(:from_db) do
+          Person.without(:title).first
+        end
+
+        it "raises an error" do
+          expect {
+            from_db.read_attribute(:title)
+          }.to raise_error(ActiveModel::MissingAttributeError)
+        end
+      end
+
+      context "when excluding with without and the field was not excluded" do
+
+        let(:from_db) do
+          Person.without(:title).first
+        end
+
+        it "returns nil" do
+          from_db.read_attribute(:undefined_field).should be nil
+        end
+      end
+    end
   end
 
   describe "#attribute_present?" do
@@ -1398,6 +1594,51 @@ describe Mongoid::Attributes do
         expect(dictionary.description).to eq('foo')
       end
     end
+
+    context 'when writing fields on a document with projection' do
+
+      let!(:person) do
+        Person.create(title: "sir")
+      end
+
+      context "when excluding with only and the field was not excluded" do
+
+        let(:from_db) do
+          Person.only(:_id).first
+        end
+
+        it "raises an error" do
+          expect {
+            from_db.write_attribute(:undefined_field, 'x')
+          }.to raise_error(ActiveModel::MissingAttributeError)
+        end
+      end
+
+      context "when excluding with without and the field was excluded" do
+
+        let(:from_db) do
+          Person.without(:title).first
+        end
+
+        it "raises an error" do
+          expect {
+            from_db.write_attribute(:title, 'x')
+          }.to raise_error(ActiveModel::MissingAttributeError)
+        end
+      end
+
+      context "when excluding with without and the field was not excluded" do
+
+        let(:from_db) do
+          Person.without(:title).first
+        end
+
+        it "writes the value" do
+          from_db.write_attribute(:undefined_field, 'x')
+          from_db.read_attribute(:undefined_field).should == 'x'
+        end
+      end
+    end
   end
 
   describe "#typed_value_for" do