add (and skip) missing specs

Author: jamis

Diff for: lib/mongo/client.rb

@@ -1364,74 +1364,25 @@ def cluster_modifying?(new_options)
     # but does not check for interactions between combinations of options.
     def validate_new_options!(opts)
       return Options::Redacted.new unless opts
-      if opts[:read_concern]
-        # Raise an error for non user-settable options
-        if opts[:read_concern][:after_cluster_time]
-          raise Mongo::Error::InvalidReadConcern.new(
-            'The after_cluster_time read_concern option cannot be specified by the user'
-          )
-        end
-
-        given_keys = opts[:read_concern].keys.map(&:to_s)
-        allowed_keys = ['level']
-        invalid_keys = given_keys - allowed_keys
-        # Warn that options are invalid but keep it and forward to the server
-        unless invalid_keys.empty?
-          log_warn("Read concern has invalid keys: #{invalid_keys.join(',')}.")
-        end
-      end
-
-      if server_api = opts[:server_api]
-        unless server_api.is_a?(Hash)
-          raise ArgumentError, ":server_api value must be a hash: #{server_api}"
-        end
-
-        extra_keys = server_api.keys - %w(version strict deprecation_errors)
-        unless extra_keys.empty?
-          raise ArgumentError, "Unknown keys under :server_api: #{extra_keys.map(&:inspect).join(', ')}"
-        end
 
-        if version = server_api[:version]
-          unless VALID_SERVER_API_VERSIONS.include?(version)
-            raise ArgumentError, "Unknown server API version: #{version}"
-          end
-        end
+      validate_read_concern!(opts[:read_concern])
+      validate_server_api!(opts[:server_api])
+      validate_max_min_pool_size!(opts)
+      validate_max_connecting!(opts)
+      validate_read!(opts)
+      validate_compressors!(opts)
+      validate_srv_max_hosts!(opts)
+
+      invalid_options = opts.keys.map(&:to_sym) - VALID_OPTIONS
+      if invalid_options.any?
+        log_warn("Unsupported client options: #{invalid_options.join(', ')}. These will be ignored.")
+        opts = opts.select { |key,| VALID_OPTIONS.include?(key.to_sym) }
       end
 
       Lint.validate_underscore_read_preference(opts[:read])
       Lint.validate_read_concern_option(opts[:read_concern])
-      opts.each.inject(Options::Redacted.new) do |_options, (k, v)|
-        key = k.to_sym
-        if VALID_OPTIONS.include?(key)
-          validate_max_min_pool_size!(key, opts)
-          validate_max_connecting!(key, opts)
-          validate_read!(key, opts)
-          if key == :compressors
-            compressors = valid_compressors(v)
-
-            if compressors.include?('snappy')
-              validate_snappy_compression!
-            end
-
-            if compressors.include?('zstd')
-              validate_zstd_compression!
-            end
 
-            _options[key] = compressors unless compressors.empty?
-          elsif key == :srv_max_hosts
-            if v && (!v.is_a?(Integer) || v < 0)
-              log_warn("#{v} is not a valid integer for srv_max_hosts")
-            else
-              _options[key] = v
-            end
-          else
-            _options[key] = v
-          end
-        else
-          log_warn("Unsupported client option '#{k}'. It will be ignored.")
-        end
-        _options
-      end
+      Options::Redacted.new(opts)
     end
 
     # Validates all options after they are set on the client.
@@ -1569,6 +1520,48 @@ def validate_options!(addresses = nil, is_srv: nil)
       end
     end
 
+    ALLOWED_READ_CONCERN_KEYS = %w[ level ].freeze
+
+    def validate_read_concern!(read_concern)
+      return unless read_concern
+
+      # Raise an error for non user-settable options
+      if read_concern[:after_cluster_time]
+        raise Mongo::Error::InvalidReadConcern.new(
+          'The after_cluster_time read_concern option cannot be specified by the user'
+        )
+      end
+
+      given_keys = read_concern.keys.map(&:to_s)
+      invalid_keys = given_keys - ALLOWED_READ_CONCERN_KEYS
+
+      # Warn that options are invalid but keep it and forward to the server
+      unless invalid_keys.empty?
+        log_warn("Read concern has invalid keys: #{invalid_keys.join(',')}.")
+      end
+    end
+
+    ALLOWED_SERVER_API_KEYS = %w[ version strict deprecation_errors ].freeze
+
+    def validate_server_api!(server_api)
+      return unless server_api
+
+      unless server_api.is_a?(Hash)
+        raise ArgumentError, ":server_api value must be a hash: #{server_api}"
+      end
+
+      extra_keys = server_api.keys - ALLOWED_SERVER_API_KEYS
+      unless extra_keys.empty?
+        raise ArgumentError, "Unknown keys under :server_api: #{extra_keys.map(&:inspect).join(', ')}"
+      end
+
+      if version = server_api[:version]
+        unless VALID_SERVER_API_VERSIONS.include?(version)
+          raise ArgumentError, "Unknown server API version: #{version}"
+        end
+      end
+    end
+
     # Validates all authentication-related options after they are set on the client
     # This method is intended to catch combinations of options which are not allowed
     def validate_authentication_options!
@@ -1639,6 +1632,22 @@ def valid_compressors(compressors)
       end
     end
 
+    def validate_compressors!(opts)
+      return unless opts[:compressors]
+
+      compressors = valid_compressors(opts[:compressors])
+
+      if compressors.include?('snappy')
+        validate_snappy_compression!
+      end
+
+      if compressors.include?('zstd')
+        validate_zstd_compression!
+      end
+
+      opts[:compressors] = compressors unless compressors.empty?
+    end
+
     def validate_snappy_compression!
       return if defined?(Snappy)
       require 'snappy'
@@ -1657,14 +1666,25 @@ def validate_zstd_compression!
         "\"bundle install\" to install the gem. (#{e.class}: #{e})"
     end
 
-    def validate_max_min_pool_size!(option, opts)
-      if option == :min_pool_size && opts[:min_pool_size]
-        max = opts[:max_pool_size] || Server::ConnectionPool::DEFAULT_MAX_SIZE
-        if max != 0 && opts[:min_pool_size] > max
-          raise Error::InvalidMinPoolSize.new(opts[:min_pool_size], max)
-        end
+    def validate_max_min_pool_size!(opts)
+      return unless opts[:min_pool_size]
+
+      max = opts[:max_pool_size] || Server::ConnectionPool::DEFAULT_MAX_SIZE
+      if max != 0 && opts[:min_pool_size] > max
+        raise Error::InvalidMinPoolSize.new(opts[:min_pool_size], max)
+      end
+    end
+
+    def validate_srv_max_hosts!(opts)
+      return unless opts.key?(:srv_max_hosts)
+
+      srv_max_hosts = opts[:srv_max_hosts]
+      return unless srv_max_hosts
+
+      if !srv_max_hosts.is_a?(Integer) || srv_max_hosts < 0
+        log_warn("#{srv_max_hosts} is not a valid integer for srv_max_hosts")
+        opts.delete(:srv_max_hosts)
       end
-      true
     end
 
     # Validates whether the max_connecting option is valid.
@@ -1673,35 +1693,34 @@ def validate_max_min_pool_size!(option, opts)
     # @param [ Hash ] opts The client options.
     #
     # @return [ true ] If the option is valid.
-    # @raise [ Error::InvalidMaxConnecting ] If the option is invalid.
-    def validate_max_connecting!(option, opts)
-      if option == :max_connecting && opts.key?(:max_connecting)
-        max_connecting = opts[:max_connecting] || Server::ConnectionPool::DEFAULT_MAX_CONNECTING
-        if max_connecting <= 0
-          raise Error::InvalidMaxConnecting.new(opts[:max_connecting])
-        end
+    def validate_max_connecting!(opts)
+      return unless opts.key?(:max_connecting)
+
+      max_connecting = opts[:max_connecting] || Server::ConnectionPool::DEFAULT_MAX_CONNECTING
+      if max_connecting <= 0
+        opts[:max_connecting] = Server::ConnectionPool::DEFAULT_MAX_CONNECTING
+        log_warn("Invalid max_connecting: #{max_connecting}. Please ensure that it is greater than zero.")
       end
-      true
     end
 
-    def validate_read!(option, opts)
-      if option == :read && opts.has_key?(:read)
-        read = opts[:read]
-        # We could check if read is a Hash, but this would fail
-        # for custom classes implementing key access ([]).
-        # Instead reject common cases of strings and symbols.
-        if read.is_a?(String) || read.is_a?(Symbol)
-          raise Error::InvalidReadOption.new(read, "the read preference must be specified as a hash: { mode: #{read.inspect} }")
-        end
+    def validate_read!(opts)
+      return unless opts.has_key?(:read)
 
-        if mode = read[:mode]
-          mode = mode.to_sym
-          unless Mongo::ServerSelector::PREFERENCES.include?(mode)
-            raise Error::InvalidReadOption.new(read, "mode #{mode} is not one of recognized modes")
-          end
+      read = opts[:read]
+
+      # We could check if read is a Hash, but this would fail
+      # for custom classes implementing key access ([]).
+      # Instead reject common cases of strings and symbols.
+      if read.is_a?(String) || read.is_a?(Symbol)
+        raise Error::InvalidReadOption.new(read, "the read preference must be specified as a hash: { mode: #{read.inspect} }")
+      end
+
+      if mode = read[:mode]
+        mode = mode.to_sym
+        unless Mongo::ServerSelector::PREFERENCES.include?(mode)
+          raise Error::InvalidReadOption.new(read, "mode #{mode} is not one of recognized modes")
         end
       end
-      true
     end
 
     def assert_not_closed

Diff for: lib/mongo/uri.rb

@@ -505,17 +505,17 @@ def validate_uri_options!
         end
 
         unless uri_options[:ssl_verify_hostname].nil?
-          raise_invalid_error_no_fmt!("tlsInsecure' and 'tlsAllowInvalidHostnames' cannot both be specified")
+          raise_invalid_error_no_fmt!("'tlsInsecure' and 'tlsAllowInvalidHostnames' cannot both be specified")
         end
 
         unless uri_options[:ssl_verify_ocsp_endpoint].nil?
-          raise_invalid_error_no_fmt!("tlsInsecure' and 'tlsDisableOCSPEndpointCheck' cannot both be specified")
+          raise_invalid_error_no_fmt!("'tlsInsecure' and 'tlsDisableOCSPEndpointCheck' cannot both be specified")
         end
       end
 
       unless uri_options[:ssl_verify_certificate].nil?
         unless uri_options[:ssl_verify_ocsp_endpoint].nil?
-          raise_invalid_error_no_fmt!("tlsAllowInvalidCertificates' and 'tlsDisableOCSPEndpointCheck' cannot both be specified")
+          raise_invalid_error_no_fmt!("'tlsAllowInvalidCertificates' and 'tlsDisableOCSPEndpointCheck' cannot both be specified")
         end
       end
 

Diff for: lib/mongo/uri/options_mapper.rb

@@ -62,7 +62,7 @@ def initialize(**opts)
       def add_uri_option(key, value, uri_options)
         strategy = URI_OPTION_MAP[key.downcase]
         if strategy.nil?
-          log_warn("Unsupported URI option '#{key}' on URI '#{@string}'. It will be ignored.")
+          warn_unsupported_option(key, @string)
           return
         end
 
@@ -91,7 +91,7 @@ def smc_to_ruby(opts)
         opts.each do |key, value|
           strategy = URI_OPTION_MAP[key.downcase]
           if strategy.nil?
-            log_warn("Unsupported URI option '#{key}' on URI '#{@string}'. It will be ignored.")
+            warn_unsupported_option(key, @string)
             return
           end
 
@@ -206,6 +206,10 @@ def ruby_to_string(opts)
 
       private
 
+      def warn_unsupported_option(key, uri)
+        log_warn("Unsupported URI option '#{key}' on URI '#{uri}'. It will be ignored.")
+      end
+
       # Applies URI value transformation by either using the default cast
       # or a transformation appropriate for the given type.
       #

Diff for: spec/spec_tests/data/uri_options/auth-options.yml

@@ -1,7 +1,7 @@
 tests:
     -
         description: "Valid auth options are parsed correctly (GSSAPI)"
-        uri: "mongodb://foo:[email protected]/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:true&authSource=$external"
+        uri: "mongodb://foo:[email protected]/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:forward,SERVICE_HOST:example.com&authSource=$external"
         valid: true
         warning: false
         hosts: ~
@@ -10,32 +10,8 @@ tests:
             authMechanism: "GSSAPI"
             authMechanismProperties:
                 SERVICE_NAME: "other"
-                CANONICALIZE_HOST_NAME: true
-            authSource: "$external"
-    -
-        description: "Mixed case in auth mechanism properties is preserved"
-        uri: "mongodb://foo:[email protected]/?authMechanism=GSSAPI&authMechanismProperties=PropertyName:PropertyValue&authSource=$external"
-        valid: true
-        warning: false
-        hosts: ~
-        auth: ~
-        options:
-            authMechanism: "GSSAPI"
-            authMechanismProperties:
-                PropertyName: PropertyValue
-                service_name: mongodb
-            authSource: "$external"
-    -
-        description: "Auth mechanism properties are all invalid"
-        uri: "mongodb://foo:[email protected]/?authMechanism=GSSAPI&authMechanismProperties=PropertyName&authSource=$external"
-        valid: true
-        warning: true
-        hosts: ~
-        auth: ~
-        options:
-            authMechanism: "GSSAPI"
-            authMechanismProperties:
-                service_name: mongodb
+                SERVICE_HOST: "example.com"
+                CANONICALIZE_HOST_NAME: "forward"
             authSource: "$external"
     -
         description: "Valid auth options are parsed correctly (SCRAM-SHA-1)"

Diff for: spec/spec_tests/data/uri_options/compression-options.yml

@@ -7,7 +7,7 @@ tests:
         hosts: ~
         auth: ~
         options:
-            compressors: 
+            compressors:
               - "zlib"
             zlibCompressionLevel: 9
     -
@@ -28,7 +28,6 @@ tests:
         warning: true
         hosts: ~
         auth: ~
-        # https://jira.mongodb.org/browse/DRIVERS-1368
         options: ~
     -
         description: "Too low zlibCompressionLevel causes a warning"
@@ -37,7 +36,6 @@ tests:
         warning: true
         hosts: ~
         auth: ~
-        # https://jira.mongodb.org/browse/DRIVERS-1368
         options: ~
     -
         description: "Too high zlibCompressionLevel causes a warning"
@@ -46,6 +44,5 @@ tests:
         warning: true
         hosts: ~
         auth: ~
-        # https://jira.mongodb.org/browse/DRIVERS-1368
         options: ~