mongo 2.4.2 → 2.4.3

data/lib/mongo/write_concern/normalizable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016 MongoDB, Inc.
+# Copyright (C) 2014-2017 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/lib/mongo/write_concern/unacknowledged.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016 MongoDB, Inc.
+# Copyright (C) 2014-2017 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/mongo.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
 
   s.executables       = ['mongo_console']
   s.require_paths     = ['lib']
-  s.has_rdoc          = 'yard'
   s.bindir            = 'bin'
 
   s.add_dependency 'bson', '>=4.2.1', '<5.0.0'

data/spec/mongo/address_spec.rb

@@ -206,17 +206,18 @@ describe Mongo::Address do
 
   describe "#socket" do
 
-    context 'when providing a DNS entry that resolves to both IPv6 and IPv4' do
+    let(:address) do
+      default_address
+    end
 
-      let(:address) do
-        default_address
-      end
+    let(:host) do
+      address.host
+    end
 
-      let(:host) do
-        address.host
-      end
+    context 'when providing a DNS entry that resolves to both IPv6 and IPv4' do
 
       before do
+        address.instance_variable_set(:@resolver, nil)
         allow(::Socket).to receive(:getaddrinfo).and_return(
           [ ["AF_INET6", 0, '::1', '::1', ::Socket::AF_INET6, 1, 6],
             ["AF_INET", 0, host, host, ::Socket::AF_INET, 1, 6]]

data/spec/mongo/client_spec.rb

@@ -238,7 +238,7 @@ describe Mongo::Client do
         end
 
         let(:client) do
-          described_class.new(['127.0.0.1:27017'], options)
+          described_class.new(['127.0.0.1:27017'], TEST_OPTIONS.merge(options))
         end
 
         it 'sets the ssl option' do

data/spec/mongo/collection/view/aggregation_spec.rb

@@ -372,6 +372,17 @@ describe Mongo::Collection::View::Aggregation do
       end
     end
 
+    context 'when a hint is specified' do
+
+      let(:options) do
+        { 'hint' => { 'y' => 1 } }
+      end
+
+      it 'includes the option in the spec' do
+        expect(aggregation.send(:aggregate_spec)[:selector][:hint]).to eq(options['hint'])
+      end
+    end
+
     context 'when use_cursor is set' do
 
       context 'when use_cursor is true' do

data/spec/mongo/collection_spec.rb

@@ -1170,6 +1170,17 @@ describe Mongo::Collection do
         expect(authorized_collection.aggregate([], options).options).to eq(BSON::Document.new(options))
       end
 
+      context 'when a hint is provided' do
+
+        let(:options) do
+          { 'hint' => { 'y' => 1 } }
+        end
+
+        it 'sets the options on the Aggregation object' do
+          expect(authorized_collection.aggregate([], options).options).to eq(options)
+        end
+      end
+
       context 'when collation is provided' do
 
         before do

data/spec/mongo/server/connection_spec.rb

@@ -38,8 +38,8 @@ describe Mongo::Server::Connection do
   end
 
   after do
-    expect(cluster).to receive(:pool).with(server).and_return(pool)
-    expect(pool).to receive(:disconnect!).and_return(true)
+    allow(cluster).to receive(:pool).with(server).and_return(pool)
+    allow(pool).to receive(:disconnect!).and_return(true)
     server.disconnect!
   end
 
@@ -432,6 +432,7 @@ describe Mongo::Server::Connection do
       after do
         sleep(0.5)
         authorized_collection.delete_many
+        client.close
       end
 
       it 'raises a timeout when it expires' do
@@ -670,4 +671,109 @@ describe Mongo::Server::Connection do
       end
     end
   end
+
+  context 'when different timeout options are set' do
+
+    let(:client) do
+      authorized_client.with(options)
+    end
+
+    let(:server) do
+      client.cluster.next_primary
+    end
+
+    let(:address) do
+      server.address
+    end
+
+    let(:connection) do
+      described_class.new(server, server.options)
+    end
+
+    after do
+      client.close
+    end
+
+    context 'when a connect_timeout is in the options' do
+
+      context 'when a socket_timeout is in the options' do
+
+        let(:options) do
+          TEST_OPTIONS.merge(connect_timeout: 3, socket_timeout: 5)
+        end
+
+        before do
+          connection.connect!
+        end
+
+        it 'uses the connect_timeout for the address' do
+          expect(connection.address.send(:connect_timeout)).to eq(3)
+        end
+
+        it 'uses the socket_timeout as the socket_timeout' do
+          expect(connection.send(:socket).timeout).to eq(5)
+        end
+      end
+
+      context 'when a socket_timeout is not in the options' do
+
+        let(:options) do
+          TEST_OPTIONS.merge(connect_timeout: 3, socket_timeout: nil)
+        end
+
+        before do
+          connection.connect!
+        end
+
+        it 'uses the connect_timeout for the address' do
+          expect(connection.address.send(:connect_timeout)).to eq(3)
+        end
+
+        it 'does not use a socket_timeout' do
+          expect(connection.send(:socket).timeout).to be(nil)
+        end
+      end
+    end
+
+    context 'when a connect_timeout is not in the options' do
+
+      context 'when a socket_timeout is in the options' do
+
+        let(:options) do
+          TEST_OPTIONS.merge(connect_timeout: nil, socket_timeout: 5)
+        end
+
+        before do
+          connection.connect!
+        end
+
+        it 'uses the default connect_timeout for the address' do
+          expect(connection.address.send(:connect_timeout)).to eq(10)
+        end
+
+        it 'uses the socket_timeout' do
+          expect(connection.send(:socket).timeout).to eq(5)
+        end
+      end
+
+      context 'when a socket_timeout is not in the options' do
+
+        let(:options) do
+          TEST_OPTIONS.merge(connect_timeout: nil, socket_timeout: nil)
+        end
+
+        before do
+          connection.connect!
+        end
+
+        it 'uses the default connect_timeout for the address' do
+          expect(connection.address.send(:connect_timeout)).to eq(10)
+        end
+
+        it 'does not use a socket_timeout' do
+          expect(connection.send(:socket).timeout).to be(nil)
+        end
+      end
+    end
+  end
 end

data/spec/mongo/server/description_spec.rb

@@ -23,6 +23,7 @@ describe Mongo::Server::Description do
       'maxWireVersion' => 2,
       'minWireVersion' => 0,
       'localTime' => Time.now,
+      'lastWrite' => { 'lastWriteDate' => Time.now },
       'ok' => 1
     }
   end
@@ -838,7 +839,10 @@ describe Mongo::Server::Description do
     end
 
     let(:other) do
-      described_class.new(address, replica.merge('localTime' => 1))
+      described_class.new(address, replica.merge(
+        'localTime' => 1,
+        'lastWrite' => { 'lastWriteDate' => 1 }
+      ))
     end
 
     it 'excludes certain fields' do

data/spec/mongo/server/monitor/connection_spec.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+
+describe Mongo::Server::Monitor::Connection do
+
+  let(:client) do
+    authorized_client.with(options)
+  end
+
+  let(:address) do
+    client.cluster.next_primary.address
+  end
+
+  let(:cluster) do
+    double('cluster').tap do |cl|
+      allow(cl).to receive(:topology).and_return(double('topology'))
+      allow(cl).to receive(:app_metadata).and_return(Mongo::Cluster::AppMetadata.new(authorized_client.cluster))
+    end
+  end
+
+  let(:server) do
+    Mongo::Server.new(address,
+                      cluster,
+                      Mongo::Monitoring.new(monitoring: false),
+                      Mongo::Event::Listeners.new, options)
+  end
+
+  let(:connection) do
+    server.monitor.connection
+  end
+
+  after do
+    client.close
+  end
+
+  context 'when a connect_timeout is in the options' do
+
+    context 'when a socket_timeout is in the options' do
+
+      let(:options) do
+        TEST_OPTIONS.merge(connect_timeout: 3, socket_timeout: 5)
+      end
+
+      before do
+        connection.connect!
+      end
+
+      it 'uses the connect_timeout for the address' do
+        expect(connection.address.send(:connect_timeout)).to eq(3)
+      end
+
+      it 'uses the connect_timeout as the socket_timeout' do
+        expect(connection.send(:socket).timeout).to eq(3)
+      end
+    end
+
+    context 'when a socket_timeout is not in the options' do
+
+      let(:options) do
+        TEST_OPTIONS.merge(connect_timeout: 3, socket_timeout: nil)
+      end
+
+      before do
+        connection.connect!
+      end
+
+      it 'uses the connect_timeout for the address' do
+        expect(connection.address.send(:connect_timeout)).to eq(3)
+      end
+
+      it 'uses the connect_timeout as the socket_timeout' do
+        expect(connection.send(:socket).timeout).to eq(3)
+      end
+    end
+  end
+
+  context 'when a connect_timeout is not in the options' do
+
+    context 'when a socket_timeout is in the options' do
+
+      let(:options) do
+        TEST_OPTIONS.merge(connect_timeout: nil, socket_timeout: 5)
+      end
+
+      before do
+        connection.connect!
+      end
+
+      it 'uses the default connect_timeout for the address' do
+        expect(connection.address.send(:connect_timeout)).to eq(10)
+      end
+
+      it 'uses the connect_timeout as the socket_timeout' do
+        expect(connection.send(:socket).timeout).to eq(10)
+      end
+    end
+
+    context 'when a socket_timeout is not in the options' do
+
+      let(:options) do
+        TEST_OPTIONS.merge(connect_timeout: nil, socket_timeout: nil)
+      end
+
+      before do
+        connection.connect!
+      end
+
+      it 'uses the default connect_timeout for the address' do
+        expect(connection.address.send(:connect_timeout)).to eq(10)
+      end
+
+      it 'uses the connect_timeout as the socket_timeout' do
+        expect(connection.send(:socket).timeout).to eq(10)
+      end
+    end
+  end
+end

data/spec/mongo/socket/ssl_spec.rb

@@ -2,22 +2,24 @@ require 'spec_helper'
 
 describe Mongo::Socket::SSL, if: running_ssl? do
 
-  let(:family) do
-    resolver = default_address.instance_variable_get(:@resolver)
-    Mongo::Address::FAMILY_MAP.key(resolver.class)
+  let(:address) do
+    default_address
+  end
+
+  let(:resolver) do
+    address.instance_variable_get(:@resolver)
+  end
+
+  let(:socket_timeout) do
+    1
   end
 
   let(:socket) do
-    described_class.new(*default_address.to_s.split(":"), default_address.host, 5, family, options)
+    resolver.socket(socket_timeout, options)
   end
 
   let(:options) do
-    {
-      :ssl => true,
-      :ssl_cert => CLIENT_CERT_PEM,
-      :ssl_key => CLIENT_KEY_PEM,
-      :ssl_verify => false
-    }
+    SSL_OPTIONS
   end
 
   let (:key_string) do
@@ -276,7 +278,7 @@ describe Mongo::Socket::SSL, if: running_ssl? do
       end
     end
 
-    context 'when ruby version is < 2.4.1', if: RUBY_VERSION < '2.4.1' do
+    context 'when ruby version is < 2.4.1', if: (RUBY_VERSION < '2.4.1' && running_ssl?) do
 
       context 'when a key is passed, but it is not of the right type' do
 
@@ -300,7 +302,7 @@ describe Mongo::Socket::SSL, if: running_ssl? do
 
     # Note that as of MRI 2.4, Creating a socket with the wrong key type raises
     # a NoMethodError because #private? is attempted to be called on the key.
-    context 'when ruby version is >= 2.4.1', if: RUBY_VERSION >= '2.4.1' do
+    context 'when ruby version is >= 2.4.1', if: (RUBY_VERSION >= '2.4.1' && running_ssl?) do
 
       context 'when a key is passed, but it is not of the right type' do
 

data/spec/support/authorization.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2016 MongoDB, Inc.
+# Copyright (C) 2009-2017 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -79,7 +79,9 @@ BASE_OPTIONS = {
                   max_pool_size: 1,
                   write: WRITE_CONCERN,
                   heartbeat_frequency: 20,
-                  max_read_retries: 5
+                  max_read_retries: 5,
+                  wait_queue_timeout: 2,
+                  connect_timeout: 3
                }
 
 # Options for test suite clients.

data/spec/support/command_monitoring.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016 MongoDB, Inc.
+# Copyright (C) 2014-2017 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/spec/support/connection_string.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016 MongoDB, Inc.
+# Copyright (C) 2014-2017 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/spec/support/connection_string_tests/invalid-uris.yml

@@ -167,6 +167,14 @@ tests:
         hosts: ~
         auth: ~
         options: ~
+    -
+        description: "Username with password containing an unescaped colon"
+        uri: "mongodb://alice:foo:bar@127.0.0.1"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
     -
         description: "Username containing an unescaped at-sign"
         uri: "mongodb://alice@@127.0.0.1"
@@ -183,6 +191,30 @@ tests:
         hosts: ~
         auth: ~
         options: ~
+    -
+        description: "Username containing an unescaped slash"
+        uri: "mongodb://alice/@127.0.0.1/db"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Username containing unescaped slash with password"
+        uri: "mongodb://alice/bob:foo@127.0.0.1/db"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Username with password containing an unescaped slash"
+        uri: "mongodb://alice:foo/bar@127.0.0.1/db"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
     -
         description: "Host with unescaped slash"
         uri: "mongodb:///tmp/mongodb-27017.sock/"