mongo 2.22.0 → 2.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc6de88aae51217bcbe02307215fefb67259f3257c5eba94c966fa8ceac5ccd
-  data.tar.gz: 258a3151671bf5ef8f6ece898dee5846b767ea5ed537fc2a86699ca688285176
+  metadata.gz: 0cdda79c0346533e626f9458f748cdb003881c93cbe597957706129277872ac0
+  data.tar.gz: 688197ddc194148b4788526763a706bae2a45e1fef0ac3ed5b1c5b55dd25a781
 SHA512:
-  metadata.gz: 2c32a72398d175523f643ad4e229f406e82f450d5eb254ee3e05815645750dd578bca77da03ee5c546146c5d78779cced7c97485107589f057fef3fcb1097662
-  data.tar.gz: 1b3dfcefc33c710792591177f18ea274439326cac1c525cc13d39c6551ac33582baa579082832422166fd819cfa68815659925d925e34f8a4e1026f244fe63f2
+  metadata.gz: f60e23e96c0ba93d06bbec7beb8cbb77420a502b5b64efe3ebafa85475e982d5f8d20c292336a716fa84b4aa6e98791cb2bed09fac1de8578b12b4320a12cdca
+  data.tar.gz: 34d8751ba7740e254e70397dd204dac01efea33d54d3ee3115cc2d3f6a460c857d625c1f367a672be3f0fc587ac0d09710318fd9011bb4152d110c939f7ec5ae

data/bin/mongo_console

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
-# rubocop:todo all
 
 $LOAD_PATH[0, 0] = File.join(File.dirname(__FILE__), '..', 'lib')
 

data/lib/mongo/active_support.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2019-2020 MongoDB Inc.
 #
@@ -17,4 +16,4 @@
 
 # Require this file if using the Ruby drver with ActiveSupport.
 
-require "bson/active_support"
+require 'bson/active_support'

data/lib/mongo/address/ipv4.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -17,13 +16,11 @@
 
 module Mongo
   class Address
-
     # Sets up resolution with IPv4 support if the address is an ip
     # address.
     #
     # @since 2.0.0
     class IPv4
-
       # @return [ String ] host The host.
       attr_reader :host
 
@@ -41,7 +38,7 @@ module Mongo
       # Split value constant.
       #
       # @since 2.1.0
-      SPLIT = ':'.freeze
+      SPLIT = ':'
 
       # Parse an IPv4 address into its host and port.
       #
@@ -56,7 +53,7 @@ module Mongo
       def self.parse(address)
         parts = address.split(SPLIT)
         host = parts[0]
-        port = (parts[1] || 27017).to_i
+        port = (parts[1] || 27_017).to_i
         [ host, port ]
       end
 
@@ -69,7 +66,7 @@ module Mongo
       # @param [ Integer ] port The port.
       #
       # @since 2.0.0
-      def initialize(host, port, host_name=nil)
+      def initialize(host, port, host_name = nil)
         @host = host
         @port = port
         @host_name = host_name

data/lib/mongo/address/ipv6.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -17,13 +16,11 @@
 
 module Mongo
   class Address
-
     # Sets up resolution with IPv6 support if the address is an ip
     # address.
     #
     # @since 2.0.0
     class IPv6
-
       # @return [ String ] host The host.
       attr_reader :host
 
@@ -51,16 +48,15 @@ module Mongo
       def self.parse(address)
         # IPAddr's parser handles IP address only, not port.
         # Therefore we need to handle the port ourselves
-        if address =~ /[\[\]]/
+        if /[\[\]]/.match?(address)
           parts = address.match(/\A\[(.+)\](?::(\d+))?\z/)
-          if parts.nil?
-            raise ArgumentError, "Invalid IPv6 address: #{address}"
-          end
+          raise ArgumentError, "Invalid IPv6 address: #{address}" if parts.nil?
+
           host = parts[1]
-          port = (parts[2] || 27017).to_i
+          port = (parts[2] || 27_017).to_i
         else
           host = address
-          port = 27017
+          port = 27_017
         end
         # Validate host.
         # This will raise IPAddr::InvalidAddressError
@@ -83,7 +79,7 @@ module Mongo
       # @param [ Integer ] port The port.
       #
       # @since 2.0.0
-      def initialize(host, port, host_name=nil)
+      def initialize(host, port, host_name = nil)
         @host = host
         @port = port
         @host_name = host_name

data/lib/mongo/address/unix.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   class Address
-
     # Sets up socket addresses.
     #
     # @since 2.0.0
     class Unix
-
       # @return [ String ] host The host.
       attr_reader :host
 
@@ -56,7 +53,7 @@ module Mongo
       # @param [ String ] host The host.
       #
       # @since 2.0.0
-      def initialize(host, port=nil, host_name=nil)
+      def initialize(host, _port = nil, _host_name = nil)
         @host = host
       end
 

data/lib/mongo/address/validator.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2017-2020 MongoDB Inc.
 #
@@ -16,22 +15,19 @@
 # limitations under the License.
 
 module Mongo
-
   class Address
-
     # @api private
     module Validator
-
       # Takes an address string in ipv4/ipv6/hostname/socket path format and
       # validates its format.
       def validate_address_str!(address_str)
         case address_str
         when /\A\[[\d:]+\](?::(\d+))?\z/
           # ipv6 with optional port
-          if port_str = $1
+          if port_str = ::Regexp.last_match(1)
             validate_port_str!(port_str)
           end
-        when /\A\//, /\.sock\z/
+        when %r{\A/}, /\.sock\z/
           # Unix socket path.
           # Spec requires us to validate that the path has no unescaped
           # slashes, but if this were to be the case, parsing would have
@@ -41,27 +37,23 @@ module Mongo
           # socket paths end in ".sock". We accept all paths but special case
           # the .sock extension to avoid relative paths falling into the
           # host:port case below.
-        when /[\/\[\]]/
+        when %r{[/\[\]]}
           # Not a host:port nor an ipv4 address with optional port.
           # Possibly botched ipv6 address with e.g. port delimiter present and
           # port missing, or extra junk before or after.
           raise Error::InvalidAddress,
-            "Invalid hostname: #{address_str}"
+                "Invalid hostname: #{address_str}"
         when /:.*:/m
           raise Error::InvalidAddress,
-            "Multiple port delimiters are not allowed: #{address_str}"
+                "Multiple port delimiters are not allowed: #{address_str}"
         else
           # host:port or ipv4 address with optional port number
           host, port = address_str.split(':')
-          if host.empty?
-            raise Error::InvalidAddress, "Host is empty: #{address_str}"
-          end
+          raise Error::InvalidAddress, "Host is empty: #{address_str}" if host.empty?
 
           validate_hostname!(host)
 
-          if port && port.empty?
-            raise Error::InvalidAddress, "Port is empty: #{address_str}"
-          end
+          raise Error::InvalidAddress, "Port is empty: #{address_str}" if port && port.empty?
 
           validate_port_str!(port)
         end
@@ -80,22 +72,18 @@ module Mongo
         # and runs of multiple dots. DNS resolution of SRV records yields
         # hostnames with trailing dots, those trailing dots are removed
         # during normalization process prior to validation.
-        if host.start_with?('.')
-          raise Error::InvalidAddress, "Hostname cannot start with a dot: #{host}"
-        end
-        if host.end_with?('.')
-          raise Error::InvalidAddress, "Hostname cannot end with a dot: #{host}"
-        end
-        if host.include?('..')
-          raise Error::InvalidAddress, "Runs of multiple dots are not allowed in hostname: #{host}"
-        end
+        raise Error::InvalidAddress, "Hostname cannot start with a dot: #{host}" if host.start_with?('.')
+        raise Error::InvalidAddress, "Hostname cannot end with a dot: #{host}" if host.end_with?('.')
+        return unless host.include?('..')
+
+        raise Error::InvalidAddress, "Runs of multiple dots are not allowed in hostname: #{host}"
       end
 
       def validate_port_str!(port)
-        unless port.nil? || (port.length > 0 && port.to_i > 0 && port.to_i <= 65535)
-          raise Error::InvalidAddress,
-            "Invalid port: #{port}. Port must be an integer greater than 0 and less than 65536"
-        end
+        return if port.nil? || (port.length > 0 && port.to_i > 0 && port.to_i <= 65_535)
+
+        raise Error::InvalidAddress,
+              "Invalid port: #{port}. Port must be an integer greater than 0 and less than 65536"
       end
     end
   end

data/lib/mongo/address.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -21,7 +20,6 @@ require 'mongo/address/unix'
 require 'mongo/address/validator'
 
 module Mongo
-
   # Represents an address to a server, either with an IP address or socket
   # path.
   #
@@ -41,7 +39,7 @@ module Mongo
     # The localhost constant.
     #
     # @since 2.1.0
-    LOCALHOST = 'localhost'.freeze
+    LOCALHOST = 'localhost'
 
     # Initialize the address.
     #
@@ -73,12 +71,11 @@ module Mongo
     #
     # @since 2.0.0
     def initialize(seed, options = {})
-      if seed.nil?
-        raise ArgumentError, "address must be not nil"
-      end
+      raise ArgumentError, 'address must be not nil' if seed.nil?
+
       @seed = seed
       @host, @port = parse_host_port
-      @options = Hash[options.map { |k, v| [k.to_sym, v] }]
+      @options = Hash[options.map { |k, v| [ k.to_sym, v ] }]
     end
 
     # @return [ String ] seed The seed address.
@@ -105,6 +102,7 @@ module Mongo
     # @since 2.0.0
     def ==(other)
       return false unless other.is_a?(Address)
+
       host == other.host && port == other.port
     end
 
@@ -143,7 +141,7 @@ module Mongo
     #
     # @since 2.0.0
     def inspect
-      "#<Mongo::Address:0x#{object_id} address=#{to_s}>"
+      "#<Mongo::Address:0x#{object_id} address=#{self}>"
     end
 
     # Get a socket for the address stored in this object, given the options.
@@ -220,10 +218,10 @@ module Mongo
       csot = !!opts[:csot]
       opts = {
         connect_timeout: Server::CONNECT_TIMEOUT,
-      }.update(options).update(Hash[opts.map { |k, v| [k.to_sym, v] }])
+      }.update(options).update(Hash[opts.map { |k, v| [ k.to_sym, v ] }])
 
       map_exceptions(csot) do
-        if seed.downcase =~ Unix::MATCH
+        if Unix::MATCH.match?(seed.downcase)
           specific_address = Unix.new(seed.downcase)
           return specific_address.socket(socket_timeout, opts)
         end
@@ -239,16 +237,14 @@ module Mongo
         # eliminate duplicates here.
         infos = getaddrinfo(host, family)
         results = infos.map do |info|
-          [info[4], info[3]]
+          [ info[4], info[3] ]
         end.uniq
         results.each do |family, address_str|
-          begin
-            specific_address = FAMILY_MAP[family].new(address_str, port, host)
-            socket = specific_address.socket(socket_timeout, opts)
-            return socket
-          rescue IOError, SystemCallError, Error::SocketTimeoutError, Error::SocketError => e
-            error = e
-          end
+          specific_address = FAMILY_MAP[family].new(address_str, port, host)
+          socket = specific_address.socket(socket_timeout, opts)
+          return socket
+        rescue IOError, SystemCallError, Error::SocketTimeoutError, Error::SocketError => e
+          error = e
         end
         raise error
       end
@@ -285,9 +281,9 @@ module Mongo
     def parse_host_port
       address = seed.downcase
       case address
-        when Unix::MATCH then Unix.parse(address)
-        when IPv6::MATCH then IPv6.parse(address)
-        else IPv4.parse(address)
+      when Unix::MATCH then Unix.parse(address)
+      when IPv6::MATCH then IPv6.parse(address)
+      else IPv4.parse(address)
       end
     end
 
@@ -297,25 +293,19 @@ module Mongo
     # @param [ Boolean ] csot Whether the client-side operation timeout
     #   should be considered when connecting the socket.
     def map_exceptions(csot)
-      begin
-        yield
-      rescue Errno::ETIMEDOUT => e
-        if csot
-          raise Error::TimeoutError, "#{e.class}: #{e} (for #{self})"
-        else
-          raise Error::SocketTimeoutError, "#{e.class}: #{e} (for #{self})"
-        end
-      rescue Error::SocketTimeoutError => e
-        if csot
-          raise Error::TimeoutError, "#{e.class}: #{e} (for #{self})"
-        else
-          raise e
-        end
-      rescue IOError, SystemCallError, ::SocketError => e
-        raise Error::SocketError, "#{e.class}: #{e} (for #{self})"
-      rescue OpenSSL::SSL::SSLError => e
-        raise Error::SocketError, "#{e.class}: #{e} (for #{self})"
-      end
+      yield
+    rescue Errno::ETIMEDOUT => e
+      raise Error::TimeoutError, "#{e.class}: #{e} (for #{self})" if csot
+
+      raise Error::SocketTimeoutError, "#{e.class}: #{e} (for #{self})"
+    rescue Error::SocketTimeoutError => e
+      raise Error::TimeoutError, "#{e.class}: #{e} (for #{self})" if csot
+
+      raise e
+    rescue IOError, SystemCallError, ::SocketError => e
+      raise Error::SocketError, "#{e.class}: #{e} (for #{self})"
+    rescue OpenSSL::SSL::SSLError => e
+      raise Error::SocketError, "#{e.class}: #{e} (for #{self})"
     end
   end
 end

data/lib/mongo/auth/aws/conversation.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2020 MongoDB Inc.
 #
@@ -18,7 +17,6 @@
 module Mongo
   module Auth
     class Aws
-
       # Defines behavior around a single MONGODB-AWS conversation between the
       # client and server.
       #
@@ -26,7 +24,6 @@ module Mongo
       #
       # @api private
       class Conversation < SaslConversationBase
-
         # Continue the AWS conversation. This sends the client final message
         # to the server after setting the reply from the previous server
         # communication.
@@ -45,12 +42,13 @@ module Mongo
           validate_server_nonce!
           @sts_host = payload[:h]
           unless (1..255).include?(@sts_host.bytesize)
-            raise Error::InvalidServerAuthConfiguration, "STS host name length is not in 1..255 bytes range: #{@sts_host}"
+            raise Error::InvalidServerAuthConfiguration,
+                  "STS host name length is not in 1..255 bytes range: #{@sts_host}"
           end
 
           selector = CLIENT_CONTINUE_MESSAGE.merge(
             payload: BSON::Binary.new(client_final_payload),
-            conversationId: conversation_id,
+            conversationId: conversation_id
           )
           build_message(connection, user.auth_source, selector)
         end
@@ -91,7 +89,7 @@ module Mongo
             secret_access_key: credentials.secret_access_key,
             session_token: credentials.session_token,
             host: @sts_host,
-            server_nonce: server_nonce,
+            server_nonce: server_nonce
           )
 
           # Uncomment this line to validate obtained credentials on the
@@ -107,15 +105,13 @@ module Mongo
           # rules, validation will fail but credentials may be perfectly OK
           # and the server may be able to authenticate using them just fine
           # (provided the server is allowed to communicate with STS).
-          #request.validate!
+          # request.validate!
 
           payload = {
             a: request.authorization,
             d: request.formatted_time,
           }
-          if credentials.session_token
-            payload[:t] = credentials.session_token
-          end
+          payload[:t] = credentials.session_token if credentials.session_token
           payload.to_bson.to_s
         end
       end

data/lib/mongo/auth/aws/credentials.rb

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

data/lib/mongo/auth/aws/credentials_cache.rb

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