mongo 2.0.6 → 2.1.0

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

data/spec/mongo/server_selector/primary_spec.rb

@@ -2,27 +2,34 @@ require 'spec_helper'
 
 describe Mongo::ServerSelector::Primary do
 
+  let(:name) { :primary }
+
   include_context 'server selector'
 
-  it_behaves_like 'a read preference mode' do
-    let(:name) { :primary }
+  it_behaves_like 'a server selector mode' do
     let(:slave_ok) { false }
   end
+  it_behaves_like 'a server selector with sensitive data in its options'
 
   describe '#tag_sets' do
 
     context 'tags not provided' do
 
       it 'returns an empty array' do
-        expect(read_pref.tag_sets).to be_empty
+        expect(selector.tag_sets).to be_empty
       end
     end
 
     context 'tag sets provided' do
-      let(:tag_sets) { [tag_set] }
+
+      let(:tag_sets) do
+        [ tag_set ]
+      end
 
       it 'raises an error' do
-        expect{read_pref.tag_sets}.to raise_error
+        expect {
+          selector.tag_sets
+        }.to raise_error(Mongo::Error::InvalidServerPreference)
       end
     end
   end
@@ -30,7 +37,7 @@ describe Mongo::ServerSelector::Primary do
   describe '#to_mongos' do
 
     it 'returns nil' do
-      expect(read_pref.to_mongos).to be_nil
+      expect(selector.to_mongos).to be_nil
     end
   end
 
@@ -40,7 +47,7 @@ describe Mongo::ServerSelector::Primary 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 +55,7 @@ describe Mongo::ServerSelector::Primary 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
 
@@ -56,7 +63,7 @@ describe Mongo::ServerSelector::Primary 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
 
@@ -64,7 +71,7 @@ describe Mongo::ServerSelector::Primary do
       let(:candidates) { [secondary, 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
 
@@ -78,7 +85,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_primary] }
 
           it 'returns array with the primary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select, candidates)).to eq([far_primary])
           end
         end
 
@@ -86,7 +93,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_secondary] }
 
           it 'returns empty array' do
-            expect(read_pref.send(:select, candidates)).to be_empty
+            expect(selector.send(:select, candidates)).to be_empty
           end
         end
       end
@@ -97,7 +104,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_primary, far_secondary] }
 
           it 'returns an array with the primary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select, candidates)).to eq([far_primary])
           end
         end
 
@@ -105,7 +112,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_primary, far_secondary] }
 
           it 'returns an array with the primary' do
-            expect(read_pref.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select, candidates)).to eq([far_primary])
           end
         end
       end