mongo 2.0.2 → 2.0.3

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

@@ -436,11 +436,11 @@ describe Mongo::Collection::View::Readable do
 
   describe '#projection' do
 
-    context 'when projection are specified' do
+    let(:options) do
+      { :projection => { 'x' => 1 } }
+    end
 
-      let(:options) do
-        { :projection => { 'x' => 1 } }
-      end
+    context 'when projection are specified' do
 
       let(:new_projection) do
         { 'y' => 1 }
@@ -456,14 +456,25 @@ describe Mongo::Collection::View::Readable do
       end
     end
 
-    context 'when projection are not specified' do
-
-      let(:options) { { :projection => { 'x' => 1 } } }
+    context 'when projection is not specified' do
 
       it 'returns the projection' do
         expect(view.projection).to eq(options[:projection])
       end
     end
+
+    context 'when projection is not a document' do
+
+      let(:new_projection) do
+        'y'
+      end
+
+      it 'raises an error' do
+        expect do
+          view.projection(new_projection)
+        end.to raise_error(Mongo::Error::InvalidDocument)
+      end
+    end
   end
 
   describe '#read' do

data/spec/mongo/collection/view_spec.rb

@@ -496,6 +496,19 @@ describe Mongo::Collection::View do
     it 'dups the options' do
       expect(view.options).not_to be(options)
     end
+
+    context 'when the selector is not a valid document' do
+
+      let(:selector) do
+        'y'
+      end
+
+      it 'raises an error' do
+        expect do
+          view
+        end.to raise_error(Mongo::Error::InvalidDocument)
+      end
+    end
   end
 
   describe '#inspect' do

data/spec/mongo/collection_spec.rb

@@ -229,6 +229,13 @@ describe Mongo::Collection do
     it 'drops the collection from the database' do
       expect(database.collection_names).to_not include('specs')
     end
+
+    context 'when the collection does not exist' do
+
+      it 'does not raise an error' do
+        expect(database['non-existent-coll'].drop).to be(false)
+      end
+    end
   end
 
   describe '#find' do

data/spec/mongo/database_spec.rb

@@ -158,7 +158,7 @@ describe Mongo::Database do
     context 'when an alternate read preference is specified' do
 
       before do
-        allow(database.cluster).to receive(:standalone?).and_return(false)
+        allow(database.cluster).to receive(:single?).and_return(false)
       end
 
       let(:read) do
@@ -176,7 +176,7 @@ describe Mongo::Database do
       it 'uses that read preference', unless: sharded? do
         expect do
           database.command({ ping: 1 }, { read: read })
-        end.to raise_error(Mongo::ServerSelector::NoServerAvailable)
+        end.to raise_error(Mongo::Error::NoServerAvailable)
       end
     end
   end

data/spec/mongo/protocol/query_spec.rb

@@ -282,4 +282,33 @@ describe Mongo::Protocol::Query do
       end
     end
   end
+
+  describe '#log_message' do
+
+    context 'when the selector is greater than LOG_STRING_LIMIT characters' do
+
+      let(:selector) do
+        'z'*260
+      end
+
+      it 'Only prints LOG_STRING_LIMIT number of characters' do
+        expect(message.log_message.scan(/z/).length).to eq(Mongo::Protocol::Query::LOG_STRING_LIMIT)
+      end
+    end
+
+    context 'when the selector cannot be inspected' do
+
+      let(:selector) do
+        'invalid string'
+      end
+
+      before do
+        allow(selector).to receive(:inspect).and_raise(ArgumentError)
+      end
+
+      it 'Does not include the selector in the log message' do
+        expect(message.log_message.scan(/invalid string/).length).to eq(0)
+      end
+    end
+  end
 end

data/spec/mongo/server/connection_pool_spec.rb

@@ -9,7 +9,7 @@ describe Mongo::Server::ConnectionPool do
   describe '#checkin' do
 
     let(:server) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
     end
 
     let(:pool) do
@@ -39,7 +39,7 @@ describe Mongo::Server::ConnectionPool do
   describe '#checkout' do
 
     let(:server) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
     end
 
     let(:pool) do
@@ -87,7 +87,7 @@ describe Mongo::Server::ConnectionPool do
   describe '.get' do
 
     let(:server) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
     end
 
     let(:pool) do
@@ -102,7 +102,7 @@ describe Mongo::Server::ConnectionPool do
   describe '#inspect' do
 
     let(:server) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
     end
 
     let(:pool) do

data/spec/mongo/server/connection_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Server::Connection do
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new)
+    Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
   end
 
   describe '#connect!' do
@@ -66,9 +66,10 @@ describe Mongo::Server::Connection do
         let(:connection) do
           described_class.new(
             server,
-            :user => 'notauser',
-            :password => 'password',
-            :database => TEST_DB
+            TEST_OPTIONS.merge(
+              :user => 'notauser',
+              :password => 'password',
+              :database => TEST_DB )
           )
         end
 
@@ -84,9 +85,10 @@ describe Mongo::Server::Connection do
         let(:connection) do
           described_class.new(
             server,
-            :user => TEST_USER.name,
-            :password => TEST_USER.password,
-            :database => TEST_DB
+            TEST_OPTIONS.merge(
+              :user => TEST_USER.name,
+              :password => TEST_USER.password,
+              :database => TEST_DB )
           )
         end
 
@@ -136,9 +138,10 @@ describe Mongo::Server::Connection do
     let!(:connection) do
       described_class.new(
         server,
-        :user => TEST_USER.name,
-        :password => TEST_USER.password,
-        :database => TEST_DB
+        TEST_OPTIONS.merge(
+          :user => TEST_USER.name,
+          :password => TEST_USER.password,
+          :database => TEST_DB )
       )
     end
 
@@ -284,6 +287,39 @@ describe Mongo::Server::Connection do
       end
     end
 
+    context 'when ssl is false' do
+
+      context 'when ssl options are provided' do
+
+        let(:ssl_options) do
+          { :ssl => false, :ssl_key => 'file', :ssl_key_pass_phrase => 'iamaphrase' }
+        end
+
+        let(:connection) do
+          described_class.new(server, ssl_options)
+        end
+
+        it 'does not set the ssl options' do
+          expect(connection.send(:ssl_options)).to be_empty
+        end
+      end
+
+      context 'when ssl options are not provided' do
+
+        let(:ssl_options) do
+          { :ssl => false }
+        end
+
+        let(:connection) do
+          described_class.new(server, ssl_options)
+        end
+
+        it 'does not set the ssl options' do
+          expect(connection.send(:ssl_options)).to be_empty
+        end
+      end
+    end
+
     context 'when authentication options are provided' do
 
       let(:connection) do

data/spec/mongo/server/monitor_spec.rb

@@ -15,7 +15,7 @@ describe Mongo::Server::Monitor do
     context 'when calling multiple times in succession' do
 
       let(:monitor) do
-        described_class.new(address, listeners)
+        described_class.new(address, listeners, TEST_OPTIONS)
       end
 
       it 'throttles the scans to minimum 500ms' do
@@ -29,7 +29,7 @@ describe Mongo::Server::Monitor do
     context 'when the ismaster command succeeds' do
 
       let(:monitor) do
-        described_class.new(address, listeners)
+        described_class.new(address, listeners, TEST_OPTIONS)
       end
 
       before do

data/spec/mongo/server_discovery_and_monitoring_spec.rb

@@ -11,6 +11,20 @@ describe 'Server Discovery and Monitoring' do
 
       before(:all) do
 
+        # We monkey-patch the address, so that looking up the spec's hostname does
+        # not throw an error.
+        #
+        # @since 2.0.0
+        class Mongo::Address
+          private
+
+          def family(host)
+            fam = host == 'localhost' ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
+            ::Socket.getaddrinfo(host, nil, fam, ::Socket::SOCK_STREAM).first[4]
+          rescue SocketError
+          end
+        end
+
         # We monkey-patch the server here, so the monitors do not run and no
         # real TCP connection is attempted. Thus we can control the server
         # descriptions per-phase.
@@ -60,6 +74,15 @@ describe 'Server Discovery and Monitoring' do
             @monitor.stop! and true
           end
         end
+
+        class Mongo::Address
+          private
+
+          def family(host)
+            fam = host == 'localhost' ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
+            ::Socket.getaddrinfo(host, nil, fam, ::Socket::SOCK_STREAM).first[4]
+          end
+        end
       end
 
       spec.phases.each_with_index do |phase, index|

data/spec/mongo/server_selection_rtt_spec.rb

@@ -88,7 +88,8 @@ describe 'Server Selection moving average round trip time calculation' do
       end
 
       let(:monitor) do
-        Mongo::Server::Monitor.new(address, Mongo::Event::Listeners.new, avg_rtt_ms: spec.avg_rtt_ms)
+        Mongo::Server::Monitor.new(address, Mongo::Event::Listeners.new,
+                                   TEST_OPTIONS.merge(avg_rtt_ms: spec.avg_rtt_ms))
       end
 
       before do

data/spec/mongo/server_selection_spec.rb

@@ -17,7 +17,7 @@ describe 'Server Selection' do
       let(:cluster) do
         double('cluster').tap do |c|
           allow(c).to receive(:topology).and_return(topology)
-          allow(c).to receive(:standalone?).and_return(topology.standalone?)
+          allow(c).to receive(:single?).and_return(topology.single?)
           allow(c).to receive(:sharded?).and_return(topology.sharded?)
           allow(c).to receive(:replica_set?).and_return(topology.replica_set?)
         end
@@ -26,7 +26,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, Mongo::Event::Listeners.new).tap do |s|
+          Mongo::Server.new(address, Mongo::Event::Listeners.new, 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 +38,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, Mongo::Event::Listeners.new).tap do |s|
+          Mongo::Server.new(address, Mongo::Event::Listeners.new, 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
@@ -56,7 +56,7 @@ describe 'Server Selection' do
         allow(cluster).to receive(:scan!).and_return(true)
       end
 
-      context 'Valid read preference and matching server available', unless: spec.raises_exception? do
+      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)   
@@ -67,21 +67,12 @@ describe 'Server Selection' do
         end
       end
 
-      context 'Invalid read preference', if: spec.invalid_server_preference? do
+      context 'No matching server available', if: !spec.server_available? do
       
         it 'Raises exception' do
           expect do
             server_selector.select_server(cluster)
-          end.to raise_exception(Mongo::ServerSelector::InvalidServerPreference) 
-        end
-      end
-
-      context 'No matching server available', unless: spec.server_available? do
-      
-        it 'Raises exception' do
-          expect do
-            server_selector.select_server(cluster)
-          end.to raise_exception(Mongo::ServerSelector::NoServerAvailable) 
+          end.to raise_exception(Mongo::Error::NoServerAvailable)
         end
       end
     end

data/spec/mongo/server_selector/nearest_spec.rb

@@ -118,7 +118,7 @@ describe Mongo::ServerSelector::Nearest do
         end
       end
 
-      context 'mtuliple candidates' do
+      context 'multiple candidates' do
 
         context 'no matching servers' do
           let(:candidates) { [primary, secondary, secondary] }

data/spec/mongo/server_selector_spec.rb

@@ -79,7 +79,7 @@ describe Mongo::ServerSelector do
       let(:cluster) do
         double('cluster').tap do |c|
           allow(c).to receive(:servers).and_return(servers)
-          allow(c).to receive(:standalone?).and_return(false)
+          allow(c).to receive(:single?).and_return(false)
           allow(c).to receive(:sharded?).and_return(false)
           allow(c).to receive(:scan!).and_return(true)
         end
@@ -94,8 +94,59 @@ describe Mongo::ServerSelector do
       it 'raises a NoServerAvailable error' do
         expect do
           read_pref.select_server(cluster)
-        end.to raise_exception(Mongo::ServerSelector::NoServerAvailable)
+        end.to raise_exception(Mongo::Error::NoServerAvailable)
       end
     end
   end
+
+  shared_context 'a ServerSelector' do
+
+    context 'when cluster#servers is empty' do
+
+      let(:servers) { [] }
+
+      let(:cluster) do
+        double('cluster').tap do |c|
+          allow(c).to receive(:servers).and_return(servers)
+          allow(c).to receive(:single?).and_return(single)
+          allow(c).to receive(:sharded?).and_return(sharded)
+          allow(c).to receive(:scan!).and_return(true)
+        end
+      end
+
+      let(:read_pref) do
+        described_class.get({ mode: :primary }, server_selection_timeout: 1)
+      end
+
+      it 'raises a NoServerAvailable error' do
+        expect do
+          read_pref.select_server(cluster)
+        end.to raise_exception(Mongo::Error::NoServerAvailable)
+      end
+    end
+  end
+
+  context 'when the cluster has a Single topology' do
+
+    let(:single) { true }
+    let(:sharded) { false }
+
+    it_behaves_like 'a ServerSelector'
+  end
+
+  context 'when the cluster has a ReplicaSet topology' do
+
+    let(:single) { false }
+    let(:sharded) { false }
+
+    it_behaves_like 'a ServerSelector'
+  end
+
+  context 'when the cluster has a Sharded topology' do
+
+    let(:single) { false }
+    let(:sharded) { true }
+
+    it_behaves_like 'a ServerSelector'
+  end
 end