mongo 2.23.0 → 2.24.0

data/lib/mongo/grid/file.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -20,7 +19,6 @@ require 'mongo/grid/file/info'
 
 module Mongo
   module Grid
-
     # A representation of a file in the database.
     #
     # @since 2.0.0
@@ -51,6 +49,7 @@ module Mongo
       # @since 2.0.0
       def ==(other)
         return false unless other.is_a?(File)
+
         chunks == other.chunks && info == other.info
       end
 
@@ -74,7 +73,7 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(data, options = {})
-        options = options.merge(:length => data.size) unless options[:length]
+        options = options.merge(length: data.size) unless options[:length]
         @info = Info.new(options)
         initialize_chunks!(data)
       end
@@ -113,11 +112,11 @@ module Mongo
       #
       # @return [ Array<Grid::File::Chunk> ] Array of chunks.
       def initialize_chunks!(value)
-        if value.is_a?(Array)
-          @chunks = value.map{ |doc| Chunk.new(doc) }
-        else
-          @chunks = Chunk.split(value, info)
-        end
+        @chunks = if value.is_a?(Array)
+                    value.map { |doc| Chunk.new(doc) }
+                  else
+                    Chunk.split(value, info)
+                  end
       end
     end
   end

data/lib/mongo/grid/fs_bucket.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 Grid
-
     # Represents a view of the GridFS in the database.
     #
     # @since 2.0.0
@@ -27,12 +25,12 @@ module Mongo
       # The default root prefix.
       #
       # @since 2.0.0
-      DEFAULT_ROOT = 'fs'.freeze
+      DEFAULT_ROOT = 'fs'
 
       # The specification for the chunks collection index.
       #
       # @since 2.0.0
-      CHUNKS_INDEX = { :files_id => 1, :n => 1 }.freeze
+      CHUNKS_INDEX = { files_id: 1, n: 1 }.freeze
 
       # The specification for the files collection index.
       #
@@ -70,13 +68,12 @@ module Mongo
       def initialize(database, options = {})
         @database = database
         @options = options.dup
-=begin WriteConcern object support
-        if @options[:write_concern].is_a?(WriteConcern::Base)
-          # Cache the instance so that we do not needlessly reconstruct it.
-          @write_concern = @options[:write_concern]
-          @options[:write_concern] = @write_concern.options
-        end
-=end
+        # WriteConcern object support
+        #         if @options[:write_concern].is_a?(WriteConcern::Base)
+        #           # Cache the instance so that we do not needlessly reconstruct it.
+        #           @write_concern = @options[:write_concern]
+        #           @options[:write_concern] = @write_concern.options
+        #         end
         @options.freeze
         @chunks_collection = database[chunks_name]
         @files_collection = database[files_name]
@@ -155,7 +152,8 @@ module Mongo
       def find_one(selector = nil)
         file_info = files_collection.find(selector).first
         return nil unless file_info
-        chunks = chunks_collection.find(:files_id => file_info[:_id]).sort(:n => 1)
+
+        chunks = chunks_collection.find(files_id: file_info[:_id]).sort(n: 1)
         Grid::File.new(chunks.to_a, Options::Mapper.transform(file_info, Grid::File::Info::MAPPINGS.invert))
       end
 
@@ -220,12 +218,13 @@ module Mongo
       def delete(id, opts = {})
         timeout_holder = CsotTimeoutHolder.new(operation_timeouts: operation_timeouts(opts))
         result = files_collection
-          .find({ :_id => id }, @options.merge(timeout_ms: timeout_holder.remaining_timeout_ms))
-          .delete_one(timeout_ms: timeout_holder.remaining_timeout_ms)
+                 .find({ _id: id }, @options.merge(timeout_ms: timeout_holder.remaining_timeout_ms))
+                 .delete_one(timeout_ms: timeout_holder.remaining_timeout_ms)
         chunks_collection
-          .find({ :files_id => id }, @options.merge(timeout_ms: timeout_holder.remaining_timeout_ms))
+          .find({ files_id: id }, @options.merge(timeout_ms: timeout_holder.remaining_timeout_ms))
           .delete_many(timeout_ms: timeout_holder.remaining_timeout_ms)
         raise Error::FileNotFound.new(id, :id) if result.n == 0
+
         result
       end
 
@@ -319,12 +318,13 @@ module Mongo
           skip = revision
           sort = { 'uploadDate' => Mongo::Index::ASCENDING }
         end
-        file_info_doc = files_collection.find({ filename: filename} ,
-                                           sort: sort,
-                                           skip: skip,
-                                           limit: -1).first
+        file_info_doc = files_collection.find({ filename: filename },
+                                              sort: sort,
+                                              skip: skip,
+                                              limit: -1).first
         unless file_info_doc
           raise Error::FileNotFound.new(filename, :filename) unless opts[:revision]
+
           raise Error::InvalidFileRevision.new(filename, opts[:revision])
         end
         open_download_stream(file_info_doc[:_id], file_info_doc: file_info_doc, &block)
@@ -434,18 +434,16 @@ module Mongo
       # @since 2.1.0
       def upload_from_stream(filename, io, opts = {})
         open_upload_stream(filename, opts) do |stream|
+          stream.write(io)
+        # IOError and SystemCallError are for errors reading the io.
+        # Error::SocketError and Error::SocketTimeoutError are for
+        # writing to MongoDB.
+        rescue IOError, SystemCallError, Error::SocketError, Error::SocketTimeoutError
           begin
-            stream.write(io)
-          # IOError and SystemCallError are for errors reading the io.
-          # Error::SocketError and Error::SocketTimeoutError are for
-          # writing to MongoDB.
-          rescue IOError, SystemCallError, Error::SocketError, Error::SocketTimeoutError
-            begin
-              stream.abort
-            rescue Error::OperationFailure
-            end
-            raise
+            stream.abort
+          rescue Error::OperationFailure
           end
+          raise
         end.file_id
       end
 
@@ -465,7 +463,7 @@ module Mongo
       def read_preference
         @read_preference ||= begin
           pref = options[:read] || database.read_preference
-          if BSON::Document === pref
+          if pref.is_a?(BSON::Document)
             pref
           else
             BSON::Document.new(pref)
@@ -483,10 +481,10 @@ module Mongo
       # @since 2.1.0
       def write_concern
         @write_concern ||= if wco = @options[:write_concern] || @options[:write]
-          WriteConcern.get(wco)
-        else
-          database.write_concern
-        end
+                             WriteConcern.get(wco)
+                           else
+                             database.write_concern
+                           end
       end
 
       # Drop the collections that implement this bucket.
@@ -525,9 +523,7 @@ module Mongo
           projection: { _id: 1 },
           timeout_ms: timeout_holder&.remaining_timeout_ms
         ).first
-        if fc_idx.nil?
-          create_index_if_missing!(files_collection, FSBucket::FILES_INDEX)
-        end
+        create_index_if_missing!(files_collection, FSBucket::FILES_INDEX) if fc_idx.nil?
 
         cc_idx = chunks_collection.find(
           {},
@@ -535,24 +531,20 @@ module Mongo
           projection: { _id: 1 },
           timeout_ms: timeout_holder&.remaining_timeout_ms
         ).first
-        if cc_idx.nil?
-          create_index_if_missing!(chunks_collection, FSBucket::CHUNKS_INDEX, :unique => true)
-        end
+        return unless cc_idx.nil?
+
+        create_index_if_missing!(chunks_collection, FSBucket::CHUNKS_INDEX, unique: true)
       end
 
       def create_index_if_missing!(collection, index_spec, options = {})
         indexes_view = collection.indexes
         begin
-          if indexes_view.get(index_spec).nil?
-            indexes_view.create_one(index_spec, options)
-          end
+          indexes_view.create_one(index_spec, options) if indexes_view.get(index_spec).nil?
         rescue Mongo::Error::OperationFailure::Family => e
           # proceed with index creation if a NamespaceNotFound error is thrown
-          if e.code == 26
-            indexes_view.create_one(index_spec, options)
-          else
-            raise
-          end
+          raise unless e.code == 26
+
+          indexes_view.create_one(index_spec, options)
         end
       end
 

data/lib/mongo/grid/stream/read.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -18,7 +17,6 @@
 module Mongo
   module Grid
     class FSBucket
-
       module Stream
         # A stream that reads files from the FSBucket.
         #
@@ -93,11 +91,9 @@ module Mongo
                 data = chunk.data.data
                 yield data
                 num_read += 1
-                length_read += data.size
+                length_read + data.size
               end.tap do
-                if num_read < num_chunks
-                  raise Error::MissingFileChunk.new(num_chunks, num_read)
-                end
+                raise Error::MissingFileChunk.new(num_chunks, num_read) if num_read < num_chunks
               end
             else
               view.to_enum
@@ -138,7 +134,7 @@ module Mongo
 
           # Is the stream closed.
           #
-          # @example Is the stream closd.
+          # @example Is the stream closed.
           #   stream.closed?
           #
           # @return [ true, false ] Whether the stream is closed.
@@ -164,7 +160,7 @@ module Mongo
           def read_preference
             @read_preference ||= begin
               pref = options[:read] || fs.read_preference
-              if BSON::Document === pref
+              if pref.is_a?(BSON::Document)
                 pref
               else
                 BSON::Document.new(pref)
@@ -185,15 +181,11 @@ module Mongo
           def file_info
             @file_info ||= begin
               doc = options[:file_info_doc] ||
-                fs.files_collection.find(
-                  { _id: file_id },
-                  { timeout_ms: @timeout_holder.remaining_timeout_ms! }
-                ).first
-              if doc
-                File::Info.new(Options::Mapper.transform(doc, File::Info::MAPPINGS.invert))
-              else
-                nil
-              end
+                    fs.files_collection.find(
+                      { _id: file_id },
+                      { timeout_ms: @timeout_holder.remaining_timeout_ms! }
+                    ).first
+              File::Info.new(Options::Mapper.transform(doc, File::Info::MAPPINGS.invert)) if doc
             end
           end
 
@@ -215,16 +207,16 @@ module Mongo
           def view
             @view ||= begin
               opts = if read_preference
-                options.merge(read: read_preference)
-              else
-                options
-              end
+                       options.merge(read: read_preference)
+                     else
+                       options
+                     end
               if @timeout_holder.csot?
                 opts[:timeout_ms] = @timeout_holder.remaining_timeout_ms!
                 opts[:timeout_mode] = :cursor_lifetime
               end
 
-              fs.chunks_collection.find({ :files_id => file_id }, opts).sort(:n => 1)
+              fs.chunks_collection.find({ files_id: file_id }, opts).sort(n: 1)
             end
           end
 
@@ -239,23 +231,21 @@ module Mongo
           end
 
           def validate_length!(index, num_chunks, chunk, length_read)
-            if num_chunks > 0 && chunk.data.data.size > 0
-              raise Error::ExtraFileChunk.new unless index < num_chunks
-              if index == num_chunks - 1
-                unless chunk.data.data.size + length_read == file_info.length
-                  raise_unexpected_chunk_length!(chunk)
-                end
-              elsif chunk.data.data.size != file_info.chunk_size
-                raise_unexpected_chunk_length!(chunk)
-              end
+            return unless num_chunks > 0 && chunk.data.data.size > 0
+            raise Error::ExtraFileChunk.new unless index < num_chunks
+
+            if index == num_chunks - 1
+              raise_unexpected_chunk_length!(chunk) unless chunk.data.data.size + length_read == file_info.length
+            elsif chunk.data.data.size != file_info.chunk_size
+              raise_unexpected_chunk_length!(chunk)
             end
           end
 
           def validate_n!(index, chunk)
-            unless index == chunk.n
-              close
-              raise Error::MissingFileChunk.new(index, chunk)
-            end
+            return if index == chunk.n
+
+            close
+            raise Error::MissingFileChunk.new(index, chunk)
           end
         end
       end

data/lib/mongo/grid/stream/write.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -18,13 +17,11 @@
 module Mongo
   module Grid
     class FSBucket
-
       module Stream
         # A stream that writes files to the FSBucket.
         #
         # @since 2.1.0
         class Write
-
           # @return [ FSBucket ] fs The fs bucket to which this stream writes.
           #
           # @since 2.1.0
@@ -73,13 +70,12 @@ module Mongo
             @n = 0
             @file_id = options[:file_id] || BSON::ObjectId.new
             @options = options.dup
-=begin WriteConcern object support
-            if @options[:write_concern].is_a?(WriteConcern::Base)
-              # Cache the instance so that we do not needlessly reconstruct it.
-              @write_concern = @options[:write_concern]
-              @options[:write_concern] = @write_concern.options
-            end
-=end
+            # WriteConcern object support
+            #             if @options[:write_concern].is_a?(WriteConcern::Base)
+            #               # Cache the instance so that we do not needlessly reconstruct it.
+            #               @write_concern = @options[:write_concern]
+            #               @options[:write_concern] = @write_concern.options
+            #             end
             @options.freeze
             @filename = @options[:filename]
             @open = true
@@ -105,12 +101,12 @@ module Mongo
             ensure_open!
             @indexes ||= ensure_indexes!
             @length += if io.respond_to?(:bytesize)
-              # String objects
-              io.bytesize
-            else
-              # IO objects
-              io.size
-            end
+                         # String objects
+                         io.bytesize
+                       else
+                         # IO objects
+                         io.size
+                       end
             chunks = File::Chunk.split(io, file_info, @n)
             @n += chunks.size
             unless chunks.empty?
@@ -153,10 +149,10 @@ module Mongo
           # @since 2.1.0
           def write_concern
             @write_concern ||= if wco = @options[:write_concern] || @options[:write]
-              WriteConcern.get(wco)
-            else
-              fs.write_concern
-            end
+                                 WriteConcern.get(wco)
+                               else
+                                 fs.write_concern
+                               end
           end
 
           # Is the stream closed.
@@ -181,7 +177,7 @@ module Mongo
           # @since 2.1.0
           def abort
             fs.chunks_collection.find(
-              { :files_id => file_id },
+              { files_id: file_id },
               @options.merge(timeout_ms: @timeout_holder.remaining_timeout_ms!)
             ).delete_many
             (@open = false) || true
@@ -200,7 +196,6 @@ module Mongo
           def with_write_concern(collection)
             if write_concern.nil? || (collection.write_concern &&
               collection.write_concern.options == write_concern.options)
-            then
               collection
             else
               collection.with(write: write_concern.options)

data/lib/mongo/grid/stream.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -21,7 +20,6 @@ require 'mongo/grid/stream/write'
 module Mongo
   module Grid
     class FSBucket
-
       # A stream that reads and writes files from/to the FSBucket.
       #
       # @since 2.1.0
@@ -42,8 +40,8 @@ module Mongo
         #
         # @since 2.1.0
         MODE_MAP = {
-            READ_MODE => Read,
-            WRITE_MODE => Write
+          READ_MODE => Read,
+          WRITE_MODE => Write
         }.freeze
 
         # Get a stream for reading/writing files from/to the FSBucket.

data/lib/mongo/grid.rb

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

data/lib/mongo/id.rb

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