mongo 2.2.5 → 2.2.6

data/spec/mongo/socket/ssl_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mongo::Socket::SSL, if: running_ssl? do
 
   let(:socket) do
-    described_class.new(*DEFAULT_ADDRESS.split(":"), DEFAULT_ADDRESS.split(":")[0], 5, Socket::PF_INET, options)
+    described_class.new(*default_address.to_s.split(":"), default_address.host, 5, Socket::PF_INET, options)
   end
 
   let(:options) do

data/spec/mongo/uri_spec.rb

@@ -4,7 +4,7 @@ describe Mongo::URI do
   let(:scheme) { 'mongodb://' }
   let(:uri) { described_class.new(string) }
 
-describe 'invalid uris' do
+  describe 'invalid uris' do
 
     context 'string is not uri' do
 
@@ -370,6 +370,10 @@ describe 'invalid uris' do
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:write]).to eq(concern)
+        end
       end
 
       context 'w=majority' do
@@ -379,6 +383,10 @@ describe 'invalid uris' do
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:write]).to eq(concern)
+        end
       end
 
       context 'journal' do
@@ -388,6 +396,10 @@ describe 'invalid uris' do
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:write]).to eq(concern)
+        end
       end
 
       context 'fsync' do
@@ -397,6 +409,10 @@ describe 'invalid uris' do
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:write]).to eq(concern)
+        end
       end
 
       context 'wtimeoutMS' do
@@ -407,6 +423,10 @@ describe 'invalid uris' do
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:write]).to eq(concern)
+        end
       end
     end
 
@@ -420,6 +440,10 @@ describe 'invalid uris' do
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+        end
       end
 
       context 'primaryPreferred' do
@@ -429,6 +453,10 @@ describe 'invalid uris' do
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+        end
       end
 
       context 'secondary' do
@@ -438,6 +466,10 @@ describe 'invalid uris' do
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+        end
       end
 
       context 'secondaryPreferred' do
@@ -447,6 +479,10 @@ describe 'invalid uris' do
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+        end
       end
 
       context 'nearest' do
@@ -456,6 +492,10 @@ describe 'invalid uris' do
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+        end
       end
     end
 
@@ -473,6 +513,10 @@ describe 'invalid uris' do
         it 'sets the read preference tag set' do
           expect(uri.uri_options[:read]).to eq(read)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+        end
       end
 
       context 'multiple read preference tag sets' do
@@ -487,6 +531,10 @@ describe 'invalid uris' do
         it 'sets the read preference tag sets' do
           expect(uri.uri_options[:read]).to eq(read)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+        end
       end
     end
 
@@ -497,6 +545,10 @@ describe 'invalid uris' do
       it 'sets the replica set option' do
         expect(uri.uri_options[:replica_set]).to eq(rs_name)
       end
+
+      it 'sets the options on a client created with the uri' do
+        expect(Mongo::Client.new(string).options[:replica_set]).to eq(rs_name)
+      end
     end
 
     context 'auth mechanism provided' do
@@ -509,6 +561,14 @@ describe 'invalid uris' do
         it 'sets the auth mechanism to :plain' do
           expect(uri.uri_options[:auth_mech]).to eq(expected)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:auth_mech]).to eq(expected)
+        end
+
+        it 'is case-insensitive' do
+          expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
+        end
       end
 
       context 'mongodb-cr' do
@@ -518,6 +578,14 @@ describe 'invalid uris' do
         it 'sets the auth mechanism to :mongodb_cr' do
           expect(uri.uri_options[:auth_mech]).to eq(expected)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:auth_mech]).to eq(expected)
+        end
+
+        it 'is case-insensitive' do
+          expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
+        end
       end
 
       context 'gssapi' do
@@ -527,6 +595,14 @@ describe 'invalid uris' do
         it 'sets the auth mechanism to :gssapi' do
           expect(uri.uri_options[:auth_mech]).to eq(expected)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:auth_mech]).to eq(expected)
+        end
+
+        it 'is case-insensitive' do
+          expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
+        end
       end
 
       context 'scram-sha-1' do
@@ -536,6 +612,14 @@ describe 'invalid uris' do
         it 'sets the auth mechanism to :scram' do
           expect(uri.uri_options[:auth_mech]).to eq(expected)
         end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:auth_mech]).to eq(expected)
+        end
+
+        it 'is case-insensitive' do
+          expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
+        end
       end
     end
 
@@ -544,19 +628,26 @@ describe 'invalid uris' do
 
       context 'regular db' do
         let(: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)
+          expect(uri.uri_options[:auth_source]).to eq(source)
+        end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:auth_source]).to eq(source)
         end
       end
 
       context '$external' do
         let(:source) { '$external' }
-        let(:auth) { Mongo::Options::Redacted.new(:source => :external) }
+        let(:expected) { :external }
 
         it 'sets the auth source to :external' do
-          expect(uri.uri_options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth_source]).to eq(expected)
+        end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:auth_source]).to eq(expected)
         end
       end
     end
@@ -569,12 +660,14 @@ describe 'invalid uris' do
         end
 
         let(:service_name) { 'foo' }
-        let(:auth) do
-          Mongo::Options::Redacted.new(auth_mech_properties: { service_name: service_name })
-        end
+        let(:expected) { Mongo::Options::Redacted.new({ service_name: service_name }) }
 
         it 'sets the auth mechanism properties' do
-          expect(uri.uri_options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+        end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:auth_mech_properties]).to eq(expected)
         end
       end
 
@@ -582,14 +675,15 @@ describe 'invalid uris' do
         let(:options) do
           "authMechanismProperties=CANONICALIZE_HOST_NAME:#{canonicalize_host_name}"
         end
-
         let(:canonicalize_host_name) { 'true' }
-        let(:auth) do
-          Mongo::Options::Redacted.new(auth_mech_properties: { canonicalize_host_name: true })
-        end
+        let(:expected) { Mongo::Options::Redacted.new({ canonicalize_host_name: true }) }
 
         it 'sets the auth mechanism properties' do
-          expect(uri.uri_options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+        end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:auth_mech_properties]).to eq(expected)
         end
       end
 
@@ -599,12 +693,15 @@ describe 'invalid uris' do
         end
 
         let(:service_realm) { 'dumdum' }
-        let(:auth) do
-          Mongo::Options::Redacted.new(auth_mech_properties: { service_realm: service_realm })
-        end
+        let(:expected) { Mongo::Options::Redacted.new({ service_realm: service_realm }) }
+
 
         it 'sets the auth mechanism properties' do
-          expect(uri.uri_options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+        end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:auth_mech_properties]).to eq(expected)
         end
       end
 
@@ -619,14 +716,18 @@ describe 'invalid uris' do
         let(:canonicalize_host_name) { 'true' }
         let(:service_realm) { 'dumdum' }
 
-        let(:auth) do
-          Mongo::Options::Redacted.new(auth_mech_properties: { service_name: service_name,
-                                                               canonicalize_host_name: true,
-                                                               service_realm: service_realm })
+        let(:expected) do
+          Mongo::Options::Redacted.new({ service_name: service_name,
+                                         canonicalize_host_name: true,
+                                         service_realm: service_realm })
         end
 
         it 'sets the auth mechanism properties' do
-          expect(uri.uri_options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+        end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:auth_mech_properties]).to eq(expected)
         end
       end
     end

data/spec/support/authorization.rb

@@ -28,11 +28,6 @@ TEST_COLL = 'test'.freeze
 ADDRESSES = ENV['MONGODB_ADDRESSES'] ? ENV['MONGODB_ADDRESSES'].split(',').freeze :
               [ '127.0.0.1:27017' ].freeze
 
-# A default address to use in tests.
-#
-# @since 2.0.0
-DEFAULT_ADDRESS = ADDRESSES.first
-
 # The topology type.
 #
 # @since 2.0.0
@@ -65,7 +60,9 @@ SSL_OPTIONS = {
 # @since 2.1.0
 BASE_OPTIONS = {
                   max_pool_size: 1,
-                  write: WRITE_CONCERN
+                  write: WRITE_CONCERN,
+                  heartbeat_frequency: 5,
+                  max_read_retries: 5
                }
 
 # Options for test suite clients.
@@ -245,5 +242,12 @@ module Authorization
     context.let(:unauthorized_primary) do
       authorized_client.cluster.next_primary
     end
+
+    # Get a default address (of the primary).
+    #
+    # @since 2.2.6
+    context.let(:default_address) do
+      authorized_client.cluster.next_primary.address
+    end
   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(DEFAULT_ADDRESS)
+  address = options[:address]
 
   server = Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
   description = Mongo::Server::Description.new(address, ismaster, average_round_trip_time)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   EhIn2f8suSc9QAqYt7w4T+PMtjxWTVcXs+Uy2PbDtjhtEBz6ZsP6YSsOpJbrCjCV
   wZtXjpRUvWz86V5vjhHCTE8fqfEb85aeDwUCckPzpio=
   -----END CERTIFICATE-----
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -48,6 +48,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby driver for MongoDB
 email: mongodb-dev@googlegroups.com
 executables:
@@ -151,6 +165,7 @@ files:
 - lib/mongo/error/socket_timeout_error.rb
 - lib/mongo/error/unchangeable_collection_option.rb
 - lib/mongo/error/unexpected_chunk_length.rb
+- lib/mongo/error/unexpected_response.rb
 - lib/mongo/error/unsupported_features.rb
 - lib/mongo/event.rb
 - lib/mongo/event/description_changed.rb
@@ -578,7 +593,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB