mongo 2.11.2 → 2.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d52eaac2e54a90b6aad27aa1ef965c67cb36d4ea61907092e867b40eac1f9539
-  data.tar.gz: c118c191fac15467052a316eadd13035ed43968af1e46bd50ea45e6ad4884900
+  metadata.gz: f1ec5495bf06a11fa0003454eb892099bc1a86da8ef1694fc25990c18d2f64ba
+  data.tar.gz: b07b2a3f5b71e89e66d6117253e1c85e4c6c90b8a8bb2f17cee24a8b47b9dad8
 SHA512:
-  metadata.gz: f652bbcf6b01f172199d467953d8f0ab3b9bc83b2e790d87a2c2f3b3251e5c0139234cbe1c2a1fbb6791ab5bf18be001b9be271ef0a0a9bfa75f9d20be9441f5
-  data.tar.gz: 82a0273865415d0ce911b96a0f80fa59610539d23e8182acd706cade06226df0d9a5ca931a3ae1b05a6191e4d4e934cb713c232a67c4dcedb48d03cf696ed79b
+  metadata.gz: 6e88a5e7d0a2bd2917c4ba887d38786229fd9f64e2056b894ccd3289983b52f7aa8b293d77c46df4412d1fb01faed8bb41bfe93fa08e5085a8ec88fe22aaed34
+  data.tar.gz: fe47a5b889ff2b9449475e040d6e189bc984158e5c6b0cfab055dcce83d7efb090ec129eb5afee5cfed7a4b30ddda6bcc0d60e1b8720ff96f188548f28a75460

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-Vn��i�'P��zQ��il|��	)8i�=���:\ʜ���ڭ)��V)�8���uH2�����q8D�����k���u�s@��`:&V�2'0$ť'�aޒ@{j����gI�.}�Ո�Y~�y8~�>��QX-��)2�N��r�
-����E�Czꅚ	�n�,��y�ڋ�X��Ϊr4���]V�
+�|A�i��7Z����$��^�H��jC˴C�8Δ�����>�6�%�&�a�������[���epR@U='�ӯY�R�ԡ�ΉȢ�:�yZ'N�#��|���i*{�v�n�\�yV]}�����+r
+?������Jtz�[���8�d��L���_�r��
��\�s�~z��;C n��5>�t"	M��F��I}�µa��{{l�ȋr���;����pG��?M S��PL��D*zA�X��

data/lib/mongo/auth/user.rb

@@ -151,6 +151,8 @@ module Mongo
       #   authorized for.
       # @option options [ String ] :user The user name.
       # @option options [ String ] :password The user's password.
+      # @option options [ String ] :pwd Legacy option for the user's password.
+      #   If :password and :pwd are both specified, :password takes precedence.
       # @option options [ Symbol ] :auth_mech The authorization mechanism.
       # @option options [ Array<String>, Array<Hash> ] roles The user roles.
       # @option options [ String ] :client_key The user's client key cached from a previous
@@ -196,7 +198,11 @@ module Mongo
       #
       # @since 2.0.0
       def spec
-        { pwd: password, roles: roles }
+        {roles: roles}.tap do |spec|
+          if password
+            spec[:pwd] = password
+          end
+        end
       end
 
       private

data/lib/mongo/bulk_write/transformable.rb

@@ -92,7 +92,7 @@ module Mongo
           Operation::U => doc[:replacement],
         }.tap do |d|
           if doc[:upsert]
-            d[:upsert] = true
+            d['upsert'] = true
           end
           d[Operation::COLLATION] = doc[:collation] if doc[:collation]
         end
@@ -108,7 +108,7 @@ module Mongo
           Operation::MULTI => true,
         }.tap do |d|
           if doc[:upsert]
-            d[:upsert] = true
+            d['upsert'] = true
           end
           d[Operation::COLLATION] = doc[:collation] if doc[:collation]
           d[Operation::ARRAY_FILTERS] = doc[:array_filters] if doc[:array_filters]
@@ -124,7 +124,7 @@ module Mongo
           Operation::U => doc[:update],
         }.tap do |d|
           if doc[:upsert]
-            d[:upsert] = true
+            d['upsert'] = true
           end
           d[Operation::COLLATION] = doc[:collation] if doc[:collation]
           d[Operation::ARRAY_FILTERS] = doc[:array_filters] if doc[:array_filters]

data/lib/mongo/cluster.rb

@@ -109,6 +109,8 @@ module Mongo
         options[:cleanup] = false
       end
 
+      seeds = seeds.uniq
+
       @servers = []
       @monitoring = monitoring
       @event_listeners = Event::Listeners.new

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

@@ -234,7 +234,7 @@ module Mongo
                          Operation::U => replacement,
                         }
           if opts[:upsert]
-            update_doc[:upsert] = true
+            update_doc['upsert'] = true
           end
           with_session(opts) do |session|
             write_concern = write_concern_with_session(session)
@@ -281,7 +281,7 @@ module Mongo
                          Operation::MULTI => true,
                          }
           if opts[:upsert]
-            update_doc[:upsert] = true
+            update_doc['upsert'] = true
           end
           with_session(opts) do |session|
             write_concern = write_concern_with_session(session)
@@ -325,7 +325,7 @@ module Mongo
                          Operation::U => spec,
                          }
           if opts[:upsert]
-            update_doc[:upsert] = true
+            update_doc['upsert'] = true
           end
           with_session(opts) do |session|
             write_concern = write_concern_with_session(session)

data/lib/mongo/cursor/builder/kill_cursors_command.rb

@@ -92,7 +92,14 @@ module Mongo
           #
           # @since 2.3.0
           def get_cursors_list(spec)
-            spec[:selector][:cursors].map(&:value)
+            spec[:selector][:cursors].map do |value|
+              if value.respond_to?(:value)
+                # bson-ruby >= 4.6.0
+                value = value.value
+              else
+                value = value.instance_variable_get('@integer')
+              end
+            end
           end
         end
       end

data/lib/mongo/cursor/builder/op_kill_cursors.rb

@@ -87,7 +87,14 @@ module Mongo
           #
           # @since 2.3.0
           def get_cursors_list(spec)
-            spec[:cursor_ids].map(&:value)
+            spec[:cursor_ids].map do |value|
+              if value.respond_to?(:value)
+                # bson-ruby >= 4.6.0
+                value.value
+              else
+                value.instance_variable_get('@integer')
+              end
+            end
           end
         end
       end

data/lib/mongo/protocol/serializers.rb

@@ -110,7 +110,12 @@ module Mongo
         # @return [String] Buffer with serialized value.
         def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           if value.is_a?(BSON::Int32)
-            value = value.value
+            if value.respond_to?(:value)
+              # bson-ruby >= 4.6.0
+              value = value.value
+            else
+              value = value.instance_variable_get('@integer')
+            end
           end
           buffer.put_int32(value)
         end
@@ -138,7 +143,12 @@ module Mongo
         # @return [ String ] Buffer with serialized value.
         def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           if value.is_a?(BSON::Int64)
-            value = value.value
+            if value.respond_to?(:value)
+              # bson-ruby >= 4.6.0
+              value = value.value
+            else
+              value = value.instance_variable_get('@integer')
+            end
           end
           buffer.put_int64(value)
         end

data/lib/mongo/server/connection.rb

@@ -322,7 +322,7 @@ module Mongo
               raise exc
             end
           rescue => e
-            log_warn("Failed to handshake with #{address}: #{e.class}: #{e}")
+            log_warn("Failed to handshake with #{address}: #{e.class}: #{e}:\n#{e.backtrace[0..5].join("\n")}")
             raise
           end
         end
@@ -379,7 +379,7 @@ module Mongo
             begin
               Auth.get(user).login(pending_connection)
             rescue => e
-              log_warn("Failed to handshake with #{address}: #{e.class}: #{e}")
+              log_warn("Failed to handshake with #{address}: #{e.class}: #{e}:\n#{e.backtrace[0..5].join("\n")}")
               raise
             end
           end

data/lib/mongo/server/monitor.rb

@@ -204,7 +204,7 @@ module Mongo
             connection.ismaster
           end
           if exc
-            log_debug("Error running ismaster on #{server.address}: #{exc.class}: #{exc.message}")
+            log_debug("Error running ismaster on #{server.address}: #{exc.class}: #{exc}:\n#{exc.backtrace[0..5].join("\n")}")
             if monitoring.monitoring?
               monitoring.failed(
                 Monitoring::SERVER_HEARTBEAT,

data/lib/mongo/server/monitor/connection.rb

@@ -232,7 +232,7 @@ module Mongo
             log_warn("Asked to handshake with #{address} but there was no app metadata provided")
           end
         rescue => e
-          log_warn("Failed to handshake with #{address}: #{e.class}: #{e}")
+          log_warn("Failed to handshake with #{address}: #{e.class}: #{e}:\n#{e.backtrace[0..5].join("\n")}")
           raise
         end
 

data/lib/mongo/uri.rb

@@ -454,7 +454,7 @@ module Mongo
     end
 
     def decode(value)
-      ::URI.decode(value)
+      ::URI::DEFAULT_PARSER.unescape(value)
     end
 
     def encode(value)

data/lib/mongo/version.rb

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

data/mongo.gemspec

@@ -40,5 +40,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.3"
 
-  s.add_dependency 'bson', '>=4.6.0', '<5.0.0'
+  s.add_dependency 'bson', '>=4.4.2', '<5.0.0'
 end

data/spec/integration/client_options_spec.rb

@@ -38,7 +38,7 @@ describe 'Client options' do
     end
   end
 
-  shared_examples_for 'auth mechanism that uses database or default auth source' do |default_auth_source:|
+  shared_examples_for 'auth mechanism that uses database or default auth source' do |default_auth_source|
     context 'where no database is provided' do
       context 'with URI options' do
         let(:credentials) { "#{user}:#{pwd}@" }
@@ -198,7 +198,7 @@ describe 'Client options' do
     let(:auth_mech_sym) { :mongodb_cr }
 
     it_behaves_like 'a supported auth mechanism'
-    it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: 'admin'
+    it_behaves_like 'auth mechanism that uses database or default auth source', 'admin'
     it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
   end
 
@@ -207,7 +207,7 @@ describe 'Client options' do
     let(:auth_mech_sym) { :scram }
 
     it_behaves_like 'a supported auth mechanism'
-    it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: 'admin'
+    it_behaves_like 'auth mechanism that uses database or default auth source', 'admin'
     it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
   end
 
@@ -216,7 +216,7 @@ describe 'Client options' do
     let(:auth_mech_sym) { :scram256 }
 
     it_behaves_like 'a supported auth mechanism'
-    it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: 'admin'
+    it_behaves_like 'auth mechanism that uses database or default auth source', 'admin'
     it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
   end
 
@@ -263,7 +263,7 @@ describe 'Client options' do
     let(:auth_mech_sym) { :plain }
 
     it_behaves_like 'a supported auth mechanism'
-    it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: '$external'
+    it_behaves_like 'auth mechanism that uses database or default auth source', '$external'
     it_behaves_like 'an auth mechanism with ssl'
     it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
   end

data/spec/integration/crud_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe 'CRUD operations' do
+  let(:collection) { authorized_client['crud_integration'] }
+
+  before do
+    collection.delete_many
+  end
+
+  describe 'upsert' do
+    context 'with default write concern' do
+      it 'upserts' do
+        collection.count_documents({}).should == 0
+
+        res = collection.find(_id: 'foo').update_one({'$set' => {foo: 'bar'}}, upsert: true)
+
+        res.documents.first['upserted'].length.should == 1
+
+        collection.count_documents({}).should == 1
+      end
+    end
+
+    context 'unacknowledged write' do
+      let(:unack_collection) do
+        collection.with(write_concern: {w: 0})
+      end
+
+      before do
+        unack_collection.write_concern.acknowledged?.should be false
+      end
+
+      it 'upserts' do
+        unack_collection.count_documents({}).should == 0
+
+        res = unack_collection.find(_id: 'foo').update_one({'$set' => {foo: 'bar'}}, upsert: true)
+
+        # since write concern is unacknowledged, wait for the data to be
+        # persisted (hopefully)
+        sleep 0.25
+
+        unack_collection.count_documents({}).should == 1
+      end
+    end
+  end
+end

data/spec/integration/cursor_reaping_spec.rb

@@ -59,7 +59,8 @@ describe 'Cursor reaping' do
       client.cluster.instance_variable_get('@periodic_executor').execute
 
       started_event = EventSubscriber.started_events.detect do |event|
-        event.command['killCursors'] && event.command['cursors'].map(&:value).include?(cursor_id)
+        event.command['killCursors'] &&
+        event.command['cursors'].map { |c| Utils.int64_value(c) }.include?(cursor_id)
       end
 
       expect(started_event).not_to be_nil

data/spec/lite_spec_helper.rb

@@ -127,6 +127,7 @@ RSpec.configure do |config|
   end
 
   config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
     c.max_formatted_output_length = 10000
   end
 end

data/spec/mongo/auth/user/view_spec.rb

@@ -2,8 +2,10 @@ require 'spec_helper'
 
 describe Mongo::Auth::User::View do
 
+  let(:database) { root_authorized_client.database }
+
   let(:view) do
-    described_class.new(root_authorized_client.database)
+    described_class.new(database)
   end
 
   before do
@@ -51,6 +53,39 @@ describe Mongo::Auth::User::View do
 
   describe '#create' do
 
+    context 'when password is not provided' do
+
+      let(:database) { root_authorized_client.use('$external').database }
+
+      let(:username) { 'passwordless-user' }
+
+      let(:response) do
+        view.create(
+          username,
+          # https://stackoverflow.com/questions/55939832/mongodb-external-database-cannot-create-new-user-with-user-defined-role
+          roles: [{role: 'read', db: 'admin'}],
+        )
+      end
+
+      before do
+        begin
+          view.remove(username)
+        rescue Mongo::Error::OperationFailure
+          # can be user not found, ignore
+        end
+      end
+
+      it 'creates the user' do
+        view.info(username).should == []
+
+        lambda do
+          response
+        end.should_not raise_error
+
+        view.info(username).first['user'].should == username
+      end
+    end
+
     context 'when a session is not used' do
 
       let!(:response) do

data/spec/mongo/auth/user_spec.rb

@@ -325,4 +325,16 @@ describe Mongo::Auth::User do
       end
     end
   end
+
+  describe '#spec' do
+    context 'when no password and no roles are set' do
+      let(:user) do
+        described_class.new(user: 'foo')
+      end
+
+      it 'is a hash with empty roles' do
+        user.spec.should == {roles: []}
+      end
+    end
+  end
 end

data/spec/mongo/bulk_write_spec.rb

@@ -1924,11 +1924,11 @@ describe Mongo::BulkWrite do
             end
 
             let(:first_txn_number) do
-              started_events[-2].command['txnNumber'].value
+              Utils.int64_value(started_events[-2].command['txnNumber'])
             end
 
             let(:second_txn_number) do
-              started_events[-1].command['txnNumber'].value
+              Utils.int64_value(started_events[-1].command['txnNumber'])
             end
 
             it 'inserts the documents' do

data/spec/mongo/cluster_spec.rb

@@ -20,6 +20,25 @@ describe Mongo::Cluster do
 
   let(:cluster) { cluster_without_io }
 
+  describe 'initialize' do
+
+    context 'when there are duplicate addresses' do
+
+      let(:addresses) do
+        SpecConfig.instance.addresses + SpecConfig.instance.addresses
+      end
+      let(:cluster_with_dup_addresses) do
+        register_cluster(
+          described_class.new(addresses, monitoring, SpecConfig.instance.test_options))
+      end
+
+      it 'does not raise an exception' do
+        expect { cluster_with_dup_addresses }.not_to raise_error
+      end
+    end
+
+  end
+
   describe '#==' do
 
     context 'when the other is a cluster' do