mongo 2.23.0 → 2.24.0

data/lib/mongo/utils.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2020 MongoDB Inc.
 #
@@ -16,10 +15,8 @@
 # limitations under the License.
 
 module Mongo
-
   # @api private
   module Utils
-
     class LocalLogger
       include Loggable
 
@@ -60,17 +57,17 @@ module Mongo
 
     # Symbolizes the keys in the provided hash.
     module_function def shallow_symbolize_keys(hash)
-      Hash[hash.map { |k, v| [k.to_sym, v] }]
+      Hash[hash.map { |k, v| [ k.to_sym, v ] }]
     end
 
     # Stringifies the keys in the provided hash and converts underscore
     # style keys to camel case style keys.
     module_function def shallow_camelize_keys(hash)
-      Hash[hash.map { |k, v| [camelize(k), v] }]
+      Hash[hash.map { |k, v| [ camelize(k), v ] }]
     end
 
     module_function def camelize(sym)
-      sym.to_s.gsub(/_(\w)/) { $1.upcase }
+      sym.to_s.gsub(/_(\w)/) { ::Regexp.last_match(1).upcase }
     end
 
     # @note server_api must have symbol keys or be a BSON::Document.
@@ -79,12 +76,8 @@ module Mongo
         if version = server_api[:version]
           doc['apiVersion'] = version
         end
-        unless server_api[:strict].nil?
-          doc['apiStrict'] = server_api[:strict]
-        end
-        unless server_api[:deprecation_errors].nil?
-          doc['apiDeprecationErrors'] = server_api[:deprecation_errors]
-        end
+        doc['apiStrict'] = server_api[:strict] unless server_api[:strict].nil?
+        doc['apiDeprecationErrors'] = server_api[:deprecation_errors] unless server_api[:deprecation_errors].nil?
       end
     end
 

data/lib/mongo/version.rb

@@ -5,5 +5,5 @@ module Mongo
   #
   # Note that this file is automatically updated via `rake candidate:create`.
   # Manual changes to this file will be overwritten by that rake task.
-  VERSION = '2.23.0'
+  VERSION = '2.24.0'
 end

data/lib/mongo/write_concern/acknowledged.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 WriteConcern
-
     # An acknowledged write concern provides a get last error command with the
     # appropriate options on each write operation.
     #

data/lib/mongo/write_concern/base.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   module WriteConcern
-
     # Defines common behavior for write concerns.
     #
     # @since 2.7.0
     class Base
-
       # @return [ Hash ] The write concern options.
       attr_reader :options
 
@@ -51,11 +48,14 @@ module Mongo
 
         if options[:w]
           if options[:w] == 0 && options[:j]
-            raise Error::InvalidWriteConcern, "Invalid write concern options: :j cannot be true when :w is 0: #{options.inspect}"
+            raise Error::InvalidWriteConcern,
+                  "Invalid write concern options: :j cannot be true when :w is 0: #{options.inspect}"
           elsif options[:w] == 0 && options[:fsync]
-            raise Error::InvalidWriteConcern, "Invalid write concern options: :fsync cannot be true when :w is 0: #{options.inspect}"
+            raise Error::InvalidWriteConcern,
+                  "Invalid write concern options: :fsync cannot be true when :w is 0: #{options.inspect}"
           elsif options[:w].is_a?(Integer) && options[:w] < 0
-            raise Error::InvalidWriteConcern, "Invalid write concern options: :w cannot be negative (#{options[:w]}): #{options.inspect}"
+            raise Error::InvalidWriteConcern,
+                  "Invalid write concern options: :w cannot be negative (#{options[:w]}): #{options.inspect}"
           end
         end
 

data/lib/mongo/write_concern/unacknowledged.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 WriteConcern
-
     # An unacknowledged write concern will provide no error on write outside of
     # network and connection exceptions.
     #

data/lib/mongo/write_concern.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #
@@ -20,7 +19,6 @@ require 'mongo/write_concern/acknowledged'
 require 'mongo/write_concern/unacknowledged'
 
 module Mongo
-
   # Base module for all write concern specific behavior.
   #
   # @since 2.0.0
@@ -31,36 +29,36 @@ module Mongo
     #
     # @since 2.0.0
     # @deprecated
-    W = :w.freeze
+    W = :w
 
     # The journal write concern.
     #
     # @since 2.0.0
     # @deprecated
-    J = :j.freeze
+    J = :j
 
     # The file sync write concern.
     #
     # @since 2.0.0
     # @deprecated
-    FSYNC = :fsync.freeze
+    FSYNC = :fsync
 
     # The wtimeout write concern.
     #
     # @since 2.0.0
     # @deprecated
-    WTIMEOUT = :wtimeout.freeze
+    WTIMEOUT = :wtimeout
 
     # The GLE command name.
     #
     # @since 2.0.0
     # @deprecated
-    GET_LAST_ERROR = :getlasterror.freeze
+    GET_LAST_ERROR = :getlasterror
 
     # The default write concern is to acknowledge on a single server.
     #
     # @since 2.0.0
-    DEFAULT = { }.freeze
+    DEFAULT = {}.freeze
 
     # Create a write concern object for the provided options.
     #
@@ -76,7 +74,7 @@ module Mongo
     # @option options :j [ true, false ] Whether to acknowledge a write to
     #   the journal.
     # @option options :fsync [ true, false ] Should the write be synced to
-    #   disc.
+    #   disk.
     # @option options :wtimeout [ Integer ] The number of milliseconds to
     #   wait for acknowledgement before raising an error.
     #
@@ -87,12 +85,13 @@ module Mongo
     # @since 2.0.0
     def get(options)
       return options if options.is_a?(Base)
-      if options
-        if (options[:w] || options['w']) == 0
-          Unacknowledged.new(options)
-        else
-          Acknowledged.new(options)
-        end
+
+      return unless options
+
+      if (options[:w] || options['w']) == 0
+        Unacknowledged.new(options)
+      else
+        Acknowledged.new(options)
       end
     end
   end

data/lib/mongo.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -83,7 +82,6 @@ require 'mongo/utils'
 require 'mongo/config'
 
 module Mongo
-
   class << self
     extend Forwardable
 
@@ -127,7 +125,7 @@ module Mongo
   #   an OpenSSL::SSL::SSLContext object as an argument.
   module_function def tls_context_hooks=(hooks)
     unless hooks.is_a?(Array) && hooks.all? { |hook| hook.is_a?(Proc) }
-      raise ArgumentError, "TLS context hooks must be an array of Procs"
+      raise ArgumentError, 'TLS context hooks must be an array of Procs'
     end
 
     @tls_context_hooks = hooks

data/mongo.gemspec

@@ -1,26 +1,26 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mongo/version'
 
 Gem::Specification.new do |s|
-  s.name              = 'mongo'
-  s.version           = Mongo::VERSION
-  s.platform          = Gem::Platform::RUBY
-  s.authors           = [ 'The MongoDB Ruby Team' ]
-  s.email             = 'dbx-ruby@mongodb.com'
-  s.homepage          = 'https://mongodb.com/docs/ruby-driver/'
-  s.summary           = 'Ruby driver for MongoDB'
-  s.license           = 'Apache-2.0'
-  s.description       = <<~DESC
+  s.name        = 'mongo'
+  s.version     = Mongo::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = [ 'The MongoDB Ruby Team' ]
+  s.email       = 'dbx-ruby@mongodb.com'
+  s.homepage    = 'https://mongodb.com/docs/ruby-driver/'
+  s.summary     = 'Ruby driver for MongoDB'
+  s.license     = 'Apache-2.0'
+  s.description = <<~DESC
     A pure-Ruby driver for connecting to, querying, and manipulating MongoDB
     databases. Officially developed and supported by MongoDB, with love for
     the Ruby community.
   DESC
 
   s.metadata = {
+    'rubygems_mfa_required' => 'true',
     'bug_tracker_uri' => 'https://jira.mongodb.org/projects/RUBY',
     'changelog_uri' => 'https://github.com/mongodb/mongo-ruby-driver/releases',
     'homepage_uri' => 'https://mongodb.com/docs/ruby-driver/',
@@ -28,14 +28,14 @@ Gem::Specification.new do |s|
     'source_code_uri' => 'https://github.com/mongodb/mongo-ruby-driver',
   }
 
-  s.files             = Dir.glob('{bin,lib}/**/*')
-  s.files             += %w[mongo.gemspec LICENSE README.md CONTRIBUTING.md]
+  s.files = Dir.glob('{bin,lib}/**/*')
+  s.files += %w[mongo.gemspec LICENSE README.md CONTRIBUTING.md]
 
-  s.executables       = ['mongo_console']
-  s.require_paths     = ['lib']
-  s.bindir            = 'bin'
+  s.executables   = [ 'mongo_console' ]
+  s.require_paths = [ 'lib' ]
+  s.bindir        = 'bin'
 
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = '>= 2.7'
 
   s.add_dependency 'base64'
   s.add_dependency 'bson', '>=4.14.1', '<6.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.24.0
 platform: ruby
 authors:
 - The MongoDB Ruby Team
@@ -269,7 +269,6 @@ files:
 - lib/mongo/error/read_write_retryable.rb
 - lib/mongo/error/sdam_error_detection.rb
 - lib/mongo/error/server_api_conflict.rb
-- lib/mongo/error/server_api_not_supported.rb
 - lib/mongo/error/server_certificate_revoked.rb
 - lib/mongo/error/server_not_usable.rb
 - lib/mongo/error/server_timeout_error.rb
@@ -435,11 +434,9 @@ files:
 - lib/mongo/operation/shared/read_preference_supported.rb
 - lib/mongo/operation/shared/response_handling.rb
 - lib/mongo/operation/shared/result/aggregatable.rb
-- lib/mongo/operation/shared/result/use_legacy_error_parser.rb
 - lib/mongo/operation/shared/sessions_supported.rb
 - lib/mongo/operation/shared/specifiable.rb
 - lib/mongo/operation/shared/timed.rb
-- lib/mongo/operation/shared/validatable.rb
 - lib/mongo/operation/shared/write.rb
 - lib/mongo/operation/shared/write_concern_supported.rb
 - lib/mongo/operation/update.rb
@@ -472,8 +469,10 @@ files:
 - lib/mongo/protocol/serializers.rb
 - lib/mongo/query_cache.rb
 - lib/mongo/retryable.rb
+- lib/mongo/retryable/backpressure.rb
 - lib/mongo/retryable/base_worker.rb
 - lib/mongo/retryable/read_worker.rb
+- lib/mongo/retryable/retry_policy.rb
 - lib/mongo/retryable/write_worker.rb
 - lib/mongo/search_index/view.rb
 - lib/mongo/semaphore.rb
@@ -540,6 +539,7 @@ homepage: https://mongodb.com/docs/ruby-driver/
 licenses:
 - Apache-2.0
 metadata:
+  rubygems_mfa_required: 'true'
   bug_tracker_uri: https://jira.mongodb.org/projects/RUBY
   changelog_uri: https://github.com/mongodb/mongo-ruby-driver/releases
   homepage_uri: https://mongodb.com/docs/ruby-driver/
@@ -559,7 +559,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.5
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Ruby driver for MongoDB
 test_files: []

data/lib/mongo/error/server_api_not_supported.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-# rubocop:todo all
-
-# Copyright (C) 2021 MongoDB Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Mongo
-  class Error
-
-    # Exception raised when a Client has :server_api configured and an
-    # operation is executed against a pre-3.6 MongoDB server using a legacy
-    # wire protocol message that does not permit sending API parameters.
-    class ServerApiNotSupported < Error
-    end
-  end
-end

data/lib/mongo/operation/shared/result/use_legacy_error_parser.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-# rubocop:todo all
-
-# Copyright (C) 2019-2020 MongoDB Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Mongo
-  module Operation
-    class Result
-
-      # This module creates the Parser instance in legacy mode.
-      #
-      # @api private
-      module UseLegacyErrorParser
-        def parser
-          @parser ||= Error::Parser.new(first_document, replies, legacy: true)
-        end
-      end
-    end
-  end
-end

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

@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-# rubocop:todo all
-
-# Copyright (C) 2021 MongoDB Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Mongo
-  module Operation
-
-    # @api private
-    module Validatable
-
-      def validate_find_options(connection, selector)
-        if selector.key?(:hint) &&
-          !connection.features.find_and_modify_option_validation_enabled?
-        then
-          raise Error::UnsupportedOption.hint_error
-        end
-
-        if selector.key?(:arrayFilters) &&
-          !connection.features.array_filters_enabled?
-        then
-          raise Error::UnsupportedArrayFilters
-        end
-
-        if selector.key?(:collation) &&
-          !connection.features.collation_enabled?
-        then
-          raise Error::UnsupportedCollation
-        end
-      end
-
-      # selector_or_item here is either:
-      # - The selector as used in a findAndModify command, or
-      # - One of the array elements in the updates array in an update command.
-      def validate_hint_on_update(connection, selector_or_item)
-        if selector_or_item.key?(:hint) &&
-          !connection.features.update_delete_option_validation_enabled?
-        then
-          raise Error::UnsupportedOption.hint_error
-        end
-      end
-
-      # selector_or_item here is either:
-      # - The selector as used in a findAndModify command, or
-      # - One of the array elements in the updates array in an update command.
-      def validate_array_filters(connection, selector_or_item)
-        if selector_or_item.key?(:arrayFilters) &&
-          !connection.features.array_filters_enabled?
-        then
-          raise Error::UnsupportedArrayFilters
-        end
-      end
-
-      # selector_or_item here is either:
-      # - The selector as used in a findAndModify command, or
-      # - One of the array elements in the updates array in an update command.
-      def validate_collation(connection, selector_or_item)
-        if selector_or_item.key?(:collation) &&
-          !connection.features.collation_enabled?
-        then
-          raise Error::UnsupportedCollation
-        end
-      end
-
-      def validate_updates(connection, updates)
-        updates.each do |update|
-          validate_array_filters(connection, update)
-          validate_collation(connection, update)
-          validate_hint_on_update(connection, update)
-        end
-        updates
-      end
-    end
-  end
-end