mongo 2.0.6 → 2.1.0

data/spec/mongo/server_selector/secondary_preferred_spec.rb

@@ -2,14 +2,16 @@ require 'spec_helper'
 
 describe Mongo::ServerSelector::SecondaryPreferred do
 
+  let(:name) { :secondary_preferred }
+
   include_context 'server selector'
 
-  it_behaves_like 'a read preference mode' do
-    let(:name) { :secondary_preferred }
+  it_behaves_like 'a server selector mode' do
     let(:slave_ok) { true }
   end
+  it_behaves_like 'a server selector with sensitive data in its options'
 
-  it_behaves_like 'a read preference mode accepting tag sets'
+  it_behaves_like 'a server selector accepting tag sets'
 
   describe '#to_mongos' do
 
@@ -20,7 +22,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       end
 
       it 'returns a read preference formatted for mongos' do
-        expect(read_pref.to_mongos).to eq(
+        expect(selector.to_mongos).to eq(
           { :mode => 'secondaryPreferred', :tags => tag_sets }
         )
       end
@@ -29,7 +31,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
     context 'tag sets not provided' do
 
       it 'returns nil' do
-        expect(read_pref.to_mongos).to be_nil
+        expect(selector.to_mongos).to be_nil
       end
     end
   end
@@ -40,7 +42,7 @@ describe Mongo::ServerSelector::SecondaryPreferred 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
 
@@ -48,7 +50,7 @@ describe Mongo::ServerSelector::SecondaryPreferred 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
 
@@ -56,7 +58,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       let(:candidates) { [secondary] }
 
       it 'returns array with secondary' do
-        expect(read_pref.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select, candidates)).to eq([secondary])
       end
     end
 
@@ -65,7 +67,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       let(:expected) { [secondary, primary] }
 
       it 'returns array with secondary first, then primary' do
-        expect(read_pref.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select, candidates)).to eq(expected)
       end
     end
 
@@ -74,7 +76,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       let(:expected) { [secondary, primary] }
 
       it 'returns array with secondary and primary' do
-        expect(read_pref.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select, candidates)).to eq(expected)
       end
     end
 
@@ -98,7 +100,7 @@ describe Mongo::ServerSelector::SecondaryPreferred 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
 
@@ -106,7 +108,7 @@ describe Mongo::ServerSelector::SecondaryPreferred 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
 
@@ -114,7 +116,7 @@ describe Mongo::ServerSelector::SecondaryPreferred 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
 
@@ -122,7 +124,7 @@ describe Mongo::ServerSelector::SecondaryPreferred 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
@@ -133,7 +135,7 @@ describe Mongo::ServerSelector::SecondaryPreferred 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
 
@@ -141,7 +143,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary, matching_secondary] }
 
           it 'returns an array of the matching secondary, then primary' do
-            expect(read_pref.send(:select, candidates)).to eq(
+            expect(selector.send(:select, candidates)).to eq(
               [matching_secondary, primary]
             )
           end
@@ -152,7 +154,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) { [matching_secondary, matching_secondary, primary] }
 
           it 'returns an array of the matching secondaries, then primary' do
-            expect(read_pref.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select, candidates)).to eq(expected)
           end
         end
 
@@ -161,7 +163,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) {[matching_secondary, matching_primary] }
 
           it 'returns an array of the matching secondary, then the primary' do
-            expect(read_pref.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select, candidates)).to eq(expected)
           end
         end
       end
@@ -177,7 +179,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [far_primary] }
 
           it 'returns array with primary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select, candidates)).to eq([far_primary])
           end
         end
 
@@ -185,7 +187,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select, candidates)).to eq([far_secondary])
           end
         end
       end
@@ -196,7 +198,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary, secondary] }
 
           it 'returns an array with secondary, then primary' do
-            expect(read_pref.send(:select, candidates)).to eq([secondary, primary])
+            expect(selector.send(:select, candidates)).to eq([secondary, primary])
           end
         end
 
@@ -204,7 +206,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary, far_secondary] }
 
           it 'returns an array with the secondary, then primary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_secondary, primary])
+            expect(selector.send(:select, candidates)).to eq([far_secondary, primary])
           end
         end
 
@@ -213,7 +215,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) { [secondary, far_primary] }
 
           it 'returns an array with secondary, then primary' do
-            expect(read_pref.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select, candidates)).to eq(expected)
           end
         end
 
@@ -222,7 +224,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) { [far_secondary, far_primary] }
 
           it 'returns an array with secondary, then primary' do
-            expect(read_pref.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select, candidates)).to eq(expected)
           end
         end
 
@@ -233,7 +235,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
             let(:expected) { [secondary, primary] }
 
             it 'returns an array with near secondary, then primary' do
-              expect(read_pref.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select, candidates)).to eq(expected)
             end
           end
 
@@ -242,7 +244,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
             let(:expected) { [secondary, secondary, far_primary] }
 
             it 'returns an array with secondaries, then primary' do
-              expect(read_pref.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select, candidates)).to eq(expected)
             end
           end
         end

data/spec/mongo/server_selector/secondary_spec.rb

@@ -2,19 +2,21 @@ require 'spec_helper'
 
 describe Mongo::ServerSelector::Secondary do
 
+  let(:name) { :secondary }
+
   include_context 'server selector'
 
-  it_behaves_like 'a read preference mode' do
-    let(:name) { :secondary }
+  it_behaves_like 'a server selector mode' do
     let(:slave_ok) { true }
   end
+  it_behaves_like 'a server selector with sensitive data in its options'
 
-  it_behaves_like 'a read preference mode accepting tag sets'
+  it_behaves_like 'a server selector accepting tag sets'
 
   describe '#to_mongos' do
 
     it 'returns read preference formatted for mongos' do
-      expect(read_pref.to_mongos).to eq(
+      expect(selector.to_mongos).to eq(
         { :mode => 'secondary' }
       )
     end
@@ -23,7 +25,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:tag_sets) { [tag_set] }
 
       it 'returns read preference formatted for mongos with tag sets' do
-        expect(read_pref.to_mongos).to eq(
+        expect(selector.to_mongos).to eq(
           { :mode => 'secondary', :tags => tag_sets}
         )
       end
@@ -36,7 +38,7 @@ describe Mongo::ServerSelector::Secondary 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
 
@@ -44,7 +46,7 @@ describe Mongo::ServerSelector::Secondary 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
 
@@ -52,7 +54,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:candidates) { [secondary] }
 
       it 'returns array with secondary' do
-        expect(read_pref.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select, candidates)).to eq([secondary])
       end
     end
 
@@ -60,7 +62,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:candidates) { [primary, secondary] }
 
       it 'returns array with secondary' do
-        expect(read_pref.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select, candidates)).to eq([secondary])
       end
     end
 
@@ -68,7 +70,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:candidates) { [secondary, secondary, primary] }
 
       it 'returns array with all secondaries' do
-        expect(read_pref.send(:select, candidates)).to eq([secondary, secondary])
+        expect(selector.send(:select, candidates)).to eq([secondary, secondary])
       end
     end
 
@@ -82,7 +84,7 @@ describe Mongo::ServerSelector::Secondary 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
 
@@ -90,7 +92,7 @@ describe Mongo::ServerSelector::Secondary 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
 
@@ -98,7 +100,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [matching_secondary] }
 
           it 'returns an 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
       end
@@ -109,7 +111,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [primary, secondary, secondary] }
 
           it 'returns an emtpy array' do
-            expect(read_pref.send(:select, candidates)).to be_empty
+            expect(selector.send(:select, candidates)).to be_empty
           end
         end
 
@@ -117,7 +119,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [secondary, 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
 
@@ -125,7 +127,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [matching_secondary, matching_secondary] }
 
           it 'returns an array with both matching secondaries' do
-            expect(read_pref.send(:select, candidates)).to eq([matching_secondary, matching_secondary])
+            expect(selector.send(:select, candidates)).to eq([matching_secondary, matching_secondary])
           end
         end
       end
@@ -141,7 +143,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [far_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
 
@@ -149,7 +151,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select, candidates)).to eq([far_secondary])
           end
         end
       end
@@ -160,7 +162,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [primary, far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select, candidates)).to eq([far_secondary])
           end
         end
 
@@ -168,7 +170,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [far_primary, far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select, candidates)).to eq([far_secondary])
           end
         end
 
@@ -178,7 +180,7 @@ describe Mongo::ServerSelector::Secondary do
             let(:candidates) { [primary, secondary, far_secondary] }
 
             it 'returns an array with near secondary' do
-              expect(read_pref.send(:select, candidates)).to eq([secondary])
+              expect(selector.send(:select, candidates)).to eq([secondary])
             end
           end
 
@@ -186,7 +188,7 @@ describe Mongo::ServerSelector::Secondary do
             let(:candidates) { [far_primary, secondary, secondary] }
 
             it 'returns an array with two secondaries' do
-              expect(read_pref.send(:select, candidates)).to eq([secondary, secondary])
+              expect(selector.send(:select, candidates)).to eq([secondary, secondary])
             end
           end
         end

data/spec/mongo/server_selector_spec.rb

@@ -6,66 +6,125 @@ describe Mongo::ServerSelector do
 
   describe '.get' do
 
-    let(:read_pref) do
-      described_class.get({ :mode => name })
+    let(:selector) do
+      described_class.get(:mode => name, :tag_sets => tag_sets)
     end
 
-    let(:name) { :secondary }
-    let(:tag_sets) { [{ 'test' => 'tag' }] }
-
     context 'when the mode is primary' do
-      let(:name) { :primary }
+
+      let(:name) do
+        :primary
+      end
 
       it 'returns a read preference of class Primary' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::Primary)
+        expect(selector).to be_a(Mongo::ServerSelector::Primary)
       end
     end
 
     context 'when the mode is primary_preferred' do
-      let(:name) { :primary_preferred }
+      let(:name) do
+        :primary_preferred
+      end
 
       it 'returns a read preference of class PrimaryPreferred' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::PrimaryPreferred)
+        expect(selector).to be_a(Mongo::ServerSelector::PrimaryPreferred)
       end
     end
 
     context 'when the mode is secondary' do
-      let(:name) { :secondary }
+      let(:name) do
+        :secondary
+      end
 
       it 'returns a read preference of class Secondary' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::Secondary)
+        expect(selector).to be_a(Mongo::ServerSelector::Secondary)
       end
     end
 
     context 'when the mode is secondary_preferred' do
-      let(:name) { :secondary_preferred }
+      let(:name) do
+        :secondary_preferred
+      end
 
       it 'returns a read preference of class SecondaryPreferred' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::SecondaryPreferred)
+        expect(selector).to be_a(Mongo::ServerSelector::SecondaryPreferred)
       end
     end
 
     context 'when the mode is nearest' do
-      let(:name) { :nearest }
+      let(:name) do
+        :nearest
+      end
 
       it 'returns a read preference of class Nearest' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::Nearest)
+        expect(selector).to be_a(Mongo::ServerSelector::Nearest)
       end
     end
 
     context 'when a mode is not provided' do
-      let(:read_pref) { described_class.get }
+      let(:selector) { described_class.get }
 
       it 'returns a read preference of class Primary' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::Primary)
+        expect(selector).to be_a(Mongo::ServerSelector::Primary)
       end
     end
 
-    context 'when tag sets provided' do
-      let(:read_pref) { described_class.get(:mode => name, :tag_sets => tag_sets) }
+    context 'when tag sets are provided' do
+
+      let(:selector) do
+        described_class.get(:mode => :secondary, :tag_sets => tag_sets)
+      end
+
+      let(:tag_sets) do
+        [{ 'test' => 'tag' }]
+      end
 
       it 'sets tag sets on the read preference object' do
-        expect(read_pref.tag_sets).to eq(tag_sets)
+        expect(selector.tag_sets).to eq(tag_sets)
+      end
+    end
+
+    context 'when server_selection_timeout is specified' do
+
+      let(:selector) do
+        described_class.get(:mode => :secondary, :server_selection_timeout => 1)
+      end
+
+      it 'sets server selection timeout on the read preference object' do
+        expect(selector.server_selection_timeout).to eq(1)
+      end
+    end
+
+    context 'when server_selection_timeout is not specified' do
+
+      let(:selector) do
+        described_class.get(:mode => :secondary)
+      end
+
+      it 'sets server selection timeout to the default' do
+        expect(selector.server_selection_timeout).to eq(Mongo::ServerSelector::SERVER_SELECTION_TIMEOUT)
+      end
+    end
+
+    context 'when local_threshold is specified' do
+
+      let(:selector) do
+        described_class.get(:mode => :secondary, :local_threshold => 0.010)
+      end
+
+      it 'sets local_threshold on the read preference object' do
+        expect(selector.local_threshold).to eq(0.010)
+      end
+    end
+
+    context 'when local_threshold is not specified' do
+
+      let(:selector) do
+        described_class.get(:mode => :secondary)
+      end
+
+      it 'sets local threshold to the default' do
+        expect(selector.local_threshold).to eq(Mongo::ServerSelector::LOCAL_THRESHOLD)
       end
     end
   end
@@ -74,7 +133,9 @@ describe Mongo::ServerSelector do
 
     context 'when #select returns a list of nils' do
 
-      let(:servers) { [ server(:primary) ] }
+      let(:servers) do
+        [ server(:primary) ]
+      end
 
       let(:cluster) do
         double('cluster').tap do |c|
@@ -86,7 +147,7 @@ describe Mongo::ServerSelector do
       end
 
       let(:read_pref) do
-        described_class.get({ mode: :primary }, server_selection_timeout: 1).tap do |pref|
+        described_class.get(mode: :primary, server_selection_timeout: 0.1).tap do |pref|
           allow(pref).to receive(:select).and_return([ nil, nil ])
         end
       end
@@ -103,7 +164,9 @@ describe Mongo::ServerSelector do
 
     context 'when cluster#servers is empty' do
 
-      let(:servers) { [] }
+      let(:servers) do
+        []
+      end
 
       let(:cluster) do
         double('cluster').tap do |c|
@@ -115,7 +178,7 @@ describe Mongo::ServerSelector do
       end
 
       let(:read_pref) do
-        described_class.get({ mode: :primary }, server_selection_timeout: 1)
+        described_class.get(mode: :primary, server_selection_timeout: 0.1)
       end
 
       it 'raises a NoServerAvailable error' do