mongo 2.23.0 → 2.24.0

data/lib/mongo/operation/shared/specifiable.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -17,133 +16,126 @@
 
 module Mongo
   module Operation
-
     # This module contains common functionality for convenience methods getting
     # various values from the spec.
     #
     # @since 2.0.0
     # @api private
     module Specifiable
-
       # The field for database name.
       #
       # @since 2.0.0
-      DB_NAME = :db_name.freeze
+      DB_NAME = :db_name
 
       # The field for deletes.
       #
       # @since 2.0.0
-      DELETES = :deletes.freeze
+      DELETES = :deletes
 
       # The field for delete.
       #
       # @since 2.0.0
-      DELETE = :delete.freeze
+      DELETE = :delete
 
       # The field for documents.
       #
       # @since 2.0.0
-      DOCUMENTS = :documents.freeze
+      DOCUMENTS = :documents
 
       # The field for collection name.
       #
       # @since 2.0.0
-      COLL_NAME = :coll_name.freeze
+      COLL_NAME = :coll_name
 
       # The field for cursor count.
       #
       # @since 2.0.0
-      CURSOR_COUNT = :cursor_count.freeze
+      CURSOR_COUNT = :cursor_count
 
       # The field for cursor id.
       #
       # @since 2.0.0
-      CURSOR_ID = :cursor_id.freeze
+      CURSOR_ID = :cursor_id
 
       # The field for an index.
       #
       # @since 2.0.0
-      INDEX = :index.freeze
+      INDEX = :index
 
       # The field for multiple indexes.
       #
       # @since 2.0.0
-      INDEXES = :indexes.freeze
+      INDEXES = :indexes
 
       # The field for index names.
       #
       # @since 2.0.0
-      INDEX_NAME = :index_name.freeze
+      INDEX_NAME = :index_name
 
       # The operation id constant.
       #
       # @since 2.1.0
-      OPERATION_ID = :operation_id.freeze
+      OPERATION_ID = :operation_id
 
       # The field for options.
       #
       # @since 2.0.0
-      OPTIONS = :options.freeze
+      OPTIONS = :options
 
       # The read concern option.
       #
       # @since 2.2.0
-      READ_CONCERN = :read_concern.freeze
+      READ_CONCERN = :read_concern
 
       # The max time ms option.
       #
       # @since 2.2.5
-      MAX_TIME_MS = :max_time_ms.freeze
+      MAX_TIME_MS = :max_time_ms
 
       # The field for a selector.
       #
       # @since 2.0.0
-      SELECTOR = :selector.freeze
-
-      # The field for number to return.
-      #
-      # @since 2.0.0
-      TO_RETURN = :to_return.freeze
+      SELECTOR = :selector
 
       # The field for updates.
       #
       # @since 2.0.0
-      UPDATES = :updates.freeze
+      UPDATES = :updates
 
       # The field for update.
       #
       # @since 2.0.0
-      UPDATE = :update.freeze
+      UPDATE = :update
 
       # The field name for a user.
       #
       # @since 2.0.0
-      USER = :user.freeze
+      USER = :user
 
       # The field name for user name.
       #
       # @since 2.0.0
-      USER_NAME = :user_name.freeze
+      USER_NAME = :user_name
 
       # The field name for a write concern.
       #
       # @since 2.0.0
-      WRITE_CONCERN = :write_concern.freeze
+      WRITE_CONCERN = :write_concern
 
       # The field name for the read preference.
       #
       # @since 2.0.0
-      READ = :read.freeze
+      READ = :read
 
       # Whether to bypass document level validation.
       #
       # @since 2.2.0
-      BYPASS_DOC_VALIDATION = :bypass_document_validation.freeze
+      BYPASS_DOC_VALIDATION = :bypass_document_validation
 
       # A collation to apply to the operation.
       #
       # @since 2.4.0
-      COLLATION = :collation.freeze
+      COLLATION = :collation
 
       # @return [ Hash ] spec The specification for the operation.
       attr_reader :spec
@@ -160,9 +152,10 @@ module Mongo
       # @since 2.0.0
       def ==(other)
         return false unless other.is_a?(Specifiable)
+
         spec == other.spec
       end
-      alias_method :eql?, :==
+      alias eql? ==
 
       # Get the cursor count from the spec.
       #
@@ -327,7 +320,7 @@ module Mongo
       # @return [ Hash ] The options.
       #
       # @since 2.0.0
-      def options(connection)
+      def options(_connection)
         spec[OPTIONS] || {}
       end
 
@@ -360,7 +353,7 @@ module Mongo
       # Whether or not to bypass document level validation.
       #
       # @example Get the bypass_document_validation option.
-      #   specifiable.bypass_documentation_validation.
+      #   specifiable.bypass_document_validation.
       #
       # @return [ true, false ] Whether to bypass document level validation.
       #
@@ -390,22 +383,10 @@ module Mongo
       # @return [ Hash ] The selector spec.
       #
       # @since 2.0.0
-      def selector(connection)
+      def selector(_connection)
         spec[SELECTOR]
       end
 
-      # The number of documents to request from the server.
-      #
-      # @example Get the to return value from the spec.
-      #   specifiable.to_return
-      #
-      # @return [ Integer ] The number of documents to return.
-      #
-      # @since 2.0.0
-      def to_return
-        spec[TO_RETURN]
-      end
-
       # The update documents from the spec.
       #
       # @example Get the update documents.
@@ -473,9 +454,7 @@ module Mongo
       #
       # @since 2.0.0
       def read
-        @read ||= begin
-          ServerSelector.get(spec[READ]) if spec[READ]
-        end
+        @read ||= (ServerSelector.get(spec[READ]) if spec[READ])
       end
 
       # Whether the operation is ordered.
@@ -487,7 +466,7 @@ module Mongo
       #
       # @since 2.1.0
       def ordered?
-        !!(@spec.fetch(:ordered, true))
+        !!@spec.fetch(:ordered, true)
       end
 
       # The namespace, consisting of the db name and collection name.
@@ -564,13 +543,8 @@ module Mongo
         write_concern.nil? || write_concern.acknowledged?
       end
 
-      def apply_collation(selector, connection, collation)
-        if collation
-          unless connection.features.collation_enabled?
-            raise Error::UnsupportedCollation
-          end
-          selector = selector.merge(collation: collation)
-        end
+      def apply_collation(selector, _connection, collation)
+        selector = selector.merge(collation: collation) if collation
         selector
       end
     end

data/lib/mongo/operation/shared/write.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2018-2020 MongoDB Inc.
 #
@@ -17,13 +16,11 @@
 
 module Mongo
   module Operation
-
     # Shared behavior of operations that write (update, insert, delete).
     #
     # @since 2.5.2
     # @api private
     module Write
-
       include ResponseHandling
 
       # Execute the operation.
@@ -73,26 +70,24 @@ module Mongo
       def bulk_execute(connection, context:)
         Lint.assert_type(connection, Server::Connection)
 
-        if connection.features.op_msg_enabled?
-          self.class::OpMsg.new(spec).execute(connection, context: context).bulk_result
-        else
-          self.class::Command.new(spec).execute(connection, context: context).bulk_result
-        end
+        self.class::OpMsg.new(spec).execute(connection, context: context).bulk_result
       end
 
       private
 
       def validate!(connection)
-        if !acknowledged_write?
-          if collation
-            raise Error::UnsupportedCollation.new(
-                Error::UnsupportedCollation::UNACKNOWLEDGED_WRITES_MESSAGE)
-          end
-          if array_filters(connection)
-            raise Error::UnsupportedArrayFilters.new(
-                Error::UnsupportedArrayFilters::UNACKNOWLEDGED_WRITES_MESSAGE)
-          end
+        return if acknowledged_write?
+
+        if collation
+          raise Error::UnsupportedCollation.new(
+            Error::UnsupportedCollation::UNACKNOWLEDGED_WRITES_MESSAGE
+          )
         end
+        return unless array_filters(connection)
+
+        raise Error::UnsupportedArrayFilters.new(
+          Error::UnsupportedArrayFilters::UNACKNOWLEDGED_WRITES_MESSAGE
+        )
       end
     end
   end

data/lib/mongo/operation/shared/write_concern_supported.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #
@@ -17,25 +16,23 @@
 
 module Mongo
   module Operation
-
     # Custom behavior for operations that support write concern.
     #
     # @since 2.5.2
     # @api private
     module WriteConcernSupported
-
       private
 
-      def write_concern_supported?(connection); true; end
+      def write_concern_supported?(_connection)
+        true
+      end
 
       def command(connection)
         add_write_concern!(super, connection)
       end
 
       def add_write_concern!(sel, connection)
-        if write_concern && write_concern_supported?(connection)
-          sel[:writeConcern] = write_concern.options
-        end
+        sel[:writeConcern] = write_concern.options if write_concern && write_concern_supported?(connection)
         sel
       end
     end

data/lib/mongo/operation/update/bulk_result.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -18,8 +17,7 @@
 module Mongo
   module Operation
     class Update
-
-      # Defines custom behavior of results for an udpate when sent as part of a bulk write.
+      # Defines custom behavior of results for an update when sent as part of a bulk write.
       #
       # @since 2.0.0
       class BulkResult < Operation::Result
@@ -28,12 +26,12 @@ module Mongo
         # The number of modified docs field in the result.
         #
         # @since 2.0.0
-        MODIFIED = 'nModified'.freeze
+        MODIFIED = 'nModified'
 
         # The upserted docs field in the result.
         #
         # @since 2.0.0
-        UPSERTED = 'upserted'.freeze
+        UPSERTED = 'upserted'
 
         # Gets the number of documents upserted.
         #
@@ -45,9 +43,10 @@ module Mongo
         # @since 2.0.0
         def n_upserted
           return 0 unless acknowledged?
+
           @replies.reduce(0) do |n, reply|
             if upsert?(reply)
-              n += reply.documents.first[UPSERTED].size
+              n + reply.documents.first[UPSERTED].size
             else
               n
             end
@@ -64,24 +63,19 @@ module Mongo
         # @since 2.0.0
         def n_matched
           return 0 unless acknowledged?
+
           @replies.reduce(0) do |n, reply|
             if upsert?(reply)
               reply.documents.first[N] - n_upserted
+            elsif reply.documents.first[N]
+              n + reply.documents.first[N]
             else
-              if reply.documents.first[N]
-                n += reply.documents.first[N]
-              else
-                n
-              end
+              n
             end
           end
         end
 
         # Gets the number of documents modified.
-        # Not that in a mixed sharded cluster a call to
-        # update could return nModified (>= 2.6) or not (<= 2.4).
-        # If any call does not return nModified we can't report
-        # a valid final count so set the field to nil.
         #
         # @example Get the modified count.
         #   result.n_modified
@@ -91,9 +85,10 @@ module Mongo
         # @since 2.0.0
         def n_modified
           return 0 unless acknowledged?
+
           @replies.reduce(0) do |n, reply|
             if n && reply.documents.first[MODIFIED]
-              n += reply.documents.first[MODIFIED]
+              n + reply.documents.first[MODIFIED]
             else
               0
             end
@@ -110,6 +105,7 @@ module Mongo
         # @since 2.1.0
         def upserted
           return [] unless acknowledged?
+
           @replies.reduce([]) do |ids, reply|
             if upserted_ids = reply.documents.first[UPSERTED]
               ids += upserted_ids
@@ -120,7 +116,7 @@ module Mongo
 
         private
 
-        def upsert?(reply)
+        def upsert?(_reply)
           upserted.any?
         end
       end

data/lib/mongo/operation/update/op_msg.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2018-2020 MongoDB Inc.
 #
@@ -18,7 +17,6 @@
 module Mongo
   module Operation
     class Update
-
       # A MongoDB update operation sent as an op message.
       #
       # @api private
@@ -29,11 +27,10 @@ module Mongo
         include ExecutableNoValidate
         include ExecutableTransactionLabel
         include PolymorphicResult
-        include Validatable
 
         private
 
-        def selector(connection)
+        def selector(_connection)
           {
             update: coll_name,
             ordered: ordered?,
@@ -43,7 +40,7 @@ module Mongo
         end
 
         def message(connection)
-          updates = validate_updates(connection, send(IDENTIFIER))
+          updates = send(IDENTIFIER)
           section = Protocol::Msg::Section1.new(IDENTIFIER, updates)
           cmd = apply_relevant_timeouts_to(command(connection), connection)
           Protocol::Msg.new(flags, {}, cmd, section)

data/lib/mongo/operation/update/result.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -18,24 +17,22 @@
 module Mongo
   module Operation
     class Update
-
       # Defines custom behavior of results for an update.
       #
       # @since 2.0.0
       # @api semiprivate
       class Result < Operation::Result
-
         # The number of modified docs field in the result.
         #
         # @since 2.0.0
         # @api private
-        MODIFIED = 'nModified'.freeze
+        MODIFIED = 'nModified'
 
         # The upserted docs field in the result.
         #
         # @since 2.0.0
         # @api private
-        UPSERTED = 'upserted'.freeze
+        UPSERTED = 'upserted'
 
         # Get the number of documents matched.
         #
@@ -48,6 +45,7 @@ module Mongo
         # @api public
         def matched_count
           return 0 unless acknowledged?
+
           if upsert?
             0
           else
@@ -66,6 +64,7 @@ module Mongo
         # @api public
         def modified_count
           return 0 unless acknowledged?
+
           first[MODIFIED]
         end
 
@@ -81,6 +80,7 @@ module Mongo
         # @api public
         def upserted_id
           return nil unless upsert?
+
           upsert?.first['_id']
         end
 

data/lib/mongo/operation/update.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #
@@ -21,7 +20,6 @@ require 'mongo/operation/update/bulk_result'
 
 module Mongo
   module Operation
-
     # A MongoDB update operation.
     #
     # @api private
@@ -31,9 +29,7 @@ module Mongo
       include Specifiable
       include Write
 
-      private
-
-      IDENTIFIER = 'updates'.freeze
+      IDENTIFIER = 'updates'
     end
   end
 end

data/lib/mongo/operation/update_user/op_msg.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2018-2020 MongoDB Inc.
 #
@@ -18,7 +17,6 @@
 module Mongo
   module Operation
     class UpdateUser
-
       # A MongoDB updateuser operation sent as an op message.
       #
       # @api private
@@ -29,8 +27,8 @@ module Mongo
 
         private
 
-        def selector(connection)
-          { :updateUser => user.name }.merge(user.spec)
+        def selector(_connection)
+          { updateUser: user.name }.merge(user.spec)
         end
       end
     end

data/lib/mongo/operation/update_user.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #
@@ -19,7 +18,6 @@ require 'mongo/operation/update_user/op_msg'
 
 module Mongo
   module Operation
-
     # A MongoDB updateuser operation.
     #
     # @api private

data/lib/mongo/operation/users_info/op_msg.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2018-2020 MongoDB Inc.
 #
@@ -18,7 +17,6 @@
 module Mongo
   module Operation
     class UsersInfo
-
       # A MongoDB usersinfo operation sent as an op message.
       #
       # @api private
@@ -30,8 +28,8 @@ module Mongo
 
         private
 
-        def selector(connection)
-          { :usersInfo => user_name }
+        def selector(_connection)
+          { usersInfo: user_name }
         end
       end
     end

data/lib/mongo/operation/users_info/result.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -18,19 +17,17 @@
 module Mongo
   module Operation
     class UsersInfo
-
       # Defines custom behavior of results when using the
       # usersInfo command.
       #
       # @since 2.1.0
       # @api semiprivate
       class Result < Operation::Result
-
         # The field name for the users document in a usersInfo result.
         #
         # @since 2.1.0
         # @api private
-        USERS = 'users'.freeze
+        USERS = 'users'
 
         # @api public
         def documents

data/lib/mongo/operation/users_info.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #
@@ -20,7 +19,6 @@ require 'mongo/operation/users_info/result'
 
 module Mongo
   module Operation
-
     # A MongoDB usersinfo operation.
     #
     # @api private

data/lib/mongo/operation/write_command/op_msg.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2021 MongoDB Inc.
 #
@@ -18,23 +17,16 @@
 module Mongo
   module Operation
     class WriteCommand
-
       # A MongoDB write command operation sent as an op message.
       #
       # @api private
       class OpMsg < OpMsgBase
-        include Validatable
-
         private
 
         def selector(connection)
           super.tap do |selector|
-            if selector.key?(:findAndModify)
-              validate_find_options(connection, selector)
-            end
-            if wc = spec[:write_concern]
-              selector[:writeConcern] = wc.options
-            end
+            wc = spec[:write_concern]
+            selector[:writeConcern] = wc.options if wc
           end
         end
       end