mongo 2.1.0.rc0 → 2.1.0

data/spec/mongo/server_selection_spec.rb

@@ -39,6 +39,7 @@ describe 'Server Selection' do
             allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
             allow(s).to receive(:primary?).and_return(server['type'] == 'RSPrimary')
+            allow(s).to receive(:connectable?).and_return(true)
           end
         end
       end
@@ -49,6 +50,7 @@ describe 'Server Selection' do
           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(:connectable?).and_return(true)
           end
         end
       end

data/spec/mongo/server_selector/nearest_spec.rb

@@ -11,6 +11,7 @@ describe Mongo::ServerSelector::Nearest do
   end
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector with sensitive data in its options'
 
   describe '#to_mongos' do
 

data/spec/mongo/server_selector/primary_preferred_spec.rb

@@ -11,6 +11,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
   end
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector with sensitive data in its options'
 
   describe '#to_mongos' do
 

data/spec/mongo/server_selector/primary_spec.rb

@@ -9,6 +9,7 @@ describe Mongo::ServerSelector::Primary do
   it_behaves_like 'a server selector mode' do
     let(:slave_ok) { false }
   end
+  it_behaves_like 'a server selector with sensitive data in its options'
 
   describe '#tag_sets' do
 
@@ -20,10 +21,15 @@ describe Mongo::ServerSelector::Primary do
     end
 
     context 'tag sets provided' do
-      let(:tag_sets) { [tag_set] }
+
+      let(:tag_sets) do
+        [ tag_set ]
+      end
 
       it 'raises an error' do
-        expect{selector.tag_sets}.to raise_error
+        expect {
+          selector.tag_sets
+        }.to raise_error(Mongo::Error::InvalidServerPreference)
       end
     end
   end

data/spec/mongo/server_selector/secondary_preferred_spec.rb

@@ -9,6 +9,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
   it_behaves_like 'a server selector mode' do
     let(:slave_ok) { true }
   end
+  it_behaves_like 'a server selector with sensitive data in its options'
 
   it_behaves_like 'a server selector accepting tag sets'
 

data/spec/mongo/server_selector/secondary_spec.rb

@@ -9,6 +9,7 @@ describe Mongo::ServerSelector::Secondary do
   it_behaves_like 'a server selector mode' do
     let(:slave_ok) { true }
   end
+  it_behaves_like 'a server selector with sensitive data in its options'
 
   it_behaves_like 'a server selector accepting tag sets'
 

data/spec/mongo/server_spec.rb

@@ -24,6 +24,10 @@ describe Mongo::Server do
       described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
     end
 
+    after do
+      server.disconnect!
+    end
+
     context 'when the other is not a server' do
 
       let(:other) do
@@ -65,6 +69,43 @@ 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
@@ -75,6 +116,10 @@ describe Mongo::Server do
       server.context
     end
 
+    after do
+      server.disconnect!
+    end
+
     it 'returns a new server context' do
       expect(context.server).to eq(server)
     end
@@ -95,7 +140,17 @@ describe Mongo::Server do
   describe '#initialize' do
 
     let(:server) do
-      described_class.new(address, cluster, monitoring, 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
@@ -121,6 +176,10 @@ describe Mongo::Server 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
@@ -132,6 +191,10 @@ describe Mongo::Server do
       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
@@ -147,6 +210,10 @@ describe Mongo::Server 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

data/spec/mongo/socket/ssl_spec.rb

@@ -19,12 +19,36 @@ describe Mongo::Socket::SSL do
         }
       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
 
@@ -42,7 +66,7 @@ describe Mongo::Socket::SSL do
       it 'raises an exception' do
         expect {
           socket.connect!
-        }.to raise_error
+        }.to raise_exception(OpenSSL::PKey::RSAError)
       end
     end
 

data/spec/mongo/uri_spec.rb

@@ -365,7 +365,7 @@ describe 'invalid uris' do
 
       context 'numerical w value' do
         let(:options) { 'w=1' }
-        let(:concern) { { :w => 1 } }
+        let(:concern) { Mongo::Options::Redacted.new(:w => 1)}
 
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
@@ -374,7 +374,7 @@ describe 'invalid uris' do
 
       context 'w=majority' do
         let(:options) { 'w=majority' }
-        let(:concern) { { :w => :majority } }
+        let(:concern) { Mongo::Options::Redacted.new(:w => :majority) }
 
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
@@ -383,7 +383,7 @@ describe 'invalid uris' do
 
       context 'journal' do
         let(:options) { 'journal=true' }
-        let(:concern) { { :j => true } }
+        let(:concern) { Mongo::Options::Redacted.new(:j => true) }
 
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
@@ -392,7 +392,7 @@ describe 'invalid uris' do
 
       context 'fsync' do
         let(:options) { 'fsync=true' }
-        let(:concern) { { :fsync => true } }
+        let(:concern) { Mongo::Options::Redacted.new(:fsync => true) }
 
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
@@ -402,7 +402,7 @@ describe 'invalid uris' do
       context 'wtimeoutMS' do
         let(:timeout) { 1234 }
         let(:options) { "w=2&wtimeoutMS=#{timeout}" }
-        let(:concern) { { :w => 2, :timeout => timeout } }
+        let(:concern) { Mongo::Options::Redacted.new(:w => 2, :timeout => timeout) }
 
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
@@ -415,7 +415,7 @@ describe 'invalid uris' do
 
       context 'primary' do
         let(:mode) { 'primary' }
-        let(:read) { { :mode => :primary } }
+        let(:read) { Mongo::Options::Redacted.new(:mode => :primary) }
 
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
@@ -424,7 +424,7 @@ describe 'invalid uris' do
 
       context 'primaryPreferred' do
         let(:mode) { 'primaryPreferred' }
-        let(:read) { { :mode => :primary_preferred } }
+        let(:read) { Mongo::Options::Redacted.new(:mode => :primary_preferred) }
 
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
@@ -433,7 +433,7 @@ describe 'invalid uris' do
 
       context 'secondary' do
         let(:mode) { 'secondary' }
-        let(:read) { { :mode => :secondary } }
+        let(:read) { Mongo::Options::Redacted.new(:mode => :secondary) }
 
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
@@ -442,7 +442,7 @@ describe 'invalid uris' do
 
       context 'secondaryPreferred' do
         let(:mode) { 'secondaryPreferred' }
-        let(:read) { { :mode => :secondary_preferred } }
+        let(:read) { Mongo::Options::Redacted.new(:mode => :secondary_preferred) }
 
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
@@ -451,7 +451,7 @@ describe 'invalid uris' do
 
       context 'nearest' do
         let(:mode) { 'nearest' }
-        let(:read) { { :mode => :nearest } }
+        let(:read) { Mongo::Options::Redacted.new(:mode => :nearest) }
 
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
@@ -467,7 +467,7 @@ describe 'invalid uris' do
         end
 
         let(:read) do
-          { :tag_sets => [{ :dc => 'ny', :rack => '1' }] }
+          Mongo::Options::Redacted.new(:tag_sets => [{ 'dc' => 'ny', 'rack' => '1' }])
         end
 
         it 'sets the read preference tag set' do
@@ -481,7 +481,7 @@ describe 'invalid uris' do
         end
 
         let(:read) do
-          { :tag_sets => [{ :dc => 'ny' }, { :dc => 'bos' }] }
+          Mongo::Options::Redacted.new(:tag_sets => [{ 'dc' => 'ny' }, { 'dc' => 'bos' }])
         end
 
         it 'sets the read preference tag sets' do
@@ -536,7 +536,7 @@ describe 'invalid uris' do
 
       context 'regular db' do
         let(:source) { 'foo' }
-        let(:auth) { { :source => 'foo' } }
+        let(:auth) { Mongo::Options::Redacted.new(:source => 'foo') }
 
         it 'sets the auth source to the database' do
           expect(uri.uri_options[:auth]).to eq(auth)
@@ -545,7 +545,7 @@ describe 'invalid uris' do
 
       context '$external' do
         let(:source) { '$external' }
-        let(:auth) { { :source => :external } }
+        let(:auth) { Mongo::Options::Redacted.new(:source => :external) }
 
         it 'sets the auth source to :external' do
           expect(uri.uri_options[:auth]).to eq(auth)
@@ -562,7 +562,7 @@ describe 'invalid uris' do
 
         let(:service_name) { 'foo' }
         let(:auth) do
-          { auth_mech_properties: { service_name: service_name } }
+          Mongo::Options::Redacted.new(auth_mech_properties: { service_name: service_name })
         end
 
         it 'sets the auth mechanism properties' do
@@ -577,7 +577,7 @@ describe 'invalid uris' do
 
         let(:canonicalize_host_name) { 'true' }
         let(:auth) do
-          { auth_mech_properties: { canonicalize_host_name: true } }
+          Mongo::Options::Redacted.new(auth_mech_properties: { canonicalize_host_name: true })
         end
 
         it 'sets the auth mechanism properties' do
@@ -592,7 +592,7 @@ describe 'invalid uris' do
 
         let(:service_realm) { 'dumdum' }
         let(:auth) do
-          { auth_mech_properties: { service_realm: service_realm } }
+          Mongo::Options::Redacted.new(auth_mech_properties: { service_realm: service_realm })
         end
 
         it 'sets the auth mechanism properties' do
@@ -612,9 +612,9 @@ describe 'invalid uris' do
         let(:service_realm) { 'dumdum' }
 
         let(:auth) do
-          { auth_mech_properties: { service_name: service_name,
-                                    canonicalize_host_name: true,
-                                    service_realm: service_realm } }
+          Mongo::Options::Redacted.new(auth_mech_properties: { service_name: service_name,
+                                                               canonicalize_host_name: true,
+                                                               service_realm: service_realm })
         end
 
         it 'sets the auth mechanism properties' do

data/spec/support/crud.rb

@@ -144,7 +144,13 @@ module Mongo
       #
       # @since 2.0.0
       def compare_collection_data
-        actual_collection_data == outcome_collection_data
+        if actual_collection_data.nil?
+          outcome_collection_data.nil?
+        else
+          actual_collection_data.all? do |doc|
+            outcome_collection_data.include?(doc)
+          end
+        end
       end
 
       # Whether this test requires server version >= 2.6 for its results to match

data/spec/support/matchers.rb

@@ -20,7 +20,7 @@ end
 
 RSpec::Matchers.define :be_cstring do |string|
   match do |actual|
-    actual == "#{string}\0"
+    actual == "#{string.force_encoding(BSON::BINARY)}\0"
   end
 end
 

data/spec/support/shared/server_selector.rb

@@ -12,7 +12,7 @@ def server(mode, options = {})
 
   listeners = Mongo::Event::Listeners.new
   monitoring = Mongo::Monitoring.new
-  address = Mongo::Address.new('127.0.0.1:27017')
+  address = Mongo::Address.new(DEFAULT_ADDRESS)
 
   server = Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
   description = Mongo::Server::Description.new(address, ismaster, average_round_trip_time)
@@ -32,7 +32,46 @@ shared_context 'server selector' do
   end
   let(:primary) { server(:primary) }
   let(:secondary) { server(:secondary) }
-  let(:selector) { described_class.new(:mode => name, :tag_sets => tag_sets) }
+  let(:options) { { :mode => name, :tag_sets => tag_sets } }
+  let(:selector) { described_class.new(options) }
+
+  before(:all) do
+    module Mongo
+      # We monkey-patch the server here, so the monitors do not run and no
+      # real TCP connection is attempted.
+      #
+      # @since 2.1.0
+      class Server
+
+        alias :original_initialize :initialize
+        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
+
+        alias :original_disconnect! :disconnect!
+        def disconnect!; true; end
+      end
+    end
+  end
+
+  after(:all) do
+
+    # Return the server implementation to its original for the other
+    # tests in the suite.
+    module Mongo
+      class Server
+        alias :initialize :original_initialize
+        remove_method(:original_initialize)
+
+        alias :disconnect! :original_disconnect!
+        remove_method(:original_disconnect!)
+      end
+    end
+  end
 end
 
 shared_examples 'a server selector mode' do
@@ -119,3 +158,20 @@ shared_examples 'a server selector accepting tag sets' do
     end
   end
 end
+
+shared_examples 'a server selector with sensitive data in its options' do
+
+  describe '#inspect' do
+
+    context 'when there is sensitive data in the options' do
+
+      let(:options) do
+        Mongo::Options::Redacted.new(:mode => name, :password => 'sensitive_data')
+      end
+
+      it 'does not print out sensitive data' do
+        expect(selector.inspect).not_to match(options[:password])
+      end
+    end
+  end
+end