mongo 2.10.3 → 2.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 530b40af0e0b87333d108098e0252efb044c9ecd366f4b61990e09373345eeb6
-  data.tar.gz: 0460c43dd38a0f6f372913326cf1da273ff9a9aa62e2d9f2b44dcdae652600b3
+  metadata.gz: 190086c9201d8ce762881a79c1f1665e27967c0750b55475fbb0947052d3e56b
+  data.tar.gz: 02452d83bc45ff4ef0e9f143c495985cf4584f4f0c7a7ea775e8553887f33d52
 SHA512:
-  metadata.gz: 02632d48133a1102fd13a7d5bab3a2770afe1b3e9a1ca1317eada51cdcdbf99f10204e8cbeff9d3ad309f59a4bb7cd026490566337bcaa9ed05e767a600f24a2
-  data.tar.gz: 3eaf94e796cb099293b19d199dec2b2163e23ef284bbc5c0f85006136b5312dbb1f7abc419c05fa23e9f3b54084f5e825cf20b2d2169fa66a732594227978db5
+  metadata.gz: 21278dcaf52c867fcf8bd257713882699d2e58b8d983fc9760b05e21b5d8412dad92a52163c0b28c1a9e6f48589167def7851b6624d68b31a6b068f0b89ead4d
+  data.tar.gz: '039e1d49bf742ec0ef51bf727c6b542d27efdf36d0cf864ca7898b1335b1312d967fe73beec34ec876d7ebfd7a04287ab6d732863c9b23ade753c6a1f6bfc8f0'

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

@@ -105,6 +105,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

@@ -232,7 +232,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)
@@ -279,7 +279,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)
@@ -323,7 +323,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/uri.rb

@@ -490,7 +490,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.10.3'.freeze
+  VERSION = '2.10.4'.freeze
 end

data/mongo.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
   s.require_paths     = ['lib']
   s.bindir            = 'bin'
 
-  s.add_dependency 'bson', '>=4.6.0', '<5.0.0'
+  s.add_dependency 'bson', '>=4.4.2', '<5.0.0'
 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/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
@@ -12,6 +14,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

@@ -284,4 +284,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

@@ -19,6 +19,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

data/spec/mongo/cursor/builder/op_kill_cursors_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Mongo::Cursor::Builder::OpKillCursors do
+
+  let(:reply) do
+    Mongo::Protocol::Reply.allocate.tap do |reply|
+      allow(reply).to receive(:cursor_id).and_return(8000)
+    end
+  end
+
+  let(:result) do
+    Mongo::Operation::Result.new(reply)
+  end
+
+  let(:view) do
+    Mongo::Collection::View.new(
+      authorized_collection,
+      {},
+      tailable: true,
+      max_time_ms: 100
+    )
+  end
+
+  let(:cursor) do
+    Mongo::Cursor.new(view, result, authorized_primary)
+  end
+
+  let(:builder) do
+    described_class.new(cursor)
+  end
+
+  describe '#specification' do
+
+    let(:specification) do
+      builder.specification
+    end
+
+    it 'includes the cursor ids' do
+      expect(specification[:cursor_ids]).to eq([BSON::Int64.new(8000)])
+    end
+
+    it 'includes the database name' do
+      expect(specification[:db_name]).to eq(SpecConfig.instance.test_db)
+    end
+
+    it 'includes the collection name' do
+      expect(specification[:coll_name]).to eq(TEST_COLL)
+    end
+  end
+
+  describe '.get_cursors_list' do
+    it 'returns integer cursor ids' do
+      expect(described_class.get_cursors_list(builder.specification)).to eq([8000])
+    end
+  end
+end

data/spec/mongo/uri_spec.rb

@@ -352,7 +352,7 @@ describe Mongo::URI do
       let(:servers) { '%2Ftmp%2Fmongodb-27017.sock' }
 
       it 'returns an array with the parsed server' do
-        expect(uri.servers).to eq([URI.unescape(servers)])
+        expect(uri.servers).to eq([URI::DEFAULT_PARSER.unescape(servers)])
       end
     end
 

data/spec/support/command_monitoring.rb

@@ -135,7 +135,7 @@ module Mongo
         if expected.keys.first == '$numberLong'
           converted = expected.values.first.to_i
           if actual.is_a?(BSON::Int64)
-            actual = actual.value
+            actual = Utils.int64_value(actual)
           elsif actual.is_a?(BSON::Int32)
             return false
           end

data/spec/support/utils.rb

@@ -70,7 +70,7 @@ module Utils
       # Convert txnNumber field from a BSON integer to an extended JSON int64
       if command['txnNumber']
         command['txnNumber'] = {
-          '$numberLong' => command['txnNumber'].value.to_s
+          '$numberLong' => int64_value(command['txnNumber']).to_s
         }
       end
 
@@ -184,4 +184,14 @@ module Utils
     end
   end
   module_function :convert_operation_options
+
+  def int64_value(value)
+    if value.respond_to?(:value)
+      # bson-ruby >= 4.6.0
+      value.value
+    else
+      value.instance_variable_get('@integer')
+    end
+  end
+  module_function :int64_value
 end