mongoid 7.2.5 → 7.3.0

data/lib/mongoid/shardable.rb

@@ -52,15 +52,31 @@ module Mongoid
       self.class.shard_key_fields
     end
 
-    # Get the document selector with the defined shard keys.
-    #
-    # @example Get the selector for the shard keys.
-    #   person.shard_key_selector
+    # Returns the selector that would match the current version of this
+    # document.
     #
     # @return [ Hash ] The shard key selector.
     #
-    # @since 2.0.0
+    # @api private
     def shard_key_selector
+      selector = {}
+      shard_key_fields.each do |field|
+        selector[field.to_s] = send(field)
+      end
+      selector
+    end
+
+    # Returns the selector that would match the existing version of this
+    # document in the database.
+    #
+    # If the document is not persisted, this method uses the current values
+    # of the shard key fields. If the document is persisted, this method
+    # uses the values retrieved from the database.
+    #
+    # @return [ Hash ] The shard key selector.
+    #
+    # @api private
+    def shard_key_selector_in_db
       selector = {}
       shard_key_fields.each do |field|
         selector[field.to_s] = new_record? ? send(field) : attribute_was(field)

data/lib/mongoid/touchable.rb

@@ -30,11 +30,30 @@ module Mongoid
         write_attribute(:updated_at, current) if respond_to?("updated_at=")
         write_attribute(field, current) if field
 
-        touches = touch_atomic_updates(field)
-        unless touches["$set"].blank?
-          selector = atomic_selector
-          _root.collection.find(selector).update_one(positionally(selector, touches), session: _session)
+        # If the document being touched is embedded, touch its parents
+        # all the way through the composition hierarchy to the root object,
+        # because when an embedded document is changed the write is actually
+        # performed by the composition root. See MONGOID-3468.
+        if _parent
+          # This will persist updated_at on this document as well as parents.
+          # TODO support passing the field name to the parent's touch method;
+          # I believe it should be read out of
+          # _association.inverse_association.options but inverse_association
+          # seems to not always/ever be set here. See MONGOID-5014.
+          _parent.touch
+        else
+          # If the current document is not embedded, it is composition root
+          # and we need to persist the write here.
+          touches = touch_atomic_updates(field)
+          unless touches["$set"].blank?
+            selector = atomic_selector
+            _root.collection.find(selector).update_one(positionally(selector, touches), session: _session)
+          end
         end
+
+        # Callbacks are invoked on the composition root first and on the
+        # leaf-most embedded document last.
+        # TODO add tests, see MONGOID-5015.
         run_callbacks(:touch)
         true
       end

data/lib/mongoid/validatable/associated.rb

@@ -43,7 +43,7 @@ module Mongoid
         ensure
           document.exit_validate
         end
-        document.errors.add(attribute, :invalid, **options) unless valid
+        document.errors.add(attribute, :invalid, options) unless valid
       end
     end
   end

data/lib/mongoid/validatable/presence.rb

@@ -34,15 +34,15 @@ module Mongoid
             document.errors.add(
               attribute,
               :blank_in_locale,
-              **options.merge(location: _locale)
+              options.merge(location: _locale)
             ) if not_present?(_value)
           end
         elsif document.relations.has_key?(attribute.to_s)
           if relation_or_fk_missing?(document, attribute, value)
-            document.errors.add(attribute, :blank, **options)
+            document.errors.add(attribute, :blank, options)
           end
         else
-          document.errors.add(attribute, :blank, **options) if not_present?(value)
+          document.errors.add(attribute, :blank, options) if not_present?(value)
         end
       end
 

data/lib/mongoid/validatable/uniqueness.rb

@@ -68,7 +68,7 @@ module Mongoid
       # @since 2.4.10
       def add_error(document, attribute, value)
         document.errors.add(
-          attribute, :taken, **options.except(:case_sensitive, :scope).merge(value: value)
+          attribute, :taken, options.except(:case_sensitive, :scope).merge(value: value)
         )
       end
 

data/lib/mongoid/version.rb

@@ -2,5 +2,5 @@
 # encoding: utf-8
 
 module Mongoid
-  VERSION = "7.2.5"
+  VERSION = "7.3.0"
 end

data/lib/mongoid.rb

@@ -6,7 +6,6 @@ require "support/ruby_version"
 require "forwardable"
 require "time"
 require "set"
-require "ruby2_keywords"
 
 require "active_support"
 require "active_support/core_ext"

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -57,7 +57,7 @@ development:
         # connect: :direct
 
         # Changes the default time in seconds the server monitors refresh their status
-        # via hello commands. (default: 10)
+        # via ismaster commands. (default: 10)
         # heartbeat_frequency: 10
 
         # The time in seconds for selecting servers for a near read preference. (default: 0.015)

data/spec/integration/app_spec.rb

@@ -297,9 +297,6 @@ describe 'Mongoid application tests' do
   end
 
   def remove_bundler_req
-    return unless File.file?('Gemfile.lock')
-    # TODO: Remove this method completely when we get rid of .lock files in
-    # mongoid-demo apps.
     lock_lines = IO.readlines('Gemfile.lock')
     # Get rid of the bundled with line so that whatever bundler is installed
     # on the system is usable with the application.

data/spec/integration/associations/embeds_many_spec.rb

@@ -21,4 +21,48 @@ describe 'embeds_many associations' do
       end
     end
   end
+
+  context 'clearing association when parent is not saved' do
+    let!(:parent) { Canvas.create!(shapes: [Shape.new]) }
+
+    let(:unsaved_parent) { Canvas.new(id: parent.id, shapes: [Shape.new]) }
+
+    context "using #clear" do
+      it 'deletes the target from the database' do
+        unsaved_parent.shapes.clear
+
+        unsaved_parent.shapes.should be_empty
+
+        unsaved_parent.new_record?.should be true
+        parent.reload
+        parent.shapes.should be_empty
+      end
+    end
+
+    shared_examples 'does not delete the target from the database' do
+      it 'does not delete the target from the database' do
+        unsaved_parent.shapes.should be_empty
+
+        unsaved_parent.new_record?.should be true
+        parent.reload
+        parent.shapes.length.should == 1
+      end
+    end
+
+    context "using #delete_all" do
+      before do
+        unsaved_parent.shapes.delete_all
+      end
+
+      include_examples 'does not delete the target from the database'
+    end
+
+    context "using #destroy_all" do
+      before do
+        unsaved_parent.shapes.destroy_all
+      end
+
+      include_examples 'does not delete the target from the database'
+    end
+  end
 end

data/spec/integration/associations/has_one_spec.rb

@@ -67,6 +67,54 @@ describe 'has_one associations' do
     end
   end
 
+  context 'when calling methods on target' do
+    let(:parent) do
+      HomCollege.create!.tap do |college|
+        HomAccreditation.create!(college: college)
+      end
+    end
+
+    shared_examples 'delegates to the field' do |reloaded: false|
+      context 'non-conflicting field name' do
+        it 'delegates to the field' do
+          parent.accreditation.price.should == 42
+        end
+
+        context 'using send' do
+          it 'delegates to the field' do
+            parent.accreditation.send(:price).should == 42
+          end
+        end
+      end
+
+      context 'field name that conflicts with Kernel' do
+        it 'delegates to the field' do
+          parent.accreditation.format.should == 'fmt'
+        end
+
+        context 'using send' do
+          it 'delegates to the field' do
+            if reloaded
+              pending 'MONGOID-4018'
+            end
+
+            parent.accreditation.send(:format).should == 'fmt'
+          end
+        end
+      end
+    end
+
+    include_examples 'delegates to the field'
+
+    context 'after reloading parent' do
+      before do
+        parent.reload
+      end
+
+      include_examples 'delegates to the field', reloaded: true
+    end
+  end
+
   context 'when child does not have parent association' do
     context 'Child.new' do
       it 'creates a child instance' do

data/spec/integration/criteria/date_field_spec.rb

@@ -12,7 +12,7 @@ describe 'Queries on Date fields' do
 
   shared_examples 'converts to beginning of day in UTC' do
     it 'converts to beginning of day in UTC' do
-      selector['founded'].should == arg.dup.beginning_of_day.utc.beginning_of_day
+      selector['founded'].should == Time.utc(arg.year, arg.month, arg.day)
     end
   end
 

data/spec/integration/document_spec.rb

@@ -20,6 +20,15 @@ describe Mongoid::Document do
     end
   end
 
+  context 'when id is unaliased' do
+    it 'persists separate id and _id values' do
+      shirt = Shirt.create!(id: 'hello', _id: 'foo')
+      shirt = Shirt.find(shirt._id)
+      shirt.id.should == 'hello'
+      shirt._id.should == 'foo'
+    end
+  end
+
   describe '#reload' do
     context 'when changing shard key value' do
       require_topology :sharded

data/spec/integration/matcher_operator_data/bits_all_clear.yml

@@ -0,0 +1,159 @@
+- name: existing field - matches with int
+  document:
+    a: 20
+    binaryValueofA: "00010100"
+  query:
+    a:
+      $bitsAllClear: 35
+  matches: true
+  min_server_version: 3.2
+
+- name: existing field - does not match with int
+  document:
+    a: 20
+    binaryValueofA: "00010100"
+  query:
+    a:
+      $bitsAllClear: 24
+  matches: false
+  min_server_version: 3.2
+
+- name: existing field - matches with binData
+  document:
+    a: 20
+    binaryValueofA: "00010100"
+  query:
+    a:
+      $bitsAllClear: !ruby/object:BSON::Binary
+        data: !binary |-
+          IW==
+        type: :generic
+  matches: true
+  min_server_version: 3.2
+
+- name: existing field - does not match with binData
+  document:
+    a: 21
+    binaryValueofA: "00010101"
+  query:
+    a:
+      $bitsAllClear: !ruby/object:BSON::Binary
+        data: !binary |-
+          IW==
+        type: :generic
+  matches: false
+  min_server_version: 3.2
+
+- name: existing binData field matches
+  document:
+    a: !ruby/object:BSON::Binary
+      data: !binary |-
+        IW==
+      type: :generic
+  query:
+    a:
+      $bitsAllClear: 20
+  matches: true
+  min_server_version: 3.2
+
+- name: existing binData field does not match
+  document:
+    a: !ruby/object:BSON::Binary
+      data: !binary |-
+        IW==
+      type: :generic
+  query:
+    a:
+      $bitsAllClear: 15
+  matches: false
+  min_server_version: 3.2
+
+- name: existing field - matches with array
+  document:
+    a: 20
+    binaryValueofA: "00010100"
+  query:
+    a:
+      $bitsAllClear: [0, 3]
+  matches: true
+  min_server_version: 3.2
+
+- name: existing field - does not match with array
+  document:
+    a: 20
+    binaryValueofA: "00010100"
+  query:
+    a:
+      $bitsAllClear: [0, 2]
+  matches: false
+  min_server_version: 3.2
+
+- name: float condition representable as an integer
+  document:
+    a: 20
+    binaryValueofA: "00010100"
+  query:
+    a:
+      $bitsAllClear: 35.0
+  matches: true
+  min_server_version: 3.2
+
+- name: float condition not representable as an integer
+  document:
+    a: 20
+    binaryValueofA: "00010100"
+  query:
+    a:
+      $bitsAllClear: 35.1
+  error: true
+  min_server_version: 3.2
+
+- name: string condition
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllClear: hello
+  error: true
+  min_server_version: 3.2
+
+- name: empty array condition
+  document:
+    a: 20
+    binaryValueofA: "00010100"
+  query:
+    a:
+      $bitsAllClear: []
+  matches: true
+  min_server_version: 3.2
+
+- name: integer 0 condition
+  document:
+    a: 20
+    binaryValueofA: "00010100"
+  query:
+    a:
+      $bitsAllClear: 0
+  matches: true
+  min_server_version: 3.2
+
+- name: negative integer condition
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllClear: -1
+  error: true
+  min_server_version: 3.2
+
+- name: negative float condition
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllClear: -1.0
+  error: true
+  min_server_version: 3.2

data/spec/integration/matcher_operator_data/bits_all_set.yml

@@ -0,0 +1,159 @@
+- name: existing field - matches with int
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllSet: 50
+  matches: true
+  min_server_version: 3.2
+
+- name: existing field - does not match with int
+  document:
+    a: 52
+    binaryValueofA: "00110100"
+  query:
+    a:
+      $bitsAllSet: 50
+  matches: false
+  min_server_version: 3.2
+
+- name: existing field - matches with binData
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllSet: !ruby/object:BSON::Binary
+        data: !binary |-
+          Ng==
+        type: :generic
+  matches: true
+  min_server_version: 3.2
+
+- name: existing field - does not match with binData
+  document:
+    a: 21
+    binaryValueofA: "00010101"
+  query:
+    a:
+      $bitsAllSet: !ruby/object:BSON::Binary
+        data: !binary |-
+          MC==
+        type: :generic
+  matches: false
+  min_server_version: 3.2
+
+- name: existing binData field matches
+  document:
+    a: !ruby/object:BSON::Binary
+      data: !binary |-
+        Ng==
+      type: :generic
+  query:
+    a:
+      $bitsAllSet: 48
+  matches: true
+  min_server_version: 3.2
+
+- name: existing binData field does not match
+  document:
+    a: !ruby/object:BSON::Binary
+      data: !binary |-
+        MC==
+      type: :generic
+  query:
+    a:
+      $bitsAllSet: 54
+  matches: false
+  min_server_version: 3.2
+
+- name: existing field - matches with array
+  document:
+    a: 20
+    binaryValueofA: "00010100"
+  query:
+    a:
+      $bitsAllSet: [2, 4]
+  matches: true
+  min_server_version: 3.2
+
+- name: existing field - does not match with array
+  document:
+    a: 20
+    binaryValueofA: "00010100"
+  query:
+    a:
+      $bitsAllSet: [0, 3]
+  matches: false
+  min_server_version: 3.2
+
+- name: float condition representable as an integer
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllSet: 50.0
+  matches: true
+  min_server_version: 3.2
+
+- name: float condition not representable as an integer
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllSet: 50.1
+  error: true
+  min_server_version: 3.2
+
+- name: string condition
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllSet: hello
+  error: true
+  min_server_version: 3.2
+
+- name: empty array condition
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllSet: []
+  matches: true
+  min_server_version: 3.2
+
+- name: integer 0 condition
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllSet: 0
+  matches: true
+  min_server_version: 3.2
+
+- name: negative integer condition
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllSet: -1
+  error: true
+  min_server_version: 3.2
+
+- name: negative float condition
+  document:
+    a: 54
+    binaryValueofA: "00110110"
+  query:
+    a:
+      $bitsAllSet: -1.0
+  error: true
+  min_server_version: 3.2