mongo 2.22.0 → 2.24.0

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

data/lib/mongo/operation/write_command.rb

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

data/lib/mongo/operation.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'mongo/operation/context'
 require 'mongo/operation/result'
@@ -19,7 +18,6 @@ require 'mongo/operation/shared/causal_consistency_supported'
 require 'mongo/operation/shared/write'
 require 'mongo/operation/shared/idable'
 require 'mongo/operation/shared/specifiable'
-require 'mongo/operation/shared/validatable'
 require 'mongo/operation/shared/object_id_generator'
 require 'mongo/operation/shared/op_msg_executable'
 require 'mongo/operation/shared/timed'
@@ -28,7 +26,6 @@ require 'mongo/operation/op_msg_base'
 require 'mongo/operation/command'
 require 'mongo/operation/write_command'
 require 'mongo/operation/aggregate'
-require 'mongo/operation/result'
 require 'mongo/operation/collections_info'
 require 'mongo/operation/list_collections'
 require 'mongo/operation/update'
@@ -57,7 +54,6 @@ require 'mongo/operation/drop_search_index'
 require 'mongo/operation/update_search_index'
 
 module Mongo
-
   # This module encapsulates all of the operation classes defined by the driver.
   #
   # The operation classes take Ruby options as constructor parameters.
@@ -68,51 +64,50 @@ module Mongo
   #
   # @api private
   module Operation
-
     # The q field constant.
     #
     # @since 2.1.0
-    Q = 'q'.freeze
+    Q = 'q'
 
     # The u field constant.
     #
     # @since 2.1.0
-    U = 'u'.freeze
+    U = 'u'
 
     # The limit field constant.
     #
     # @since 2.1.0
-    LIMIT = 'limit'.freeze
+    LIMIT = 'limit'
 
     # The multi field constant.
     #
     # @since 2.1.0
-    MULTI = 'multi'.freeze
+    MULTI = 'multi'
 
     # The upsert field constant.
     #
     # @since 2.1.0
-    UPSERT = 'upsert'.freeze
+    UPSERT = 'upsert'
 
     # The collation field constant.
     #
     # @since 2.4.0
-    COLLATION = 'collation'.freeze
+    COLLATION = 'collation'
 
     # The array filters field constant.
     #
     # @since 2.5.0
-    ARRAY_FILTERS = 'arrayFilters'.freeze
+    ARRAY_FILTERS = 'arrayFilters'
 
     # The operation time field constant.
     #
     # @since 2.5.0
-    OPERATION_TIME = 'operationTime'.freeze
+    OPERATION_TIME = 'operationTime'
 
     # The cluster time field constant.
     #
     # @since 2.5.0
     # @deprecated
-    CLUSTER_TIME = '$clusterTime'.freeze
+    CLUSTER_TIME = '$clusterTime'
   end
 end

data/lib/mongo/options/mapper.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   module Options
-
     # Utility class for various options mapping behavior.
     #
     # @since 2.0.0
@@ -42,13 +40,12 @@ module Mongo
       def transform(options, mappings)
         map = transform_keys_to_strings(mappings)
         opts = transform_keys_to_strings(options)
-        opts.reduce({}) do |transformed, (key, value)|
+        opts.each_with_object({}) do |(key, value), transformed|
           if map[key]
             transformed[map[key]] = value
           else
             transformed[key] = value
           end
-          transformed
         end
       end
 
@@ -67,14 +64,13 @@ module Mongo
       #
       # @since 2.0.0
       def transform_documents(options, mappings, document = BSON::Document.new)
-        options.reduce(document) do |transformed, (key, value)|
+        options.each_with_object(document) do |(key, value), transformed|
           name = mappings[key]
           transformed[name] = value if name && !value.nil?
-          transformed
         end
       end
 
-      # Coverts all the keys of the options to strings.
+      # Converts all the keys of the options to strings.
       #
       # @example Convert all option keys to strings.
       #   Mapper.transform({ :name => 1 })
@@ -85,13 +81,12 @@ module Mongo
       #
       # @since 2.0.0
       def transform_keys_to_strings(options)
-        options.reduce({}) do |transformed, (key, value)|
+        options.each_with_object({}) do |(key, value), transformed|
           transformed[key.to_s] = value
-          transformed
         end
       end
 
-      # Coverts all the keys of the options to symbols.
+      # Converts all the keys of the options to symbols.
       #
       # @example Convert all option keys to symbols.
       #   Mapper.transform({ 'name' => 1 })
@@ -102,13 +97,12 @@ module Mongo
       #
       # @since 2.2.2
       def transform_keys_to_symbols(options)
-        options.reduce({}) do |transformed, (key, value)|
+        options.each_with_object({}) do |(key, value), transformed|
           transformed[key.to_sym] = value
-          transformed
         end
       end
 
-      # Coverts all the symbol values to strings.
+      # Converts all the symbol values to strings.
       #
       # @example Convert all option symbol values to strings.
       #   Mapper.transform({ :name => 1 })
@@ -119,9 +113,8 @@ module Mongo
       #
       # @since 2.0.0
       def transform_values_to_strings(options)
-        options.reduce({}) do |transformed, (key, value)|
+        options.each_with_object({}) do |(key, value), transformed|
           transformed[key] = value.is_a?(Symbol) ? value.to_s : value
-          transformed
         end
       end
     end

data/lib/mongo/options/redacted.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #
@@ -17,23 +16,21 @@
 
 module Mongo
   module Options
-
     # Class for wrapping options that could be sensitive.
     # When printed, the sensitive values will be redacted.
     #
     # @since 2.1.0
     class Redacted < BSON::Document
-
       # The options whose values will be redacted.
       #
       # @since 2.1.0
-      SENSITIVE_OPTIONS = [ :password,
-                            :pwd ].freeze
+      SENSITIVE_OPTIONS = %i[password
+                             pwd].freeze
 
       # The replacement string used in place of the value for sensitive keys.
       #
       # @since 2.1.0
-      STRING_REPLACEMENT = '<REDACTED>'.freeze
+      STRING_REPLACEMENT = '<REDACTED>'
 
       # Get a string representation of the options.
       #
@@ -66,7 +63,7 @@ module Mongo
       def has_key?(key)
         super(convert_key(key))
       end
-      alias_method :key?, :has_key?
+      alias key? has_key?
 
       # Returns a new options object consisting of pairs for which the block returns false.
       #
@@ -99,7 +96,7 @@ module Mongo
           keys.each do |key|
             delete(key) if yield(key, self[key])
           end
-          n_keys == keys.size ? nil : self
+          (n_keys == keys.size) ? nil : self
         else
           to_enum
         end
@@ -136,7 +133,7 @@ module Mongo
           keys.each do |key|
             delete(key) unless yield(key, self[key])
           end
-          n_keys == keys.size ? nil : self
+          (n_keys == keys.size) ? nil : self
         else
           to_enum
         end
@@ -152,6 +149,7 @@ module Mongo
 
       def redact(k, v, method)
         return STRING_REPLACEMENT if SENSITIVE_OPTIONS.include?(k.to_sym)
+
         v.send(method)
       end
     end

data/lib/mongo/options.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #

data/lib/mongo/protocol/bit_vector.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -24,7 +23,6 @@ module Mongo
       #
       # @api private
       class BitVector
-
         # Initializes a BitVector with a layout
         #
         # @param layout [ Array<Symbol> ] the array of fields in the bit vector
@@ -43,9 +41,9 @@ module Mongo
         #   This option is deprecated and will not be used. It will removed in version 3.0.
         #
         # @return [ String ] Buffer that received the serialized vector
-        def serialize(buffer, value, validating_keys = nil)
+        def serialize(buffer, value, _validating_keys = nil)
           bits = 0
-          value.each { |flag| bits |= (@masks[flag] || 0) }
+          value.each { |flag| bits |= @masks[flag] || 0 }
           buffer.put_int32(bits)
         end
 
@@ -55,7 +53,7 @@ module Mongo
         # @param [ Hash ] options This method does not currently accept any options.
         #
         # @return [ Array<Symbol> ] Flags contained in the vector
-        def deserialize(buffer, options = {})
+        def deserialize(buffer, _options = {})
           vector = buffer.get_int32
           flags = []
           @masks.each do |flag, mask|

data/lib/mongo/protocol/caching_hash.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2022 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   module Protocol
-
     # A Hash that caches the results of #to_bson.
     #
     # @api private
     class CachingHash
-
       def initialize(hash)
         @hash = hash
       end
@@ -41,10 +38,8 @@ module Mongo
       #   This option is deprecated and will not be used. It will removed in version 3.0.
       #
       # @return [ BSON::ByteBuffer ] The buffer with the encoded object.
-      def to_bson(buffer = BSON::ByteBuffer.new, validating_keys = nil)
-        if !@bytes
-          @bytes = @hash.to_bson(BSON::ByteBuffer.new).to_s
-        end
+      def to_bson(buffer = BSON::ByteBuffer.new, _validating_keys = nil)
+        @bytes ||= @hash.to_bson(BSON::ByteBuffer.new).to_s
         buffer.put_bytes(@bytes)
       end
     end

data/lib/mongo/protocol/compressed.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2017-2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   module Protocol
-
     # MongoDB Wire protocol Compressed message.
     #
     # This is a bi-directional message that compresses another opcode.
@@ -27,15 +25,14 @@ module Mongo
     #
     # @since 2.5.0
     class Compressed < Message
-
       # The noop compressor identifier.
-      NOOP = 'noop'.freeze
+      NOOP = 'noop'
 
       # The byte signaling that the message has not been compressed (test mode).
       NOOP_BYTE = 0.chr.force_encoding(BSON::BINARY).freeze
 
       # The snappy compressor identifier.
-      SNAPPY = 'snappy'.freeze
+      SNAPPY = 'snappy'
 
       # The byte signaling that the message has been compressed with snappy.
       SNAPPY_BYTE = 1.chr.force_encoding(BSON::BINARY).freeze
@@ -48,10 +45,10 @@ module Mongo
       # The Zlib compressor identifier.
       #
       # @since 2.5.0
-      ZLIB = 'zlib'.freeze
+      ZLIB = 'zlib'
 
       # The zstd compressor identifier.
-      ZSTD = 'zstd'.freeze
+      ZSTD = 'zstd'
 
       # The byte signaling that the message has been compressed with zstd.
       ZSTD_BYTE = 3.chr.force_encoding(BSON::BINARY).freeze
@@ -103,9 +100,7 @@ module Mongo
             Message.deserialize_field(message, buf, field)
           end
         end
-        if message.is_a?(Msg)
-          message.fix_after_deserialization
-        end
+        message.fix_after_deserialization if message.is_a?(Msg)
         message
       end
 

data/lib/mongo/protocol/get_more.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   module Protocol
-
     # MongoDB Wire protocol getMore message.
     #
     # This is a client request message that is sent to the server in order
@@ -29,7 +27,6 @@ module Mongo
     #
     # @api semipublic
     class GetMore < Message
-
       # Creates a new getMore message
       #
       # @example Get 15 additional documents from cursor 123 in 'xgen.users'.
@@ -81,8 +78,6 @@ module Mongo
 
       attr_reader :upconverter
 
-      private
-
       # The operation code required to specify a getMore message.
       # @return [Fixnum] the operation code.
       #
@@ -104,17 +99,16 @@ module Mongo
       # @return [Fixnum] The cursor id to get more documents from.
       field :cursor_id, Int64
 
-      # Converts legacy getMore messages to the appropriare OP_COMMAND style
+      # Converts legacy getMore messages to the appropriate OP_COMMAND style
       # message.
       #
       # @since 2.1.0
       class Upconverter
-
         # The get more constant.
         #
         # @since 2.2.0
         # @deprecated
-        GET_MORE = 'getMore'.freeze
+        GET_MORE = 'getMore'
 
         # @return [ String ] collection The name of the collection.
         attr_reader :collection

data/lib/mongo/protocol/kill_cursors.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   module Protocol
-
     # MongoDB Wire protocol KillCursors message.
     #
     # This is a client request message that is sent to the server in order
@@ -25,7 +23,6 @@ module Mongo
     #
     # @api semipublic
     class KillCursors < Message
-
       # Creates a new KillCursors message
       #
       # @example Kill the cursor on the server with id 1.
@@ -55,7 +52,7 @@ module Mongo
           command_name: 'killCursors',
           database_name: @database,
           command: upconverter.command,
-          request_id: request_id,
+          request_id: request_id
         )
       end
 
@@ -63,8 +60,6 @@ module Mongo
 
       attr_reader :upconverter
 
-      private
-
       # The operation code required to specify +KillCursors+ message.
       # @return [Fixnum] the operation code.
       #
@@ -82,12 +77,11 @@ module Mongo
       # @return [Array<Fixnum>] Cursors to kill.
       field :cursor_ids, Int64, true
 
-      # Converts legacy insert messages to the appropriare OP_COMMAND style
+      # Converts legacy insert messages to the appropriate OP_COMMAND style
       # message.
       #
       # @since 2.1.0
       class Upconverter
-
         # @return [ String ] collection The name of the collection.
         attr_reader :collection