mongo 2.14.0.rc1 → 2.15.1

data/spec/mongo/operation/update/op_msg_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Update::OpMsg do
@@ -78,7 +81,7 @@ describe Mongo::Operation::Update::OpMsg do
 
   describe 'write concern' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when write concern is not specified' do
 
@@ -105,7 +108,7 @@ describe Mongo::Operation::Update::OpMsg do
 
   describe '#message' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when the server supports OP_MSG' do
       min_server_fcv '3.6'
@@ -159,7 +162,7 @@ describe Mongo::Operation::Update::OpMsg do
 
         context 'when an implicit session is created and the topology is then updated and the server does not support sessions' do
           # Mocks on features are incompatible with linting
-          skip_if_linting
+          require_no_linting
 
           let(:expected_global_args) do
             global_args.dup.tap do |args|

data/spec/mongo/operation/update_spec.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Update do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   let(:document) do
     { :q => { :foo => 1 },
@@ -100,7 +106,7 @@ describe Mongo::Operation::Update do
         end
 
         let(:result) do
-          update.execute(authorized_primary, client: nil)
+          update.execute(authorized_primary, context: context)
         end
 
         it 'updates the document' do
@@ -128,7 +134,7 @@ describe Mongo::Operation::Update do
 
         it 'raises an exception' do
           expect {
-            update.execute(authorized_primary, client: nil)
+            update.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -152,7 +158,7 @@ describe Mongo::Operation::Update do
         end
 
         let(:result) do
-          update.execute(authorized_primary, client: nil)
+          update.execute(authorized_primary, context: context)
         end
 
         it 'updates the documents' do
@@ -180,7 +186,7 @@ describe Mongo::Operation::Update do
 
         it 'raises an exception' do
           expect {
-            update.execute(authorized_primary, client: nil)
+            update.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -193,7 +199,7 @@ describe Mongo::Operation::Update do
 
         it 'raises an error' do
           expect {
-            update.execute(authorized_primary, client: nil)
+            update.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::MaxBSONSize)
         end
       end
@@ -205,7 +211,7 @@ describe Mongo::Operation::Update do
         end
 
         let(:result) do
-          update.execute(authorized_primary, client: nil)
+          update.execute(authorized_primary, context: context)
         end
 
         it 'inserts the document' do
@@ -243,7 +249,7 @@ describe Mongo::Operation::Update do
       end
 
       let(:result) do
-        update.execute(authorized_primary, client: nil)
+        update.execute(authorized_primary, context: context)
       end
 
       before do

data/spec/mongo/operation/update_user_spec.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::UpdateUser do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   describe '#execute' do
 
@@ -35,7 +41,7 @@ describe Mongo::Operation::UpdateUser do
     context 'when user update was successful' do
 
       let!(:response) do
-        operation.execute(root_authorized_primary, client: nil)
+        operation.execute(root_authorized_primary, context: context)
       end
 
       it 'updates the user in the database' do

data/spec/mongo/options/redacted_spec.rb

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

data/spec/mongo/protocol/compressed_spec.rb

@@ -1,4 +1,7 @@
-require 'lite_spec_helper'
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
 
 describe Mongo::Protocol::Compressed do
 
@@ -10,15 +13,35 @@ describe Mongo::Protocol::Compressed do
     described_class.new(original_message, compressor, level)
   end
 
+  let(:original_message_bytes) do
+    buf = BSON::ByteBuffer.new
+    original_message.send(:serialize_fields, buf)
+    buf.to_s
+  end
+
   describe '#serialize' do
 
-    context 'when zlib compression level is not provided' do
+    context "when using the snappy compressor" do
+      require_snappy_compression
+      let(:compressor) { 'snappy' }
 
-      let(:original_message_bytes) do
-        buf = BSON::ByteBuffer.new
-        original_message.send(:serialize_fields, buf)
-        buf.to_s
+      it "uses snappy" do
+        expect(Snappy).to receive(:deflate).with(original_message_bytes).and_call_original
+        message.serialize
       end
+    end
+
+    context "when using the zstd compressor" do
+      require_zstd_compression
+      let(:compressor) { 'zstd' }
+
+      it "uses zstd with default compression level" do
+        expect(Zstd).to receive(:compress).with(original_message_bytes).and_call_original
+        message.serialize
+      end
+    end
+
+    context 'when zlib compression level is not provided' do
 
       it 'does not set a compression level' do
         expect(Zlib::Deflate).to receive(:deflate).with(original_message_bytes, nil).and_call_original
@@ -30,12 +53,6 @@ describe Mongo::Protocol::Compressed do
 
       let(:level) { 1 }
 
-      let(:original_message_bytes) do
-        buf = BSON::ByteBuffer.new
-        original_message.send(:serialize_fields, buf)
-        buf.to_s
-      end
-
       it 'uses the compression level' do
         expect(Zlib::Deflate).to receive(:deflate).with(original_message_bytes, 1).and_call_original
         message.serialize

data/spec/mongo/protocol/delete_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 

data/spec/mongo/protocol/get_more_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 

data/spec/mongo/protocol/insert_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 

data/spec/mongo/protocol/kill_cursors_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 

data/spec/mongo/protocol/msg_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 
@@ -100,7 +103,7 @@ describe Mongo::Protocol::Msg do
       context 'when the main_document are not equal' do
 
         let(:other_main_document) do
-          { '$db'=> SpecConfig.instance.test_db, ismaster: 1 }
+          { '$db'=> SpecConfig.instance.test_db, hello: 1 }
         end
 
         let(:other) do

data/spec/mongo/protocol/query_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 
@@ -27,7 +30,7 @@ describe Mongo::Protocol::Query do
     context 'when options are provided' do
 
       context 'when flags are provided' do
-        let(:options) { { :flags => [:slave_ok] } }
+        let(:options) { { :flags => [:secondary_ok] } }
 
         it 'sets the flags' do
           expect(message.flags).to eq(options[:flags])
@@ -166,7 +169,7 @@ describe Mongo::Protocol::Query do
         end
 
         context 'slave ok flag' do
-          let(:flags) { [:slave_ok] }
+          let(:flags) { [:secondary_ok] }
           it 'sets the third bit' do
             expect(field).to be_int32(4)
           end
@@ -208,7 +211,7 @@ describe Mongo::Protocol::Query do
         end
 
         context 'multiple flags' do
-          let(:flags) { [:await_data, :slave_ok] }
+          let(:flags) { [:await_data, :secondary_ok] }
           it 'sets the correct bits' do
             expect(field).to be_int32(36)
           end

data/spec/mongo/protocol/registry_spec.rb

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

data/spec/mongo/protocol/reply_spec.rb

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

data/spec/mongo/protocol/update_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 

data/spec/mongo/query_cache_middleware_spec.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Mongo::QueryCache::Middleware do
+
+  let :middleware do
+    described_class.new(app)
+  end
+
+  context "when not touching query cache in the app" do
+
+    let(:app) do
+      lambda do |env|
+        @enabled = Mongo::QueryCache.enabled?
+        [200, env, "app"]
+      end
+    end
+
+    it "returns success" do
+      code, _ = middleware.call({})
+      expect(code).to eq(200)
+    end
+
+    it "enables the query cache" do
+      middleware.call({})
+      expect(@enabled).to be true
+    end
+  end
+
+  context "when querying in the app" do
+
+    before do
+      authorized_client['test'].insert_one(test: 1)
+    end
+
+    let(:app) do
+      lambda do |env|
+        authorized_client['test'].find
+        [200, env, "app"]
+      end
+    end
+
+    it "returns success" do
+      code, _ = middleware.call({})
+      expect(code).to eq(200)
+    end
+
+    it "cleans the query cache after it responds" do
+      middleware.call({})
+      expect(Mongo::QueryCache.send(:cache_table)).to be_empty
+    end
+  end
+end

data/spec/mongo/query_cache_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::QueryCache do
@@ -149,6 +152,7 @@ describe Mongo::QueryCache do
 
     before do
       allow(result).to receive(:cursor_id) { 0 }
+      allow(result).to receive(:namespace) { 'db.coll' }
       allow(view).to receive(:limit) { nil }
     end
 

data/spec/mongo/retryable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 class RetryableTestConsumer
@@ -574,8 +577,9 @@ describe Mongo::Retryable do
     context 'when an error due to using an unsupported storage engine occurs' do
       before do
         expect(operation).to receive(:execute).and_raise(
-          Mongo::Error::OperationFailure.new('Transaction numbers are only allowed on...',
-            nil, :code=>20)).ordered
+          Mongo::Error::OperationFailure.new('message which is not checked',
+            nil, code: 20, server_message: 'Transaction numbers are only allowed on...',
+        )).ordered
       end
 
       it 'raises an exception with the correct error message' do

data/spec/mongo/semaphore_spec.rb

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

data/spec/mongo/server/app_metadata_spec.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
-require_relative './app_metadata_shared'
 
 describe Mongo::Server::AppMetadata do
 
@@ -11,6 +13,14 @@ describe Mongo::Server::AppMetadata do
     authorized_client.cluster
   end
 
+  describe 'MAX_DOCUMENT_SIZE' do
+    it 'should be 512 bytes' do
+      # This test is an additional check that MAX_DOCUMENT_SIZE
+      # has not been accidentially changed.
+      expect(described_class::MAX_DOCUMENT_SIZE).to eq(512)
+    end
+  end
+
   describe '#initialize' do
 
     context 'when the cluster has an app name option set' do
@@ -53,6 +63,8 @@ describe Mongo::Server::AppMetadata do
     end
 
     context 'when the client document exceeds the max of 512 bytes' do
+      # Server api parameters change metadata length
+      require_no_required_api_version
 
       context 'when the os.type length is too long' do
 
@@ -61,7 +73,9 @@ describe Mongo::Server::AppMetadata do
         end
 
         it 'truncates the document' do
-          expect(app_metadata.send(:ismaster_bytes)).to be_a(String)
+          expect(
+            app_metadata.validated_document.to_bson.to_s.size
+          ).to be < described_class::MAX_DOCUMENT_SIZE
         end
       end
 
@@ -72,7 +86,9 @@ describe Mongo::Server::AppMetadata do
         end
 
         it 'truncates the document' do
-          expect(app_metadata.send(:ismaster_bytes)).to be_a(String)
+          expect(
+            app_metadata.validated_document.to_bson.to_s.size
+          ).to be < described_class::MAX_DOCUMENT_SIZE
         end
       end
 
@@ -83,7 +99,9 @@ describe Mongo::Server::AppMetadata do
         end
 
         it 'truncates the document' do
-          expect(app_metadata.send(:ismaster_bytes)).to be_a(String)
+          expect(
+            app_metadata.validated_document.to_bson.to_s.size
+          ).to be < described_class::MAX_DOCUMENT_SIZE
         end
       end
 
@@ -93,8 +111,10 @@ describe Mongo::Server::AppMetadata do
           allow(app_metadata).to receive(:platform).and_return('x'*500)
         end
 
-        it 'truncates the document to be just an ismaster command' do
-          expect(app_metadata.send(:ismaster_bytes)).to be_a(String)
+        it 'truncates the document' do
+          expect(
+            app_metadata.validated_document.to_bson.to_s.size
+          ).to be < described_class::MAX_DOCUMENT_SIZE
         end
       end
 
@@ -105,21 +125,10 @@ describe Mongo::Server::AppMetadata do
           allow(app_metadata).to receive(:driver_doc).and_return('x'*500)
         end
 
-        it 'truncates the document to be just an ismaster command and the compressors' do
-          # Because we sometimes request that the server provide a list of valid auth mechanisms for
-          # the user, we need to conditionally add the length of that metadata to the expected
-          # length of the isMaster document.
-          sasl_supported_mechs_size = 0
-          sasl_supported_mechs = app_metadata.instance_variable_get(:@request_auth_mech)
-
-          if sasl_supported_mechs
-            sasl_supported_mechs_size += 1                               # length of BSON type byte
-            sasl_supported_mechs_size += 'saslSupportedMechs'.length + 1        # length of BSON key
-            sasl_supported_mechs_size += 4                               # length of BSON string length
-            sasl_supported_mechs_size += sasl_supported_mechs.length + 1 # length of BSON string
-          end
-
-          expect(app_metadata.ismaster_bytes.length).to eq(Mongo::Server::Monitor::Connection::ISMASTER_BYTES.length + sasl_supported_mechs_size + 26)
+        it 'truncates the document' do
+          expect(
+            app_metadata.validated_document.to_bson.to_s.size
+          ).to be < described_class::MAX_DOCUMENT_SIZE
         end
       end
     end
@@ -142,4 +151,20 @@ describe Mongo::Server::AppMetadata do
 
     it_behaves_like 'app metadata document'
   end
+
+  describe '#validated_document' do
+    it 'raises with too long app name' do
+      app_name = 'app'*500
+      expect {
+        described_class.new(app_name: app_name).validated_document
+      }.to raise_error(Mongo::Error::InvalidApplicationName)
+    end
+
+    it 'does not raise with correct app name' do
+      app_name = 'app'
+      expect {
+        described_class.new(app_name: app_name).validated_document
+      }.not_to raise_error
+    end
+  end
 end