mongo 2.14.0.rc1 → 2.16.0.alpha1

data/spec/mongo/crypt/auto_decryption_context_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'mongo'
 require 'lite_spec_helper'
 

data/spec/mongo/crypt/auto_encrypter_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Crypt::AutoEncrypter do

data/spec/mongo/crypt/auto_encryption_context_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'mongo'
 require 'lite_spec_helper'
 

data/spec/mongo/crypt/binary_spec.rb

@@ -1,9 +1,7 @@
-require 'mongo'
-require 'support/lite_constraints'
+# frozen_string_literal: true
+# encoding: utf-8
 
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe Mongo::Crypt::Binary do
   require_libmongocrypt

data/spec/mongo/crypt/binding/binary_spec.rb

@@ -1,9 +1,7 @@
-require 'mongo'
-require 'support/lite_constraints'
+# frozen_string_literal: true
+# encoding: utf-8
 
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe 'Mongo::Crypt::Binding' do
   describe 'binary_t bindings' do

data/spec/mongo/crypt/binding/context_spec.rb

@@ -1,10 +1,8 @@
-require 'mongo'
-require 'support/lite_constraints'
-require 'mongo/crypt/helpers/mongo_crypt_spec_helper'
+# frozen_string_literal: true
+# encoding: utf-8
 
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
+require_relative '../helpers/mongo_crypt_spec_helper'
 
 shared_context 'initialized for data key creation' do
   let(:master_key) { "ru\xfe\x00" * 24 }

data/spec/mongo/crypt/binding/helpers_spec.rb

@@ -1,9 +1,7 @@
-require 'mongo'
-require 'support/lite_constraints'
+# frozen_string_literal: true
+# encoding: utf-8
 
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe 'Mongo::Crypt::Binding' do
   describe 'helper methods' do

data/spec/mongo/crypt/binding/mongocrypt_spec.rb

@@ -1,10 +1,8 @@
-require 'mongo'
-require 'support/lite_constraints'
-require 'mongo/crypt/helpers/mongo_crypt_spec_helper'
+# frozen_string_literal: true
+# encoding: utf-8
 
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
+require_relative '../helpers/mongo_crypt_spec_helper'
 
 describe 'Mongo::Crypt::Binding' do
   describe 'mongocrypt_t binding' do

data/spec/mongo/crypt/binding/status_spec.rb

@@ -1,9 +1,7 @@
-require 'mongo'
-require 'support/lite_constraints'
+# frozen_string_literal: true
+# encoding: utf-8
 
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe 'Mongo::Crypt::Binding' do
   describe 'mongocrypt_status_t binding' do

data/spec/mongo/crypt/binding/version_spec.rb

@@ -1,9 +1,7 @@
-require 'mongo'
-require 'support/lite_constraints'
+# frozen_string_literal: true
+# encoding: utf-8
 
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe 'Mongo::Crypt::Binding' do
   require_libmongocrypt

data/spec/mongo/crypt/binding_unloaded_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 describe 'Mongo::Crypt::Binding' do

data/spec/mongo/crypt/data_key_context_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'mongo'
 require 'base64'
 require 'lite_spec_helper'
@@ -188,7 +191,7 @@ describe Mongo::Crypt::DataKeyContext do
       end
 
       context 'with valid endpoint' do
-        let(:options) { { master_key: { region: 'us-east-2', key: 'arn', endpoint: 'endpoint/to/kms' } } }
+        let(:options) { { master_key: { region: 'us-east-2', key: 'arn', endpoint: 'kms.us-east-2.amazonaws.com:443' } } }
 
         it 'does not raise an exception' do
           expect do

data/spec/mongo/crypt/encryption_io_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'mongo'
 require 'spec_helper'
 

data/spec/mongo/crypt/explicit_decryption_context_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'mongo'
 require 'lite_spec_helper'
 

data/spec/mongo/crypt/explicit_encryption_context_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'mongo'
 require 'lite_spec_helper'
 

data/spec/mongo/crypt/handle_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'mongo'
 require 'base64'
 require 'lite_spec_helper'

data/spec/mongo/crypt/helpers/mongo_crypt_spec_helper.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module MongoCryptSpecHelper
   def bind_crypto_hooks(mongocrypt)
     Mongo::Crypt::Binding.mongocrypt_setopt_crypto_hooks(

data/spec/mongo/crypt/status_spec.rb

@@ -1,9 +1,7 @@
-require 'mongo'
-require 'support/lite_constraints'
+# frozen_string_literal: true
+# encoding: utf-8
 
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe Mongo::Crypt::Status do
   require_libmongocrypt

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

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'spec_helper'
 
 describe Mongo::Cursor::Builder::GetMoreCommand do
@@ -11,8 +17,10 @@ describe Mongo::Cursor::Builder::GetMoreCommand do
     end
 
     let(:description) do
-      Mongo::Server::Description.new(double('description address'),
-        'minWireVersion' => 0, 'maxWireVersion' => 2)
+      Mongo::Server::Description.new(
+        double('description address'),
+        { 'minWireVersion' => 0, 'maxWireVersion' => 2 }
+      )
     end
 
     let(:result) do
@@ -184,3 +192,4 @@ describe Mongo::Cursor::Builder::GetMoreCommand do
     end
   end
 end
+=end

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

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'spec_helper'
 
 describe Mongo::Cursor::Builder::OpGetMore do
@@ -11,8 +17,10 @@ describe Mongo::Cursor::Builder::OpGetMore do
     end
 
     let(:description) do
-      Mongo::Server::Description.new(double('description address'),
-        'minWireVersion' => 0, 'maxWireVersion' => 2)
+      Mongo::Server::Description.new(
+        double('description address'),
+        { 'minWireVersion' => 0, 'maxWireVersion' => 2 }
+      )
     end
 
     let(:result) do
@@ -57,3 +65,4 @@ describe Mongo::Cursor::Builder::OpGetMore do
     end
   end
 end
+=end

data/spec/mongo/cursor_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Cursor do
@@ -77,6 +80,8 @@ describe Mongo::Cursor do
     end
 
     context 'server is unknown' do
+      require_topology :single, :replica_set, :sharded
+
       let(:server) do
         view.send(:server_selector).select_server(authorized_client.cluster).tap do |server|
           authorized_client.cluster.disconnect!
@@ -326,8 +331,7 @@ describe Mongo::Cursor do
 
       before do
         authorized_collection.insert_many(documents)
-        cluster.schedule_kill_cursor(cursor.id,
-                                     cursor.send(:kill_cursors_op_spec),
+        cluster.schedule_kill_cursor(cursor.kill_spec,
                                      cursor.instance_variable_get(:@server))
       end
 
@@ -426,7 +430,7 @@ describe Mongo::Cursor do
 
       it 'removes the cursor id from the active cursors tracked by the cluster cursor manager' do
         enum.next
-        expect(cursor_reaper.instance_variable_get(:@active_cursors)).not_to include(cursor_id)
+        expect(cursor_reaper.instance_variable_get(:@active_cursor_ids)).not_to include(cursor_id)
       end
     end
   end
@@ -434,7 +438,7 @@ describe Mongo::Cursor do
   context 'when an implicit session is used' do
     min_server_fcv '3.6'
 
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     let(:subscribed_client) do
       authorized_client.tap do |client|
@@ -447,6 +451,7 @@ describe Mongo::Cursor do
     end
 
     before do
+      collection.delete_many
       collection.insert_many(documents)
     end
 
@@ -497,19 +502,42 @@ describe Mongo::Cursor do
       end
 
 
-      context 'when not all documents are iterated' do
+      context 'when result set is not iterated fully but the known # of documents is retrieved' do
+        # These tests set up a collection with 4 documents and find all
+        # of them but, instead of iterating the result set to completion,
+        # manually retrieve the 4 documents that are expected to exist.
+        # On 4.9 and lower servers, the server closes the cursor after
+        # retrieving the 4 documents.
+        # On 5.0, the server does not close the cursor after the 4 documents
+        # have been retrieved, and the client must attempt to retrieve the
+        # next batch (which would be empty) for the server to realize that
+        # the result set is fully iterated and close the cursor.
+        max_server_version '4.9'
 
-        it 'returns the session to the cluster session pool' do
-          3.times { enum.next }
-          expect(find_events.collect { |event| event.command['lsid'] }.uniq.size).to eq(1)
-          expect(session_pool_ids).to include(find_events.collect { |event| event.command['lsid'] }.uniq.first)
+        context 'when not all documents are iterated' do
+
+          it 'returns the session to the cluster session pool' do
+            3.times { enum.next }
+            expect(find_events.collect { |event| event.command['lsid'] }.uniq.size).to eq(1)
+            expect(session_pool_ids).to include(find_events.collect { |event| event.command['lsid'] }.uniq.first)
+          end
+        end
+
+        context 'when the same number of documents is iterated as # in the collection' do
+
+          it 'returns the session to the cluster session pool' do
+            4.times { enum.next }
+            expect(find_events.collect { |event| event.command['lsid'] }.uniq.size).to eq(1)
+            expect(session_pool_ids).to include(find_events.collect { |event| event.command['lsid'] }.uniq.first)
+          end
         end
       end
 
-      context 'when all documents are iterated' do
+      context 'when result set is iterated fully' do
 
         it 'returns the session to the cluster session pool' do
-          4.times { enum.next }
+          # Iterate fully and assert that there are 4 documents total
+          enum.to_a.length.should == 4
           expect(find_events.collect { |event| event.command['lsid'] }.uniq.size).to eq(1)
           expect(session_pool_ids).to include(find_events.collect { |event| event.command['lsid'] }.uniq.first)
         end
@@ -528,8 +556,17 @@ describe Mongo::Cursor do
         db_name: SpecConfig.instance.test_db, coll_name: TEST_COLL }
     end
 
+    let(:conn_desc) do
+      double('connection description').tap do |cd|
+        allow(cd).to receive(:service_id).and_return(nil)
+      end
+    end
+
     let(:reply) do
-      Mongo::Operation::Find.new(query_spec).tap do |reply|
+      double('reply').tap do |reply|
+        allow(reply).to receive(:is_a?).with(Mongo::Operation::Result).and_return(true)
+        allow(reply).to receive(:namespace)
+        allow(reply).to receive(:connection_description).and_return(conn_desc)
         allow(reply).to receive(:cursor_id).and_return(42)
       end
     end
@@ -620,4 +657,44 @@ describe Mongo::Cursor do
       end
     end
   end
+
+  describe '#close' do
+    let(:view) do
+      Mongo::Collection::View.new(authorized_collection)
+    end
+
+    let(:server) do
+      view.send(:server_selector).select_server(authorized_client.cluster)
+    end
+
+    let(:reply) do
+      view.send(:send_initial_query, server)
+    end
+
+    let(:cursor) do
+      described_class.new(view, reply, server)
+    end
+
+    it 'closes' do
+      cursor.close
+      expect(cursor).to be_closed
+    end
+
+    context 'when there is a socket error during close' do
+      clean_slate
+
+      before do
+        server.with_connection do |conn|
+          expect(conn).to receive(:deliver)
+            .and_raise(Mongo::Error::SocketError, "test error")
+        end
+      end
+
+      it 'raises an error' do
+        expect do
+          cursor.close
+        end.to raise_error(Mongo::Error::SocketError, "test error")
+      end
+    end
+  end
 end

data/spec/mongo/database_spec.rb

@@ -1,7 +1,23 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Database do
 
+  shared_context 'more than 100 collections' do
+    let(:client) do
+      root_authorized_client.use('many-collections')
+    end
+
+    before do
+      120.times do |i|
+        client["coll-#{i}"].drop
+        client["coll-#{i}"].create
+      end
+    end
+  end
+
   describe '#==' do
 
     let(:database) do
@@ -82,6 +98,26 @@ describe Mongo::Database do
         expect(collection.server_selector).to eq(Mongo::ServerSelector.get(mode: :secondary))
         expect(collection.read_preference).to eq(BSON::Document.new(mode: :secondary))
       end
+
+      context ':server_api option' do
+
+        let(:client) do
+          new_local_client_nmio(['localhost'], server_api: {version: '1'})
+        end
+
+        it 'is not transfered to the collection' do
+          client.options[:server_api].should == {'version' => '1'}
+          collection.options[:server_api].should be nil
+        end
+      end
+    end
+
+    context 'when providing :server_api option' do
+      it 'is rejected' do
+        lambda do
+          database['foo', server_api: {version: '1'}]
+        end.should raise_error(ArgumentError, 'The :server_api option cannot be specified for collection objects. It can only be specified on Client level')
+      end
     end
   end
 
@@ -182,7 +218,7 @@ describe Mongo::Database do
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -228,6 +264,20 @@ describe Mongo::Database do
         end
       end
     end
+
+    context 'when there are more than 100 collections' do
+      include_context 'more than 100 collections'
+
+      let(:collection_names) do
+        client.database.collection_names.sort
+      end
+
+      it 'lists all collections' do
+        collection_names.length.should == 120
+        collection_names.should include('coll-0')
+        collection_names.should include('coll-119')
+      end
+    end
   end
 
   describe '#list_collections' do
@@ -292,21 +342,40 @@ describe Mongo::Database do
         described_class.new(root_authorized_client, 'admin')
       end
 
-      it 'does not include system collections' do
-        expect(result.none? { |name| name =~ /(^|\.)system\./ }).to be true
+      shared_examples 'does not include system collections' do
+        it 'does not include system collections' do
+          expect(result.none? { |name| name =~ /(^|\.)system\./ }).to be true
+        end
       end
 
-      context 'server 3.0+' do
+      context 'server 4.7+' do
+        min_server_fcv '4.7'
+        # https://jira.mongodb.org/browse/SERVER-35804
+        require_topology :single, :replica_set
+
+        include_examples 'does not include system collections'
+
+        it 'returns results' do
+          expect(result).to include('acol')
+        end
+      end
+
+      context 'server 3.0-4.5' do
         min_server_fcv '3.0'
+        max_server_version '4.5'
+
+        include_examples 'does not include system collections'
 
         it 'returns results' do
           expect(result).to include('acol')
         end
       end
 
-      context 'server 2.6-' do
+      context 'server 2.6' do
         max_server_version '2.6'
 
+        include_examples 'does not include system collections'
+
         it 'returns results' do
           expect(result).to include('admin.acol')
         end
@@ -322,7 +391,7 @@ describe Mongo::Database do
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -391,6 +460,25 @@ describe Mongo::Database do
         end
       end
     end
+
+    context 'when there are more than 100 collections' do
+      include_context 'more than 100 collections'
+
+      let(:collections) do
+        client.database.list_collections
+      end
+
+      let(:collection_names) do
+        # 2.6 server prefixes collection names with database name
+        collections.map { |info| info['name'].sub(/^many-collections\./, '') }.sort
+      end
+
+      it 'lists all collections' do
+        collections.length.should == 120
+        collection_names.should include('coll-0')
+        collection_names.should include('coll-119')
+      end
+    end
   end
 
   describe '#collections' do
@@ -495,7 +583,7 @@ describe Mongo::Database do
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -541,6 +629,24 @@ describe Mongo::Database do
         end
       end
     end
+
+    context 'when there are more than 100 collections' do
+      include_context 'more than 100 collections'
+
+      let(:collections) do
+        client.database.collections
+      end
+
+      let(:collection_names) do
+        collections.map(&:name).sort
+      end
+
+      it 'lists all collections' do
+        collections.length.should == 120
+        collection_names.should include('coll-0')
+        collection_names.should include('coll-119')
+      end
+    end
   end
 
   describe '#command' do
@@ -550,18 +656,18 @@ describe Mongo::Database do
     end
 
     it 'sends the query command to the cluster' do
-      expect(database.command(:ismaster => 1).written_count).to eq(0)
+      expect(database.command(:ping => 1).written_count).to eq(0)
     end
 
     it 'does not mutate the command selector' do
-      expect(database.command({:ismaster => 1}.freeze).written_count).to eq(0)
+      expect(database.command({:ping => 1}.freeze).written_count).to eq(0)
     end
 
     context 'when provided a session' do
       min_server_fcv '3.6'
 
       let(:operation) do
-        client.database.command({ :ismaster => 1 }, session: session)
+        client.database.command({ :ping => 1 }, session: session)
       end
 
       let(:failed_operation) do
@@ -572,7 +678,7 @@ describe Mongo::Database do
         client.start_session
       end
 
-      let(:subscriber) { EventSubscriber.new }
+      let(:subscriber) { Mrss::EventSubscriber.new }
 
       let(:client) do
         authorized_client.tap do |client|
@@ -585,7 +691,7 @@ describe Mongo::Database do
 
 
       let(:full_command) do
-        subscriber.started_events.find { |cmd| cmd.command_name == 'ismaster' }.command
+        subscriber.started_events.find { |cmd| cmd.command_name == 'ping' }.command
       end
 
       it 'does not add a afterClusterTime field' do
@@ -603,7 +709,7 @@ describe Mongo::Database do
 
         it 'sends the read concern' do
           expect {
-            database.command(:ismaster => 1, readConcern: { level: 'local' })
+            database.command(:ping => 1, readConcern: { level: 'local' })
           }.to_not raise_error
         end
       end
@@ -613,7 +719,7 @@ describe Mongo::Database do
 
         it 'raises an exception' do
           expect {
-            database.command(:ismaster => 1, readConcern: { level: 'yay' })
+            database.command(:ping => 1, readConcern: { level: 'yay' })
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -626,12 +732,12 @@ describe Mongo::Database do
         database.cluster.next_primary
       end
 
-      before do
-        expect(primary_server).to receive(:with_connection).at_least(:once).and_call_original
-      end
-
       it 'uses read preference of primary' do
-        expect(database.command(ping: 1)).to be_successful
+        RSpec::Mocks.with_temporary_scope do
+          expect(primary_server).to receive(:with_connection).with(any_args).and_call_original
+
+          expect(database.command(ping: 1)).to be_successful
+        end
       end
     end
 
@@ -654,12 +760,12 @@ describe Mongo::Database do
         described_class.new(client, SpecConfig.instance.test_db, client.options)
       end
 
-      before do
-        expect(primary_server).to receive(:with_connection).at_least(:once).and_call_original
-      end
-
       it 'does not use the client read preference 'do
-        expect(database.command(ping: 1)).to be_successful
+        RSpec::Mocks.with_temporary_scope do
+          expect(primary_server).to receive(:with_connection).with(any_args).and_call_original
+
+          expect(database.command(ping: 1)).to be_successful
+        end
       end
     end
 
@@ -772,6 +878,29 @@ describe Mongo::Database do
         end
       end
     end
+
+    context 'when client server api is not set' do
+      require_no_required_api_version
+      min_server_fcv '4.7'
+
+      it 'passes server api parameters' do
+        lambda do
+          database.command(ping: 1, apiVersion: 'does-not-exist')
+        end.should raise_error(
+          an_instance_of(Mongo::Error::OperationFailure).and having_attributes(code: 322))
+      end
+    end
+
+    context 'when client server api is set' do
+      require_required_api_version
+      min_server_fcv '4.7'
+
+      it 'reports server api conflict' do
+        lambda do
+          database.command(ping: 1, apiVersion: 'does-not-exist')
+        end.should raise_error(Mongo::Error::ServerApiConflict)
+      end
+    end
   end
 
   describe '#drop' do
@@ -840,7 +969,7 @@ describe Mongo::Database do
           client.start_session
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           root_authorized_client.tap do |client|