mongo 2.23.0 → 2.24.0

data/lib/mongo/config/options.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongo
   module Config
-
     # Encapsulates logic for setting options.
     module Options
-
       # Get the defaults or initialize a new empty hash.
       #
       # @return [ Hash ] The default options.

data/lib/mongo/config/validators/option.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongo
   module Config
     module Validators
-
       # Validator for configuration options.
       #
       # @api private
@@ -17,9 +15,9 @@ module Mongo
         #
         # @param [ String ] option The name of the option.
         def validate(option)
-          unless Config.settings.keys.include?(option.to_sym)
-            raise Mongo::Error::InvalidConfigOption.new(option)
-          end
+          return if Config.settings.keys.include?(option.to_sym)
+
+          raise Mongo::Error::InvalidConfigOption.new(option)
         end
       end
     end

data/lib/mongo/config.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "mongo/config/options"
-require "mongo/config/validators/option"
+require 'mongo/config/options'
+require 'mongo/config/validators/option'
 
 module Mongo
-
   # This module defines configuration options for Mongo.
   #
   # @api private

data/lib/mongo/crypt/auto_decryption_context.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2019-2020 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   module Crypt
-
     # A Context object initialized for auto decryption
     #
     # @api private
     class AutoDecryptionContext < Context
-
       # Create a new AutoEncryptionContext object
       #
       # @param [ Mongo::Crypt::Handle ] mongocrypt a Handle that

data/lib/mongo/crypt/auto_encrypter.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2019-2020 MongoDB Inc.
 #
@@ -17,8 +16,7 @@
 
 module Mongo
   module Crypt
-
-    # An AutoEcnrypter is an object that encapsulates the behavior of
+    # An AutoEncrypter is an object that encapsulates the behavior of
     # automatic encryption. It controls all resources associated with
     # auto-encryption, including the libmongocrypt handle, key vault client
     # object, mongocryptd client object, and encryption I/O.
@@ -29,19 +27,15 @@ module Mongo
     #
     # @api private
     class AutoEncrypter
-
-      attr_reader :mongocryptd_client
-      attr_reader :key_vault_client
-      attr_reader :metadata_client
-      attr_reader :options
+      attr_reader :mongocryptd_client, :key_vault_client, :metadata_client, :options
 
       # A Hash of default values for the :extra_options option
       DEFAULT_EXTRA_OPTIONS = Options::Redacted.new({
-        mongocryptd_uri: 'mongodb://localhost:27020',
-        mongocryptd_bypass_spawn: false,
-        mongocryptd_spawn_path: 'mongocryptd',
-        mongocryptd_spawn_args: ['--idleShutdownTimeoutSecs=60'],
-      })
+                                                      mongocryptd_uri: 'mongodb://localhost:27020',
+                                                      mongocryptd_bypass_spawn: false,
+                                                      mongocryptd_spawn_path: 'mongocryptd',
+                                                      mongocryptd_spawn_args: [ '--idleShutdownTimeoutSecs=60' ],
+                                                    })
 
       # Set up encryption-related options and instance variables
       # on the class that includes this module. Calls the same method
@@ -105,6 +99,7 @@ module Mongo
           bypass_query_analysis: @options[:bypass_query_analysis],
           crypt_shared_lib_path: @options[:extra_options][:crypt_shared_lib_path],
           crypt_shared_lib_required: @options[:extra_options][:crypt_shared_lib_required],
+          disable_crypt_shared_lib_search: @options[:extra_options][:disable_crypt_shared_lib_search]
         )
 
         @mongocryptd_options = @options[:extra_options].slice(
@@ -114,9 +109,9 @@ module Mongo
           :mongocryptd_spawn_args
         )
         @mongocryptd_options[:mongocryptd_bypass_spawn] = @options[:bypass_auto_encryption] ||
-          @options[:extra_options][:mongocryptd_bypass_spawn] ||
-          @crypt_handle.crypt_shared_lib_available? ||
-          @options[:extra_options][:crypt_shared_lib_required]
+                                                          @options[:extra_options][:mongocryptd_bypass_spawn] ||
+                                                          @crypt_handle.crypt_shared_lib_available? ||
+                                                          @options[:extra_options][:crypt_shared_lib_required]
 
         unless @options[:extra_options][:crypt_shared_lib_required] || @crypt_handle.crypt_shared_lib_available? || @options[:bypass_query_analysis]
           @mongocryptd_client = Client.new(
@@ -137,33 +132,31 @@ module Mongo
             metadata_client: @metadata_client,
             mongocryptd_options: @mongocryptd_options
           )
-        rescue
+        rescue StandardError
           begin
             @mongocryptd_client&.close
-          rescue => e
+          rescue StandardError => e
             log_warn("Error closing mongocryptd client in auto encrypter's constructor: #{e.class}: #{e}")
             # Drop this exception so that the original exception is raised
           end
           raise
         end
-      rescue
+      rescue StandardError
         if @key_vault_client && @key_vault_client != options[:client] &&
-          @key_vault_client.cluster != options[:client].cluster
-        then
+           @key_vault_client.cluster != options[:client].cluster
           begin
             @key_vault_client.close
-          rescue => e
+          rescue StandardError => e
             log_warn("Error closing key vault client in auto encrypter's constructor: #{e.class}: #{e}")
             # Drop this exception so that the original exception is raised
           end
         end
 
         if @metadata_client && @metadata_client != options[:client] &&
-          @metadata_client.cluster != options[:client].cluster
-        then
+           @metadata_client.cluster != options[:client].cluster
           begin
             @metadata_client.close
-          rescue => e
+          rescue StandardError => e
             log_warn("Error closing metadata client in auto encrypter's constructor: #{e.class}: #{e}")
             # Drop this exception so that the original exception is raised
           end
@@ -216,14 +209,12 @@ module Mongo
         @mongocryptd_client.close if @mongocryptd_client
 
         if @key_vault_client && @key_vault_client != options[:client] &&
-          @key_vault_client.cluster != options[:client].cluster
-        then
+           @key_vault_client.cluster != options[:client].cluster
           @key_vault_client.close
         end
 
         if @metadata_client && @metadata_client != options[:client] &&
-          @metadata_client.cluster != options[:client].cluster
-        then
+           @metadata_client.cluster != options[:client].cluster
           @metadata_client.close
         end
 
@@ -234,7 +225,7 @@ module Mongo
 
       # Returns a new set of options with the following changes:
       # - sets default values for all extra_options
-      # - adds --idleShtudownTimeoutSecs=60 to extra_options[:mongocryptd_spawn_args]
+      # - adds --idleShutdownTimeoutSecs=60 to extra_options[:mongocryptd_spawn_args]
       #   if not already present
       # - sets bypass_auto_encryption to false
       # - sets default key vault client
@@ -268,20 +259,20 @@ module Mongo
       def set_or_create_clients(options)
         client = options[:client]
         @key_vault_client = if options[:key_vault_client]
-          options[:key_vault_client]
-        elsif client.options[:max_pool_size] == 0
-          client
-        else
-          internal_client(client)
-        end
+                              options[:key_vault_client]
+                            elsif client.options[:max_pool_size] == 0
+                              client
+                            else
+                              internal_client(client)
+                            end
 
         @metadata_client = if options[:bypass_auto_encryption]
-          nil
-        elsif client.options[:max_pool_size] == 0
-          client
-        else
-          internal_client(client)
-        end
+                             nil
+                           elsif client.options[:max_pool_size] == 0
+                             client
+                           else
+                             internal_client(client)
+                           end
       end
 
       # Creates or return already created internal client to be used for
@@ -296,7 +287,7 @@ module Mongo
         @internal_client ||= client.with(
           auto_encryption_options: nil,
           min_pool_size: 0,
-          monitoring: client.send(:monitoring),
+          monitoring: client.send(:monitoring)
         )
       end
     end

data/lib/mongo/crypt/auto_encryption_context.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2019-2020 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   module Crypt
-
     # A Context object initialized for auto encryption
     #
     # @api private
     class AutoEncryptionContext < Context
-
       # Create a new AutoEncryptionContext object
       #
       # @param [ Mongo::Crypt::Handle ] mongocrypt a Handle that

data/lib/mongo/crypt/binary.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2019-2020 MongoDB Inc.
 #
@@ -19,7 +18,6 @@ require 'ffi'
 
 module Mongo
   module Crypt
-
     # A wrapper around mongocrypt_binary_t, a non-owning buffer of
     # uint-8 byte data. Each Binary instance keeps a copy of the data
     # passed to it in order to keep that data alive.
@@ -43,7 +41,7 @@ module Mongo
 
           # FFI::MemoryPointer automatically frees memory when it goes out of scope
           @data_p = FFI::MemoryPointer.new(bytes.length)
-                    .write_array_of_uint8(bytes)
+                                      .write_array_of_uint8(bytes)
 
           # FFI::AutoPointer uses a custom release strategy to automatically free
           # the pointer once this object goes out of scope
@@ -74,7 +72,7 @@ module Mongo
       #
       # @return [ Mongo::Crypt::Binary ] A new binary object
       def self.from_pointer(pointer)
-        self.new(pointer: pointer)
+        new(pointer: pointer)
       end
 
       # Initialize a Binary object with a string. The Binary object will store a
@@ -85,7 +83,7 @@ module Mongo
       #
       # @return [ Mongo::Crypt::Binary ] A new binary object
       def self.from_data(data)
-        self.new(data: data)
+        new(data: data)
       end
 
       # Overwrite the existing data wrapped by this Binary object
@@ -102,9 +100,7 @@ module Mongo
       # than was originally allocated or when writing to an object that
       # already owns data.
       def write(data)
-        if @data
-          raise ArgumentError, 'Cannot write to an owned Binary'
-        end
+        raise ArgumentError, 'Cannot write to an owned Binary' if @data
 
         # Cannot write a string that's longer than the space currently allocated
         # by the mongocrypt_binary_t object
@@ -145,7 +141,7 @@ module Mongo
       def self.wrap_string(str)
         binary_p = Binding.mongocrypt_binary_new_from_data(
           FFI::MemoryPointer.from_string(str),
-          str.bytesize,
+          str.bytesize
         )
         begin
           yield binary_p