mongo 2.0.6 → 2.1.0.beta

data/spec/mongo/server/connection_pool_spec.rb

@@ -2,14 +2,26 @@ require 'spec_helper'
 
 describe Mongo::Server::ConnectionPool do
 
+  let(:options) do
+    TEST_OPTIONS.merge(max_pool_size: 2)
+  end
+
   let(:address) do
     Mongo::Address.new('127.0.0.1:27017')
   end
 
+  let(:monitoring) do
+    Mongo::Monitoring.new
+  end
+
+  let(:listeners) do
+    Mongo::Event::Listeners.new
+  end
+
   describe '#checkin' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
     end
 
     let!(:pool) do
@@ -39,7 +51,7 @@ describe Mongo::Server::ConnectionPool do
   describe '#checkout' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
     end
 
     let!(:pool) do
@@ -71,7 +83,7 @@ describe Mongo::Server::ConnectionPool do
     context 'when a connection is checked out on a different thread' do
 
       let!(:connection) do
-        Thread.new { pool.checkout }.value
+        Thread.new { pool.checkout }.join
       end
 
       it 'returns a new connection' do
@@ -87,7 +99,7 @@ describe Mongo::Server::ConnectionPool do
   describe '.get' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
     end
 
     let!(:pool) do
@@ -102,7 +114,7 @@ describe Mongo::Server::ConnectionPool do
   describe '#inspect' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
     end
 
     let!(:pool) do
@@ -121,7 +133,7 @@ describe Mongo::Server::ConnectionPool do
   describe '#with_connection' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
     end
 
     let!(:pool) do

data/spec/mongo/server/connection_spec.rb

@@ -6,8 +6,16 @@ describe Mongo::Server::Connection do
     Mongo::Address.new(DEFAULT_ADDRESS)
   end
 
+  let(:monitoring) do
+    Mongo::Monitoring.new
+  end
+
+  let(:listeners) do
+    Mongo::Event::Listeners.new
+  end
+
   let(:server) do
-    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+    Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
   end
 
   describe '#connect!' do
@@ -164,7 +172,7 @@ describe Mongo::Server::Connection do
       end
 
       after do
-        authorized_collection.find.delete_many
+        authorized_collection.delete_many
       end
 
       it 'it dispatchs the message to the socket' do
@@ -187,7 +195,7 @@ describe Mongo::Server::Connection do
       end
 
       after do
-        authorized_collection.find.delete_many
+        authorized_collection.delete_many
       end
 
       it 'it dispatchs the message to the socket' do
@@ -225,7 +233,7 @@ describe Mongo::Server::Connection do
       end
 
       after do
-        authorized_collection.find.delete_many
+        authorized_collection.delete_many
       end
 
       it 'disconnects the connection' do

data/spec/mongo/server/description_spec.rb

@@ -31,6 +31,10 @@ describe Mongo::Server::Description do
     Mongo::Address.new('127.0.0.1:27017')
   end
 
+  let(:monitoring) do
+    Mongo::Monitoring.new
+  end
+
   describe '#arbiter?' do
 
     context 'when the server is an arbiter' do
@@ -583,7 +587,7 @@ describe Mongo::Server::Description do
     end
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), listeners)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners)
     end
 
     let(:description) do
@@ -604,7 +608,7 @@ describe Mongo::Server::Description do
       end
 
       let(:server) do
-        Mongo::Server.new(other_address, double('cluster'), listeners)
+        Mongo::Server.new(other_address, double('cluster'), monitoring, listeners)
       end
 
       it 'returns false' do
@@ -628,7 +632,7 @@ describe Mongo::Server::Description do
     end
 
     let(:server) do
-      Mongo::Server.new(server_address, double('cluster'), listeners)
+      Mongo::Server.new(server_address, double('cluster'), monitoring, listeners)
     end
 
     context 'when the server is included in the description hosts list' do

data/spec/mongo/server/monitor_spec.rb

@@ -141,4 +141,34 @@ describe Mongo::Server::Monitor do
       expect(monitor.description).to_not be_nil
     end
   end
+
+  describe '#restart!' do
+
+    let(:monitor) do
+      described_class.new(address, listeners, TEST_OPTIONS)
+    end
+
+    let!(:thread) do
+      monitor.run!
+    end
+
+    context 'when the monitor is already running' do
+
+      it 'does not create a new thread' do
+        expect(monitor.restart!).to be(thread)
+      end
+    end
+
+    context 'when the monitor is not already running' do
+
+      before do
+        monitor.stop!
+        sleep(1)
+      end
+
+      it 'creates a new thread' do
+        expect(monitor.restart!).not_to be(thread)
+      end
+    end
+  end
 end

data/spec/mongo/server_discovery_and_monitoring_spec.rb

@@ -34,9 +34,10 @@ describe 'Server Discovery and Monitoring' do
 
           # The constructor keeps the same API, but does not instantiate a
           # monitor and run it.
-          def initialize(address, cluster, event_listeners, options = {})
+          def initialize(address, cluster, monitoring, event_listeners, options = {})
             @address = address
             @cluster = cluster
+            @monitoring = monitoring
             @options = options.freeze
             @monitor = Monitor.new(address, event_listeners, options)
           end
@@ -59,9 +60,10 @@ describe 'Server Discovery and Monitoring' do
         class Mongo::Server
 
           # Returns the constructor to its original implementation.
-          def initialize(address, cluster, event_listeners, options = {})
+          def initialize(address, cluster, monitoring, event_listeners, options = {})
             @address = address
             @cluster = cluster
+            @monitoring = monitoring
             @options = options.freeze
             @monitor = Monitor.new(address, event_listeners, options)
             @monitor.scan!
@@ -96,8 +98,13 @@ describe 'Server Discovery and Monitoring' do
               # For each response in the phase, we need to change that server's
               # description.
               server = find_server(@client, response.address)
-              server = Mongo::Server.new(Mongo::Address.new(response.address), @client.cluster,
-                                         @client.cluster.send(:event_listeners), @client.cluster.options) unless server
+              server = Mongo::Server.new(
+                Mongo::Address.new(response.address),
+                @client.cluster,
+                @client.instance_variable_get(:@monitoring),
+                @client.cluster.send(:event_listeners),
+                @client.cluster.options
+              ) unless server
               monitor = server.instance_variable_get(:@monitor)
               description = monitor.inspector.run(server.description, response.ismaster, 0.5)
               monitor.instance_variable_set(:@description, description)

data/spec/mongo/server_selection_spec.rb

@@ -14,6 +14,14 @@ describe 'Server Selection' do
         spec.type.new({})
       end
 
+      let(:monitoring) do
+        Mongo::Monitoring.new
+      end
+
+      let(:listeners) do
+        Mongo::Event::Listeners.new
+      end
+
       let(:cluster) do
         double('cluster').tap do |c|
           allow(c).to receive(:topology).and_return(topology)
@@ -26,7 +34,7 @@ describe 'Server Selection' do
       let(:candidate_servers) do
         spec.candidate_servers.collect do |server|
           address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
+          Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
             allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
@@ -38,7 +46,7 @@ describe 'Server Selection' do
       let(:in_latency_window) do
         spec.in_latency_window.collect do |server|
           address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
+          Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
             allow(s).to receive(:tags).and_return(server['tags'])
           end
@@ -57,18 +65,18 @@ describe 'Server Selection' do
       end
 
       context 'Valid read preference and matching server available', if: spec.server_available? do
-      
+
         it 'Finds all suitable servers in the latency window', if: spec.replica_set? do
-          expect(server_selector.send(:select, cluster.servers)).to eq(in_latency_window)   
+          expect(server_selector.send(:select, cluster.servers)).to eq(in_latency_window)
         end
-      
+
         it 'Finds the most suitable server in the latency window' do
           expect(in_latency_window).to include(server_selector.select_server(cluster))
         end
       end
 
       context 'No matching server available', if: !spec.server_available? do
-      
+
         it 'Raises exception' do
           expect do
             server_selector.select_server(cluster)

data/spec/mongo/server_spec.rb

@@ -10,6 +10,10 @@ describe Mongo::Server do
     Mongo::Event::Listeners.new
   end
 
+  let(:monitoring) do
+    Mongo::Monitoring.new
+  end
+
   let(:address) do
     Mongo::Address.new('127.0.0.1:27017')
   end
@@ -17,7 +21,7 @@ describe Mongo::Server do
   describe '#==' do
 
     let(:server) do
-      described_class.new(address, cluster, listeners, TEST_OPTIONS)
+      described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
     end
 
     context 'when the other is not a server' do
@@ -36,7 +40,7 @@ describe Mongo::Server do
       context 'when the addresses match' do
 
         let(:other) do
-          described_class.new(address, cluster, listeners, TEST_OPTIONS)
+          described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
         end
 
         it 'returns true' do
@@ -51,7 +55,7 @@ describe Mongo::Server do
         end
 
         let(:other) do
-          described_class.new(other_address, cluster, listeners, TEST_OPTIONS)
+          described_class.new(other_address, cluster, monitoring, listeners, TEST_OPTIONS)
         end
 
         it 'returns false' do
@@ -64,7 +68,7 @@ describe Mongo::Server do
   describe '#context' do
 
     let(:server) do
-      described_class.new(address, cluster, listeners, TEST_OPTIONS)
+      described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:context) do
@@ -79,7 +83,7 @@ describe Mongo::Server do
   describe '#disconnect!' do
 
     let(:server) do
-      described_class.new(address, cluster, listeners, TEST_OPTIONS)
+      described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
     end
 
     it 'stops the monitor instance' do
@@ -91,7 +95,7 @@ describe Mongo::Server do
   describe '#initialize' do
 
     let(:server) do
-      described_class.new(address, cluster, listeners, TEST_OPTIONS.merge(:heartbeat_frequency => 5))
+      described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS.merge(:heartbeat_frequency => 5))
     end
 
     it 'sets the address host' do
@@ -110,7 +114,7 @@ describe Mongo::Server do
   describe '#pool' do
 
     let(:server) do
-      described_class.new(address, cluster, listeners, TEST_OPTIONS)
+      described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:pool) do
@@ -125,11 +129,26 @@ describe Mongo::Server do
   describe '#scan!' do
 
     let(:server) do
-      described_class.new(address, cluster, listeners, TEST_OPTIONS)
+      described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
     end
 
     it 'forces a scan on the monitor' do
       expect(server.scan!).to eq(server.description)
     end
   end
+
+  describe '#reconnect!' do
+
+    let(:server) do
+      described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
+    end
+
+    before do
+      expect(server.monitor).to receive(:restart!).and_call_original
+    end
+
+    it 'restarts the monitor and returns true' do
+      expect(server.reconnect!).to be(true)
+    end
+  end
 end

data/spec/mongo/socket/ssl_spec.rb

@@ -12,9 +12,10 @@ describe Mongo::Socket::SSL do
 
       let(:options) do
         {
-          :ssl => true,
-          :ssl_cert => CLIENT_PEM,
-          :ssl_key => CLIENT_PEM
+            :ssl => true,
+            :ssl_cert => CLIENT_PEM,
+            :ssl_key => CLIENT_PEM,
+            :ssl_verify => false
         }
       end
 
@@ -31,9 +32,10 @@ describe Mongo::Socket::SSL do
 
       let(:options) do
         {
-          :ssl => true,
-          :ssl_cert => CLIENT_PEM,
-          :ssl_key => CRL_PEM
+            :ssl => true,
+            :ssl_cert => CLIENT_PEM,
+            :ssl_key => CRL_PEM,
+            :ssl_verify => false
         }
       end
 
@@ -44,14 +46,15 @@ describe Mongo::Socket::SSL do
       end
     end
 
-    context 'when a CA certificate is provided', if: running_ssl? && testing_locally? do
+    context 'when a CA certificate is provided', if: testing_ssl_locally? do
 
       let(:options) do
         {
             :ssl => true,
             :ssl_cert => CLIENT_PEM,
             :ssl_key => CLIENT_PEM,
-            :ssl_ca_cert => CA_PEM
+            :ssl_ca_cert => CA_PEM,
+            :ssl_verify => true
         }
       end
 
@@ -63,5 +66,88 @@ describe Mongo::Socket::SSL do
         expect(socket).to be_alive
       end
     end
+
+    context 'when a CA certificate is not provided', if: testing_ssl_locally? do
+
+      let(:options) do
+        {
+            :ssl => true,
+            :ssl_cert => CLIENT_PEM,
+            :ssl_key => CLIENT_PEM,
+            :ssl_verify => true
+        }
+      end
+
+      before do
+        ENV['SSL_CERT_FILE']= CA_PEM
+        socket.connect!
+      end
+
+      it 'uses the default cert store' do
+        expect(socket).to be_alive
+      end
+    end
+
+    context 'when ssl_verify is not specified', if: testing_ssl_locally? do
+
+      let(:options) do
+        {
+            :ssl => true,
+            :ssl_cert => CLIENT_PEM,
+            :ssl_key => CLIENT_PEM,
+            :ssl_ca_cert => CA_PEM
+        }
+      end
+
+      before do
+        socket.connect!
+      end
+
+      it 'verifies the server certificate' do
+        expect(socket).to be_alive
+      end
+    end
+
+    context 'when ssl_verify is true', if: testing_ssl_locally? do
+
+      let(:options) do
+        {
+            :ssl => true,
+            :ssl_cert => CLIENT_PEM,
+            :ssl_key => CLIENT_PEM,
+            :ssl_ca_cert => CA_PEM,
+            :ssl_verify => true
+        }
+      end
+
+      before do
+        socket.connect!
+      end
+
+      it 'verifies the server certificate' do
+        expect(socket).to be_alive
+      end
+    end
+
+    context 'when ssl_verify is false' do
+
+      let(:options) do
+        {
+            :ssl => true,
+            :ssl_cert => CLIENT_PEM,
+            :ssl_key => CLIENT_PEM,
+            :ssl_ca_cert => 'invalid',
+            :ssl_verify => false
+        }
+      end
+
+      before do
+        socket.connect!
+      end
+
+      it 'does not verify the server certificate' do
+        expect(socket).to be_alive
+      end
+    end
   end
 end