mongo 2.1.0.beta → 2.1.0.rc0

data/spec/mongo/operation/write/bulk/{bulk_insert_spec.rb → insert_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::BulkInsert do
+describe Mongo::Operation::Write::Bulk::Insert do
   include_context 'operation'
 
   let(:documents) do
@@ -74,17 +74,6 @@ describe Mongo::Operation::Write::BulkInsert do
     end
   end
 
-  describe '#dup' do
-
-    context 'deep copy' do
-
-      it 'copies the list of documents' do
-        copy = op.dup
-        expect(copy.spec[:documents]).to_not be(op.spec[:documents])
-      end
-    end
-  end
-
   describe 'document ids' do
 
     context 'when documents do not contain an id' do

data/spec/mongo/operation/write/bulk/{bulk_update_spec.rb → update_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::BulkUpdate do
+describe Mongo::Operation::Write::Bulk::Update do
   include_context 'operation'
 
   let(:documents) do
@@ -72,17 +72,6 @@ describe Mongo::Operation::Write::BulkUpdate do
     end
   end
 
-  describe '#dup' do
-
-    context 'deep copy' do
-
-      it 'copies the list of updates' do
-        copy = op.dup
-        expect(copy.spec[:updates]).not_to be(op.spec[:updates])
-      end
-    end
-  end
-
   describe '#execute' do
 
     before do

data/spec/mongo/operation/write/insert_spec.rb

@@ -73,17 +73,6 @@ describe Mongo::Operation::Write::Insert do
     end
   end
 
-  describe '#dup' do
-
-    context 'deep copy' do
-
-      it 'copies the list of documents' do
-        copy = insert.dup
-        expect(copy.spec[:documents]).to_not be(insert.spec[:documents])
-      end
-    end
-  end
-
   describe 'document ids' do
 
     context 'when documents do not contain an id' do

data/spec/mongo/protocol/kill_cursors_spec.rb

@@ -5,8 +5,10 @@ describe Mongo::Protocol::KillCursors do
   let(:opcode)     { 2007 }
   let(:cursor_ids) { [123, 456, 789] }
   let(:id_count)   { cursor_ids.size }
+  let(:collection) { TEST_COLL }
+  let(:database)   { TEST_DB }
   let(:message) do
-    described_class.new(cursor_ids)
+    described_class.new(collection, database, cursor_ids)
   end
 
   describe '#initialize' do
@@ -26,7 +28,7 @@ describe Mongo::Protocol::KillCursors do
 
       context 'when the cursor ids are equal' do
         let(:other) do
-          described_class.new(cursor_ids)
+          described_class.new(collection, database, cursor_ids)
         end
 
         it 'returns true' do
@@ -36,7 +38,7 @@ describe Mongo::Protocol::KillCursors do
 
       context 'when the cursor ids are not equal' do
         let(:other) do
-          described_class.new([123, 456])
+          described_class.new(collection, database, [123, 456])
         end
 
         it 'returns false' do

data/spec/mongo/server/description_spec.rb

@@ -617,6 +617,48 @@ describe Mongo::Server::Description do
     end
   end
 
+  describe '#me_mismatch?' do
+
+    let(:description) do
+      described_class.new(address, config)
+    end
+
+    context 'when the server address matches the me field' do
+
+      let(:config) do
+        replica.merge('me' => address.to_s)
+      end
+
+      it 'returns false' do
+        expect(description.me_mismatch?).to be(false)
+      end
+    end
+
+    context 'when the server address does not match the me field' do
+
+      let(:config) do
+        replica.merge('me' => 'localhost:27020')
+      end
+
+      it 'returns true' do
+        expect(description.me_mismatch?).to be(true)
+      end
+    end
+
+    context 'when there is no me field' do
+
+      let(:config) do
+        replica.tap do |r|
+          r.delete('me')
+        end
+      end
+
+      it 'returns false' do
+        expect(description.me_mismatch?).to be(false)
+      end
+    end
+  end
+
   describe '#lists_server?' do
 
     let(:description) do

data/spec/mongo/server/monitor_spec.rb

@@ -171,4 +171,25 @@ describe Mongo::Server::Monitor do
       end
     end
   end
+
+  describe '#stop' do
+
+    let(:monitor) do
+      described_class.new(address, listeners, TEST_OPTIONS)
+    end
+
+    let!(:thread) do
+      monitor.run!
+    end
+
+    before do
+      expect(monitor.connection).to receive(:disconnect!).and_call_original
+      monitor.stop!
+      sleep(1)
+    end
+
+    it 'kills the monitor thread' do
+      expect(thread.stop?).to be(true)
+    end
+  end
 end

data/spec/mongo/server_discovery_and_monitoring_spec.rb

@@ -54,6 +54,7 @@ describe 'Server Discovery and Monitoring' do
       end
 
       after(:all) do
+        @client.close
 
         # Return the server implementation to its original for the other
         # tests in the suite.

data/spec/mongo/server_selection_spec.rb

@@ -54,9 +54,9 @@ describe 'Server Selection' do
       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,37 @@ 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'
 
   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 +45,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 +53,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 +61,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 +69,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 +77,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 +96,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 +104,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 +112,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 +120,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 +131,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 +139,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 +147,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 +156,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 +165,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 +181,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 +189,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 +200,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 +210,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 +218,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 +227,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 +238,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 +247,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,22 @@ 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'
 
   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 +25,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 +38,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 +46,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 +54,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 +63,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 +72,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 +93,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 +101,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 +109,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 +117,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 +128,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 +136,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 +145,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 +154,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 +163,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 +179,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 +187,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 +202,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 +211,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 +220,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 +229,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 +240,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 +249,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 +262,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 +271,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 +280,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