mongo 2.1.0.beta → 2.2.0

data/spec/mongo/server_selection_rtt_spec.rb

@@ -8,80 +8,60 @@ describe 'Server Selection moving average round trip time calculation' do
 
     spec = Mongo::ServerSelection::RTT::Spec.new(file)
 
-    before(:all) do
-
-      module Mongo
-        class Server
-
-          # We monkey-patch the monitor here, so the last average rtt can be controlled.
-          # We keep the API of Monitor#initialize but add in an extra option and set the last rtt.
-          #
-          # @since 2.0.0
-          class Monitor
-
-            def initialize(address, listeners, options = {})
-              @description = Mongo::Server::Description.new(address, {})
-              @inspector = Mongo::Server::Description::Inspector.new(listeners)
-              @options = options.freeze
-              @connection = Connection.new(address, options)
-              @last_round_trip_time = options[:avg_rtt_ms]
-              @mutex = Mutex.new
-            end
+    context(spec.description) do
 
-            private
+      before(:all) do
 
-            # We monkey patch this method to use an instance variable instead of calculating time elapsed.
+        module Mongo
+          class Server
+
+            # We monkey-patch the monitor here, so the last average rtt can be controlled.
+            # We keep the API of Monitor#initialize but add in an extra option and set the last rtt.
             #
             # @since 2.0.0
-            def average_round_trip_time(start)
-              new_rtt = @new_rtt_ms
-              RTT_WEIGHT_FACTOR * new_rtt + (1 - RTT_WEIGHT_FACTOR) * (@last_round_trip_time || new_rtt)
+            class Monitor
+
+              alias :original_initialize :initialize
+              def initialize(address, listeners, options = {})
+                @description = Mongo::Server::Description.new(address, {})
+                @inspector = Mongo::Server::Description::Inspector.new(listeners)
+                @options = options.freeze
+                @connection = Connection.new(address, options)
+                @last_round_trip_time = options[:avg_rtt_ms]
+                @mutex = Mutex.new
+              end
+
+              # We monkey patch this method to use an instance variable instead of calculating time elapsed.
+              #
+              # @since 2.0.0
+              alias :original_average_round_trip_time :average_round_trip_time
+              def average_round_trip_time(start)
+                new_rtt = @new_rtt_ms
+                RTT_WEIGHT_FACTOR * new_rtt + (1 - RTT_WEIGHT_FACTOR) * (@last_round_trip_time || new_rtt)
+              end
             end
           end
         end
       end
-    end
 
-    after(:all) do
+      after(:all) do
 
-      module Mongo
-        class Server
+        module Mongo
+          class Server
 
-          # Return the monitor implementation to its original for the other
-          # tests in the suite.
-          class Monitor
+            # Return the monitor implementation to its original for the other
+            # tests in the suite.
+            class Monitor
 
-            # Create the new server monitor.
-            #
-            # @example Create the server monitor.
-            #   Mongo::Server::Monitor.new(address, listeners)
-            #
-            # @param [ Address ] address The address to monitor.
-            # @param [ Event::Listeners ] listeners The event listeners.
-            # @param [ Hash ] options The options.
-            #
-            # @since 2.0.0
-            def initialize(address, listeners, options = {})
-              @description = Description.new(address, {})
-              @inspector = Description::Inspector.new(listeners)
-              @options = options.freeze
-              @connection = Connection.new(address, options)
-              @last_round_trip_time = nil
-              @mutex = Mutex.new
-            end
-
-            private
+              alias :initialize :original_initialize
+              remove_method(:original_initialize)
 
-            def average_round_trip_time(start)
-              new_rtt = Time.now - start
-              RTT_WEIGHT_FACTOR * new_rtt + (1 - RTT_WEIGHT_FACTOR) * (@last_round_trip_time || new_rtt)
+              alias :average_round_trip_time :original_average_round_trip_time
+              remove_method(:original_average_round_trip_time)
             end
           end
         end
       end
-    end
-
-    context(spec.description) do
 
       let(:address) do
         Mongo::Address.new('127.0.0.1:27017')

data/spec/mongo/server_selection_spec.rb

@@ -39,6 +39,7 @@ describe 'Server Selection' do
             allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
             allow(s).to receive(:primary?).and_return(server['type'] == 'RSPrimary')
+            allow(s).to receive(:connectable?).and_return(true)
           end
         end
       end
@@ -49,14 +50,15 @@ describe 'Server Selection' do
           Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
             allow(s).to receive(:tags).and_return(server['tags'])
+            allow(s).to receive(:connectable?).and_return(true)
           end
         end
       end
 
       let(:server_selector) do
-        Mongo::ServerSelector.get({ :mode => spec.read_preference['mode'],
-                                    :tag_sets => spec.read_preference['tag_sets'] },
-                                    :server_selection_timeout => 1)
+        Mongo::ServerSelector.get(:mode => spec.read_preference['mode'],
+                                  :tag_sets => spec.read_preference['tag_sets'],
+                                  :server_selection_timeout => 1)
       end
 
       before do

data/spec/mongo/server_selector/nearest_spec.rb

@@ -2,30 +2,38 @@ require 'spec_helper'
 
 describe Mongo::ServerSelector::Nearest do
 
+  let(:name) { :nearest }
+
   include_context 'server selector'
 
-  it_behaves_like 'a read preference mode' do
-    let(:name) { :nearest }
+  it_behaves_like 'a server selector mode' do
     let(:slave_ok) { true }
   end
 
-  it_behaves_like 'a read preference mode accepting tag sets'
+  it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector with sensitive data in its options'
 
   describe '#to_mongos' do
 
     context 'tag set not provided' do
+
+      let(:expected) do
+        { :mode => 'nearest' }
+      end
+
       it 'returns a read preference formatted for mongos' do
-        expect(read_pref.to_mongos).to eq({ :mode => 'nearest' })
+        expect(selector.to_mongos).to eq(expected)
       end
     end
 
     context 'tag set provided' do
+
       let(:tag_sets) do
         [tag_set]
       end
 
       it 'returns a read preference formatted for mongos' do
-        expect(read_pref.to_mongos).to eq(
+        expect(selector.to_mongos).to eq(
           { :mode => 'nearest', :tags => tag_sets }
         )
       end
@@ -38,7 +46,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(read_pref.send(:select, candidates)).to be_empty
+        expect(selector.send(:select, candidates)).to be_empty
       end
     end
 
@@ -46,7 +54,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(read_pref.send(:select, candidates)).to eq([primary])
+        expect(selector.send(:select, candidates)).to eq([primary])
       end
     end
 
@@ -54,7 +62,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [secondary] }
 
       it 'returns an array with the secondary' do
-        expect(read_pref.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select, candidates)).to eq([secondary])
       end
     end
 
@@ -62,7 +70,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [primary, secondary] }
 
       it 'returns an array with the primary and secondary' do
-        expect(read_pref.send(:select, candidates)).to match_array([primary, secondary])
+        expect(selector.send(:select, candidates)).to match_array([primary, secondary])
       end
     end
 
@@ -70,7 +78,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [secondary, secondary] }
 
       it 'returns an array with the secondaries' do
-        expect(read_pref.send(:select, candidates)).to match_array([secondary, secondary])
+        expect(selector.send(:select, candidates)).to match_array([secondary, secondary])
       end
     end
 
@@ -89,7 +97,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary] }
 
           it 'returns an empty array' do
-            expect(read_pref.send(:select, candidates)).to be_empty
+            expect(selector.send(:select, candidates)).to be_empty
           end
         end
 
@@ -97,7 +105,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [matching_primary] }
 
           it 'returns an array with the primary' do
-            expect(read_pref.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select, candidates)).to eq([matching_primary])
           end
         end
 
@@ -105,7 +113,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [secondary] }
 
           it 'returns an empty array' do
-            expect(read_pref.send(:select, candidates)).to be_empty
+            expect(selector.send(:select, candidates)).to be_empty
           end
         end
 
@@ -113,7 +121,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [matching_secondary] }
 
           it 'returns an array with the matching secondary' do
-            expect(read_pref.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select, candidates)).to eq([matching_secondary])
           end
         end
       end
@@ -124,7 +132,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, secondary, secondary] }
 
           it 'returns an empty array' do
-            expect(read_pref.send(:select, candidates)).to be_empty
+            expect(selector.send(:select, candidates)).to be_empty
           end
         end
 
@@ -132,7 +140,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [matching_primary, secondary, secondary] }
 
           it 'returns an array with the matching primary' do
-            expect(read_pref.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select, candidates)).to eq([matching_primary])
           end
         end
 
@@ -140,7 +148,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, matching_secondary, secondary] }
 
           it 'returns an array with the matching secondary' do
-            expect(read_pref.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select, candidates)).to eq([matching_secondary])
           end
         end
 
@@ -149,7 +157,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:expected) { [matching_secondary, matching_secondary] }
 
           it 'returns an array with the matching secondaries' do
-            expect(read_pref.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select, candidates)).to eq(expected)
           end
         end
 
@@ -158,7 +166,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:expected) { [matching_primary, matching_secondary] }
 
           it 'returns an array with the matching primary and secondary' do
-            expect(read_pref.send(:select, candidates)).to match_array(expected)
+            expect(selector.send(:select, candidates)).to match_array(expected)
           end
         end
       end
@@ -174,7 +182,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [far_primary] }
 
           it 'returns array with far primary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select, candidates)).to eq([far_primary])
           end
         end
 
@@ -182,7 +190,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [far_secondary] }
 
           it 'returns array with far primary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select, candidates)).to eq([far_secondary])
           end
         end
       end
@@ -193,7 +201,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, secondary] }
 
           it 'returns array with primary and secondary' do
-            expect(read_pref.send(:select, candidates)).to match_array(
+            expect(selector.send(:select, candidates)).to match_array(
               [primary, secondary]
             )
           end
@@ -203,7 +211,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, far_secondary] }
 
           it 'returns array with local primary' do
-            expect(read_pref.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select, candidates)).to eq([primary])
           end
         end
 
@@ -211,7 +219,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [far_primary, secondary] }
 
           it 'returns array with local secondary' do
-            expect(read_pref.send(:select, candidates)).to eq([secondary])
+            expect(selector.send(:select, candidates)).to eq([secondary])
           end
         end
 
@@ -220,7 +228,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:expected) { [far_primary, far_secondary] }
 
           it 'returns array with both servers' do
-            expect(read_pref.send(:select, candidates)).to match_array(expected)
+            expect(selector.send(:select, candidates)).to match_array(expected)
           end
         end
 
@@ -231,7 +239,7 @@ describe Mongo::ServerSelector::Nearest do
             let(:expected) { [primary, secondary] }
 
             it 'returns array with local primary and local secondary' do
-              expect(read_pref.send(:select, candidates)).to match_array(expected)
+              expect(selector.send(:select, candidates)).to match_array(expected)
             end
           end
 
@@ -240,7 +248,7 @@ describe Mongo::ServerSelector::Nearest do
             let(:expected) { [secondary, secondary] }
 
             it 'returns array with the two local secondaries' do
-              expect(read_pref.send(:select, candidates)).to match_array(expected)
+              expect(selector.send(:select, candidates)).to match_array(expected)
             end
           end
         end

data/spec/mongo/server_selector/primary_preferred_spec.rb

@@ -2,21 +2,23 @@ require 'spec_helper'
 
 describe Mongo::ServerSelector::PrimaryPreferred do
 
+  let(:name) { :primary_preferred }
+
   include_context 'server selector'
 
-  it_behaves_like 'a read preference mode' do
-    let(:name) { :primary_preferred }
+  it_behaves_like 'a server selector mode' do
     let(:slave_ok) { true }
   end
 
-  it_behaves_like 'a read preference mode accepting tag sets'
+  it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector with sensitive data in its options'
 
   describe '#to_mongos' do
 
     context 'tag sets not provided' do
 
       it 'returns a read preference formatted for mongos' do
-        expect(read_pref.to_mongos).to eq({ :mode => 'primaryPreferred' })
+        expect(selector.to_mongos).to eq({ :mode => 'primaryPreferred' })
       end
     end
 
@@ -24,7 +26,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:tag_sets) { [tag_set] }
 
       it 'returns a read preference formatted for mongos' do
-        expect(read_pref.to_mongos).to eq(
+        expect(selector.to_mongos).to eq(
           { :mode => 'primaryPreferred', :tags => tag_sets}
         )
       end
@@ -37,7 +39,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(read_pref.send(:select, candidates)).to be_empty
+        expect(selector.send(:select, candidates)).to be_empty
       end
     end
 
@@ -45,7 +47,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:candidates) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(read_pref.send(:select, candidates)).to eq( [primary] )
+        expect(selector.send(:select, candidates)).to eq( [primary] )
       end
     end
 
@@ -53,7 +55,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:candidates) { [secondary] }
 
       it 'returns an array with the secondary' do
-        expect(read_pref.send(:select, candidates)).to eq( [secondary] )
+        expect(selector.send(:select, candidates)).to eq( [secondary] )
       end
     end
 
@@ -62,7 +64,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:expected) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(read_pref.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select, candidates)).to eq(expected)
       end
     end
 
@@ -71,7 +73,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:expected) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(read_pref.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select, candidates)).to eq(expected)
       end
     end
 
@@ -92,7 +94,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [primary] }
 
           it 'returns array with primary' do
-            expect(read_pref.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select, candidates)).to eq([primary])
           end
         end
 
@@ -100,7 +102,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [matching_primary] }
 
           it 'returns array with matching primary' do
-            expect(read_pref.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select, candidates)).to eq([matching_primary])
           end
         end
 
@@ -108,7 +110,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [matching_secondary] }
 
           it 'returns array with matching secondary' do
-            expect(read_pref.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select, candidates)).to eq([matching_secondary])
           end
         end
 
@@ -116,7 +118,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [secondary] }
 
           it 'returns an empty array' do
-            expect(read_pref.send(:select, candidates)).to be_empty
+            expect(selector.send(:select, candidates)).to be_empty
           end
         end
       end
@@ -127,7 +129,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [primary, secondary, secondary] }
 
           it 'returns an array with the primary' do
-            expect(read_pref.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select, candidates)).to eq([primary])
           end
         end
 
@@ -135,7 +137,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [matching_primary, secondary, secondary] }
 
           it 'returns an array of the primary' do
-            expect(read_pref.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select, candidates)).to eq([matching_primary])
           end
         end
 
@@ -144,7 +146,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:expected) { [primary] }
 
           it 'returns an array of the primary' do
-            expect(read_pref.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select, candidates)).to eq(expected)
           end
         end
 
@@ -153,7 +155,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:expected) { [primary] }
 
           it 'returns an array of the primary ' do
-            expect(read_pref.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select, candidates)).to eq(expected)
           end
         end
 
@@ -162,7 +164,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:expected) { [primary] }
 
           it 'returns an array of the primary' do
-            expect(read_pref.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select, candidates)).to eq(expected)
           end
         end
       end
@@ -178,7 +180,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [far_primary] }
 
           it 'returns array with far primary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select, candidates)).to eq([far_primary])
           end
         end
 
@@ -186,7 +188,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [far_secondary] }
 
           it 'returns array with far primary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select, candidates)).to eq([far_secondary])
           end
 
         end
@@ -201,7 +203,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [primary] }
 
             it 'returns an array of the primary' do
-              expect(read_pref.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select, candidates)).to eq(expected)
             end
           end
 
@@ -210,7 +212,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [primary] }
 
             it 'returns an array of the primary' do
-              expect(read_pref.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select, candidates)).to eq(expected)
             end
           end
 
@@ -219,7 +221,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [far_primary] }
 
             it 'returns an array of the far primary' do
-              expect(read_pref.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select, candidates)).to eq(expected)
             end
           end
 
@@ -228,7 +230,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [far_primary] }
 
             it 'returns an array of the far primary' do
-              expect(read_pref.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select, candidates)).to eq(expected)
             end
           end
 
@@ -239,7 +241,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
               let(:expected) { [primary] }
 
               it 'returns an array of the primary' do
-                expect(read_pref.send(:select, candidates)).to eq(expected)
+                expect(selector.send(:select, candidates)).to eq(expected)
               end
             end
 
@@ -248,7 +250,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
               let(:expected) { [far_primary] }
 
               it 'returns an array with primary' do
-                expect(read_pref.send(:select, candidates)).to eq(expected)
+                expect(selector.send(:select, candidates)).to eq(expected)
               end
             end
           end
@@ -261,7 +263,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [secondary] }
 
             it 'returns an array with the secondary' do
-              expect(read_pref.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select, candidates)).to eq(expected)
             end
           end
 
@@ -270,7 +272,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [secondary] }
 
             it 'returns an array of the secondary' do
-              expect(read_pref.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select, candidates)).to eq(expected)
             end
           end
 
@@ -279,7 +281,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [secondary, secondary] }
 
             it 'returns an array of the secondary' do
-              expect(read_pref.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select, candidates)).to eq(expected)
             end
           end
         end