mongoid 7.2.6 → 7.3.0

data/lib/mongoid/matcher.rb

@@ -79,6 +79,11 @@ end
 
 require 'mongoid/matcher/all'
 require 'mongoid/matcher/and'
+require 'mongoid/matcher/bits'
+require 'mongoid/matcher/bits_all_clear'
+require 'mongoid/matcher/bits_all_set'
+require 'mongoid/matcher/bits_any_clear'
+require 'mongoid/matcher/bits_any_set'
 require 'mongoid/matcher/elem_match'
 require 'mongoid/matcher/elem_match_expression'
 require 'mongoid/matcher/eq'
@@ -92,6 +97,7 @@ require 'mongoid/matcher/gte'
 require 'mongoid/matcher/in'
 require 'mongoid/matcher/lt'
 require 'mongoid/matcher/lte'
+require 'mongoid/matcher/mod'
 require 'mongoid/matcher/ne'
 require 'mongoid/matcher/nin'
 require 'mongoid/matcher/nor'
@@ -99,5 +105,6 @@ require 'mongoid/matcher/not'
 require 'mongoid/matcher/or'
 require 'mongoid/matcher/regex'
 require 'mongoid/matcher/size'
+require 'mongoid/matcher/type'
 require 'mongoid/matcher/expression_operator'
 require 'mongoid/matcher/field_operator'

data/lib/mongoid/persistable/deletable.rb

@@ -47,7 +47,7 @@ module Mongoid
       #
       # @since 4.0.0
       def atomic_deletes
-        { atomic_delete_modifier => { atomic_path => _index ? { "_id" => id } : true }}
+        { atomic_delete_modifier => { atomic_path => _index ? { "_id" => _id } : true }}
       end
 
       # Delete the embedded document.
@@ -117,7 +117,6 @@ module Mongoid
       #
       # @since 4.0.0
       def prepare_delete
-        return false unless catch(:abort) { apply_delete_dependencies! }
         yield(self)
         freeze
         self.destroyed = true

data/lib/mongoid/persistable/destroyable.rb

@@ -23,13 +23,19 @@ module Mongoid
       def destroy(options = nil)
         raise Errors::ReadonlyDocument.new(self.class) if readonly?
         self.flagged_for_destroy = true
-        result = run_callbacks(:destroy) { delete(options || {}) }
+        result = run_callbacks(:destroy) do
+          if catch(:abort) { apply_destroy_dependencies! }
+            delete(options || {})
+          else
+            false
+          end
+        end
         self.flagged_for_destroy = false
         result
       end
 
       def destroy!(options = {})
-        destroy || raise(Errors::DocumentNotDestroyed.new(id, self.class))
+        destroy || raise(Errors::DocumentNotDestroyed.new(_id, self.class))
       end
 
       module ClassMethods

data/lib/mongoid/persistable/updatable.rb

@@ -137,8 +137,33 @@ module Mongoid
             coll = collection(_root)
             selector = atomic_selector
             coll.find(selector).update_one(positionally(selector, updates), session: _session)
-            conflicts.each_pair do |key, value|
-              coll.find(selector).update_one(positionally(selector, { key => value }), session: _session)
+
+            # The following code applies updates which would cause
+            # path conflicts in MongoDB, for example when changing attributes
+            # of foo.0.bars while adding another foo. Each conflicting update
+            # is applied using its own write.
+            #
+            # TODO: MONGOID-5026: reduce the number of writes performed by
+            # more intelligently combining the writes such that there are
+            # fewer conflicts.
+            conflicts.each_pair do |modifier, changes|
+
+              # Group the changes according to their root key which is
+              # the top-level association name.
+              # This handles at least the cases described in MONGOID-4982.
+              conflicting_change_groups = changes.group_by do |key, _|
+                key.split(".", 2).first
+              end.values
+
+              # Apply changes in batches. Pop one change from each
+              # field-conflict group round-robin until all changes
+              # have been applied.
+              while batched_changes = conflicting_change_groups.map(&:pop).compact.to_h.presence
+                coll.find(selector).update_one(
+                  positionally(selector, modifier => batched_changes),
+                  session: _session,
+                )
+              end
             end
           end
         end

data/lib/mongoid/persistence_context.rb

@@ -237,9 +237,7 @@ module Mongoid
       # @since 6.0.0
       def clear(object, cluster = nil, original_context = nil)
         if context = get(object)
-          unless cluster.nil? || context.cluster.equal?(cluster)
-            context.client.close
-          end
+          context.client.close unless (context.cluster.equal?(cluster) || cluster.nil?)
         end
       ensure
         Thread.current["[mongoid][#{object.object_id}]:context"] = original_context

data/lib/mongoid/query_cache.rb

@@ -7,14 +7,8 @@ module Mongoid
   #
   # @since 4.0.0
   module QueryCache
-    # @api private
-    LEGACY_WARNING = <<~DOC
-      You are using the legacy Mongoid query cache which has known issues.
-      Please upgrade the `mongo' gem to at least 2.14.0 to use the improved driver query cache.
-      Refer to: https://docs.mongodb.com/mongoid/current/tutorials/mongoid-queries/#the-improved-driver-query-cache
-    DOC
-
     class << self
+
       # Get the cached queries.
       #
       # @example Get the cached queries from the current thread.
@@ -92,10 +86,6 @@ module Mongoid
         if defined?(Mongo::QueryCache)
           Mongo::QueryCache.cache(&block)
         else
-          @legacy_query_cache_warned ||= begin
-            Mongoid.logger.warn(LEGACY_WARNING)
-            true
-          end
           enabled = QueryCache.enabled?
           QueryCache.enabled = true
           begin
@@ -127,38 +117,44 @@ module Mongoid
       end
     end
 
-    # The middleware to be added to a rack application in order to activate the
-    # query cache.
-    #
-    # @since 4.0.0
-    class Middleware
-
-      # Instantiate the middleware.
-      #
-      # @example Create the new middleware.
-      #   Middleware.new(app)
-      #
-      # @param [ Object ] app The rack applciation stack.
+    if defined?(Mongo::QueryCache::Middleware)
+      Middleware = Mongo::QueryCache::Middleware
+    else
+      # The middleware to be added to a rack application in order to activate the
+      # query cache.
       #
       # @since 4.0.0
-      def initialize(app)
-        @app = app
-      end
+      class Middleware
 
-      # Execute the request, wrapping in a query cache.
-      #
-      # @example Execute the request.
-      #   middleware.call(env)
-      #
-      # @param [ Object ] env The environment.
-      #
-      # @return [ Object ] The result of the call.
-      #
-      # @since 4.0.0
-      def call(env)
-        QueryCache.cache { @app.call(env) }
-      ensure
-        QueryCache.clear_cache
+        # Instantiate the middleware.
+        #
+        # @example Create the new middleware.
+        #   Middleware.new(app)
+        #
+        # @param [ Object ] app The rack application stack.
+        #
+        # @since 4.0.0
+        def initialize(app)
+          @app = app
+        end
+
+        # Execute the request, wrapping in a query cache.
+        #
+        # @example Execute the request.
+        #   middleware.call(env)
+        #
+        # @param [ Object ] env The environment.
+        #
+        # @return [ Object ] The result of the call.
+        #
+        # @since 4.0.0
+        def call(env)
+          QueryCache.cache do
+            @app.call(env)
+          end
+        ensure
+          QueryCache.clear_cache
+        end
       end
     end
 

data/lib/mongoid/selectable.rb

@@ -21,7 +21,7 @@ module Mongoid
     # @since 1.0.0
     def atomic_selector
       @atomic_selector ||=
-        (embedded? ? embedded_atomic_selector : root_atomic_selector)
+        (embedded? ? embedded_atomic_selector : root_atomic_selector_in_db)
     end
 
     private
@@ -44,18 +44,16 @@ module Mongoid
       end
     end
 
-    # Get the atomic selector for a root document.
+    # Get the atomic selector that would match the existing version of the
+    # root document.
     #
     # @api private
     #
-    # @example Get the root atomic selector.
-    #   document.root_atomic_selector
-    #
     # @return [ Hash ] The root document selector.
     #
     # @since 4.0.0
-    def root_atomic_selector
-      { "_id" => _id }.merge!(shard_key_selector)
+    def root_atomic_selector_in_db
+      { "_id" => _id }.merge!(shard_key_selector_in_db)
     end
   end
 end

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/tasks/database.rb

@@ -123,7 +123,7 @@ module Mongoid
           next if model.shard_config.nil?
 
           if model.embedded? && !model.cyclic?
-            logger.warn("MONGOID: #{model} has shard config but is embedded")
+            logger.warn("MONGOID: #{model} has shard config but is emdedded")
             next
           end
 

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.6"
+  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