mongo 2.18.1 → 2.18.2

data/lib/mongo/operation/explain.rb

@@ -17,8 +17,6 @@
 
 require 'mongo/operation/explain/result'
 require 'mongo/operation/explain/op_msg'
-require 'mongo/operation/explain/command'
-require 'mongo/operation/explain/legacy'
 
 module Mongo
   module Operation
@@ -30,7 +28,7 @@ module Mongo
     # @since 2.5.0
     class Explain
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/find/builder.rb

@@ -17,5 +17,4 @@
 
 require 'mongo/operation/find/builder/command'
 require 'mongo/operation/find/builder/flags'
-require 'mongo/operation/find/builder/legacy'
 require 'mongo/operation/find/builder/modifiers'

data/lib/mongo/operation/find.rb

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/find/command'
 require 'mongo/operation/find/op_msg'
-require 'mongo/operation/find/legacy'
 require 'mongo/operation/find/result'
 require 'mongo/operation/find/builder'
 
@@ -31,7 +29,7 @@ module Mongo
     # @since 2.0.0
     class Find
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/get_more.rb

@@ -16,9 +16,7 @@
 # limitations under the License.
 
 require 'mongo/operation/get_more/command_builder'
-require 'mongo/operation/get_more/command'
 require 'mongo/operation/get_more/op_msg'
-require 'mongo/operation/get_more/legacy'
 require 'mongo/operation/get_more/result'
 
 module Mongo
@@ -31,7 +29,7 @@ module Mongo
     # @since 2.5.0
     class GetMore
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/indexes.rb

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/indexes/command'
 require 'mongo/operation/indexes/op_msg'
-require 'mongo/operation/indexes/legacy'
 require 'mongo/operation/indexes/result'
 
 module Mongo
@@ -30,21 +28,7 @@ module Mongo
     # @since 2.0.0
     class Indexes
       include Specifiable
-      include PolymorphicOperation
-      include PolymorphicLookup
-
-      private
-
-      def final_operation(connection)
-        cls = if connection.features.op_msg_enabled?
-          polymorphic_class(self.class.name, :OpMsg)
-        elsif connection.features.list_indexes_enabled?
-          polymorphic_class(self.class.name, :Command)
-        else
-          polymorphic_class(self.class.name, :Legacy)
-        end
-        cls.new(spec)
-      end
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/insert.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/insert/command'
 require 'mongo/operation/insert/op_msg'
 require 'mongo/operation/insert/result'
 require 'mongo/operation/insert/bulk_result'

data/lib/mongo/operation/kill_cursors.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 
 require 'mongo/operation/kill_cursors/command_builder'
-require 'mongo/operation/kill_cursors/command'
 require 'mongo/operation/kill_cursors/op_msg'
 
 module Mongo
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class KillCursors
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/list_collections.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/list_collections/command'
 require 'mongo/operation/list_collections/op_msg'
 require 'mongo/operation/list_collections/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class ListCollections
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/map_reduce.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/map_reduce/command'
 require 'mongo/operation/map_reduce/op_msg'
 require 'mongo/operation/map_reduce/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.5.0
     class MapReduce
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/parallel_scan.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/parallel_scan/command'
 require 'mongo/operation/parallel_scan/op_msg'
 require 'mongo/operation/parallel_scan/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class ParallelScan
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/remove_user.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/remove_user/command'
 require 'mongo/operation/remove_user/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class RemoveUser
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/shared/{polymorphic_operation.rb → op_msg_executable.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-# Copyright (C) 2021 MongoDB Inc.
+# Copyright (C) 2018-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@
 module Mongo
   module Operation
 
-    # Shared behavior of implementing an operation differently based on
-    # the server that will be executing the operation.
+    # Shared behavior of executing the operation as an OpMsg.
     #
     # @api private
-    module PolymorphicOperation
+    module OpMsgExecutable
+      include PolymorphicLookup
 
       # Execute the operation.
       #
@@ -46,8 +46,13 @@ module Mongo
       #
       # @return [ Mongo::Operation::Result ] The operation result.
       def execute_with_connection(connection, context:, options: {})
-        operation = final_operation(connection)
-        operation.execute(connection, context: context, options: options)
+        final_operation.execute(connection, context: context, options: options)
+      end
+
+      private
+
+      def final_operation
+        polymorphic_class(self.class.name, :OpMsg).new(spec)
       end
     end
   end

data/lib/mongo/operation/update.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/update/command'
 require 'mongo/operation/update/op_msg'
 require 'mongo/operation/update/result'
 require 'mongo/operation/update/bulk_result'

data/lib/mongo/operation/update_user.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/update_user/command'
 require 'mongo/operation/update_user/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class UpdateUser
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/users_info.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/users_info/command'
 require 'mongo/operation/users_info/op_msg'
 require 'mongo/operation/users_info/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class UsersInfo
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/write_command.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/write_command/command'
 require 'mongo/operation/write_command/op_msg'
 
 module Mongo
@@ -26,7 +25,7 @@ module Mongo
     # @api private
     class WriteCommand
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation.rb

@@ -9,7 +9,6 @@ require 'mongo/operation/shared/executable'
 require 'mongo/operation/shared/executable_no_validate'
 require 'mongo/operation/shared/executable_transaction_label'
 require 'mongo/operation/shared/polymorphic_lookup'
-require 'mongo/operation/shared/polymorphic_operation'
 require 'mongo/operation/shared/polymorphic_result'
 require 'mongo/operation/shared/read_preference_supported'
 require 'mongo/operation/shared/bypass_document_validation'
@@ -22,8 +21,7 @@ require 'mongo/operation/shared/idable'
 require 'mongo/operation/shared/specifiable'
 require 'mongo/operation/shared/validatable'
 require 'mongo/operation/shared/object_id_generator'
-require 'mongo/operation/shared/op_msg_or_command'
-require 'mongo/operation/shared/op_msg_or_find_command'
+require 'mongo/operation/shared/op_msg_executable'
 
 require 'mongo/operation/op_msg_base'
 require 'mongo/operation/command'

data/lib/mongo/protocol.rb

@@ -10,12 +10,9 @@ require 'mongo/protocol/caching_hash'
 
 # Client Requests
 require 'mongo/protocol/compressed'
-require 'mongo/protocol/delete'
 require 'mongo/protocol/get_more'
-require 'mongo/protocol/insert'
 require 'mongo/protocol/kill_cursors'
 require 'mongo/protocol/query'
-require 'mongo/protocol/update'
 require 'mongo/protocol/msg'
 
 # Server Responses

data/lib/mongo/query_cache.rb

@@ -114,24 +114,24 @@ module Mongo
       #
       # @param [ Mongo::CachingCursor ] cursor The CachingCursor instance to store.
       #
-      # @option opts [ String | nil ] namespace The namespace of the query,
+      # @option opts [ String | nil ] :namespace The namespace of the query,
       #   in the format "database_name.collection_name".
-      # @option opts [ Array, Hash ] selector The selector passed to the query.
+      # @option opts [ Array, Hash ] :selector The selector passed to the query.
       #   For most queries, this will be a Hash, but for aggregations, this
       #   will be an Array representing the aggregation pipeline. May not be nil.
-      # @option opts [ Integer | nil ] skip The skip value of the query.
-      # @option opts [ Hash | nil ] sort The order of the query results
+      # @option opts [ Integer | nil ] :skip The skip value of the query.
+      # @option opts [ Hash | nil ] :sort The order of the query results
       #   (e.g. { name: -1 }).
-      # @option opts [ Integer | nil ] limit The limit value of the query.
-      # @option opts [ Hash | nil ] projection The projection of the query
+      # @option opts [ Integer | nil ] :limit The limit value of the query.
+      # @option opts [ Hash | nil ] :projection The projection of the query
       #   results (e.g. { name: 1 }).
-      # @option opts [ Hash | nil ] collation The collation of the query
+      # @option opts [ Hash | nil ] :collation The collation of the query
       #   (e.g. { "locale" => "fr_CA" }).
-      # @option opts [ Hash | nil ] read_concern The read concern of the query
+      # @option opts [ Hash | nil ] :read_concern The read concern of the query
       #   (e.g. { level: :majority }).
-      # @option opts [ Hash | nil ] read_preference The read preference of
+      # @option opts [ Hash | nil ] :read_preference The read preference of
       #   the query (e.g. { mode: :secondary }).
-      # @option opts [ Boolean | nil ] multi_collection Whether the query
+      # @option opts [ Boolean | nil ] :multi_collection Whether the query
       #   results could potentially come from multiple collections. When true,
       #   these results will be stored under the nil namespace key and cleared
       #   on every write command.
@@ -152,24 +152,24 @@ module Mongo
       # For the given query options, retrieve a cached cursor that can be used
       # to obtain the correct query results, if one exists in the cache.
       #
-      # @option opts [ String | nil ] namespace The namespace of the query,
+      # @option opts [ String | nil ] :namespace The namespace of the query,
       #   in the format "database_name.collection_name".
-      # @option opts [ Array, Hash ] selector The selector passed to the query.
+      # @option opts [ Array, Hash ] :selector The selector passed to the query.
       #   For most queries, this will be a Hash, but for aggregations, this
       #   will be an Array representing the aggregation pipeline. May not be nil.
-      # @option opts [ Integer | nil ] skip The skip value of the query.
-      # @option opts [ Hash | nil ] sort The order of the query results
+      # @option opts [ Integer | nil ] :skip The skip value of the query.
+      # @option opts [ Hash | nil ] :sort The order of the query results
       #   (e.g. { name: -1 }).
-      # @option opts [ Integer | nil ] limit The limit value of the query.
-      # @option opts [ Hash | nil ] projection The projection of the query
+      # @option opts [ Integer | nil ] :limit The limit value of the query.
+      # @option opts [ Hash | nil ] :projection The projection of the query
       #   results (e.g. { name: 1 }).
-      # @option opts [ Hash | nil ] collation The collation of the query
+      # @option opts [ Hash | nil ] :collation The collation of the query
       #   (e.g. { "locale" => "fr_CA" }).
-      # @option opts [ Hash | nil ] read_concern The read concern of the query
+      # @option opts [ Hash | nil ] :read_concern The read concern of the query
       #   (e.g. { level: :majority }).
-      # @option opts [ Hash | nil ] read_preference The read preference of
+      # @option opts [ Hash | nil ] :read_preference The read preference of
       #   the query (e.g. { mode: :secondary }).
-      # @option opts [ Boolean | nil ] multi_collection Whether the query
+      # @option opts [ Boolean | nil ] :multi_collection Whether the query
       #   results could potentially come from multiple collections. When true,
       #   these results will be stored under the nil namespace key and cleared
       #   on every write command.

data/lib/mongo/session.rb

@@ -522,7 +522,7 @@ module Mongo
     #
     # @option options [ Integer ] :max_commit_time_ms The maximum amount of
     #   time to allow a single commitTransaction command to run, in milliseconds.
-    # @option options [ Hash ] read_concern The read concern options hash,
+    # @option options [ Hash ] :read_concern The read concern options hash,
     #   with the following optional keys:
     #   - *:level* -- the read preference level as a symbol; valid values
     #      are *:local*, *:majority*, and *:snapshot*

data/lib/mongo/version.rb

@@ -20,5 +20,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.18.1'.freeze
+  VERSION = '2.18.2'.freeze
 end

data/spec/integration/command_spec.rb

@@ -12,7 +12,7 @@ describe 'Command' do
 
     let(:payload) do
       server.with_connection do |connection|
-        command.send(:final_operation, connection).send(:message, connection).payload.dup.tap do |payload|
+        command.send(:final_operation).send(:message, connection).payload.dup.tap do |payload|
           if payload['request_id'].is_a?(Integer)
             payload['request_id'] = 42
           end
@@ -150,28 +150,6 @@ describe 'Command' do
           expect(payload).to eq(expected_payload)
         end
       end
-
-      # Servers using legacy wire protocol message do not have $db in payload.
-      # $db is added to the payload later when the command monitoring event is
-      # published.
-      context 'pre-OP_MSG servers' do
-        max_server_version '3.4'
-
-        let(:expected_payload) do
-          {
-            'command' => {
-              'find' => 'collection_name',
-            },
-            'command_name' => 'find',
-            'database_name' => 'foo',
-            'request_id' => 42,
-          }
-        end
-
-        it 'returns expected payload' do
-          expect(payload).to eq(expected_payload)
-        end
-      end
     end
 
   end

data/spec/mongo/client_construction_spec.rb

@@ -1773,28 +1773,28 @@ describe Mongo::Client do
             expect do
               client = new_local_client_nmio(['127.0.0.1:27017'],
                 :read => {:mode => :bogus})
-            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: {"mode"=>:bogus}: mode bogus is not one of recognized modes')
+            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read preference value: {"mode"=>:bogus}: mode bogus is not one of recognized modes')
           end
 
           it 'rejects bogus read preference as string' do
             expect do
               client = new_local_client_nmio(['127.0.0.1:27017'],
                 :read => {:mode => 'bogus'})
-            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: {"mode"=>"bogus"}: mode bogus is not one of recognized modes')
+            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read preference value: {"mode"=>"bogus"}: mode bogus is not one of recognized modes')
           end
 
           it 'rejects read option specified as a string' do
             expect do
               client = new_local_client_nmio(['127.0.0.1:27017'],
                 :read => 'primary')
-            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: primary: must be a hash')
+            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read preference value: "primary": the read preference must be specified as a hash: { mode: "primary" }')
           end
 
           it 'rejects read option specified as a symbol' do
             expect do
               client = new_local_client_nmio(['127.0.0.1:27017'],
                 :read => :primary)
-            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: primary: must be a hash')
+            end.to raise_error(Mongo::Error::InvalidReadOption, "Invalid read preference value: :primary: the read preference must be specified as a hash: { mode: :primary }")
           end
         end
       end

data/spec/mongo/collection_crud_spec.rb

@@ -362,6 +362,42 @@ describe Mongo::Collection do
       expect(result.inserted_ids.size).to eq(2)
     end
 
+    context 'when an enumerable is used instead of an array' do
+
+      context 'when the enumerable is not empty' do
+
+        let(:source_data) do
+          [{ name: 'test1' }, { name: 'test2' }]
+        end
+
+        let(:result) do
+          authorized_collection.insert_many(source_data.lazy)
+        end
+
+        it 'should accepts them without raising an error' do
+          expect { result }.to_not raise_error
+          expect(result.inserted_count).to eq(source_data.size)
+        end
+      end
+
+      context 'when the enumerable is empty' do
+
+        let(:source_data) do
+          []
+        end
+
+        let(:result) do
+          authorized_collection.insert_many(source_data.lazy)
+        end
+
+        it 'should raise ArgumentError' do
+          expect do
+            result
+          end.to raise_error(ArgumentError, /Bulk write requests cannot be empty/)
+        end
+      end
+    end
+
     context 'when a session is provided' do
 
       let(:session) do
@@ -4412,4 +4448,24 @@ describe Mongo::Collection do
       expect(result).to be_nil
     end
   end
+
+  context "when creating collection with view_on and pipeline" do
+    before do
+      authorized_client["my_view"].drop
+      authorized_collection.insert_one({ bar: "here!" })
+      authorized_client["my_view",
+        view_on: authorized_collection.name,
+        pipeline: [ { :'$project' => { "baz": "$bar" } } ]
+      ].create
+    end
+
+    it "the view has a document" do
+      expect(authorized_client["my_view"].find.to_a.length).to eq(1)
+    end
+
+    it "applies the pipeline" do
+      expect(authorized_client["my_view"].find.first).to have_key("baz")
+      expect(authorized_client["my_view"].find.first["baz"]).to eq("here!")
+    end
+  end
 end

data/spec/mongo/collection_spec.rb

@@ -647,7 +647,11 @@ describe Mongo::Collection do
     context 'when the collection is capped' do
 
       let(:collection) do
-        described_class.new(database, :specs, :capped => true, :size => 1024)
+        described_class.new(database, :specs, :capped => true, :size => 4096, :max => 512)
+      end
+
+      let(:collstats) do
+        database.read_command(:collstats => :specs).documents.first
       end
 
       before do
@@ -658,6 +662,12 @@ describe Mongo::Collection do
       it 'returns true' do
         expect(collection).to be_capped
       end
+
+      it "applies the options" do
+        expect(collstats["capped"]).to be true
+        expect(collstats["max"]).to eq(512)
+        expect(collstats["maxSize"]).to eq(4096)
+      end
     end
 
     context 'when the collection is not capped' do

data/spec/mongo/crypt/kms_spec.rb

@@ -33,7 +33,6 @@ describe Mongo::Crypt::KMS do
         %i(
           ssl_verify_certificate
           ssl_verify_hostname
-          ssl_verify_ocsp_endpoint
         ).each do |insecure_opt|
           expect {
             Mongo::Crypt::KMS::Validations.validate_tls_options(
@@ -46,14 +45,18 @@ describe Mongo::Crypt::KMS do
       end
 
       it 'allows valid options' do
-        options = {
-          aws: {
-            ssl: true,
-            ssl_cert_string: 'Content is not validated',
-
-          }
-        }
+        expect do
+          Mongo::Crypt::KMS::Validations.validate_tls_options(
+            {
+              aws: {
+                ssl: true,
+                ssl_cert_string: 'Content is not validated',
+                ssl_verify_ocsp_endpoint: false
+              }
+            }
+          )
+        end.not_to raise_error
       end
     end
   end
-end
+end