mongo 2.23.0 → 2.24.0

data/lib/mongo/server_selector/secondary_preferred.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -16,19 +15,16 @@
 # limitations under the License.
 
 module Mongo
-
   module ServerSelector
-
     # Encapsulates specifications for selecting servers, with
     #   secondaries preferred, given a list of candidates.
     #
     # @since 2.0.0
     class SecondaryPreferred < Base
-
       # Name of the this read preference in the server's format.
       #
       # @since 2.5.0
-      SERVER_FORMATTED_NAME = 'secondaryPreferred'.freeze
+      SERVER_FORMATTED_NAME = 'secondaryPreferred'
 
       # Get the name of the server mode type.
       #

data/lib/mongo/server_selector.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -23,7 +22,6 @@ require 'mongo/server_selector/secondary'
 require 'mongo/server_selector/secondary_preferred'
 
 module Mongo
-
   # Functionality for getting an object able to select a server, given a preference.
   #
   # @since 2.0.0
@@ -34,12 +32,12 @@ module Mongo
     # considered for selection.
     #
     # @since 2.0.0
-    LOCAL_THRESHOLD = 0.015.freeze
+    LOCAL_THRESHOLD = 0.015
 
     # How long to block for server selection before throwing an exception.
     #
     # @since 2.0.0
-    SERVER_SELECTION_TIMEOUT = 30.freeze
+    SERVER_SELECTION_TIMEOUT = 30
 
     # The smallest allowed max staleness value, in seconds.
     #
@@ -74,6 +72,7 @@ module Mongo
     # @since 2.0.0
     def get(preference = {})
       return preference if PREFERENCES.values.include?(preference.class)
+
       Mongo::Lint.validate_underscore_read_preference(preference)
       PREFERENCES.fetch((preference[:mode] || :primary).to_sym).new(preference)
     end

data/lib/mongo/session/server_session.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2017-2020 MongoDB Inc.
 #
@@ -18,9 +17,7 @@
 require 'mongo/session/server_session/dirtyable'
 
 module Mongo
-
   class Session
-
     # An object representing the server-side session.
     #
     # @api private
@@ -32,12 +29,12 @@ module Mongo
       # Regex for removing dashes from the UUID string.
       #
       # @since 2.5.0
-      DASH_REGEX = /\-/.freeze
+      DASH_REGEX = /-/.freeze
 
       # Pack directive for the UUID.
       #
       # @since 2.5.0
-      UUID_PACK = 'H*'.freeze
+      UUID_PACK = 'H*'
 
       # The last time the server session was used.
       #
@@ -96,8 +93,10 @@ module Mongo
       #
       # @since 2.5.0
       def session_id
-        @session_id ||= (bytes = [SecureRandom.uuid.gsub(DASH_REGEX, '')].pack(UUID_PACK)
-                          BSON::Document.new(id: BSON::Binary.new(bytes, :uuid)))
+        @session_id ||= begin
+          bytes = [ SecureRandom.uuid.gsub(DASH_REGEX, '') ].pack(UUID_PACK)
+          BSON::Document.new(id: BSON::Binary.new(bytes, :uuid))
+        end
       end
 
       # Increment the current transaction number and return the new value.

data/lib/mongo/session/session_pool.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2017-2020 MongoDB Inc.
 #
@@ -16,9 +15,7 @@
 # limitations under the License.
 
 module Mongo
-
   class Session
-
     # A pool of server sessions.
     #
     # @api private
@@ -63,14 +60,10 @@ module Mongo
       def checkout
         @mutex.synchronize do
           loop do
-            if @queue.empty?
-              return ServerSession.new
-            else
-              session = @queue.shift
-              unless about_to_expire?(session)
-                return session
-              end
-            end
+            return ServerSession.new if @queue.empty?
+
+            session = @queue.shift
+            return session unless about_to_expire?(session)
           end
         end
       end
@@ -84,9 +77,7 @@ module Mongo
       #
       # @since 2.5.0
       def checkin(session)
-        if session.nil?
-          raise ArgumentError, 'session cannot be nil'
-        end
+        raise ArgumentError, 'session cannot be nil' if session.nil?
 
         @mutex.synchronize do
           prune!
@@ -101,17 +92,17 @@ module Mongo
       #
       # @since 2.5.0
       def end_sessions
-        while !@queue.empty?
+        until @queue.empty?
           server = ServerSelector.get(mode: :primary_preferred).select_server(@cluster)
           op = Operation::Command.new(
             selector: {
               endSessions: @queue.shift(10_000).map(&:session_id),
             },
-            db_name: Database::ADMIN,
+            db_name: Database::ADMIN
           )
           context = Operation::Context.new(options: {
-            server_api: server.options[:server_api],
-          })
+                                             server_api: server.options[:server_api],
+                                           })
           op.execute(server, context: context)
         end
       rescue Mongo::Error, Error::AuthError
@@ -131,23 +122,19 @@ module Mongo
       end
 
       def about_to_expire?(session)
-        if session.nil?
-          raise ArgumentError, 'session cannot be nil'
-        end
+        raise ArgumentError, 'session cannot be nil' if session.nil?
 
         # Load balancers spec explicitly requires to ignore the logical session
         # timeout value.
         # No rationale is provided as of the time of this writing.
-        if @cluster.load_balanced?
-          return false
-        end
+        return false if @cluster.load_balanced?
 
         logical_session_timeout = @cluster.logical_session_timeout
 
-        if logical_session_timeout
-          idle_time_minutes = (Time.now - session.last_use) / 60
-          (idle_time_minutes + 1) >= logical_session_timeout
-        end
+        return unless logical_session_timeout
+
+        idle_time_minutes = (Time.now - session.last_use) / 60
+        (idle_time_minutes + 1) >= logical_session_timeout
       end
 
       def prune!
@@ -155,12 +142,11 @@ module Mongo
         # No rationale is provided as of the time of this writing.
         return if @cluster.load_balanced?
 
-        while !@queue.empty?
-          if about_to_expire?(@queue[-1])
-            @queue.pop
-          else
-            break
-          end
+        until @queue.empty?
+          break unless about_to_expire?(@queue[-1])
+
+          @queue.pop
+
         end
       end
     end