mongo 2.4.0.rc1 → 2.4.0

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.rc1'.freeze
+  VERSION = '2.4.0'.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.rc1'
+  s.add_dependency 'bson', '~> 4.2.0'
 end

data/spec/mongo/auth/cr_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Auth::CR do
   end
 
   let(:monitoring) do
-    Mongo::Monitoring.new
+    Mongo::Monitoring.new(monitoring: false)
   end
 
   let(:listeners) do
@@ -16,10 +16,15 @@ describe Mongo::Auth::CR do
 
   let(:cluster) do
     double('cluster').tap do |cl|
+      allow(cl).to receive(:topology).and_return(topology)
       allow(cl).to receive(:app_metadata).and_return(app_metadata)
     end
   end
 
+  let(:topology) do
+    double('topology')
+  end
+
   let(:server) do
     Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
   end

data/spec/mongo/auth/ldap_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Auth::LDAP do
   end
 
   let(:monitoring) do
-    Mongo::Monitoring.new
+    Mongo::Monitoring.new(monitoring: false)
   end
 
   let(:listeners) do
@@ -16,10 +16,15 @@ describe Mongo::Auth::LDAP do
 
   let(:cluster) do
     double('cluster').tap do |cl|
+      allow(cl).to receive(:topology).and_return(topology)
       allow(cl).to receive(:app_metadata).and_return(app_metadata)
     end
   end
 
+  let(:topology) do
+    double('topology')
+  end
+
   let(:server) do
     Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
   end

data/spec/mongo/auth/scram_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Auth::SCRAM do
   end
 
   let(:monitoring) do
-    Mongo::Monitoring.new
+    Mongo::Monitoring.new(monitoring: false)
   end
 
   let(:listeners) do
@@ -16,10 +16,15 @@ describe Mongo::Auth::SCRAM do
 
   let(:cluster) do
     double('cluster').tap do |cl|
+      allow(cl).to receive(:topology).and_return(topology)
       allow(cl).to receive(:app_metadata).and_return(app_metadata)
     end
   end
 
+  let(:topology) do
+    double('topology')
+  end
+
   let(:server) do
     Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
   end

data/spec/mongo/auth/x509/conversation_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe Mongo::Auth::X509::Conversation do
+
+  let(:user) do
+    Mongo::Auth::User.new(
+      database: Mongo::Database::ADMIN,
+      user: 'user',
+    )
+  end
+
+  let(:conversation) do
+    described_class.new(user)
+  end
+
+  describe '#start' do
+
+    let(:query) do
+      conversation.start
+    end
+
+    let(:selector) do
+      query.selector
+    end
+
+    it 'sets username' do
+      expect(selector[:user]).to eq('user')
+    end
+
+    it 'sets the mechanism' do
+      expect(selector[:mechanism]).to eq('MONGODB-X509')
+    end
+
+    context 'when a username is not provided' do
+
+      let(:user) do
+        Mongo::Auth::User.new(
+          database: Mongo::Database::ADMIN
+        )
+      end
+
+      it 'does not set the username' do
+        expect(selector[:user]).to be_nil
+      end
+
+      it 'sets the mechanism' do
+        expect(selector[:mechanism]).to eq('MONGODB-X509')
+      end
+    end
+
+    context 'when the username is nil' do
+
+      let(:user) do
+        Mongo::Auth::User.new(
+          database: Mongo::Database::ADMIN,
+          user: nil
+        )
+      end
+
+      it 'does not set the username' do
+        expect(selector.has_key?(:user)).to be(false)
+      end
+
+      it 'sets the mechanism' do
+        expect(selector[:mechanism]).to eq('MONGODB-X509')
+      end
+    end
+  end
+end

data/spec/mongo/auth/x509_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Auth::X509 do
   end
 
   let(:monitoring) do
-    Mongo::Monitoring.new
+    Mongo::Monitoring.new(monitoring: false)
   end
 
   let(:listeners) do
@@ -16,10 +16,15 @@ describe Mongo::Auth::X509 do
 
   let(:cluster) do
     double('cluster').tap do |cl|
+      allow(cl).to receive(:topology).and_return(topology)
       allow(cl).to receive(:app_metadata).and_return(app_metadata)
     end
   end
 
+  let(:topology) do
+    double('topology')
+  end
+
   let(:server) do
     Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
   end
@@ -36,17 +41,17 @@ describe Mongo::Auth::X509 do
 
     context 'when the user is not authorized for the database' do
 
-      let(:cr) do
+      let(:x509) do
         described_class.new(user)
       end
 
       let(:login) do
-        cr.login(connection).documents[0]
+        x509.login(connection).documents[0]
       end
 
       it 'logs the user into the connection' do
         expect {
-          cr.login(connection)
+          x509.login(connection)
         }.to raise_error(Mongo::Auth::Unauthorized)
       end
     end

data/spec/mongo/client_spec.rb

@@ -158,7 +158,7 @@ describe Mongo::Client do
       described_class.new(
         ['127.0.0.1:27017'],
         :read => { :mode => :primary },
-        :local_threshold => 10,
+        :local_threshold => 0.010,
         :server_selection_timeout => 10000,
         :database => TEST_DB
       )
@@ -166,7 +166,7 @@ describe Mongo::Client do
 
     let(:options) do
       Mongo::Options::Redacted.new(:read => { :mode => :primary },
-                                    :local_threshold => 10,
+                                    :local_threshold => 0.010,
                                     :server_selection_timeout => 10000,
                                     :database => TEST_DB)
     end
@@ -271,6 +271,44 @@ describe Mongo::Client do
           expect(client.cluster.options[:heartbeat_frequency]).to eq(client.options[:heartbeat_frequency])
         end
       end
+
+      context 'when platform details are specified' do
+
+        let(:app_metadata) do
+          client.cluster.app_metadata
+        end
+
+        let(:client) do
+          described_class.new(['127.0.0.1:27017'], :platform => 'mongoid-6.0.2')
+        end
+
+        it 'includes the platform info in the app metadata' do
+          expect(app_metadata.send(:full_client_document)[:platform]).to match(/mongoid-6\.0\.2/)
+        end
+      end
+
+      context 'when platform details are not specified' do
+
+        let(:app_metadata) do
+          client.cluster.app_metadata
+        end
+
+        let(:client) do
+          described_class.new(['127.0.0.1:27017'])
+        end
+
+        let(:platform_string) do
+          [
+            RUBY_VERSION,
+            RUBY_PLATFORM,
+            RbConfig::CONFIG['build']
+          ].join(', ')
+        end
+
+        it 'does not include the platform info in the app metadata' do
+          expect(app_metadata.send(:full_client_document)[:platform]).to eq(platform_string)
+        end
+      end
     end
 
     context 'when providing a connection string' do

data/spec/mongo/cluster/topology/replica_set_spec.rb

@@ -11,11 +11,12 @@ describe Mongo::Cluster::Topology::ReplicaSet do
   end
 
   let(:monitoring) do
-    Mongo::Monitoring.new
+    Mongo::Monitoring.new(monitoring: false)
   end
 
   let(:cluster) do
     double('cluster').tap do |cl|
+      allow(cl).to receive(:topology).and_return(topology)
       allow(cl).to receive(:app_metadata).and_return(app_metadata)
     end
   end
@@ -64,7 +65,7 @@ describe Mongo::Cluster::Topology::ReplicaSet do
     context 'when no replica set name is provided' do
 
       let(:topology) do
-        described_class.new({})
+        described_class.new({}, monitoring, [])
       end
 
       let(:servers) do
@@ -79,7 +80,7 @@ describe Mongo::Cluster::Topology::ReplicaSet do
     context 'when a replica set name is provided' do
 
       let(:topology) do
-        described_class.new(:replica_set => 'testing')
+        described_class.new({ :replica_set => 'testing' }, monitoring)
       end
 
       let(:servers) do
@@ -95,21 +96,229 @@ describe Mongo::Cluster::Topology::ReplicaSet do
   describe '.replica_set?' do
 
     it 'returns true' do
-      expect(described_class.new({})).to be_replica_set
+      expect(described_class.new({}, monitoring)).to be_replica_set
     end
   end
 
   describe '.sharded?' do
 
     it 'returns false' do
-      expect(described_class.new({})).to_not be_sharded
+      expect(described_class.new({}, monitoring)).to_not be_sharded
     end
   end
 
   describe '.single?' do
 
     it 'returns false' do
-      expect(described_class.new({})).to_not be_single
+      expect(described_class.new({}, monitoring)).to_not be_single
+    end
+  end
+
+  describe '#has_readable_servers?' do
+
+    let(:topology) do
+      described_class.new({}, monitoring, [])
+    end
+
+    let(:cluster) do
+      double('cluster', servers: servers, single?: false, sharded?: false, unknown?: false)
+    end
+
+    context 'when the read preference is primary' do
+
+      let(:selector) do
+        Mongo::ServerSelector.get(:mode => :primary)
+      end
+
+      context 'when a primary exists' do
+
+        let(:servers) do
+          [ double('server', primary?: true) ]
+        end
+
+        it 'returns true' do
+          expect(topology).to have_readable_server(cluster, selector)
+        end
+      end
+
+      context 'when a primary does not exist' do
+
+        let(:servers) do
+          [ double('server', primary?: false) ]
+        end
+
+        it 'returns false' do
+          expect(topology).to_not have_readable_server(cluster, selector)
+        end
+      end
+    end
+
+    context 'when the read preference is primary preferred' do
+
+      let(:selector) do
+        Mongo::ServerSelector.get(:mode => :primary_preferred)
+      end
+
+      context 'when a primary exists' do
+
+        let(:servers) do
+          [ double('server', primary?: true, secondary?: false) ]
+        end
+
+        it 'returns true' do
+          expect(topology).to have_readable_server(cluster, selector)
+        end
+      end
+
+      context 'when a primary does not exist' do
+
+        let(:servers) do
+          [ double('server', primary?: false, secondary?: true, average_round_trip_time: 0.01) ]
+        end
+
+        it 'returns true' do
+          expect(topology).to have_readable_server(cluster, selector)
+        end
+      end
+    end
+
+    context 'when the read preference is secondary' do
+
+      let(:selector) do
+        Mongo::ServerSelector.get(:mode => :secondary)
+      end
+
+      context 'when a secondary exists' do
+
+        let(:servers) do
+          [ double('server', primary?: false, secondary?: true, average_round_trip_time: 0.01) ]
+        end
+
+        it 'returns true' do
+          expect(topology).to have_readable_server(cluster, selector)
+        end
+      end
+
+      context 'when a secondary does not exist' do
+
+        let(:servers) do
+          [ double('server', primary?: true, secondary?: false) ]
+        end
+
+        it 'returns false' do
+          expect(topology).to_not have_readable_server(cluster, selector)
+        end
+      end
+    end
+
+    context 'when the read preference is secondary preferred' do
+
+      let(:selector) do
+        Mongo::ServerSelector.get(:mode => :secondary_preferred)
+      end
+
+      context 'when a secondary exists' do
+
+        let(:servers) do
+          [ double('server', primary?: false, secondary?: true, average_round_trip_time: 0.01) ]
+        end
+
+        it 'returns true' do
+          expect(topology).to have_readable_server(cluster, selector)
+        end
+      end
+
+      context 'when a secondary does not exist' do
+
+        let(:servers) do
+          [ double('server', secondary?: false, primary?: true) ]
+        end
+
+        it 'returns true' do
+          expect(topology).to have_readable_server(cluster, selector)
+        end
+      end
+    end
+
+    context 'when the read preference is nearest' do
+
+      let(:selector) do
+        Mongo::ServerSelector.get(:mode => :nearest)
+      end
+
+      let(:servers) do
+        [ double('server', primary?: false, secondary?: true, average_round_trip_time: 0.01) ]
+      end
+
+      it 'returns true' do
+        expect(topology).to have_readable_server(cluster, selector)
+      end
+    end
+
+    context 'when the read preference is not provided' do
+
+      context 'when a primary exists' do
+
+        let(:servers) do
+          [ double('server', primary?: true, secondary?: false) ]
+        end
+
+        it 'returns true' do
+          expect(topology).to have_readable_server(cluster)
+        end
+      end
+
+      context 'when a primary does not exist' do
+
+        let(:servers) do
+          [ double('server', primary?: false, secondary?: true, average_round_trip_time: 0.01) ]
+        end
+
+        it 'returns false' do
+          expect(topology).to_not have_readable_server(cluster)
+        end
+      end
+    end
+  end
+
+  describe '#has_writable_servers?' do
+
+    let(:topology) do
+      described_class.new({}, monitoring, [])
+    end
+
+    context 'when a primary server exists' do
+
+      let(:primary) do
+        double('server', :primary? => true)
+      end
+
+      let(:secondary) do
+        double('server', :primary? => false)
+      end
+
+      let(:cluster) do
+        double('cluster', servers: [ primary, secondary ])
+      end
+
+      it 'returns true' do
+        expect(topology).to have_writable_server(cluster)
+      end
+    end
+
+    context 'when no primary server exists' do
+
+      let(:server) do
+        double('server', :primary? => false)
+      end
+
+      let(:cluster) do
+        double('cluster', servers: [ server ])
+      end
+
+      it 'returns false' do
+        expect(topology).to_not have_writable_server(cluster)
+      end
     end
   end
 
@@ -133,7 +342,7 @@ describe Mongo::Cluster::Topology::ReplicaSet do
     end
 
     let(:topology) do
-      described_class.new(:replica_set => 'testing')
+      described_class.new({ :replica_set => 'testing' }, monitoring)
     end
 
     before do
@@ -207,7 +416,7 @@ describe Mongo::Cluster::Topology::ReplicaSet do
     end
 
     let(:topology) do
-      described_class.new(:replica_set => 'testing')
+      described_class.new({ :replica_set => 'testing' }, monitoring)
     end
 
     before do
@@ -289,7 +498,7 @@ describe Mongo::Cluster::Topology::ReplicaSet do
     end
 
     let(:topology) do
-      described_class.new(:replica_set => 'testing')
+      described_class.new({ :replica_set => 'testing' }, monitoring)
     end
 
     before do