mongo 2.0.2 → 2.0.3

data/spec/mongo/server_spec.rb

@@ -13,7 +13,7 @@ describe Mongo::Server do
   describe '#==' do
 
     let(:server) do
-      described_class.new(address, listeners)
+      described_class.new(address, listeners, TEST_OPTIONS)
     end
 
     context 'when the other is not a server' do
@@ -32,7 +32,7 @@ describe Mongo::Server do
       context 'when the addresses match' do
 
         let(:other) do
-          described_class.new(address, listeners)
+          described_class.new(address, listeners, TEST_OPTIONS)
         end
 
         it 'returns true' do
@@ -47,7 +47,7 @@ describe Mongo::Server do
         end
 
         let(:other) do
-          described_class.new(other_address, listeners)
+          described_class.new(other_address, listeners, TEST_OPTIONS)
         end
 
         it 'returns false' do
@@ -60,7 +60,7 @@ describe Mongo::Server do
   describe '#context' do
 
     let(:server) do
-      described_class.new(address, listeners)
+      described_class.new(address, listeners, TEST_OPTIONS)
     end
 
     let(:context) do
@@ -75,7 +75,7 @@ describe Mongo::Server do
   describe '#disconnect!' do
 
     let(:server) do
-      described_class.new(address, listeners)
+      described_class.new(address, listeners, TEST_OPTIONS)
     end
 
     it 'stops the monitor instance' do
@@ -87,7 +87,7 @@ describe Mongo::Server do
   describe '#initialize' do
 
     let(:server) do
-      described_class.new(address, listeners, :heartbeat_frequency => 5)
+      described_class.new(address, listeners, TEST_OPTIONS.merge(:heartbeat_frequency => 5))
     end
 
     it 'sets the address host' do
@@ -99,14 +99,14 @@ describe Mongo::Server do
     end
 
     it 'sets the options' do
-      expect(server.options).to eq(:heartbeat_frequency => 5)
+      expect(server.options).to eq(TEST_OPTIONS.merge(:heartbeat_frequency => 5))
     end
   end
 
   describe '#pool' do
 
     let(:server) do
-      described_class.new(address, listeners)
+      described_class.new(address, listeners, TEST_OPTIONS)
     end
 
     let(:pool) do
@@ -121,7 +121,7 @@ describe Mongo::Server do
   describe '#scan!' do
 
     let(:server) do
-      described_class.new(address, listeners)
+      described_class.new(address, listeners, TEST_OPTIONS)
     end
 
     it 'forces a scan on the monitor' do

data/spec/mongo/socket/ssl_spec.rb

@@ -5,7 +5,7 @@ describe Mongo::Socket::SSL do
   describe '#connect!', if: running_ssl? do
 
     let(:socket) do
-      described_class.new('localhost', 27017, 5, Socket::PF_INET, options)
+      described_class.new(*DEFAULT_ADDRESS.split(":"), 5, Socket::PF_INET, options)
     end
 
     context 'when a certificate is provided' do

data/spec/mongo/uri_spec.rb

@@ -8,7 +8,7 @@ describe Mongo::URI do
     context 'string is not uri' do
       let(:string) { 'tyler' }
       it 'raises an error' do
-        expect { uri }.to raise_error(Mongo::URI::Invalid)
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
       end
     end
   end
@@ -510,7 +510,7 @@ describe Mongo::URI do
       it 'raises an exception' do
         expect {
           uri.options
-        }.to raise_error(Mongo::URI::InvalidOption)
+        }.to raise_error(Mongo::Error::InvalidURIOption)
       end
     end
   end

data/spec/spec_helper.rb

@@ -48,14 +48,14 @@ RSpec.configure do |config|
     begin
       # Adds the test user to the test database with permissions on all
       # databases that will be used in the test suite.
-      ADMIN_AUTHORIZED_CLIENT.database.users.create(TEST_USER)
+      ADMIN_AUTHORIZED_TEST_CLIENT.database.users.create(TEST_USER)
     rescue Exception => e
       unless write_command_enabled?
         # If we are on versions less than 2.6, we need to create a user for
         # each database, since the users are not stored in the admin database
         # but in the system.users collection on the datbases themselves. Also,
         # roles in versions lower than 2.6 can only be strings, not hashes.
-        begin ROOT_AUTHORIZED_CLIENT.database.users.create(TEST_READ_WRITE_USER); rescue; end
+        begin ADMIN_AUTHORIZED_TEST_CLIENT.database.users.create(TEST_READ_WRITE_USER); rescue; end
       end
     end
   end
@@ -80,7 +80,7 @@ CRL_PEM = "#{SSL_CERTS_DIR}/crl.pem"
 # @since 2.0.0
 def standalone?
   $mongo_client ||= initialize_scanned_client!
-  $standalone ||= $mongo_client.cluster.standalone?
+  $standalone ||= $mongo_client.cluster.servers.first.standalone?
 end
 
 # Determine whether the test clients are connecting to a replica set.
@@ -99,6 +99,35 @@ def sharded?
   $sharded ||= $mongo_client.cluster.sharded?
 end
 
+# Determine whether the single address provided is a replica set member.
+# @note To run the specs relying on this to return true,
+#   start a replica set and set the environment variable
+#   MONGODB_ADDRESSES to the address of a single member.
+#
+# @since 2.0.0
+def single_rs_member?
+  $mongo_client ||= initialize_scanned_client!
+  single_seed? && $mongo_client.cluster.servers.first.replica_set_name
+end
+
+# Determine whether the single address provided is a mongos.
+# @note To run the specs relying on this to return true,
+#   start a sharded cluster and set the environment variable
+#   MONGODB_ADDRESSES to the address of a single mongos.
+#
+# @since 2.0.0
+def single_mongos?
+  $mongo_client ||= initialize_scanned_client!
+  single_seed? && $mongo_client.cluster.servers.first.mongos?
+end
+
+# Determine whether a single address was provided.
+#
+# @since 2.0.0
+def single_seed?
+  ADDRESSES.size == 1
+end
+
 # For instances where behaviour is different on different versions, we need to
 # determine in the specs if we are 2.6 or higher.
 #
@@ -118,7 +147,7 @@ def list_command_enabled?
 end
 
 def running_ssl?
-  !!ENV['SSL']
+  SSL
 end
 
 alias :scram_sha_1_enabled? :list_command_enabled?
@@ -136,7 +165,7 @@ end
 #
 # @since 2.0.0
 def initialize_scanned_client!
-  Mongo::Client.new(ADDRESSES, database: TEST_DB, connect: CONNECT)
+  Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(database: TEST_DB))
 end
 
 # require all shared examples

data/spec/support/authorization.rb

@@ -40,6 +40,23 @@ CONNECT = ENV['RS_ENABLED'] == 'true' ? :replica_set.freeze :
             ENV['SHARDED_ENABLED'] == 'true' ? :sharded.freeze :
             :direct.freeze
 
+# The write concern to use in the tests.
+#
+# @since 2.0.0
+WRITE_CONCERN = (CONNECT == :replica_set) ? { w: ADDRESSES.size } : { w: 1 }
+
+# Whether to use SSL.
+#
+# @since 2.0.3
+SSL = ENV['SSL_ENABLED'] == 'true'
+
+# Options for test suite clients.
+#
+# @since 2.0.3
+TEST_OPTIONS = { max_pool_size: 1,
+                 write: WRITE_CONCERN,
+                 ssl: SSL }
+
 # The root user name.
 #
 # @since 2.0.0
@@ -54,7 +71,6 @@ ROOT_USER_PWD = ENV['ROOT_USER_PWD'] || 'password'
 #
 # @since 2.0.0
 ROOT_USER = Mongo::Auth::User.new(
-  database: Mongo::Database::ADMIN,
   user: ROOT_USER_NAME,
   password: ROOT_USER_PWD,
   roles: [
@@ -94,38 +110,16 @@ TEST_READ_WRITE_USER = Mongo::Auth::User.new(
   roles: [ Mongo::Auth::Roles::READ_WRITE, Mongo::Auth::Roles::DATABASE_ADMIN ]
 )
 
-# The write concern to use in the tests.
-#
-# @since 2.0.0
-WRITE_CONCERN = (CONNECT == :replica_set) ? { w: ADDRESSES.size } : { w: 1 }
-
 # Provides an authorized mongo client on the default test database for the
 # default test user.
 #
 # @since 2.0.0
 AUTHORIZED_CLIENT = Mongo::Client.new(
   ADDRESSES,
-  database: TEST_DB,
-  user: TEST_USER.name,
-  password: TEST_USER.password,
-  max_pool_size: 1,
-  write: WRITE_CONCERN,
-  connect: CONNECT
-)
-
-# Provides an authorized mongo client on the default test database for the
-# default root system administrator.
-#
-# @since 2.0.0
-ROOT_AUTHORIZED_CLIENT = Mongo::Client.new(
-  ADDRESSES,
-  auth_source: Mongo::Database::ADMIN,
-  database: TEST_DB,
-  user: ROOT_USER.name,
-  password: ROOT_USER.password,
-  max_pool_size: 1,
-  write: WRITE_CONCERN,
-  connect: CONNECT
+  TEST_OPTIONS.merge(
+    database: TEST_DB,
+    user: TEST_USER.name,
+    password: TEST_USER.password)
 )
 
 # Provides an unauthorized mongo client on the default test database.
@@ -133,10 +127,8 @@ ROOT_AUTHORIZED_CLIENT = Mongo::Client.new(
 # @since 2.0.0
 UNAUTHORIZED_CLIENT = Mongo::Client.new(
   ADDRESSES,
-  database: TEST_DB,
-  max_pool_size: 1,
-  write: WRITE_CONCERN,
-  connect: CONNECT
+  TEST_OPTIONS.merge(
+    database: TEST_DB)
 )
 
 # Provides an unauthorized mongo client on the admin database, for use in
@@ -145,19 +137,19 @@ UNAUTHORIZED_CLIENT = Mongo::Client.new(
 # @since 2.0.0
 ADMIN_UNAUTHORIZED_CLIENT = Mongo::Client.new(
   ADDRESSES,
-  database: Mongo::Database::ADMIN,
-  max_pool_size: 1,
-  write: WRITE_CONCERN,
-  connect: CONNECT
+  TEST_OPTIONS.merge(
+    database: Mongo::Database::ADMIN)
 )
 
-# Get an authorized client on the admin database logged in as the admin
+# Get an authorized client on the test database logged in as the admin
 # root user.
 #
 # @since 2.0.0
-ADMIN_AUTHORIZED_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
+ADMIN_AUTHORIZED_TEST_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
   user: ROOT_USER.name,
-  password: ROOT_USER.password
+  password: ROOT_USER.password,
+  database: TEST_DB,
+  auth_source: Mongo::Database::ADMIN
 )
 
 module Authorization
@@ -185,12 +177,6 @@ module Authorization
     # @since 2.0.0
     context.let(:authorized_client) { AUTHORIZED_CLIENT }
 
-    # Provides an authorized mongo client on the default test database for the
-    # default root system administrator.
-    #
-    # @since 2.0.0
-    context.let(:root_authorized_client) { ROOT_AUTHORIZED_CLIENT }
-
     # Provides an unauthorized mongo client on the default test database.
     #
     # @since 2.0.0
@@ -202,11 +188,11 @@ module Authorization
     # @since 2.0.0
     context.let!(:admin_unauthorized_client) { ADMIN_UNAUTHORIZED_CLIENT }
 
-    # Get an authorized client on the admin database logged in as the admin
+    # Get an authorized client on the test database logged in as the admin
     # root user.
     #
     # @since 2.0.0
-    context.let!(:admin_authorized_client) { ADMIN_AUTHORIZED_CLIENT }
+    context.let!(:root_authorized_client) { ADMIN_AUTHORIZED_TEST_CLIENT }
 
     # Gets the default test collection from the authorized client.
     #

data/spec/support/server_discovery_and_monitoring.rb

@@ -29,7 +29,7 @@ RSpec::Matchers.define :be_topology do |expected|
       when 'ReplicaSetWithPrimary' then actual.replica_set?
       when 'ReplicaSetNoPrimary' then actual.replica_set?
       when 'Sharded' then actual.sharded?
-      when 'Single' then actual.standalone?
+      when 'Single' then actual.single?
       when 'Unknown' then actual.unknown?
     end
   end

data/spec/support/server_selection.rb

@@ -14,7 +14,7 @@ module Mongo
           'ReplicaSetNoPrimary' => Mongo::Cluster::Topology::ReplicaSet,
           'ReplicaSetWithPrimary' => Mongo::Cluster::Topology::ReplicaSet,
           'Sharded' => Mongo::Cluster::Topology::Sharded,
-          'Single' => Mongo::Cluster::Topology::Standalone,
+          'Single' => Mongo::Cluster::Topology::Single,
           'Unknown' => Mongo::Cluster::Topology::Unknown
         }
 
@@ -92,18 +92,6 @@ module Mongo
           type == Mongo::Cluster::Topology::ReplicaSet
         end
 
-        # Does this spec raise an exception.
-        #
-        # @example Determine if the spec raises an exception.
-        #   spec.raises_exception?
-        #
-        # @return [true, false] If the spec raises an exception.
-        #
-        # @since 2.0.0
-        def raises_exception?
-          !server_available? || invalid_server_preference?
-        end
-
         # Does this spec expect a server to be found.
         #
         # @example Will a server be found with this spec.
@@ -116,18 +104,6 @@ module Mongo
           !in_latency_window.empty?
         end
 
-        # Is the read preference defined in the spec invalid.
-        #
-        # @example Determine if the spec's read preference is invalid.
-        #   spec.invalid_server_preference?
-        #
-        # @return [true, false] If the spec's read preference is invalid.
-        #
-        # @since 2.0.0
-        def invalid_server_preference?
-          read_preference['mode'] == 'Primary' && read_preference['tag_sets']
-        end
-
         # The subset of suitable servers that falls within the allowable latency
         #   window.
         # We have to correct for our server selection algorithm that adds the primary

data/spec/support/shared/operation.rb

@@ -43,6 +43,7 @@ shared_context 'operation' do
       allow(cxt).to receive(:primary?) { true }
       allow(cxt).to receive(:secondary?) { false }
       allow(cxt).to receive(:standalone?) { false }
+      allow(cxt).to receive(:slave_ok?) { false }
     end
   end
   let(:secondary_context) do
@@ -54,6 +55,7 @@ shared_context 'operation' do
       allow(cxt).to receive(:secondary?) { true }
       allow(cxt).to receive(:primary?) { false }
       allow(cxt).to receive(:standalone?) { false }
+      allow(cxt).to receive(:slave_ok?) { false }
     end
   end
   let(:primary_context_2_4_version) do
@@ -64,6 +66,7 @@ shared_context 'operation' do
       allow(cxt).to receive(:primary?) { true }
       allow(cxt).to receive(:secondary?) { false }
       allow(cxt).to receive(:standalone?) { false }
+      allow(cxt).to receive(:slave_ok?) { false }
       allow(cxt).to receive(:features) { features_2_4 }
     end
   end

data/spec/support/shared/server_selector.rb

@@ -13,7 +13,7 @@ def server(mode, options = {})
   listeners = Mongo::Event::Listeners.new
   address = Mongo::Address.new('127.0.0.1:27017')
 
-  server = Mongo::Server.new(address, listeners)
+  server = Mongo::Server.new(address, listeners, TEST_OPTIONS)
   description = Mongo::Server::Description.new(address, ismaster, average_round_trip_time)
   server.tap do |s|
     allow(s).to receive(:description).and_return(description)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   o2UXDbWtz5PqoFd8EgNJAn3+BG1pwC9S9pVFG3WPucfAx/bE8iq/vvchHei5Y/Vo
   aAz5f/hY4zFeYWvGDBHYEXE1rTN2hhMSyJscPcFbmz0=
   -----END CERTIFICATE-----
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -67,7 +67,6 @@ files:
 - lib/mongo/auth.rb
 - lib/mongo/auth/cr.rb
 - lib/mongo/auth/cr/conversation.rb
-- lib/mongo/auth/executable.rb
 - lib/mongo/auth/ldap.rb
 - lib/mongo/auth/ldap/conversation.rb
 - lib/mongo/auth/roles.rb
@@ -90,7 +89,7 @@ files:
 - lib/mongo/cluster/topology.rb
 - lib/mongo/cluster/topology/replica_set.rb
 - lib/mongo/cluster/topology/sharded.rb
-- lib/mongo/cluster/topology/standalone.rb
+- lib/mongo/cluster/topology/single.rb
 - lib/mongo/cluster/topology/unknown.rb
 - lib/mongo/collection.rb
 - lib/mongo/collection/view.rb
@@ -114,12 +113,16 @@ files:
 - lib/mongo/error/invalid_file.rb
 - lib/mongo/error/invalid_nonce.rb
 - lib/mongo/error/invalid_replacement_document.rb
+- lib/mongo/error/invalid_server_preference.rb
 - lib/mongo/error/invalid_signature.rb
 - lib/mongo/error/invalid_update_document.rb
+- lib/mongo/error/invalid_uri.rb
+- lib/mongo/error/invalid_uri_option.rb
 - lib/mongo/error/max_bson_size.rb
 - lib/mongo/error/max_message_size.rb
 - lib/mongo/error/multi_index_drop.rb
 - lib/mongo/error/need_primary_server.rb
+- lib/mongo/error/no_server_available.rb
 - lib/mongo/error/operation_failure.rb
 - lib/mongo/error/parser.rb
 - lib/mongo/error/socket_error.rb
@@ -253,7 +256,7 @@ files:
 - spec/mongo/client_spec.rb
 - spec/mongo/cluster/topology/replica_set_spec.rb
 - spec/mongo/cluster/topology/sharded_spec.rb
-- spec/mongo/cluster/topology/standalone_spec.rb
+- spec/mongo/cluster/topology/single_spec.rb
 - spec/mongo/cluster/topology_spec.rb
 - spec/mongo/cluster_spec.rb
 - spec/mongo/collection/view/aggregation_spec.rb
@@ -454,7 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongo
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB
@@ -475,7 +478,7 @@ test_files:
 - spec/mongo/client_spec.rb
 - spec/mongo/cluster/topology/replica_set_spec.rb
 - spec/mongo/cluster/topology/sharded_spec.rb
-- spec/mongo/cluster/topology/standalone_spec.rb
+- spec/mongo/cluster/topology/single_spec.rb
 - spec/mongo/cluster/topology_spec.rb
 - spec/mongo/cluster_spec.rb
 - spec/mongo/collection/view/aggregation_spec.rb