mongo 2.1.0.rc0 → 2.1.0

data/lib/mongo/server/connection_pool.rb

@@ -54,6 +54,18 @@ module Mongo
         queue.dequeue
       end
 
+      # Disconnect the connection pool.
+      #
+      # @example Disconnect the connection pool.
+      #   pool.disconnect!
+      #
+      # @return [ true ] true.
+      #
+      # @since 2.1.0
+      def disconnect!
+        queue.disconnect!
+      end
+
       # Create the new connection pool.
       #
       # @example Create the new connection pool.

data/lib/mongo/server/connection_pool/queue.rb

@@ -63,6 +63,21 @@ module Mongo
           end
         end
 
+        # Disconnect all connections in the queue.
+        #
+        # @example Disconnect all connections.
+        #   queue.disconnect!
+        #
+        # @return [ true ] Always true.
+        #
+        # @since 2.1.0
+        def disconnect!
+          mutex.synchronize do
+            queue.each{ |connection| connection.disconnect! }
+            true
+          end
+        end
+
         # Enqueue a connection in the queue.
         #
         # @example Enqueue a connection.

data/lib/mongo/server/monitor/connection.rb

@@ -36,7 +36,7 @@ module Mongo
         def connect!
           unless socket
             @socket = address.socket(timeout, ssl_options)
-            @socket.connect!
+            socket.connect!
           end
           true
         end
@@ -96,7 +96,7 @@ module Mongo
         def initialize(address, options = {})
           @address = address
           @options = options.freeze
-          @ssl_options = options.reject { |k, v| !k.to_s.start_with?('ssl') }
+          @ssl_options = options.reject { |k, v| !k.to_s.start_with?(SSL) }
           @socket = nil
           @pid = Process.pid
         end

data/lib/mongo/server_selector.rb

@@ -38,6 +38,11 @@ module Mongo
     # @since 2.0.0
     SERVER_SELECTION_TIMEOUT = 30.freeze
 
+    # Primary read preference.
+    #
+    # @since 2.1.0
+    PRIMARY = Options::Redacted.new(mode: :primary).freeze
+
     # Hash lookup for the selector classes based off the symbols
     #   provided in configuration.
     #

data/lib/mongo/server_selector/selectable.rb

@@ -61,10 +61,10 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(options = {})
+        @options = (options || {}).freeze
         tag_sets = options[:tag_sets] || []
         validate_tag_sets!(tag_sets)
-        @tag_sets = tag_sets
-        @options = options
+        @tag_sets = tag_sets.freeze
       end
 
       # Select a server from eligible candidates.
@@ -80,14 +80,11 @@ module Mongo
       def select_server(cluster)
         deadline = Time.now + server_selection_timeout
         while (deadline - Time.now) > 0
-          if cluster.single?
-            servers = cluster.servers
-          elsif cluster.sharded?
-            servers = near_servers(cluster.servers)
-          else
-            servers = select(cluster.servers)
+          servers = candidates(cluster)
+          if servers && !servers.compact.empty?
+            server = servers.first
+            return server if server.connectable?
           end
-          return servers.first if servers && !servers.compact.empty?
           cluster.scan!
         end
         raise Error::NoServerAvailable.new(self)
@@ -120,6 +117,16 @@ module Mongo
 
       private
 
+      def candidates(cluster)
+        if cluster.single?
+          cluster.servers
+        elsif cluster.sharded?
+          near_servers(cluster.servers)
+        else
+          select(cluster.servers)
+        end
+      end
+
       # Select the primary from a list of provided candidates.
       #
       # @param [ Array ] candidates List of candidate servers to select the

data/lib/mongo/socket.rb

@@ -54,7 +54,7 @@ module Mongo
     #
     # @return [ true, false ] If the socket is alive.
     #
-    # @since 2.0.0
+    # @deprecated Use #connectable? on the connection instead.
     def alive?
       sock_arr = [ @socket ]
       if Kernel::select(sock_arr, nil, sock_arr, 0)
@@ -172,10 +172,14 @@ module Mongo
       @socket.read(length) || String.new
     end
 
+    def unix_socket?(sock)
+      defined?(UNIXSocket) && sock.is_a?(UNIXSocket)
+    end
+
     def set_socket_options(sock)
       sock.set_encoding(BSON::BINARY)
 
-      unless sock.is_a?(UNIXSocket) && BSON::Environment.jruby?
+      unless unix_socket?(sock) && BSON::Environment.jruby?
         encoded_timeout = [ timeout, 0 ].pack(TIMEOUT_PACK)
         sock.setsockopt(SOL_SOCKET, SO_RCVTIMEO, encoded_timeout)
         sock.setsockopt(SOL_SOCKET, SO_SNDTIMEO, encoded_timeout)

data/lib/mongo/uri.rb

@@ -268,7 +268,7 @@ module Mongo
 
     def parse_db_opts!(string)
       auth_db, d, uri_opts = string.partition(URI_OPTS_DELIM)
-      @uri_options = parse_uri_options!(uri_opts)
+      @uri_options = Options::Redacted.new(parse_uri_options!(uri_opts))
       @database = parse_database!(auth_db)
     end
 

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.1.0.rc0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/spec/mongo/bulk_write/ordered_combiner_spec.rb

@@ -24,8 +24,8 @@ describe Mongo::BulkWrite::OrderedCombiner do
             [
               {
                 delete_one: [
-                  { q: { _id: 0 }, limit: 1 },
-                  { q: { _id: 1 }, limit: 1 }
+                  { 'q' => { _id: 0 }, 'limit' => 1 },
+                  { 'q' => { _id: 1 }, 'limit' => 1 }
                 ]
               }
             ]
@@ -66,8 +66,8 @@ describe Mongo::BulkWrite::OrderedCombiner do
             [
               {
                 delete_many: [
-                  { q: { _id: 0 }, limit: 0 },
-                  { q: { _id: 1 }, limit: 0 }
+                  { 'q' => { _id: 0 }, 'limit' => 0 },
+                  { 'q' => { _id: 1 }, 'limit' => 0 }
                 ]
               }
             ]
@@ -137,8 +137,8 @@ describe Mongo::BulkWrite::OrderedCombiner do
             [
               {
                 replace_one: [
-                  { q: { _id: 0 }, u: { name: 'test' }, multi: false, upsert: false },
-                  { q: { _id: 1 }, u: { name: 'test' }, multi: false, upsert: false }
+                  { 'q' => { _id: 0 }, 'u' => { name: 'test' }, 'multi' => false, 'upsert' => false },
+                  { 'q' => { _id: 1 }, 'u' => { name: 'test' }, 'multi' => false, 'upsert' => false }
                 ]
               }
             ]
@@ -179,8 +179,8 @@ describe Mongo::BulkWrite::OrderedCombiner do
             [
               {
                 update_one: [
-                  { q: { _id: 0 }, u: { '$set' => { name: 'test' }}, multi: false, upsert: false },
-                  { q: { _id: 1 }, u: { '$set' => { name: 'test' }}, multi: false, upsert: false }
+                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false },
+                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false }
                 ]
               }
             ]
@@ -221,8 +221,8 @@ describe Mongo::BulkWrite::OrderedCombiner do
             [
               {
                 update_many: [
-                  { q: { _id: 0 }, u: { '$set' => { name: 'test' }}, multi: true, upsert: false },
-                  { q: { _id: 1 }, u: { '$set' => { name: 'test' }}, multi: true, upsert: false }
+                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false },
+                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false }
                 ]
               }
             ]
@@ -261,7 +261,7 @@ describe Mongo::BulkWrite::OrderedCombiner do
         expect(combiner.combine).to eq(
           [
             { insert_one: [{ _id: 0 }]},
-            { delete_one: [{ q: { _id: 0 }, limit: 1 }]},
+            { delete_one: [{ 'q' => { _id: 0 }, 'limit' => 1 }]},
             { insert_one: [{ _id: 1 }]}
           ]
         )

data/spec/mongo/bulk_write/unordered_combiner_spec.rb

@@ -24,8 +24,8 @@ describe Mongo::BulkWrite::UnorderedCombiner do
             [
               {
                 delete_one: [
-                  { q: { _id: 0 }, limit: 1 },
-                  { q: { _id: 1 }, limit: 1 }
+                  { 'q' => { _id: 0 }, 'limit' => 1 },
+                  { 'q' => { _id: 1 }, 'limit' => 1 }
                 ]
               }
             ]
@@ -66,8 +66,8 @@ describe Mongo::BulkWrite::UnorderedCombiner do
             [
               {
                 delete_many: [
-                  { q: { _id: 0 }, limit: 0 },
-                  { q: { _id: 1 }, limit: 0 }
+                  { 'q' => { _id: 0 }, 'limit' => 0 },
+                  { 'q' => { _id: 1 }, 'limit' => 0 }
                 ]
               }
             ]
@@ -137,8 +137,8 @@ describe Mongo::BulkWrite::UnorderedCombiner do
             [
               {
                 update_one: [
-                  { q: { _id: 0 }, u: { '$set' => { name: 'test' }}, multi: false, upsert: false },
-                  { q: { _id: 1 }, u: { '$set' => { name: 'test' }}, multi: false, upsert: false }
+                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false },
+                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false }
                 ]
               }
             ]
@@ -179,8 +179,8 @@ describe Mongo::BulkWrite::UnorderedCombiner do
             [
               {
                 update_many: [
-                  { q: { _id: 0 }, u: { '$set' => { name: 'test' }}, multi: true, upsert: false },
-                  { q: { _id: 1 }, u: { '$set' => { name: 'test' }}, multi: true, upsert: false }
+                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false },
+                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false }
                 ]
               }
             ]
@@ -227,8 +227,8 @@ describe Mongo::BulkWrite::UnorderedCombiner do
             },
             {
               delete_one: [
-                { q: { _id: 0 }, limit: 1 },
-                { q: { _id: 1 }, limit: 1 }
+                { 'q' => { _id: 0 }, 'limit' => 1 },
+                { 'q' => { _id: 1 }, 'limit' => 1 }
               ]
             }
           ]

data/spec/mongo/client_spec.rb

@@ -167,16 +167,20 @@ describe Mongo::Client do
         ['127.0.0.1:27017'],
         :read => { :mode => :primary },
         :local_threshold_ms => 10,
-        :server_selection_timeout_ms => 10000,
+        :server_selection_timeout => 10000,
         :database => TEST_DB
       )
     end
 
+    let(:options) do
+      Mongo::Options::Redacted.new(:read => { :mode => :primary },
+                                    :local_threshold_ms => 10,
+                                    :server_selection_timeout => 10000,
+                                    :database => TEST_DB)
+    end
+
     let(:expected) do
-      [client.cluster, { :read => { :mode => :primary },
-                         :local_threshold_ms => 10,
-                         :server_selection_timeout_ms => 10000,
-                         :database => TEST_DB }].hash
+      [client.cluster, options].hash
     end
 
     it 'returns a hash of the cluster and options' do
@@ -199,6 +203,23 @@ describe Mongo::Client do
         "<Mongo::Client:0x#{client.object_id} cluster=127.0.0.1:27017"
       )
     end
+
+    context 'when there is sensitive data in the options' do
+
+      let(:client) do
+        described_class.new(
+            ['127.0.0.1:27017'],
+            :read => { :mode => :primary },
+            :database => TEST_DB,
+            :password => 'some_password',
+            :user => 'emily'
+        )
+      end
+
+      it 'does not print out sensitive data' do
+        expect(client.inspect).not_to match('some_password')
+      end
+    end
   end
 
   describe '#initialize' do
@@ -291,8 +312,12 @@ describe Mongo::Client do
           described_class.new(uri)
         end
 
+        let(:expected_options) do
+          Mongo::Options::Redacted.new(:write => { :w => 3 }, :database => 'testdb')
+        end
+
         it 'sets the options' do
-          expect(client.options).to eq(:write => { :w => 3 }, :database => 'testdb')
+          expect(client.options).to eq(expected_options)
         end
       end
 
@@ -306,8 +331,12 @@ describe Mongo::Client do
           described_class.new(uri, :write => { :w => 3 })
         end
 
+        let(:expected_options) do
+          Mongo::Options::Redacted.new(:write => { :w => 3 }, :database => 'testdb')
+        end
+
         it 'sets the options' do
-          expect(client.options).to eq(:write => { :w => 3 }, :database => 'testdb')
+          expect(client.options).to eq(expected_options)
         end
       end
 
@@ -321,8 +350,12 @@ describe Mongo::Client do
           described_class.new(uri, :write => { :w => 4 })
         end
 
+        let(:expected_options) do
+          Mongo::Options::Redacted.new(:write => { :w => 4 }, :database => 'testdb')
+        end
+
         it 'allows explicit options to take preference' do
-          expect(client.options).to eq(:write => { :w => 4 }, :database => 'testdb')
+          expect(client.options).to eq(expected_options)
         end
       end
 
@@ -348,7 +381,8 @@ describe Mongo::Client do
     let(:client) do
       described_class.new(['127.0.0.1:27017'],
                           :database => TEST_DB,
-                          :read => mode)
+                          :read => mode,
+                          :server_selection_timeout => 2)
     end
 
     let(:preference) do
@@ -366,7 +400,7 @@ describe Mongo::Client do
       end
 
       it 'passes the options to the read preference' do
-        expect(preference.options[:database]).to eq(TEST_DB)
+        expect(preference.options[:server_selection_timeout]).to eq(2)
       end
     end
 
@@ -424,6 +458,33 @@ describe Mongo::Client do
         expect(preference).to be_a(Mongo::ServerSelector::Primary)
       end
     end
+
+    context 'when the read preference is printed' do
+
+      let(:client) do
+        described_class.new([ DEFAULT_ADDRESS ], options)
+      end
+
+      let(:options) do
+        { user: 'Emily', password: 'sensitive_data', server_selection_timeout: 0.1 }
+      end
+
+      before do
+        allow(client.database.cluster).to receive(:single?).and_return(false)
+      end
+
+      let(:error) do
+        begin
+          client.database.command(ping: 1)
+        rescue => e
+          e
+        end
+      end
+
+      it 'redacts sensitive client options' do
+        expect(error.message).not_to match(options[:password])
+      end
+    end
   end
 
   describe '#use' do
@@ -497,20 +558,28 @@ describe Mongo::Client do
         client.with(:read => { :mode => :primary })
       end
 
+      let(:new_options) do
+        Mongo::Options::Redacted.new(:read => { :mode => :primary },
+                                             :write => { :w => 1 },
+                                             :database => TEST_DB)
+      end
+
+      let(:original_options) do
+        Mongo::Options::Redacted.new(:read => { :mode => :secondary },
+                                             :write => { :w => 1 },
+                                             :database => TEST_DB)
+      end
+
       it 'returns a new client' do
         expect(new_client).not_to equal(client)
       end
 
       it 'replaces the existing options' do
-        expect(new_client.options).to eq({
-          :read => { :mode => :primary }, :write => { :w => 1 }, :database => TEST_DB
-        })
+        expect(new_client.options).to eq(new_options)
       end
 
       it 'does not modify the original client' do
-        expect(client.options).to eq({
-          :read => { :mode => :secondary }, :write => { :w => 1 }, :database => TEST_DB
-        })
+        expect(client.options).to eq(original_options)
       end
 
       it 'keeps the same cluster' do
@@ -579,7 +648,7 @@ describe Mongo::Client do
         end
 
         it 'returns a acknowledged write concern' do
-          expect(concern.get_last_error).to eq(:getlasterror => 1, :j => true)
+          expect(concern.get_last_error).to eq(:getlasterror => 1, 'j' => true)
         end
       end
 
@@ -656,7 +725,21 @@ describe Mongo::Client do
 
     it 'reconnects the cluster and returns true' do
       expect(client.reconnect).to be(true)
-      sleep(2)
+    end
+  end
+
+  describe '#dup' do
+
+    let(:client) do
+      described_class.new(
+          ['127.0.0.1:27017'],
+          :read => { :mode => :primary },
+          :database => TEST_DB
+      )
+    end
+
+    it 'creates a client with Redacted options' do
+      expect(client.dup.options).to be_a(Mongo::Options::Redacted)
     end
   end
 end