mongo 2.4.0.rc0 → 2.4.0.rc1

data/lib/mongo/protocol/update.rb

@@ -59,6 +59,7 @@ module Mongo
         @update      = update
         @flags       = options[:flags] || []
         @upconverter = Upconverter.new(collection, selector, update, flags)
+        super
       end
 
       # Return the event payload for monitoring.
@@ -78,10 +79,12 @@ module Mongo
         }
       end
 
-      private
+      protected
 
       attr_reader :upconverter
 
+      private
+
       # The operation code required to specify an Update message.
       # @return [Fixnum] the operation code.
       def op_code

data/lib/mongo/server/connectable.rb

@@ -28,6 +28,10 @@ module Mongo
       # The default time in seconds to timeout an operation executed on a socket.
       #
       # @since 2.0.0
+      #
+      # @deprecated Timeouts on Ruby sockets aren't effective so this default option is
+      #   no longer used.
+      #   Will be removed in driver version 3.0.
       TIMEOUT = 5.freeze
 
       # @return [ Mongo::Address ] address The address to connect to.
@@ -73,13 +77,15 @@ module Mongo
       #
       # @since 2.0.0
       def timeout
-        @timeout ||= options[:socket_timeout] || TIMEOUT
+        @timeout ||= options[:socket_timeout]
       end
 
-      private
+      protected
 
       attr_reader :socket
 
+      private
+
       def ssl_options
         @ssl_options[:ssl] == true ? @ssl_options : {}
       end

data/lib/mongo/server/connection_pool.rb

@@ -109,10 +109,12 @@ module Mongo
         checkin(connection) if connection
       end
 
-      private
+      protected
 
       attr_reader :queue
 
+      private
+
       class << self
 
         # Get a connection pool for the provided server.

data/lib/mongo/server/monitor.rb

@@ -104,6 +104,7 @@ module Mongo
         @options = options.freeze
         @connection = Connection.new(address, options)
         @last_round_trip_time = nil
+        @last_scan = nil
         @mutex = Mutex.new
       end
 

data/lib/mongo/socket.rb

@@ -162,14 +162,28 @@ module Mongo
     # @since 2.0.5
     def eof?
       @socket.eof?
-    rescue IOError, SystemCallError => e
+    rescue IOError, SystemCallError => _
       true
     end
 
     private
 
     def read_from_socket(length)
-      @socket.read(length) || String.new
+      data = String.new
+      deadline = (Time.now + timeout) if timeout
+      begin
+        while (data.length < length)
+          data << @socket.read_nonblock(length - data.length)
+        end
+      rescue IO::WaitReadable
+        select_timeout = (deadline - Time.now) if deadline
+        unless Kernel::select([@socket], nil, [@socket], select_timeout)
+          raise Timeout::Error.new("Took more than #{timeout} seconds to receive data.")
+        end
+        retry
+      end
+
+      data
     end
 
     def unix_socket?(sock)
@@ -178,12 +192,6 @@ module Mongo
 
     def set_socket_options(sock)
       sock.set_encoding(BSON::BINARY)
-
-      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)
-      end
     end
 
     def handle_errors

data/lib/mongo/socket/ssl.rb

@@ -116,22 +116,32 @@ module Mongo
 
       def create_context(options)
         context = OpenSSL::SSL::SSLContext.new
-        set_cert(context, options) if options[:ssl_cert]
-        set_key(context, options) if options[:ssl_key]
+        set_cert(context, options)
+        set_key(context, options)
         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]))
+        if options[:ssl_cert]
+          context.cert = OpenSSL::X509::Certificate.new(File.open(options[:ssl_cert]))
+        elsif options[:ssl_cert_string]
+          context.cert = OpenSSL::X509::Certificate.new(options[:ssl_cert_string])
+        elsif options[:ssl_cert_object]
+          context.cert = options[:ssl_cert_object]
+        end
       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]))
+        passphrase = options[:ssl_key_pass_phrase]
+        if options[:ssl_key]
+          context.key = passphrase ? OpenSSL::PKey.read(File.open(options[:ssl_key]), passphrase) :
+            OpenSSL::PKey.read(File.open(options[:ssl_key]))
+        elsif options[:ssl_key_string]
+          context.key = passphrase ? OpenSSL::PKey.read(options[:ssl_key_string], passphrase) :
+            OpenSSL::PKey.read(options[:ssl_key_string])
+        elsif options[:ssl_key_object]
+          context.key = options[:ssl_key_object]
         end
       end
 
@@ -139,7 +149,12 @@ module Mongo
         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])
+          cert_store.add_cert(OpenSSL::X509::Certificate.new(File.open(options[:ssl_ca_cert])))
+        elsif options[:ssl_ca_cert_string]
+          cert_store.add_cert(OpenSSL::X509::Certificate.new(options[:ssl_ca_cert_string]))
+        elsif options[:ssl_ca_cert_object]
+          raise TypeError("Option :ssl_ca_cert_object should be an array of OpenSSL::X509:Certificate objects") unless options[:ssl_ca_cert_object].is_a? Array
+          options[:ssl_ca_cert_object].each {|cert| cert_store.add_cert(cert)}
         else
           cert_store.set_default_paths
         end

data/lib/mongo/uri.rb

@@ -193,7 +193,7 @@ module Mongo
     def initialize(string, options = {})
       @string = string
       @options = options
-      empty, scheme, remaining = @string.partition(SCHEME)
+      _, scheme, remaining = @string.partition(SCHEME)
       raise_invalid_error!(INVALID_SCHEME) unless scheme == SCHEME
       setup!(remaining)
     end
@@ -248,7 +248,7 @@ module Mongo
     end
 
     def extract_db_opts!(string)
-      db_opts, d, creds_hosts = string.reverse.partition(DATABASE_DELIM)
+      db_opts, _, creds_hosts = string.reverse.partition(DATABASE_DELIM)
       db_opts, creds_hosts = creds_hosts, db_opts if creds_hosts.empty?
       if db_opts.empty? && creds_hosts.include?(URI_OPTS_DELIM)
         raise_invalid_error!(INVALID_OPTS_DELIM)
@@ -264,13 +264,13 @@ module Mongo
     end
 
     def split_creds_hosts(string)
-      hosts, d, creds = string.reverse.partition(AUTH_DELIM)
+      hosts, _, creds = string.reverse.partition(AUTH_DELIM)
       hosts, creds = creds, hosts if hosts.empty?
       [ hosts, creds ].map { |s| s.reverse }
     end
 
     def parse_db_opts!(string)
-      auth_db, d, uri_opts = string.partition(URI_OPTS_DELIM)
+      auth_db, _, uri_opts = string.partition(URI_OPTS_DELIM)
       @uri_options = Options::Redacted.new(parse_uri_options!(uri_opts))
       @database = parse_database!(auth_db)
     end
@@ -324,7 +324,7 @@ module Mongo
             validate_port_string!(p)
           end
         elsif host.index(HOST_PORT_DELIM)
-          h, d, p = host.partition(HOST_PORT_DELIM)
+          h, _, p = host.partition(HOST_PORT_DELIM)
           raise_invalid_error!(INVALID_HOST) unless h.size > 0
           validate_port_string!(p)
         elsif host =~ UNIX_SOCKET
@@ -339,7 +339,7 @@ module Mongo
     end
 
     def decode(value)
-      ::URI.decode(value)
+      ::URI::DEFAULT_PARSER.unescape(value)
     end
 
     # Hash for storing map of URI option parameters to conversion strategies

data/lib/mongo/version.rb

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

data/mongo.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |s|
   s.has_rdoc          = 'yard'
   s.bindir            = 'bin'
 
-  s.add_dependency 'bson', '~> 4.2.0.rc0'
+  s.add_dependency 'bson', '~> 4.2.0.rc1'
 end

data/spec/mongo/bulk_write_spec.rb

@@ -243,6 +243,19 @@ describe Mongo::BulkWrite do
                     bulk_write.execute
                   }.to raise_exception(Mongo::Error::UnsupportedCollation)
                 end
+
+                context 'when a String key is used' do
+
+                  let(:requests) do
+                    [{ delete_one: { filter: { name: 'BANG' }, 'collation' => collation } }]
+                  end
+
+                  it 'raises an exception' do
+                    expect {
+                      bulk_write.execute
+                    }.to raise_exception(Mongo::Error::UnsupportedCollation)
+                  end
+                end
               end
             end
 
@@ -371,6 +384,20 @@ describe Mongo::BulkWrite do
                   bulk_write.execute
                 }.to raise_exception(Mongo::Error::UnsupportedCollation)
               end
+
+              context 'when a String key is used' do
+
+                let(:requests) do
+                  [{ delete_one: { filter: { name: 'BANG' }, 'collation' => collation }},
+                   { delete_one: { filter: { name: 'DOINK' }, 'collation' => collation }}]
+                end
+
+                it 'raises an exception' do
+                  expect {
+                    bulk_write.execute
+                  }.to raise_exception(Mongo::Error::UnsupportedCollation)
+                end
+              end
             end
           end
 
@@ -473,6 +500,19 @@ describe Mongo::BulkWrite do
                   bulk_write.execute
                 }.to raise_exception(Mongo::Error::UnsupportedCollation)
               end
+
+              context 'when a String key is used' do
+
+                let(:requests) do
+                  [{ delete_many: { filter: { name: 'BANG' }, 'collation' => collation }}]
+                end
+
+                it 'raises an exception' do
+                  expect {
+                    bulk_write.execute
+                  }.to raise_exception(Mongo::Error::UnsupportedCollation)
+                end
+              end
             end
           end
 
@@ -582,6 +622,20 @@ describe Mongo::BulkWrite do
                   bulk_write.execute
                 }.to raise_exception(Mongo::Error::UnsupportedCollation)
               end
+
+              context 'when a String key is used' do
+
+                let(:requests) do
+                  [{ delete_many: { filter: { name: 'BANG' },  'collation' => collation }},
+                   { delete_many: { filter: { name: 'DOINK' },  'collation' => collation }}]
+                end
+
+                it 'raises an exception' do
+                  expect {
+                    bulk_write.execute
+                  }.to raise_exception(Mongo::Error::UnsupportedCollation)
+                end
+              end
             end
           end
 
@@ -698,6 +752,21 @@ describe Mongo::BulkWrite do
                   bulk_write.execute
                 }.to raise_exception(Mongo::Error::UnsupportedCollation)
               end
+
+              context 'when a String key is used' do
+
+                let(:requests) do
+                  [{ replace_one: { filter: { name: 'BANG' },
+                                    replacement: { other: 'pong' },
+                                    'collation' => collation }}]
+                end
+
+                it 'raises an exception' do
+                  expect {
+                    bulk_write.execute
+                  }.to raise_exception(Mongo::Error::UnsupportedCollation)
+                end
+              end
             end
           end
 
@@ -936,6 +1005,21 @@ describe Mongo::BulkWrite do
                   bulk_write.execute
                 }.to raise_exception(Mongo::Error::UnsupportedCollation)
               end
+
+              context 'when a String key is used' do
+
+                let(:requests) do
+                  [{ update_one: { filter: { name: 'BANG' },
+                                   update: { "$set" => { name: 'pong' }},
+                                   'collation' => collation }}]
+                end
+
+                it 'raises an exception' do
+                  expect {
+                    bulk_write.execute
+                  }.to raise_exception(Mongo::Error::UnsupportedCollation)
+                end
+              end
             end
           end
 
@@ -1027,6 +1111,24 @@ describe Mongo::BulkWrite do
                   bulk_write.execute
                 }.to raise_exception(Mongo::Error::UnsupportedCollation)
               end
+
+              context 'when a String key is used' do
+
+                let(:requests) do
+                  [{ update_one: { filter: { name: 'BANG' },
+                                   update: { "$set" => { name: 'pong' }},
+                                   'collation' => collation }},
+                   { update_one: { filter: { name: 'DOINK' },
+                                   update: { "$set" => { name: 'pong' }},
+                                   'collation' => collation }}]
+                end
+
+                it 'raises an exception' do
+                  expect {
+                    bulk_write.execute
+                  }.to raise_exception(Mongo::Error::UnsupportedCollation)
+                end
+              end
             end
           end
 
@@ -1314,6 +1416,21 @@ describe Mongo::BulkWrite do
                   bulk_write.execute
                 }.to raise_exception(Mongo::Error::UnsupportedCollation)
               end
+
+              context 'when a String key is used' do
+
+                let(:requests) do
+                  [{ update_many: { filter: { name: 'BANG' },
+                                    update: { "$set" => { name: 'pong' }},
+                                    'collation' => collation }}]
+                end
+
+                it 'raises an exception' do
+                  expect {
+                    bulk_write.execute
+                  }.to raise_exception(Mongo::Error::UnsupportedCollation)
+                end
+              end
             end
           end
 

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

@@ -235,6 +235,19 @@ describe Mongo::Collection::View::Aggregation do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+
+        context 'when a String key is used' do
+
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
   end
@@ -419,6 +432,19 @@ describe Mongo::Collection::View::Aggregation do
           result
         }.to raise_exception(Mongo::Error::UnsupportedCollation)
       end
+
+      context 'when a String key is used' do
+
+        let(:options) do
+          { 'collation' => { locale: 'en_US', strength: 2 } }
+        end
+
+        it 'raises an exception' do
+          expect {
+            result
+          }.to raise_exception(Mongo::Error::UnsupportedCollation)
+        end
+      end
     end
   end