mongo 2.1.0.beta → 2.2.0

data/spec/mongo/write_concern_spec.rb

@@ -0,0 +1,126 @@
+require 'spec_helper'
+
+describe Mongo::WriteConcern do
+
+  describe '#get' do
+
+    context 'when no options are set' do
+
+      let(:options) do
+        { }
+      end
+
+      it 'returns an Acknowledged write concern object' do
+        expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Acknowledged)
+      end
+    end
+
+    context 'when w is 0' do
+
+      context 'when no other options are provided' do
+
+        let(:options) do
+          { w: 0 }
+        end
+
+        it 'returns an Unacknowledged write concern object' do
+          expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Unacknowledged)
+        end
+      end
+
+      context 'when j is also provided' do
+
+        context 'when j is false' do
+
+          let(:options) do
+            { w: 0, j: false }
+          end
+
+          it 'returns an Unacknowledged write concern object' do
+            expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Unacknowledged)
+          end
+        end
+
+        context 'when j is true' do
+
+          let(:options) do
+            { w: 0, j: true }
+          end
+
+          it 'raises an exception' do
+            expect {
+              Mongo::WriteConcern.get(options)
+            }.to raise_error(Mongo::Error::InvalidWriteConcern)
+          end
+        end
+
+        context 'when fsync is true' do
+
+          let(:options) do
+            { w: 0, fsync: true }
+          end
+
+          it 'raises an exception' do
+            expect {
+              Mongo::WriteConcern.get(options)
+            }.to raise_error(Mongo::Error::InvalidWriteConcern)
+          end
+        end
+      end
+
+      context 'when wtimeout is also provided' do
+
+        let(:options) do
+          { w: 0, wimteout: 100 }
+        end
+
+        it 'returns an Unacknowledged write concern object' do
+          expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Unacknowledged)
+        end
+      end
+    end
+
+    context 'when w is less than 0' do
+
+      let(:options) do
+        { w: -1 }
+      end
+
+      it 'raises an exception' do
+        expect {
+          Mongo::WriteConcern.get(options)
+        }.to raise_error(Mongo::Error::InvalidWriteConcern)
+      end
+    end
+
+    context 'when w is greater than 0' do
+
+      let(:options) do
+        { w: 2, journal: true }
+      end
+
+      it 'returns an Acknowledged write concern object' do
+        expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Acknowledged)
+      end
+
+      it 'sets the options' do
+        expect(Mongo::WriteConcern.get(options).options).to eq(options)
+      end
+    end
+
+    context 'when w is a string' do
+
+      let(:options) do
+        { w: 'majority', journal: true }
+      end
+
+      it 'returns an Acknowledged write concern object' do
+        expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Acknowledged)
+      end
+
+      it 'sets the options' do
+        expect(Mongo::WriteConcern.get(options).options).to eq(options)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,22 +1,3 @@
-if RUBY_VERSION > '1.9' && RUBY_VERSION < '2.2'
-  require 'simplecov'
-  require 'coveralls'
-
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-
-  SimpleCov.start do
-    # report groups
-    add_group 'Wire Protocol', 'lib/mongo/protocol'
-    # filters
-    add_filter 'tasks'
-    add_filter 'spec'
-    add_filter 'bin'
-  end
-end
-
 TEST_SET = 'ruby-driver-rs'
 COVERAGE_MIN = 90
 CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
@@ -24,6 +5,9 @@ SERVER_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/support/sdam/**/*.yml")
 SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/rtt/*.yml")
 SERVER_SELECTION_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/selection/**/*.yml")
 CRUD_TESTS = Dir.glob("#{CURRENT_PATH}/support/crud_tests/**/*.yml")
+COMMAND_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/support/command_monitoring/**/*.yml")
+CONNECTION_STRING_TESTS = Dir.glob("#{CURRENT_PATH}/support/connection_string_tests/*.yml")
+GRIDFS_TESTS = Dir.glob("#{CURRENT_PATH}/support/gridfs_tests/*.yml")
 
 SSL_CERTS_DIR = "#{CURRENT_PATH}/support/certificates"
 CLIENT_PEM = "#{SSL_CERTS_DIR}/client.pem"
@@ -33,6 +17,9 @@ CRL_PEM = "#{SSL_CERTS_DIR}/crl.pem"
 
 require 'mongo'
 
+Mongo::Logger.logger = Logger.new($stdout)
+Mongo::Logger.logger.level = Logger::INFO
+
 require 'support/travis'
 require 'support/matchers'
 require 'support/authorization'
@@ -40,9 +27,9 @@ require 'support/server_discovery_and_monitoring'
 require 'support/server_selection_rtt'
 require 'support/server_selection'
 require 'support/crud'
-
-Mongo::Logger.logger = Logger.new($stdout)
-Mongo::Logger.logger.level = Logger::INFO
+require 'support/command_monitoring'
+require 'support/connection_string'
+require 'support/gridfs'
 
 RSpec.configure do |config|
   config.color     = true
@@ -57,6 +44,7 @@ RSpec.configure do |config|
       # database. This user will need to be authenticated in order to add any
       # more users to any other databases.
       ADMIN_UNAUTHORIZED_CLIENT.database.users.create(ROOT_USER)
+      ADMIN_UNAUTHORIZED_CLIENT.close
     rescue Exception => e
     end
     begin
@@ -67,7 +55,7 @@ RSpec.configure do |config|
       unless write_command_enabled?
         # If we are on versions less than 2.6, we need to create a user for
         # each database, since the users are not stored in the admin database
-        # but in the system.users collection on the datbases themselves. Also,
+        # but in the system.users collection on the databases themselves. Also,
         # roles in versions lower than 2.6 can only be strings, not hashes.
         begin ADMIN_AUTHORIZED_TEST_CLIENT.database.users.create(TEST_READ_WRITE_USER); rescue; end
       end
@@ -131,6 +119,15 @@ def single_seed?
   ADDRESSES.size == 1
 end
 
+# For instances where behaviour is different on different versions, we need to
+# determine in the specs if we are 3.2 or higher.
+#
+# @since 2.0.0
+def find_command_enabled?
+  $mongo_client ||= initialize_scanned_client!
+  $find_command_enabled ||= $mongo_client.cluster.servers.first.features.find_command_enabled?
+end
+
 # For instances where behaviour is different on different versions, we need to
 # determine in the specs if we are 2.6 or higher.
 #
@@ -174,6 +171,15 @@ def failing_delete_doc
                            { que: { field: 'test' } }
 end
 
+# Try running a command on the admin database to see if the mongod was started with auth.
+#
+# @since 2.2.0
+def auth_enabled?
+  $mongo_client ||= initialize_scanned_client!
+  begin; $mongo_client.use(:admin).command(getCmdLineOpts: 1); rescue; return true; end
+  false
+end
+
 # Initializes a basic scanned client to do an ismaster check.
 #
 # @since 2.0.0

data/spec/support/authorization.rb

@@ -144,8 +144,7 @@ AUTHORIZED_CLIENT = Mongo::Client.new(
 # @since 2.0.0
 UNAUTHORIZED_CLIENT = Mongo::Client.new(
   ADDRESSES,
-  TEST_OPTIONS.merge(
-    database: TEST_DB)
+  TEST_OPTIONS.merge(database: TEST_DB, monitoring: false)
 )
 
 # Provides an unauthorized mongo client on the admin database, for use in
@@ -154,8 +153,7 @@ UNAUTHORIZED_CLIENT = Mongo::Client.new(
 # @since 2.0.0
 ADMIN_UNAUTHORIZED_CLIENT = Mongo::Client.new(
   ADDRESSES,
-  TEST_OPTIONS.merge(
-    database: Mongo::Database::ADMIN)
+  TEST_OPTIONS.merge(database: Mongo::Database::ADMIN, monitoring: false)
 )
 
 # Get an authorized client on the test database logged in as the admin
@@ -166,7 +164,8 @@ ADMIN_AUTHORIZED_TEST_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
   user: ROOT_USER.name,
   password: ROOT_USER.password,
   database: TEST_DB,
-  auth_source: Mongo::Database::ADMIN
+  auth_source: Mongo::Database::ADMIN,
+  monitoring: false
 )
 
 module Authorization

data/spec/support/command_monitoring/bulkWrite.yml

@@ -0,0 +1,73 @@
+data:
+  - { _id: 1, x: 11 }
+  - { _id: 2, x: 22 }
+  - { _id: 3, x: 33 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful mixed bulk write"
+    operation:
+      name: "bulkWrite"
+      arguments:
+        requests:
+          - insertOne: 
+              document: { _id: 4, x: 44 }
+          - updateOne:
+              filter: { _id: 3 }
+              update: { $set: { x: 333 } }
+    expectations:
+      -
+        command_started_event:
+          command:
+            insert: *collection_name
+            documents:
+              - { _id: 4, x: 44 }
+            ordered: true
+          command_name: "insert"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1 }
+          command_name: "insert"
+      -
+        command_started_event:
+          command:
+            update: *collection_name
+            updates:
+              - { q: {_id: 3 }, u: { $set: { x: 333 } }, upsert: false, multi: false }
+            ordered: true
+          command_name: "update"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1 }
+          command_name: "update"
+  -
+    description: "A successful unordered bulk write with an unacknowledged write concern"
+    comment: "On a 2.4 server, no GLE is sent and requires a client-side manufactored reply"
+    operation:
+      name: "bulkWrite"
+      arguments:
+        requests:
+          - insertOne: 
+              document: { _id: 4, x: 44 }
+        ordered: false
+        writeConcern: { w: 0 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            insert: *collection_name
+            documents:
+              - { _id: 4, x: 44 }
+            ordered: false
+            writeConcern: { w: 0 }
+          command_name: "insert"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0 }
+          command_name: "insert"

data/spec/support/command_monitoring/command.yml

@@ -0,0 +1,42 @@
+data:
+  - { _id: 1, x: 11 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful command"
+    operation:
+      name: "count"
+      arguments:
+        filter: { _id: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            count: *collection_name
+            query: { _id: 1 }
+          command_name: "count"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1 }
+          command_name: "count"
+  -
+    description: "A failed command event"
+    operation:
+      name: "count"
+      arguments:
+        filter: { $or: true }
+    expectations:
+      -
+        command_started_event:
+          command:
+            count: *collection_name
+            query: { $or: true }
+          command_name: "count"
+          database_name: *database_name
+      -
+        command_failed_event:
+          command_name: "count"

data/spec/support/command_monitoring/deleteMany.yml

@@ -0,0 +1,55 @@
+data:
+  - { _id: 1, x: 11 }
+  - { _id: 2, x: 22 }
+  - { _id: 3, x: 33 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful delete many"
+    operation:
+      name: "deleteMany"
+      arguments:
+        filter:
+          _id: { $gt: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              - { q: { _id: { $gt: 1 }}, limit: 0 }
+            ordered: true
+          command_name: "delete"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 2 }
+          command_name: "delete"
+  -
+    description: "A successful delete many command with write errors"
+    operation:
+      name: "deleteMany"
+      arguments:
+        filter:
+          _id: { $nothing: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              - { q: { _id: { $nothing: 1 }}, limit: 0 }
+            ordered: true
+          command_name: "delete"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            n: 0
+            writeErrors:
+              - { index: 0, code: 42, errmsg: "" }
+          command_name: "delete"

data/spec/support/command_monitoring/deleteOne.yml

@@ -0,0 +1,55 @@
+data:
+  - { _id: 1, x: 11 }
+  - { _id: 2, x: 22 }
+  - { _id: 3, x: 33 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful delete one"
+    operation:
+      name: "deleteOne"
+      arguments:
+        filter:
+          _id: { $gt: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              - { q: { _id: { $gt: 1 }}, limit: 1 }
+            ordered: true
+          command_name: "delete"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1 }
+          command_name: "delete"
+  -
+    description: "A successful delete one command with write errors"
+    operation:
+      name: "deleteOne"
+      arguments:
+        filter:
+          _id: { $nothing: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              - { q: { _id: { $nothing: 1 }}, limit: 1 }
+            ordered: true
+          command_name: "delete"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            n: 0
+            writeErrors:
+              - { index: 0, code: 42, errmsg: "" }
+          command_name: "delete"