mongo 2.5.0.beta → 2.5.0

data/spec/mongo/cluster_spec.rb

@@ -241,15 +241,15 @@ describe Mongo::Cluster do
       cluster.instance_variable_get(:@servers)
     end
 
-    let(:cursor_reaper) do
-      cluster.instance_variable_get(:@cursor_reaper)
+    let(:periodic_executor) do
+      cluster.instance_variable_get(:@periodic_executor)
     end
 
     before do
       known_servers.each do |server|
         expect(server).to receive(:disconnect!).and_call_original
       end
-      expect(cursor_reaper).to receive(:stop!).and_call_original
+      expect(periodic_executor).to receive(:stop!).and_call_original
     end
 
     it 'disconnects each server and the cursor reaper and returns true' do
@@ -259,15 +259,15 @@ describe Mongo::Cluster do
 
   describe '#reconnect!' do
 
-    let(:cursor_reaper) do
-      cluster.instance_variable_get(:@cursor_reaper)
+    let(:periodic_executor) do
+      cluster.instance_variable_get(:@periodic_executor)
     end
 
     before do
       cluster.servers.each do |server|
         expect(server).to receive(:reconnect!).and_call_original
       end
-      expect(cursor_reaper).to receive(:restart!).and_call_original
+      expect(periodic_executor).to receive(:restart!).and_call_original
     end
 
     it 'reconnects each server and the cursor reaper and returns true' do
@@ -580,8 +580,12 @@ describe Mongo::Cluster do
       client.command(ping: 1)
     end
 
+    let(:operation_with_session) do
+      client.command({ ping: 1 }, session: session)
+    end
+
     let(:second_operation) do
-      client.command(ping: 1)
+      client.command({ ping: 1 }, session: session)
     end
 
     it_behaves_like 'an operation updating cluster time'

data/spec/mongo/collection/view/aggregation_spec.rb

@@ -224,6 +224,40 @@ describe Mongo::Collection::View::Aggregation do
       expect(aggregation.explain).to_not be_empty
     end
 
+    context 'session id', if: test_sessions? do
+
+      let(:options) do
+        { session: session }
+      end
+
+      let(:client) do
+        authorized_client.with(heartbeat_frequency: 100).tap do |cl|
+          cl.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+        end
+      end
+
+      let(:session) do
+        client.start_session
+      end
+
+      let(:subscriber) do
+        EventSubscriber.new
+      end
+
+      let(:view) do
+        Mongo::Collection::View.new(client[TEST_COLL], selector, view_options)
+      end
+
+      let(:command) do
+        aggregation.explain
+        subscriber.started_events.find { |c| c.command_name == 'aggregate'}.command
+      end
+
+      it 'sends the session id' do
+        expect(command['lsid']).to eq(session.session_id)
+      end
+    end
+
     context 'when a collation is specified' do
 
       before do
@@ -357,6 +391,17 @@ describe Mongo::Collection::View::Aggregation do
       end
     end
 
+    context 'when comment is an option' do
+
+      let(:options) do
+        { :comment => 'testing' }
+      end
+
+      it 'includes the option in the spec' do
+        expect(aggregation_spec[:selector][:comment]).to eq(options[:comment])
+      end
+    end
+
     context 'when batch_size is set' do
 
       context 'when batch_size is set on the view' do
@@ -498,7 +543,7 @@ describe Mongo::Collection::View::Aggregation do
     end
   end
 
-  context 'when $out is in the pipeline', if: write_command_enabled? do
+  context 'when $out is in the pipeline' do
 
     let(:pipeline) do
       [{

data/spec/mongo/collection/view/builder/find_command_spec.rb

@@ -475,6 +475,21 @@ describe Mongo::Collection::View::Builder::FindCommand do
       it 'applies the read concern of the collection' do
         expect(selector['readConcern']).to eq(BSON::Document.new(level: 'invalid'))
       end
+
+      context 'when explain is called for the find' do
+
+        let(:collection) do
+          authorized_collection.with(read_concern: { level: 'invalid' })
+        end
+
+        let(:view) do
+          Mongo::Collection::View.new(collection, {})
+        end
+
+        it 'applies the read concern of the collection' do
+          expect( builder.explain_specification[:selector][:explain][:readConcern]).to eq(BSON::Document.new(level: 'invalid'))
+        end
+      end
     end
 
     context 'when the collection does not have a read concern defined' do

data/spec/mongo/collection/view/change_stream_spec.rb

@@ -35,7 +35,11 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
   end
 
   let(:command_selector) do
-    change_stream.send(:aggregate_spec, double('session'))[:selector]
+    command_spec[:selector]
+  end
+
+  let(:command_spec) do
+    change_stream.send(:aggregate_spec, double('session'))
   end
 
   let(:cursor) do
@@ -137,8 +141,7 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
       end
 
       it 'sets the collation value to the provided document' do
-        expect(error).to be_a(Mongo::Error::OperationFailure)
-        expect(error.message).to include('Only default collation is allowed')
+        expect(command_selector['collation']).to eq(BSON::Document.new(options['collation']))
       end
     end
 
@@ -181,7 +184,7 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
       context 'when the other pipeline operators are supported' do
 
         let(:pipeline) do
-          [ { '$project' => { '_id' => 0 }}]
+          [{ '$project' => { '_id' => 0 }}]
         end
 
         it 'uses the pipeline operators' do
@@ -192,21 +195,23 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
       context 'when the other pipeline operators are not supported' do
 
         let(:pipeline) do
-          [ { '$unwind' => '$test' }]
+          [{ '$unwind' => '$test' }]
         end
 
         it 'sends the pipeline to the server without a custom error' do
-          expect(change_stream).to be_a(Mongo::Collection::View::ChangeStream)
+          expect {
+            change_stream
+          }.to raise_exception(Mongo::Error::OperationFailure)
         end
 
-        context 'when the operation fails', if: sessions_enabled? && test_change_streams? do
+        context 'when the operation fails', if: test_change_streams? do
 
           let!(:before_last_use) do
             session.instance_variable_get(:@server_session).last_use
           end
 
           let!(:before_operation_time) do
-            (session.instance_variable_get(:@operation_time) || 0)
+            (session.operation_time || 0)
           end
 
           let(:pipeline) do
@@ -238,7 +243,7 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
           end
 
           it 'updates the operation time value' do
-            expect(session.instance_variable_get(:@operation_time)).not_to eq(before_operation_time)
+            expect(session.operation_time).not_to eq(before_operation_time)
           end
         end
       end
@@ -286,7 +291,7 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
         end
 
         let!(:before_operation_time) do
-          (session.instance_variable_get(:@operation_time) || 0)
+          (session.operation_time || 0)
         end
 
         let!(:operation_result) do
@@ -298,7 +303,7 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
         end
 
         it 'updates the operation time value' do
-          expect(session.instance_variable_get(:@operation_time)).not_to eq(before_operation_time)
+          expect(session.operation_time).not_to eq(before_operation_time)
         end
 
         it 'does not close the session when the operation completes' do
@@ -416,7 +421,7 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
   context 'when the first response does not contain the resume token' do
 
     let(:pipeline) do
-      [ { '$project' => { _id: 0 } }]
+      [{ '$project' => { _id: 0 } }]
     end
 
     before do
@@ -811,4 +816,66 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
       end
     end
   end
+
+  describe '#inspect' do
+
+    it 'includes the Ruby object_id in the formatted string' do
+      expect(change_stream.inspect).to include(change_stream.object_id.to_s)
+    end
+
+    context 'when resume_after is provided' do
+
+      let(:options) do
+        { resume_after: sample_resume_token }
+      end
+
+      it 'includes resume_after value in the formatted string' do
+        expect(change_stream.inspect).to include(sample_resume_token.to_s)
+      end
+    end
+
+    context 'when max_await_time_ms is provided' do
+
+      let(:options) do
+        { max_await_time_ms: 10 }
+      end
+
+      it 'includes the max_await_time value in the formatted string' do
+        expect(change_stream.inspect).to include({ max_await_time_ms: 10 }.to_s)
+      end
+    end
+
+    context 'when batch_size is provided' do
+
+      let(:options) do
+        { batch_size: 5 }
+      end
+
+      it 'includes the batch_size value in the formatted string' do
+        expect(change_stream.inspect).to include({ batch_size: 5 }.to_s)
+      end
+    end
+
+    context 'when collation is provided'  do
+
+      let(:options) do
+        { 'collation' => { locale: 'en_US', strength: 2 } }
+      end
+
+      it 'includes the collation value in the formatted string' do
+        expect(change_stream.inspect).to include({ 'collation' => { locale: 'en_US', strength: 2 } }.to_s)
+      end
+    end
+
+    context 'when pipeline operators are provided' do
+
+      let(:pipeline) do
+        [{ '$project' => { '_id' => 0 }}]
+      end
+
+      it 'includes the filters in the formatted string' do
+        expect(change_stream.inspect).to include([{ '$project' => { '_id' => 0 }}].to_s)
+      end
+    end
+  end
 end

data/spec/mongo/collection/view/map_reduce_spec.rb

@@ -59,6 +59,44 @@ describe Mongo::Collection::View::MapReduce do
     described_class.new(view, map, reduce, options)
   end
 
+  describe '#map_function' do
+
+    it 'returns the map function' do
+      expect(map_reduce.map_function).to eq(map)
+    end
+  end
+
+  describe '#reduce_function' do
+
+    it 'returns the map function' do
+      expect(map_reduce.reduce_function).to eq(reduce)
+    end
+  end
+
+  describe '#map' do
+
+    let(:results) do
+      map_reduce.map do |document|
+        document
+      end
+    end
+
+    it 'calls the Enumerable method' do
+      expect(results).to eq(map_reduce.to_a)
+    end
+  end
+
+  describe '#reduce' do
+
+    let(:results) do
+      map_reduce.reduce(0) { |sum, doc| sum + doc['value']['population'] }
+    end
+
+    it 'calls the Enumerable method' do
+      expect(results).to eq(12000000)
+    end
+  end
+
   describe '#each' do
 
     context 'when no options are provided' do
@@ -72,7 +110,7 @@ describe Mongo::Collection::View::MapReduce do
 
     context 'when provided a session' do
 
-      let(:view_options) do
+      let(:options) do
         { session: session }
       end
 
@@ -139,6 +177,21 @@ describe Mongo::Collection::View::MapReduce do
         authorized_client['output_collection'].delete_many
       end
 
+      context 'when #each is called without a block' do
+
+        let(:new_map_reduce) do
+          map_reduce.out(replace: 'output_collection')
+        end
+
+        before do
+          new_map_reduce.each
+        end
+
+        it 'executes the map reduce' do
+          expect(map_reduce.to_a).to eq(new_map_reduce.to_a)
+        end
+      end
+
       context 'when the option is to replace' do
 
         let(:new_map_reduce) do
@@ -157,7 +210,7 @@ describe Mongo::Collection::View::MapReduce do
 
         context 'when provided a session' do
 
-          let(:view_options) do
+          let(:options) do
             { session: session }
           end
 
@@ -174,7 +227,7 @@ describe Mongo::Collection::View::MapReduce do
 
         context 'when the output collection is iterated' do
 
-          let(:view_options) do
+          let(:options) do
             { session: session }
           end
 
@@ -205,7 +258,7 @@ describe Mongo::Collection::View::MapReduce do
             begin; client.use('another-db')[TEST_COLL].create; rescue; end
           end
 
-          it 'uses the session when iterating over the output collection', if: sessions_enabled? do
+          it 'uses the session when iterating over the output collection', if: test_sessions? do
             new_map_reduce.to_a
             expect(find_command["lsid"]).to eq(BSON::Document.new(session.session_id))
           end
@@ -360,6 +413,69 @@ describe Mongo::Collection::View::MapReduce do
     end
   end
 
+  describe '#execute' do
+
+    context 'when output is to a collection' do
+
+      let(:options) do
+        { out: 'output_collection' }
+      end
+
+      let!(:result) do
+        map_reduce.execute
+      end
+
+      it 'executes the map reduce' do
+        expect(authorized_client['output_collection'].count).to eq(2)
+      end
+
+      it 'returns a result object' do
+        expect(result).to be_a(Mongo::Operation::Result)
+      end
+    end
+
+    context 'when there is no output' do
+
+      let(:result) do
+        map_reduce.execute
+      end
+
+      it 'executes the map reduce' do
+        expect(result.documents.size).to eq(2)
+      end
+
+      it 'returns a result object' do
+        expect(result).to be_a(Mongo::Operation::Result)
+      end
+    end
+
+    context 'when a session is provided' do
+
+      let(:session) do
+        authorized_client.start_session
+      end
+
+      let(:options) do
+        { session: session }
+      end
+
+      let(:operation) do
+        map_reduce.execute
+      end
+
+      let(:failed_operation) do
+        described_class.new(view, '$invalid', reduce, options).execute
+      end
+
+      let(:client) do
+        authorized_client
+      end
+
+      it_behaves_like 'an operation using a session'
+      it_behaves_like 'a failed operation using a session'
+    end
+  end
+
   describe '#finalize' do
 
     let(:finalize) do