mongo 2.2.7 → 2.3.0

data/spec/mongo/operation/commands/collections_info_spec.rb

@@ -29,7 +29,7 @@ describe Mongo::Operation::Commands::CollectionsInfo do
     end
 
     let(:info) do
-      docs = op.execute(authorized_primary.context).documents
+      docs = op.execute(authorized_primary).documents
       docs.collect { |info| info['name'].sub("#{TEST_DB}.", '') }
     end
 

data/spec/mongo/operation/commands/command_spec.rb

@@ -43,7 +43,7 @@ describe Mongo::Operation::Commands::Command do
     context 'when the command succeeds' do
 
       let(:response) do
-        op.execute(authorized_primary.context)
+        op.execute(authorized_primary)
       end
 
       it 'returns the reponse' do
@@ -59,7 +59,7 @@ describe Mongo::Operation::Commands::Command do
 
       it 'raises an exception' do
         expect {
-          op.execute(authorized_primary.context)
+          op.execute(authorized_primary)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end
@@ -72,7 +72,7 @@ describe Mongo::Operation::Commands::Command do
 
       it 'raises an error' do
         expect {
-          op.execute(authorized_primary.context)
+          op.execute(authorized_primary)
         }.to raise_error(Mongo::Error::MaxBSONSize)
       end
     end

data/spec/mongo/operation/commands/indexes_spec.rb

@@ -21,7 +21,7 @@ describe Mongo::Operation::Commands::Indexes do
     end
 
     let(:indexes) do
-      operation.execute(authorized_primary.context)
+      operation.execute(authorized_primary)
     end
 
     it 'returns the indexes for the collection' do

data/spec/mongo/operation/commands/map_reduce_spec.rb

@@ -97,7 +97,7 @@ describe Mongo::Operation::Commands::MapReduce do
     context 'when the map/reduce succeeds' do
 
       let(:response) do
-        op.execute(authorized_primary.context)
+        op.execute(authorized_primary)
       end
 
       it 'returns the response' do
@@ -117,7 +117,7 @@ describe Mongo::Operation::Commands::MapReduce do
 
       it 'raises an exception' do
         expect {
-          op.execute(authorized_primary.context)
+          op.execute(authorized_primary)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

data/spec/mongo/operation/kill_cursors_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
 
 describe Mongo::Operation::KillCursors do
-  include_context 'operation'
 
-  let(:spec) { { :cursor_ids => [1,2] } }
+  let(:spec) do
+    { coll_name: TEST_COLL,
+      db_name: TEST_DB,
+      :cursor_ids => [1,2]
+    }
+  end
   let(:op) { described_class.new(spec) }
 
   describe '#initialize' do
@@ -27,24 +31,11 @@ describe Mongo::Operation::KillCursors do
     end
   end
 
-  describe '#execute' do
-
-    context 'message' do
+  describe '#message' do
 
-      it 'creates a kill cursors wire protocol message with correct specs' do
-        expect(Mongo::Protocol::KillCursors).to receive(:new) do |collection, database, ids|
-          expect(ids).to eq(spec[:cursor_ids])
-        end
-        op.execute(primary_context)
-      end
-    end
-
-    context 'connection' do
-
-      it 'dispatches the message on the connection' do
-        expect(connection).to receive(:dispatch)
-        op.execute(primary_context)
-      end
+    it 'creates a kill cursors wire protocol message with correct specs' do
+      expect(Mongo::Protocol::KillCursors).to receive(:new).with(TEST_COLL, TEST_DB, spec[:cursor_ids])
+      op.send(:message, authorized_primary)
     end
   end
 end

data/spec/mongo/operation/read/get_more_spec.rb

@@ -1,14 +1,18 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Read::GetMore do
-  include_context 'operation'
 
-  let(:to_return) { 50 }
-  let(:cursor_id) { 1 }
+  let(:to_return) do
+    50
+  end
+
+  let(:cursor_id) do
+    1
+  end
 
   let(:spec) do
-    { :db_name   => db_name,
-      :coll_name => coll_name,
+    { :db_name   => TEST_DB,
+      :coll_name => TEST_COLL,
       :to_return => to_return,
       :cursor_id => cursor_id }
   end
@@ -39,27 +43,11 @@ describe Mongo::Operation::Read::GetMore do
     end
   end
 
-  describe '#execute' do
+  describe '#message' do
 
-    context 'message' do
-
-      it 'creates a get more wire protocol message with correct specs' do
-        expect(Mongo::Protocol::GetMore).to receive(:new) do |db, coll, to_ret, id|
-          expect(db).to eq(db_name)
-          expect(coll).to eq(coll_name)
-          expect(to_ret).to eq(to_return)
-          expect(id).to eq(cursor_id)
-        end
-        op.execute(primary_context)
-      end
-    end
-
-    context 'connection' do
-
-      it 'dispatches the message on the connection' do
-        expect(connection).to receive(:dispatch)
-        op.execute(primary_context)
-      end
+    it 'creates a get more wire protocol message with correct specs' do
+      expect(Mongo::Protocol::GetMore).to receive(:new).with(TEST_DB, TEST_COLL, to_return, cursor_id)
+      op.send(:message, authorized_primary)
     end
   end
 end

data/spec/mongo/operation/read/query_spec.rb

@@ -1,15 +1,14 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Read::Query do
-  include_context 'operation'
-
-  let(:selector) { {} }
+  
+  let(:selector) { { foo: 1 } }
   let(:query_options) { {} }
   let(:spec) do
     { :selector  => selector,
       :options      => query_options,
-      :db_name   => db_name,
-      :coll_name => coll_name,
+      :db_name   => authorized_collection.database.name,
+      :coll_name => authorized_collection.name,
       :read => Mongo::ServerSelector.get
     }
   end
@@ -30,8 +29,8 @@ describe Mongo::Operation::Read::Query do
       let(:other_spec) do
         { :selector  => { :a => 1 },
           :options      => query_options,
-          :db_name   => db_name,
-          :coll_name => coll_name
+          :db_name   => authorized_collection.database.name,
+          :coll_name => authorized_collection.name
         }
       end
       let(:other) { described_class.new(other_spec) }
@@ -52,34 +51,35 @@ describe Mongo::Operation::Read::Query do
       described_class.new(spec)
     end
 
-    let(:message) do
-      query.send(:message, secondary_context_slave)
+    let(:cluster_single) do
+      double('cluster').tap do |c|
+        allow(c).to receive(:single?).and_return(true)
+      end
     end
 
-    it 'does not lose flags' do
-      expect(message.flags).to eq([ :no_cursor_timeout, :slave_ok ])
+    let(:message) do
+      query.send(:message, authorized_primary)
     end
-  end
 
-  describe '#execute' do
+    it 'applies the correct flags' do
+      expect(message.flags).to eq(query_options[:flags])
+    end
 
-    context 'message' do
+    context 'when the server is a secondary' do
 
-      it 'creates a query wire protocol message with correct specs' do
-        expect(Mongo::Protocol::Query).to receive(:new) do |db, coll, sel, options|
-          expect(db).to eq(db_name)
-          expect(coll).to eq(coll_name)
-          expect(sel).to eq(selector)
+      let(:secondary_server_single) do
+        double('secondary_server').tap do |server|
+          allow(server).to receive(:mongos?) { false }
+          allow(server).to receive(:cluster) { cluster_single }
         end
-        op.execute(primary_context)
       end
-    end
 
-    context 'connection' do
+      let(:message) do
+        query.send(:message, secondary_server_single)
+      end
 
-      it 'dispatches the message on the connection' do
-        expect(connection).to receive(:dispatch)
-        op.execute(primary_context)
+      it 'applies the correct flags' do
+        expect(message.flags).to eq([ :no_cursor_timeout, :slave_ok ])
       end
     end
 
@@ -93,12 +93,8 @@ describe Mongo::Operation::Read::Query do
         authorized_collection.delete_many
       end
 
-      let(:context) do
-        authorized_client.cluster.next_primary.context
-      end
-
       it 'does not raise an exception' do
-        expect(op.execute(context)).to be_a(Mongo::Operation::Read::Query::Result)
+        expect(op.execute(authorized_primary)).to be_a(Mongo::Operation::Read::Query::Result)
       end
     end
   end

data/spec/mongo/operation/read_preference_spec.rb

@@ -26,7 +26,7 @@ describe Mongo::Operation::ReadPreference do
     Mongo::ServerSelector.get
   end
 
-  let(:read_preference) do
+  let(:operation) do
     Class.new do
       include Mongo::Operation::ReadPreference
     end.new.tap do |rp|
@@ -36,8 +36,8 @@ describe Mongo::Operation::ReadPreference do
     end
   end
 
-  let(:context) do
-    double('context').tap do |c|
+  let(:server) do
+    double('server').tap do |c|
       allow(c).to receive(:cluster).and_return(cluster_double)
       allow(cluster_double).to receive(:single?).and_return(single?)
       allow(c).to receive(:mongos?).and_return(mongos?)
@@ -55,7 +55,7 @@ describe Mongo::Operation::ReadPreference do
     end
 
     it 'returns a special selector' do
-      expect(read_preference.send(:update_selector, context)).to eq(expected)
+      expect(operation.send(:update_selector, server)).to eq(expected)
     end
 
     context 'when the selector already has $query in it' do
@@ -70,7 +70,7 @@ describe Mongo::Operation::ReadPreference do
       end
 
       it 'returns an unaltered special selector' do
-        expect(read_preference.send(:update_selector, context)).to eq(expected)
+        expect(operation.send(:update_selector, server)).to eq(expected)
       end
     end
   end
@@ -82,7 +82,7 @@ describe Mongo::Operation::ReadPreference do
     end
 
     it 'returns a selector' do
-      expect(read_preference.send(:update_selector, context)).to eq(selector)
+      expect(operation.send(:update_selector, server)).to eq(selector)
     end
   end
 
@@ -168,7 +168,7 @@ describe Mongo::Operation::ReadPreference do
       end
 
       it 'does not set the slave_ok flag' do
-        expect(read_preference.send(:update_options, context)).to eq(expected)
+        expect(operation.send(:update_options, server)).to eq(expected)
       end
     end
 
@@ -183,7 +183,7 @@ describe Mongo::Operation::ReadPreference do
       end
 
       it 'sets the slave_ok flag' do
-        expect(read_preference.send(:update_options, context)).to eq(expected)
+        expect(operation.send(:update_options, server)).to eq(expected)
       end
     end
   end
@@ -205,7 +205,7 @@ describe Mongo::Operation::ReadPreference do
       end
 
       it 'does not set the slave_ok flag' do
-        expect(read_preference.send(:update_options, context)).to eq(expected)
+        expect(operation.send(:update_options, server)).to eq(expected)
       end
     end
 
@@ -222,7 +222,7 @@ describe Mongo::Operation::ReadPreference do
         end
 
         it 'sets the slave_ok flag' do
-          expect(read_preference.send(:update_options, context)).to eq(expected)
+          expect(operation.send(:update_options, server)).to eq(expected)
         end
       end
 
@@ -237,7 +237,7 @@ describe Mongo::Operation::ReadPreference do
         end
 
         it 'does not set the slave_ok flag' do
-          expect(read_preference.send(:update_options, context)).to eq(expected)
+          expect(operation.send(:update_options, server)).to eq(expected)
         end
       end
     end

data/spec/mongo/operation/specifiable_spec.rb

@@ -50,4 +50,35 @@ describe Mongo::Operation::Specifiable do
       end
     end
   end
+
+  describe '#read' do
+
+    context 'when read is specified' do
+
+      let(:spec) do
+        {
+          read: { mode: :secondary}
+        }
+      end
+
+      let(:server_selector) do
+        Mongo::ServerSelector.get(spec[:read])
+      end
+
+      it 'converts the read option to a ServerSelector' do
+        expect(specifiable.read).to be_a(Mongo::ServerSelector::Secondary)
+      end
+
+      it 'uses the read option provided' do
+        expect(specifiable.read).to eq(server_selector)
+      end
+    end
+
+    context 'when read is not specified' do
+
+      it 'returns a Primary ServerSelector object' do
+        expect(specifiable.read).to eq(Mongo::ServerSelector.get(Mongo::ServerSelector::PRIMARY))
+      end
+    end
+  end
 end

data/spec/mongo/operation/write/bulk/delete_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Write::Bulk::Delete do
-  include_context 'operation'
 
   let(:documents) do
     [ { 'q' => { foo: 1 }, 'limit' => 1 } ]
@@ -9,9 +8,9 @@ describe Mongo::Operation::Write::Bulk::Delete do
 
   let(:spec) do
     { :deletes       => documents,
-      :db_name       => db_name,
-      :coll_name     => coll_name,
-      :write_concern => write_concern,
+      :db_name       => TEST_DB,
+      :coll_name     => TEST_COLL,
+      :write_concern => Mongo::WriteConcern.get(WRITE_CONCERN),
       :ordered       => true
     }
   end
@@ -47,9 +46,9 @@ describe Mongo::Operation::Write::Bulk::Delete do
 
         let(:other_spec) do
           { :deletes       => other_docs,
-            :db_name       => db_name,
-            :coll_name     => coll_name,
-            :write_concern => write_concern,
+            :db_name       => TEST_DB,
+            :coll_name     => TEST_COLL,
+            :write_concern => Mongo::WriteConcern.get(WRITE_CONCERN),
             :ordered       => true
           }
         end
@@ -93,7 +92,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
         end
 
         it 'deletes the document from the database' do
-          op.execute(authorized_primary.context)
+          op.execute(authorized_primary)
           expect(authorized_collection.find.count).to eq(1)
         end
       end
@@ -106,7 +105,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
           deletes: documents,
           db_name: TEST_DB,
           coll_name: TEST_COLL,
-          write_concern: Mongo::WriteConcern.get(w: 1)
+          write_concern: Mongo::WriteConcern.get(WRITE_CONCERN)
         })
       end
 
@@ -117,7 +116,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
         end
 
         it 'deletes the documents from the database' do
-          op.execute(authorized_primary.context)
+          op.execute(authorized_primary)
           expect(authorized_collection.find.count).to eq(0)
         end
       end
@@ -135,7 +134,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
         { :deletes       => documents,
           :db_name       => TEST_DB,
           :coll_name     => TEST_COLL,
-          :write_concern => write_concern,
+          :write_concern => Mongo::WriteConcern.get(WRITE_CONCERN),
           :ordered       => true
         }
       end
@@ -149,11 +148,11 @@ describe Mongo::Operation::Write::Bulk::Delete do
         context 'when write concern is acknowledged' do
 
           let(:write_concern) do
-            Mongo::WriteConcern.get(w: 1)
+            Mongo::WriteConcern.get(WRITE_CONCERN)
           end
 
           it 'aborts after first error' do
-            failing_delete.execute(authorized_primary.context)
+            failing_delete.execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(2)
           end
         end
@@ -165,7 +164,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
           end
 
           it 'aborts after first error' do
-            failing_delete.execute(authorized_primary.context)
+            failing_delete.execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(2)
           end
         end
@@ -184,7 +183,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
         { :deletes       => documents,
           :db_name       => TEST_DB,
           :coll_name     => TEST_COLL,
-          :write_concern => write_concern,
+          :write_concern => Mongo::WriteConcern.get(WRITE_CONCERN),
           :ordered       => false
         }
       end
@@ -202,7 +201,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
           end
 
           it 'does not abort after first error' do
-            failing_delete.execute(authorized_primary.context)
+            failing_delete.execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(1)
           end
         end
@@ -214,8 +213,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
           end
 
           it 'does not abort after first error' do
-            failing_delete.execute(authorized_primary.context)
-            sleep(1)
+            failing_delete.execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(1)
           end
         end