mongo 2.0.6 → 2.1.0

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,11 @@ 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
+
+    after do
+      server.disconnect!
     end
 
     context 'when the other is not a server' do
@@ -36,7 +44,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 +59,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
@@ -61,16 +69,57 @@ describe Mongo::Server do
     end
   end
 
+  describe '#connectable?' do
+
+    context 'when the server is connectable' do
+
+      let(:server) do
+        described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
+      end
+
+      after do
+        server.disconnect!
+      end
+
+      it 'returns true' do
+        expect(server).to be_connectable
+      end
+    end
+
+    context 'when the server is not connectable' do
+
+      let(:bad_address) do
+        Mongo::Address.new('127.0.0.1:666')
+      end
+
+      let(:server) do
+        described_class.new(bad_address, cluster, monitoring, listeners, TEST_OPTIONS)
+      end
+
+      before do
+        server.disconnect!
+      end
+
+      it 'returns false' do
+        expect(server).to_not be_connectable
+      end
+    end
+  end
+
   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
       server.context
     end
 
+    after do
+      server.disconnect!
+    end
+
     it 'returns a new server context' do
       expect(context.server).to eq(server)
     end
@@ -79,7 +128,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 +140,17 @@ 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
+
+    after do
+      server.disconnect!
     end
 
     it 'sets the address host' do
@@ -110,13 +169,17 @@ 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
       server.pool
     end
 
+    after do
+      server.disconnect!
+    end
+
     it 'returns the connection pool for the server' do
       expect(pool).to be_a(Mongo::Server::ConnectionPool)
     end
@@ -125,11 +188,34 @@ 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
+
+    after do
+      server.disconnect!
     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
+
+    after do
+      server.disconnect!
+    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,18 +12,43 @@ 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
 
-      before do
-        socket.connect!
+
+      context 'when connecting the tcp socket is successful' do
+
+        before do
+          socket.connect!
+        end
+
+        it 'connects to the server' do
+          expect(socket).to be_alive
+        end
       end
 
-      it 'connects to the server' do
-        expect(socket).to be_alive
+      context 'when connecting the tcp socket raises an exception' do
+
+        before do
+          tcp_socket = socket.instance_variable_get(:@tcp_socket)
+          allow(tcp_socket).to receive(:connect).and_raise(Mongo::Error::SocketTimeoutError)
+        end
+
+        let!(:result) do
+          begin
+            socket.connect!
+          rescue => e
+            e
+          end
+        end
+
+        it 'raises an exception' do
+          expect(result).to be_a(Mongo::Error::SocketTimeoutError)
+        end
       end
     end
 
@@ -31,27 +56,29 @@ 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
 
       it 'raises an exception' do
         expect {
           socket.connect!
-        }.to raise_error
+        }.to raise_exception(OpenSSL::PKey::RSAError)
       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 +90,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

data/spec/mongo/socket/unix_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Mongo::Socket::Unix do
+
+  let(:socket) do
+    described_class.new("/tmp/mongodb-27017.sock", 5)
+  end
+
+  describe '#connect!' do
+
+    before do
+      socket.connect!
+    end
+
+    after do
+      socket.close
+    end
+
+    it 'connects to the server' do
+      expect(socket).to be_alive
+    end
+  end
+
+  describe '#alive?' do
+
+    context 'when the socket is connected' do
+
+      before do
+        socket.connect!
+      end
+
+      after do
+        socket.close
+      end
+
+      it 'returns true' do
+        expect(socket).to be_alive
+      end
+    end
+
+    context 'when the socket is not connected' do
+
+      before do
+        socket.close
+      end
+
+      it 'raises error' do
+        expect { socket.alive? }.to raise_error(IOError)
+      end
+    end
+  end
+end