mongo 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70bb36aedc302fa28a3103c1216e865448733b54
-  data.tar.gz: 05f39ba3e498bd4763f89ca4ac7b30d9d5b3537f
+  metadata.gz: 72df9675f13de7a6111464ef0089ba64b4ef11af
+  data.tar.gz: 20832950dd436fb031938d2e164cca2c7fe5d84c
 SHA512:
-  metadata.gz: 704bcf79dd037eeb329fd5e9120d9ead72b80f8bf4897e9260e2b624afad5c280feb0300228cee83b8ff639f97ef288e9dcf4ea7d6aa86b519e2e6f15853e688
-  data.tar.gz: c25ecaaee43f90ee59c501712aa8632802a31136deebc90cebaa6bb31ba419be5ba44ad9ad5f5f1c721bf36c722c6828e65bf340fdf34b41f967a91f0414e7bd
+  metadata.gz: eaaf003581ddec08e424a7a8168917b4a971514029527229ffe0e1a5746715be52caf0eb8e1f3ef4af29e35d744b23240282fecfa157280f4e31cb4f8c03bfbf
+  data.tar.gz: 32dd69254433179769be7b7d030e230da1b499ce59da53ab1535b1d736cca6dd2a3bb8d1516323abdf3f8dbb7d2285356ef011c708f8a460cc2ffa1e4e88f015

data.tar.gz.sig

@@ -0,0 +1 @@
+���Y;ht����S���~r�٘-��ZK���cu�̸x����=��\�w�JG��%@y�U�3x;�d�:IR"�^�i�\���<
^;O�Y����H�,�;_1eH�����6���(�>�/�`zRІ|@N	�&����b�
lz�8r��jy�ѓ��C����i,JY(^Q�a�ydQ���"…_�k�94�J#*5���hi�F���'�����`~+�85�>q���Nl��|[]/��8&�no���v

data/lib/mongo/bson.rb

@@ -23,7 +23,7 @@ class Symbol
   # @example Get the bson type.
   #   :test.bson_type
   #
-  # @return [ String ] The charater 14.
+  # @return [ String ] The character 14.
   #
   # @since 2.2.1
   def bson_type

data/lib/mongo/cluster/topology/replica_set.rb

@@ -68,6 +68,7 @@ module Mongo
                 end
               end
               update_max_election_id(description)
+              update_max_set_version(description)
             end
           else
             log_warn(
@@ -88,7 +89,8 @@ module Mongo
         # @since 2.0.0
         def initialize(options, seeds = [])
           @options = options
-          @max_election_id = 0
+          @max_election_id = nil
+          @max_set_version = nil
         end
 
         # A replica set topology is a replica set.
@@ -222,14 +224,29 @@ module Mongo
         private
 
         def update_max_election_id(description)
-          if description.election_id && description.election_id > @max_election_id
+          if description.election_id &&
+              (@max_election_id.nil? ||
+                  description.election_id > @max_election_id)
             @max_election_id = description.election_id
           end
         end
 
+        def update_max_set_version(description)
+          if description.set_version &&
+              (@max_set_version.nil? ||
+                  description.set_version > @max_set_version)
+            @max_set_version = description.set_version
+          end
+        end
+
         def detect_stale_primary!(description)
-          if description.election_id && description.election_id < @max_election_id
-            description.unknown!
+          if description.election_id && description.set_version
+            if @max_set_version && @max_election_id &&
+                (description.set_version < @max_set_version ||
+                    (description.set_version == @max_set_version &&
+                        description.election_id < @max_election_id))
+              description.unknown!
+            end
           end
         end
 

data/lib/mongo/collection/view/readable.rb

@@ -120,7 +120,6 @@ module Mongo
         # @option options :limit [ Integer ] Max number of docs to return.
         # @option options :max_time_ms [ Integer ] The maximum amount of time to allow the
         #   command to run.
-        # @option options :read [ Hash ] The read preference for this command.
         #
         # @return [ Integer ] The document count.
         #

data/lib/mongo/error/operation_failure.rb

@@ -37,7 +37,9 @@ module Mongo
         'error querying',
         'could not get last error',
         'connection attempt failed',
-        'interrupted at shutdown'
+        'interrupted at shutdown',
+        'unknown replica set',
+        'dbclient error communicating with server'
       ].freeze
 
       # Can the operation that caused the error be retried?

data/lib/mongo/grid/file.rb

@@ -30,9 +30,6 @@ module Mongo
       # @return [ Array<Chunk> ] chunks The file chunks.
       attr_reader :chunks
 
-      # @return [ IO ] data The raw data for the file.
-      attr_reader :data
-
       # @return [ File::Info ] info The file information.
       attr_reader :info
 
@@ -48,7 +45,7 @@ module Mongo
       # @since 2.0.0
       def ==(other)
         return false unless other.is_a?(File)
-        chunks == other.chunks && data == other.data && info == other.info
+        chunks == other.chunks && info == other.info
       end
 
       # Initialize the file.
@@ -56,8 +53,8 @@ module Mongo
       # @example Create the file.
       #   Grid::File.new(data, :filename => 'test.txt')
       #
-      # @param [ IO, Array<BSON::Document> ] data The file or IO object or
-      #   chunks.
+      # @param [ IO, String, Array<BSON::Document> ] data The file object, file
+      #   contents or chunks.
       # @param [ BSON::Document, Hash ] options The info options.
       #
       # @option options [ String ] :filename Required name of the file.
@@ -71,10 +68,19 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(data, options = {})
-        @info = Info.new(options.merge(:length => data.length))
+        @info = Info.new(options.merge(:length => data.size))
         initialize_chunks!(data)
       end
 
+      # Joins chunks into a string.
+      #
+      # @return [ String ] The raw data for the file.
+      #
+      # @since 2.0.0
+      def data
+        @data ||= Chunk.assemble(chunks)
+      end
+
       # Gets a pretty inspection of the file.
       #
       # @example Get the file inspection.
@@ -96,12 +102,9 @@ module Mongo
       #   the original data itself.
       def initialize_chunks!(value)
         if value.is_a?(Array)
-          chks = value.map{ |doc| Chunk.new(doc) }
-          @chunks = chks
-          @data = Chunk.assemble(chks)
+          @chunks = value.map{ |doc| Chunk.new(doc) }
         else
           @chunks = Chunk.split(value, info)
-          @data = value
         end
       end
     end

data/lib/mongo/grid/file/chunk.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'stringio'
+
 module Mongo
   module Grid
     class File
@@ -159,23 +161,23 @@ module Mongo
           # @example Split the data into chunks.
           #   Chunks.split(data)
           #
-          # @param [ String ] data The raw bytes.
+          # @param [ String, IO ] data The raw bytes.
           # @param [ File::Info ] file_info The files collection file doc.
           #
           # @return [ Array<Chunk> ] The chunks of the data.
           #
           # @since 2.0.0
-          def split(data, file_info, offset = 0)
-            chunks, index, n = [], 0, offset
-            while index < data.length
-              bytes = data.slice(index, file_info.chunk_size)
+          def split(io, file_info, offset = 0)
+            io = StringIO.new(io) if io.is_a?(String)
+            parts = Enumerator.new { |y| y << io.read(file_info.chunk_size) until io.eof? }
+            parts.map.with_index do |bytes, n|
               file_info.md5.update(bytes)
-              chunk = Chunk.new(:data => BSON::Binary.new(bytes), :files_id => file_info.id, :n => n)
-              chunks.push(chunk)
-              index += bytes.length
-              n += 1
+              Chunk.new(
+                data: BSON::Binary.new(bytes),
+                files_id: file_info.id,
+                n: n + offset,
+              )
             end
-            chunks
           end
         end
       end

data/lib/mongo/grid/fs_bucket.rb

@@ -359,8 +359,8 @@ module Mongo
       # chunks collection. After all the chunks have been uploaded, it creates a files collection
       # document for the filename in the files collection.
       #
-      # @example Open a stream to which the contents of a file came be written.
-      #   fs.open_upload_stream('a-file.txt')
+      # @example Upload a file to the GridFS bucket.
+      #   fs.upload_from_stream('a-file.txt')
       #
       # @param [ String ] filename The filename of the file to upload.
       # @param [ IO ] io The source io stream to upload from.

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

@@ -74,7 +74,7 @@ module Mongo
             view.each_with_index.reduce(0) do |length_read, (doc, index)|
               chunk = Grid::File::Chunk.new(doc)
               validate!(index, num_chunks, chunk, length_read)
-              data = Grid::File::Chunk.assemble([ chunk ])
+              data = chunk.data.data
               yield data
               length_read += data.size
             end if block_given?

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

@@ -82,9 +82,8 @@ module Mongo
           def write(io)
             ensure_open!
             @indexes ||= ensure_indexes!
-            data = io.read
-            @length += data.length
-            chunks = File::Chunk.split(data, file_info, @n)
+            @length += io.size
+            chunks = File::Chunk.split(io, file_info, @n)
             @n += chunks.size
             chunks_collection.insert_many(chunks) unless chunks.empty?
             self
@@ -157,10 +156,11 @@ module Mongo
           end
 
           def with_write_concern(collection)
-            if collection.write_concern.options == write_concern.options
+            if write_concern.nil? || (collection.write_concern &&
+                collection.write_concern.options == write_concern.options)
               collection
             else
-              collection.client.with(write: write_concern.options)[collection.name]
+              collection.with(write: write_concern.options)
             end
           end
 

data/lib/mongo/options/mapper.rb

@@ -81,6 +81,23 @@ module Mongo
         end
       end
 
+      # Coverts all the keys of the options to symbols.
+      #
+      # @example Convert all option keys to symbols.
+      #   Mapper.transform({ 'name' => 1 })
+      #
+      # @param [ Hash ] options The options to transform.
+      #
+      # @return [ Hash ] The transformed options.
+      #
+      # @since 2.2.2
+      def transform_keys_to_symbols(options)
+        options.reduce({}) do |transformed, (key, value)|
+          transformed[key.to_sym] = value
+          transformed
+        end
+      end
+
       # Coverts all the symbol values to strings.
       #
       # @example Convert all option symbol values to strings.

data/lib/mongo/protocol/message.rb

@@ -114,7 +114,7 @@ module Mongo
 
         # Protection from potential DOS man-in-the-middle attacks. See
         # DRIVERS-276.
-        if length > max_message_size
+        if length > (max_message_size || MAX_MESSAGE_SIZE)
           raise Error::MaxMessageSize.new(max_message_size)
         end
 

data/lib/mongo/server/connection.rb

@@ -38,29 +38,12 @@ module Mongo
       # @since 2.1.0
       PING_BYTES = PING_MESSAGE.serialize.to_s.freeze
 
-      # @return [ Mongo::Auth::CR, Mongo::Auth::X509, Mongo::Auth:LDAP, Mongo::Auth::SCRAM ]
-      #   authenticator The authentication strategy.
-      attr_reader :authenticator
-
       def_delegators :@server,
                      :features,
                      :max_bson_object_size,
                      :max_message_size,
                      :mongos?
 
-      # Is this connection authenticated. Will return true if authorization
-      # details were provided and authentication passed.
-      #
-      # @example Is the connection authenticated?
-      #   connection.authenticated?
-      #
-      # @return [ true, false ] If the connection is authenticated.
-      #
-      # @since 2.0.0
-      def authenticated?
-        !!@authenticated
-      end
-
       # Tell the underlying socket to establish a connection to the host.
       #
       # @example Connect to the host.
@@ -76,10 +59,7 @@ module Mongo
         unless socket
           @socket = address.socket(timeout, ssl_options)
           socket.connect!
-          if authenticator
-            authenticator.login(self)
-            @authenticated = true
-          end
+          authenticate!
         end
         true
       end
@@ -99,7 +79,6 @@ module Mongo
         if socket
           socket.close
           @socket = nil
-          @authenticated = false
         end
         true
       end
@@ -151,7 +130,6 @@ module Mongo
         @ssl_options = options.reject { |k, v| !k.to_s.start_with?(SSL) }
         @socket = nil
         @pid = Process.pid
-        setup_authentication!
       end
 
       # Ping the connection to see if the server is responding to commands.
@@ -180,11 +158,11 @@ module Mongo
         messages.last.replyable? ? read : nil
       end
 
-      def setup_authentication!
+      def authenticate!
         if options[:user]
           default_mechanism = @server.features.scram_sha_1_enabled? ? :scram : :mongodb_cr
           user = Auth::User.new(Options::Redacted.new(:auth_mech => default_mechanism).merge(options))
-          @authenticator = Auth.get(user)
+          Auth.get(user).login(self)
         end
       end
 

data/lib/mongo/server/description.rb

@@ -129,11 +129,16 @@ module Mongo
       # @since 2.0.0
       TAGS = 'tags'.freeze
 
-      # Constant for reading electionID info from config.
+      # Constant for reading electionId info from config.
       #
       # @since 2.1.0
       ELECTION_ID = 'electionId'.freeze
 
+      # Constant for reading setVersion info from config.
+      #
+      # @since 2.2.2
+      SET_VERSION = 'setVersion'.freeze
+
       # Constant for reading localTime info from config.
       #
       # @since 2.1.0
@@ -142,7 +147,7 @@ module Mongo
       # Fields to exclude when comparing two descriptions.
       #
       # @since 2.0.6
-      EXCLUDE_FOR_COMPARISON = [ LOCAL_TIME, ELECTION_ID ].freeze
+      EXCLUDE_FOR_COMPARISON = [ LOCAL_TIME, ELECTION_ID, SET_VERSION ].freeze
 
       # @return [ Address ] address The server's address.
       attr_reader :address
@@ -343,6 +348,18 @@ module Mongo
         config[ELECTION_ID]
       end
 
+      # Get the setVersion from the config.
+      #
+      # @example Get the setVersion.
+      #   description.set_version
+      #
+      # @return [ Integer ] The set version.
+      #
+      # @since 2.2.2
+      def set_version
+        config[SET_VERSION]
+      end
+
       # Is the server a mongos?
       #
       # @example Is the server a mongos?

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.2.1'.freeze
+  VERSION = '2.2.2'.freeze
 end

data/lib/mongo/write_concern/normalizable.rb

@@ -44,7 +44,8 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(options)
-        @options = options.freeze
+        opts =  Options::Mapper.transform_keys_to_symbols(options)
+        @options = Options::Mapper.transform_values_to_strings(opts).freeze
       end
     end
   end

data/spec/mongo/client_spec.rb

@@ -688,7 +688,7 @@ describe Mongo::Client do
         end
 
         it 'returns a acknowledged write concern' do
-          expect(concern.get_last_error).to eq(:getlasterror => 1, 'j' => true)
+          expect(concern.get_last_error).to eq(:getlasterror => 1, :j => true)
         end
       end
 

data/spec/mongo/collection/view/readable_spec.rb

@@ -377,6 +377,17 @@ describe Mongo::Collection::View::Readable do
           expect(distinct).to be_empty
         end
       end
+
+      context 'when the field does not exist' do
+
+        let(:distinct) do
+          view.distinct(:doesnotexist)
+        end
+
+        it 'returns an empty array' do
+          expect(distinct).to be_empty
+        end
+      end
     end
 
     context 'when no selector is provided' do
@@ -462,6 +473,13 @@ describe Mongo::Collection::View::Readable do
         expect(view.distinct(:field, max_time_ms: 100)).to eq([ 'test' ])
       end
     end
+
+    context 'when the field does not exist' do
+
+      it 'returns an empty array' do
+        expect(view.distinct(:nofieldexists)).to be_empty
+      end
+    end
   end
 
   describe '#hint' do