mongo 2.0.6 → 2.1.0.beta

data/lib/mongo/server/connectable.rb

@@ -19,7 +19,6 @@ module Mongo
     #
     # @since 2.0.0
     module Connectable
-      include Loggable
 
       # The default time in seconds to timeout a connection attempt.
       #
@@ -47,27 +46,6 @@ module Mongo
         !!@socket && @socket.alive?
       end
 
-      # Dispatch the provided messages to the connection. If the last message
-      # requires a response a reply will be returned.
-      #
-      # @example Dispatch the messages.
-      #   connection.dispatch([ insert, command ])
-      #
-      # @note This method is named dispatch since 'send' is a core Ruby method on
-      #   all objects.
-      #
-      # @param [ Array<Message> ] messages The messages to dispatch.
-      #
-      # @return [ Protocol::Reply ] The reply if needed.
-      #
-      # @since 2.0.0
-      def dispatch(messages)
-        log_debug(messages) do |msgs|
-          write(msgs)
-          msgs.last.replyable? ? read : nil
-        end
-      end
-
       # Get the connection timeout.
       #
       # @example Get the connection timeout.

data/lib/mongo/server/connection.rb

@@ -20,6 +20,7 @@ module Mongo
     # @since 2.0.0
     class Connection
       include Connectable
+      include Monitoring::Publishable
       extend Forwardable
 
       # @return [ Mongo::Auth::CR, Mongo::Auth::X509, Mongo::Auth:LDAP, Mongo::Auth::SCRAM ]
@@ -88,17 +89,45 @@ module Mongo
         true
       end
 
+      # Dispatch the provided messages to the connection. If the last message
+      # requires a response a reply will be returned.
+      #
+      # @example Dispatch the messages.
+      #   connection.dispatch([ insert, command ])
+      #
+      # @note This method is named dispatch since 'send' is a core Ruby method on
+      #   all objects.
+      #
+      # @param [ Array<Message> ] messages The messages to dispatch.
+      # @param [ Integer ] operation_id The operation id to link messages.
+      #
+      # @return [ Protocol::Reply ] The reply if needed.
+      #
+      # @since 2.0.0
+      def dispatch(messages, operation_id = nil)
+        publish_command(messages, operation_id || Monitoring.next_operation_id) do |msgs|
+          write(msgs)
+          msgs.last.replyable? ? read : nil
+        end
+      end
+
       # Initialize a new socket connection from the client to the server.
       #
+      # @api private
+      #
       # @example Create the connection.
       #   Connection.new(server)
       #
+      # @note Connection must never be directly instantiated outside of a
+      #   Server.
+      #
       # @param [ Mongo::Server ] server The server the connection is for.
       # @param [ Hash ] options The connection options.
       #
       # @since 2.0.0
       def initialize(server, options = {})
         @address = server.address
+        @monitoring = server.monitoring
         @options = options.freeze
         @server = server
         @ssl_options = options.reject { |k, v| !k.to_s.start_with?('ssl') }

data/lib/mongo/server/description.rb

@@ -124,10 +124,20 @@ module Mongo
       # @since 2.0.0
       TAGS = 'tags'.freeze
 
+      # Constant for reading electionID info from config.
+      #
+      # @since 2.1.0
+      ELECTION_ID = 'electionId'.freeze
+
+      # Constant for reading localTime info from config.
+      #
+      # @since 2.1.0
+      LOCAL_TIME = 'localTime'.freeze
+
       # Fields to exclude when comparing two descriptions.
       #
       # @since 2.0.6
-      EXCLUDE_FOR_COMPARISON = [ 'localTime' ]
+      EXCLUDE_FOR_COMPARISON = [ LOCAL_TIME, ELECTION_ID ]
 
       # @return [ Address ] address The server's address.
       attr_reader :address
@@ -304,6 +314,18 @@ module Mongo
         config[TAGS] || {}
       end
 
+      # Get the electionId from the config.
+      #
+      # @example Get the electionId.
+      #   description.election_id
+      #
+      # @return [ BSON::ObjectId ] The election id.
+      #
+      # @since 2.1.0
+      def election_id
+        config[ELECTION_ID]
+      end
+
       # Is the server a mongos?
       #
       # @example Is the server a mongos?

data/lib/mongo/server/monitor.rb

@@ -91,9 +91,13 @@ module Mongo
 
       # Create the new server monitor.
       #
+      # @api private
+      #
       # @example Create the server monitor.
       #   Mongo::Server::Monitor.new(address, listeners)
       #
+      # @note Monitor must never be directly instantiated outside of a Server.
+      #
       # @param [ Address ] address The address to monitor.
       # @param [ Event::Listeners ] listeners The event listeners.
       # @param [ Hash ] options The options.
@@ -112,7 +116,7 @@ module Mongo
       # server.
       #
       # @example Run the monitor.
-      #   monito.run
+      #   monitor.run
       #
       # @return [ Thread ] The thread the monitor runs on.
       #
@@ -139,6 +143,18 @@ module Mongo
         @thread.kill && @thread.stop?
       end
 
+      # Restarts the server monitor unless the current thread is alive.
+      #
+      # @example Restart the monitor.
+      #   monitor.restart!
+      #
+      # @return [ Thread ] The thread the monitor runs on.
+      #
+      # @since 2.1.0
+      def restart!
+        @thread.alive? ? @thread : run!
+      end
+
       private
 
       def average_round_trip_time(start)

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

@@ -60,11 +60,35 @@ module Mongo
           true
         end
 
+        # Dispatch the provided messages to the connection. If the last message
+        # requires a response a reply will be returned.
+        #
+        # @example Dispatch the messages.
+        #   connection.dispatch([ insert, command ])
+        #
+        # @note This method is named dispatch since 'send' is a core Ruby method on
+        #   all objects.
+        #
+        # @param [ Array<Message> ] messages The messages to dispatch.
+        #
+        # @return [ Protocol::Reply ] The reply if needed.
+        #
+        # @since 2.0.0
+        def dispatch(messages)
+          write(messages)
+          messages.last.replyable? ? read : nil
+        end
+
         # Initialize a new socket connection from the client to the server.
         #
+        # @api private
+        #
         # @example Create the connection.
         #   Connection.new(address)
         #
+        # @note Connection must never be directly instantiated outside of a
+        #   Monitor.
+        #
         # @param [ Mongo::Address ] address The address the connection is for.
         # @param [ Hash ] options The connection options.
         #

data/lib/mongo/socket/ssl.rb

@@ -54,10 +54,10 @@ module Mongo
       # @since 2.0.0
       def connect!
         Timeout.timeout(timeout, Error::SocketTimeoutError) do
-          @tcp_socket.connect(::Socket.pack_sockaddr_in(port, host))
+          handle_errors { @tcp_socket.connect(::Socket.pack_sockaddr_in(port, host)) }
           @socket = OpenSSL::SSL::SSLSocket.new(@tcp_socket, context)
           @socket.sync_close = true
-          @socket.connect
+          handle_errors { @socket.connect }
           verify_certificate!(@socket)
           self
         end
@@ -100,22 +100,34 @@ module Mongo
 
       def create_context(options)
         context = OpenSSL::SSL::SSLContext.new
-        if options[:ssl_cert]
-          context.cert = OpenSSL::X509::Certificate.new(File.open(options[:ssl_cert]))
-        end
-        if options[:ssl_key]
-          if options[:ssl_key_pass_phrase]
-            context.key = OpenSSL::PKey::RSA.new(File.open(options[:ssl_key]),
-                                                           options[:ssl_key_pass_phrase])
-          else
-            context.key = OpenSSL::PKey::RSA.new(File.open(options[:ssl_key]))
-          end
+        set_cert(context, options) if options[:ssl_cert]
+        set_key(context, options) if options[:ssl_key]
+        set_cert_verification(context, options) unless options[:ssl_verify] == false
+        context
+      end
+
+      def set_cert(context, options)
+        context.cert = OpenSSL::X509::Certificate.new(File.open(options[:ssl_cert]))
+      end
+
+      def set_key(context, options)
+        if options[:ssl_key_pass_phrase]
+          context.key = OpenSSL::PKey::RSA.new(File.open(options[:ssl_key]),
+                                               options[:ssl_key_pass_phrase])
+        else
+          context.key = OpenSSL::PKey::RSA.new(File.open(options[:ssl_key]))
         end
-        if options[:ssl_verify] || options[:ssl_ca_cert]
-          context.ca_file = options[:ssl_ca_cert]
-          context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
+
+      def set_cert_verification(context, options)
+        context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        cert_store = OpenSSL::X509::Store.new
+        if options[:ssl_ca_cert]
+          cert_store.add_file(options[:ssl_ca_cert])
+        else
+          cert_store.set_default_paths
         end
-        context
+        context.cert_store = cert_store
       end
 
       def verify_certificate!(socket)

data/lib/mongo/socket/tcp.rb

@@ -43,7 +43,7 @@ module Mongo
       def connect!
         Timeout.timeout(timeout, Error::SocketTimeoutError) do
           socket.setsockopt(IPPROTO_TCP, TCP_NODELAY, 1)
-          socket.connect(::Socket.pack_sockaddr_in(port, host))
+          handle_errors { socket.connect(::Socket.pack_sockaddr_in(port, host)) }
           self
         end
       end

data/lib/mongo/socket/unix.rb

@@ -39,7 +39,7 @@ module Mongo
       # @since 2.0.0
       def connect!
         Timeout.timeout(timeout, Error::SocketTimeoutError) do
-          socket.connect(path)
+          handle_errors { socket.connect(path) }
           self
         end
       end

data/lib/mongo/uri.rb

@@ -27,6 +27,7 @@ module Mongo
   #
   # @since 2.0.0
   class URI
+    include Loggable
 
     # Scheme Regex: non-capturing, matches scheme.
     #
@@ -69,7 +70,7 @@ module Mongo
     # @since 2.0.0
     DATABASE = %r{(?:/([^/\.\ "*<>:\|\?]*))?}.freeze
 
-    # Option Regex: notably only matches the ampersand separator and does
+    # Option Regex: only matches the ampersand separator and does
     # not allow for semicolon to be used to separate options.
     #
     # @since 2.0.0
@@ -123,7 +124,8 @@ module Mongo
     #
     # @since 2.0.0
     def initialize(string)
-      @match = string.match(URI)
+      @string = string
+      @match = @string.match(URI)
       raise Error::InvalidURI.new(string) unless @match
     end
 
@@ -210,8 +212,13 @@ module Mongo
       parsed_options.split('&').reduce({}) do |options, option|
         key, value = option.split('=')
         strategy = OPTION_MAP[key]
-        raise Error::InvalidURIOption.new(key) if strategy.nil?
-        add_option(strategy, value, options)
+        if strategy.nil?
+          log_warn([
+                       "Unsupported URI option '#{key}' on URI '#{@string}'. It will be ignored."
+                   ])
+        else
+          add_option(strategy, value, options)
+        end
         options
       end
     end
@@ -243,7 +250,7 @@ module Mongo
 
     # Write Options
     option 'w', :w, :group => :write
-    option 'j', :j, :group => :write
+    option 'journal', :j, :group => :write
     option 'fsync', :fsync, :group => :write
     option 'wtimeoutMS', :timeout, :group => :write
 

data/lib/mongo/version.rb

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

data/spec/mongo/auth/cr_spec.rb

@@ -6,8 +6,16 @@ describe Mongo::Auth::CR 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, TEST_OPTIONS)
+    Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
   end
 
   let(:connection) do

data/spec/mongo/auth/ldap_spec.rb

@@ -6,8 +6,16 @@ describe Mongo::Auth::LDAP 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, TEST_OPTIONS)
+    Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
   end
 
   let(:connection) do

data/spec/mongo/auth/scram_spec.rb

@@ -6,8 +6,16 @@ describe Mongo::Auth::SCRAM 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, TEST_OPTIONS)
+    Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
   end
 
   let(:connection) do

data/spec/mongo/auth/x509_spec.rb

@@ -6,8 +6,16 @@ describe Mongo::Auth::X509 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, TEST_OPTIONS)
+    Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
   end
 
   let(:connection) do

data/spec/mongo/{bulk/bulk_write_spec.rb → bulk_write_spec.rb}

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Mongo::BulkWrite do
 
   before do
-    authorized_collection.find.delete_many
+    authorized_collection.delete_many
   end
 
   after do
-    authorized_collection.find.delete_many
+    authorized_collection.delete_many
   end
 
   let(:bulk) do
@@ -59,13 +59,13 @@ describe Mongo::BulkWrite do
     let(:options) do
        { ordered: true }
     end
-     
+
     it_behaves_like 'a bulk write object'
-    
+
     context 'when the batch requires splitting' do
-    
+
       context 'when the operations are the same type' do
-    
+
         let(:error) do
           begin
             bulk.execute
@@ -73,7 +73,7 @@ describe Mongo::BulkWrite do
             ex
           end
         end
-    
+
         let(:operations) do
           [].tap do |ops|
             3000.times do |i|
@@ -83,13 +83,13 @@ describe Mongo::BulkWrite do
             ops << { insert_one: { _id: 3001 } }
           end
         end
-    
+
         it 'raises a BulkWriteError' do
           expect(error).to be_a(Mongo::Error::BulkWriteError)
         end
 
         it 'halts execution after first error and reports correct index' do
-          expect(error.result[:write_errors].first['index']).to eq(3000)
+          expect(error.result[Mongo::Error::WRITE_ERRORS].first['index']).to eq(3000)
           expect(authorized_collection.find.count).to eq(3000)
         end
       end
@@ -120,7 +120,7 @@ describe Mongo::BulkWrite do
         end
 
         it 'halts execution after first error and reports correct index' do
-          expect(error.result[:write_errors].first['index']).to eq(2001)
+          expect(error.result[Mongo::Error::WRITE_ERRORS].first['index']).to eq(2001)
           expect(authorized_collection.find.count).to eq(1999)
         end
       end
@@ -134,7 +134,7 @@ describe Mongo::BulkWrite do
             ex
           end
         end
-    
+
         let(:operations) do
           [].tap do |ops|
             6.times do |i|
@@ -144,11 +144,11 @@ describe Mongo::BulkWrite do
             ops << { insert_one: { _id: 100 } }
           end
         end
-    
+
         it 'raises a BulkWriteError error' do
           expect(error).to be_a(Mongo::Error::BulkWriteError)
         end
-    
+
         it 'splits messages into multiple messages' do
           error
           expect(authorized_collection.find.count).to eq(6)
@@ -192,7 +192,7 @@ describe Mongo::BulkWrite do
         end
 
         it 'does not halt execution after first error' do
-          expect(error.result[:write_errors].first['index']).to eq(3000)
+          expect(error.result[Mongo::Error::WRITE_ERRORS].first['index']).to eq(3000)
           expect(authorized_collection.find.count).to eq(3001)
         end
       end
@@ -223,7 +223,7 @@ describe Mongo::BulkWrite do
         end
 
         it 'does not halt execution after first error' do
-          expect(error.result[:write_errors].first['index']).to eq(2001)
+          expect(error.result[Mongo::Error::WRITE_ERRORS].first['index']).to eq(2001)
           expect(authorized_collection.find.count).to eq(2000)
         end
       end