mongo 2.0.6 → 2.1.0.beta

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

@@ -15,7 +15,7 @@ describe Mongo::Collection::View::Explainable do
   end
 
   after do
-    authorized_collection.find.delete_many
+    authorized_collection.delete_many
   end
 
   describe '#explain' do

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

@@ -48,7 +48,7 @@ describe Mongo::Collection::View::MapReduce do
   end
 
   after do
-    authorized_collection.find.delete_many
+    authorized_collection.delete_many
   end
 
   let(:map_reduce) do

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

@@ -15,7 +15,7 @@ describe Mongo::Collection::View::Readable do
   end
 
   after do
-    authorized_collection.find.delete_many
+    authorized_collection.delete_many
   end
 
   describe '#allow_partial_results' do
@@ -75,6 +75,21 @@ describe Mongo::Collection::View::Readable do
         end
       end
     end
+
+    context 'when options are specified' do
+
+      let(:agg_options) do
+        { :max_time_ms => 500 }
+      end
+
+      let(:aggregation) do
+        view.aggregate(pipeline, agg_options)
+      end
+
+      it 'passes the option to the Aggregation object' do
+        expect(aggregation.options[:max_time_ms]).to eq(agg_options[:max_time_ms])
+      end
+    end
   end
 
   describe '#map_reduce' do
@@ -200,7 +215,7 @@ describe Mongo::Collection::View::Readable do
     end
 
     after do
-      authorized_collection.find.delete_many
+      authorized_collection.delete_many
     end
 
     context 'when a selector is provided' do
@@ -224,6 +239,16 @@ describe Mongo::Collection::View::Readable do
     it 'takes a read preference option' do
       expect(view.count(read: { mode: :secondary })).to eq(10)
     end
+
+    it 'takes a max_time_ms option', if: write_command_enabled? do
+      expect {
+        view.count(max_time_ms: 0.1)
+      }.to raise_error(Mongo::Error::OperationFailure)
+    end
+
+    it 'sets the max_time_ms option on the command', if: write_command_enabled? do
+      expect(view.count(max_time_ms: 100)).to eq(10)
+    end
   end
 
   describe '#distinct' do
@@ -338,6 +363,27 @@ describe Mongo::Collection::View::Readable do
         expect(distinct).to eq([ 'test1', 'test2', 'test3' ])
       end
     end
+
+    context 'when a max_time_ms is specified', if: write_command_enabled? do
+
+      let(:documents) do
+        (1..3).map{ |i| { field: "test" }}
+      end
+
+      before do
+        authorized_collection.insert_many(documents)
+      end
+
+      it 'sets the max_time_ms option on the command' do
+        expect {
+          view.distinct(:field, max_time_ms: 0.1)
+        }.to raise_error(Mongo::Error::OperationFailure)
+      end
+
+      it 'sets the max_time_ms option on the command' do
+        expect(view.distinct(:field, max_time_ms: 100)).to eq([ 'test' ])
+      end
+    end
   end
 
   describe '#hint' do
@@ -434,6 +480,41 @@ describe Mongo::Collection::View::Readable do
     end
   end
 
+  describe '#parallel_scan', unless: sharded? do
+
+    let(:documents) do
+      (1..200).map do |i|
+        { name: "testing-scan-#{i}" }
+      end
+    end
+
+    before do
+      authorized_collection.insert_many(documents)
+    end
+
+    let(:cursors) do
+      view.parallel_scan(2)
+    end
+
+    it 'returns an array of cursors', if: write_command_enabled? do
+      cursors.each do |cursor|
+        expect(cursor.class).to be(Mongo::Cursor)
+      end
+    end
+
+    it 'returns the correct number of documents', if: write_command_enabled? do
+      expect(
+        cursors.reduce(0) { |total, cursor| total + cursor.to_a.size }
+      ).to eq(200)
+    end
+
+    it 'raises an error', unless: write_command_enabled? do
+      expect {
+        cursors
+      }.to raise_error(Mongo::Error::OperationFailure)
+    end
+  end
+
   describe '#projection' do
 
     let(:options) do
@@ -479,6 +560,15 @@ describe Mongo::Collection::View::Readable do
 
   describe '#read' do
 
+    context 'when providing a hash' do
+
+      it 'converts to a read preference' do
+        expect(view.read(:mode => :primary_preferred).read).to be_a(
+          Mongo::ServerSelector::PrimaryPreferred
+        )
+      end
+    end
+
     context 'when a read pref is specified' do
 
       let(:options) do
@@ -524,12 +614,91 @@ describe Mongo::Collection::View::Readable do
 
   describe '#show_disk_loc' do
 
-    let(:new_view) do
-      view.show_disk_loc(true)
+    let(:options) do
+      { :show_disk_loc => true }
     end
 
-    it 'sets the value in the options' do
-      expect(new_view.show_disk_loc).to be true
+    context 'when show_disk_loc is specified' do
+
+      let(:new_show_disk_loc) do
+        false
+      end
+
+      it 'sets the show_disk_loc value' do
+        new_view = view.show_disk_loc(new_show_disk_loc)
+        expect(new_view.show_disk_loc).to eq(new_show_disk_loc)
+      end
+
+      it 'returns a new View' do
+        expect(view.show_disk_loc(new_show_disk_loc)).not_to be(view)
+      end
+    end
+
+    context 'when show_disk_loc is not specified' do
+
+      it 'returns the show_disk_loc value' do
+        expect(view.show_disk_loc).to eq(options[:show_disk_loc])
+      end
+    end
+  end
+
+  describe '#modifiers' do
+
+    let(:options) do
+      { :modifiers => { :$orderby => Mongo::Index::ASCENDING } }
+    end
+
+    context 'when a modifiers document is specified' do
+
+      let(:new_modifiers) do
+        { :modifiers => { :$orderby => Mongo::Index::DESCENDING } }
+      end
+
+      it 'sets the new_modifiers document' do
+        new_view = view.modifiers(new_modifiers)
+        expect(new_view.modifiers).to eq(new_modifiers)
+      end
+
+      it 'returns a new View' do
+        expect(view.modifiers(new_modifiers)).not_to be(view)
+      end
+    end
+
+    context 'when a modifiers document is not specified' do
+
+      it 'returns the modifiers value' do
+        expect(view.modifiers).to eq(options[:modifiers])
+      end
+    end
+  end
+
+  describe '#max_time_ms' do
+
+    let(:options) do
+      { :max_time_ms => 200 }
+    end
+
+    context 'when max_time_ms is specified' do
+
+      let(:new_max_time_ms) do
+        300
+      end
+
+      it 'sets the max_time_ms value' do
+        new_view = view.max_time_ms(new_max_time_ms)
+        expect(new_view.max_time_ms).to eq(new_max_time_ms)
+      end
+
+      it 'returns a new View' do
+        expect(view.max_time_ms(new_max_time_ms)).not_to be(view)
+      end
+    end
+
+    context 'when max_time_ms is not specified' do
+
+      it 'returns the max_time_ms value' do
+        expect(view.max_time_ms).to eq(options[:max_time_ms])
+      end
     end
   end
 
@@ -610,5 +779,81 @@ describe Mongo::Collection::View::Readable do
         expect(view.sort).to eq(options[:sort])
       end
     end
+
+    context 'when an option is a cursor flag' do
+
+      let(:query_spec_options) do
+        view.send(:query_spec)[:options]
+      end
+
+      context 'when allow_partial_results is set as an option' do
+
+        let(:options) do
+          { :allow_partial_results => true }
+        end
+
+        it 'sets the cursor flag' do
+          expect(query_spec_options[:flags]).to eq([:partial])
+        end
+
+        context 'when allow_partial_results is also called as a method' do
+
+          before do
+            view.allow_partial_results
+          end
+
+          it 'sets only one cursor flag' do
+            expect(query_spec_options[:flags]).to eq([:partial])
+          end
+        end
+      end
+
+      context 'when oplog_replay is set as an option' do
+
+        let(:options) do
+          { :oplog_replay => true }
+        end
+
+        it 'sets the cursor flag' do
+          expect(query_spec_options[:flags]).to eq([:oplog_replay])
+        end
+      end
+
+      context 'when no_cursor_timeout is set as an option' do
+
+        let(:options) do
+          { :no_cursor_timeout => true }
+        end
+
+        it 'sets the cursor flag' do
+          expect(query_spec_options[:flags]).to eq([:no_cursor_timeout])
+        end
+      end
+
+      context 'when cursor_type is set as an option' do
+
+        context 'when :tailable is the cursor type' do
+
+          let(:options) do
+            { :cursor_type => :tailable }
+          end
+
+          it 'sets the cursor flag' do
+            expect(query_spec_options[:flags]).to eq([:tailable_cursor])
+          end
+        end
+
+        context 'when :tailable_await is the cursor type' do
+
+          let(:options) do
+            { :cursor_type => :tailable_await }
+          end
+
+          it 'sets the cursor flags' do
+            expect(query_spec_options[:flags]).to eq([:await_data, :tailable_cursor])
+          end
+        end
+      end
+    end
   end
 end

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

@@ -15,7 +15,7 @@ describe Mongo::Collection::View::Writable do
   end
 
   after do
-    authorized_collection.find.delete_many
+    authorized_collection.delete_many
   end
 
   describe '#find_one_and_delete' do
@@ -456,11 +456,11 @@ describe Mongo::Collection::View::Writable do
     context 'when a selector was provided' do
 
       let(:selector) do
-        { field: 'test1' }
+        { field: 'test' }
       end
 
       before do
-        authorized_collection.insert_many([{ field: 'test1' }, { field: 'test2' }])
+        authorized_collection.insert_many([{ field: 'test' }, { field: 'test' }])
       end
 
       let!(:response) do
@@ -472,7 +472,7 @@ describe Mongo::Collection::View::Writable do
       end
 
       it 'returns the number updated' do
-        expect(response.written_count).to eq(1)
+        expect(response.written_count).to eq(2)
       end
 
       it 'updates the documents in the collection' do

data/spec/mongo/collection/view_spec.rb

@@ -15,7 +15,7 @@ describe Mongo::Collection::View do
   end
 
   after do
-    authorized_collection.find.delete_many
+    authorized_collection.delete_many
   end
 
   describe '#==' do
@@ -116,32 +116,38 @@ describe Mongo::Collection::View do
     end
 
     after do
-      authorized_collection.find.delete_many
+      authorized_collection.delete_many
     end
 
     context 'when sending the initial query' do
 
+      let(:returned) do
+        view.to_a
+      end
+
+      let(:query_spec) do
+        view.send(:query_spec)
+      end
+
       context 'when limit is specified' do
 
         let(:options) do
           { :limit => 5 }
         end
 
-        before do
-          expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-            expect(spec[:options][:limit]).to eq(options[:limit])
-          end.and_call_original
-        end
-
         let(:returned) do
           view.to_a
         end
 
+        it 'sets the limit on the initial query' do
+          expect(query_spec[:options][:limit]).to eq(options[:limit])
+        end
+
         it 'returns limited documents' do
           expect(returned.count).to eq(5)
         end
 
-        it 'allows iteration of the documents' do
+        it 'iterates over all of the documents' do
           returned.each do |doc|
             expect(doc).to have_key('field')
           end
@@ -154,21 +160,19 @@ describe Mongo::Collection::View do
           { :batch_size => 5 }
         end
 
-        before do
-          expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-            expect(spec[:options][:limit]).to eq(options[:batch_size])
-          end.and_call_original
-        end
-
         let(:returned) do
           view.to_a
         end
 
+        it 'sets the batch size on the initial query' do
+          expect(query_spec[:options][:limit]).to eq(options[:batch_size])
+        end
+
         it 'returns all the documents' do
           expect(returned.count).to eq(10)
         end
 
-        it 'allows iteration of all documents' do
+        it 'iterates over all of the documents' do
           returned.each do |doc|
             expect(doc).to have_key('field')
           end
@@ -177,21 +181,15 @@ describe Mongo::Collection::View do
 
       context 'when no limit is specified' do
 
-        before do
-          expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-            expect(spec[:options][:limit]).to eq(nil)
-          end.and_call_original
-        end
-
-        let(:returned) do
-          view.to_a
+        it 'does not set a limit on the initial query' do
+          expect(query_spec[:options][:limit]).to be_nil
         end
 
         it 'returns all the documents' do
           expect(returned.count).to eq(10)
         end
 
-        it 'allows iteration of all documents' do
+        it 'iterates over all of the documents' do
           returned.each do |doc|
             expect(doc).to have_key('field')
           end
@@ -204,21 +202,19 @@ describe Mongo::Collection::View do
           { :batch_size => 5, :limit => 3 }
         end
 
-        before do
-          expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-            expect(spec[:options][:limit]).to eq(options[:limit])
-          end.and_call_original
-        end
-
         let(:returned) do
           view.to_a
         end
 
+        it 'sets the limit on the initial query' do
+          expect(query_spec[:options][:limit]).to eq(options[:limit])
+        end
+
         it 'returns the limit of documents' do
           expect(returned.count).to eq(3)
         end
 
-        it 'allows iteration of the documents' do
+        it 'iterates over all of the documents' do
           returned.each do |doc|
             expect(doc).to have_key('field')
           end
@@ -231,21 +227,19 @@ describe Mongo::Collection::View do
           { :limit => 5, :batch_size => 3 }
         end
 
-        before do
-          expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-            expect(spec[:options][:limit]).to eq(options[:batch_size])
-          end.and_call_original
-        end
-
         let(:returned) do
           view.to_a
         end
 
+        it 'sets the batch size on the initial query' do
+          expect(query_spec[:options][:limit]).to eq(options[:batch_size])
+        end
+
         it 'returns the limit of documents' do
           expect(returned.count).to eq(5)
         end
 
-        it 'allows iteration of the documents' do
+        it 'iterates over all of the documents' do
           returned.each do |doc|
             expect(doc).to have_key('field')
           end
@@ -254,20 +248,22 @@ describe Mongo::Collection::View do
 
       context 'when the selector has special fields' do
 
-        context 'when a snapshot option is provided' do
+        context 'when a snapshot option is specified' do
 
           let(:options) do
             { :snapshot => true }
           end
 
           before do
-            expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-              expect(spec[:selector][:$query]).to eq(selector)
-            end.and_call_original
+            expect(view).to receive(:special_selector).and_call_original
           end
 
           it 'creates a special query selector' do
-            view.each do |doc|
+            expect(query_spec[:selector][:$snapshot]).to eq(options[:snapshot])
+          end
+
+          it 'iterates over all of the documents' do
+            returned.each do |doc|
               expect(doc).to have_key('field')
             end
           end
@@ -280,13 +276,36 @@ describe Mongo::Collection::View do
           end
 
           before do
-            expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-              expect(spec[:selector][:$query]).to eq(selector)
-            end.and_call_original
+            expect(view).to receive(:special_selector).and_call_original
           end
 
           it 'creates a special query selector' do
-            view.each do |doc|
+            expect(query_spec[:selector][:$maxScan]).to eq(options[:max_scan])
+          end
+
+          it 'iterates over all of the documents' do
+            returned.each do |doc|
+              expect(doc).to have_key('field')
+            end
+          end
+        end
+
+        context 'when a max_time_ms option is provided' do
+
+          let(:options) do
+            { :max_time_ms => 100 }
+          end
+
+          before do
+            expect(view).to receive(:special_selector).and_call_original
+          end
+
+          it 'creates a special query selector' do
+            expect(query_spec[:selector][:$maxTimeMS]).to eq(options[:max_time_ms])
+          end
+
+          it 'iterates over all of the documents' do
+            returned.each do |doc|
               expect(doc).to have_key('field')
             end
           end
@@ -299,15 +318,16 @@ describe Mongo::Collection::View do
           end
 
           before do
-            expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-              expect(spec[:selector][:$query]).to eq(selector)
-            end.and_call_original
+            expect(view).to receive(:special_selector).and_call_original
           end
 
           it 'creates a special query selector' do
-            view.each do |doc|
+            expect(query_spec[:selector][:$showDiskLoc]).to eq(options[:show_disk_loc])
+          end
+
+          it 'iterates over all of the documents' do
+            returned.each do |doc|
               expect(doc).to have_key('field')
-              break
             end
           end
         end
@@ -320,13 +340,15 @@ describe Mongo::Collection::View do
         end
 
         before do
-          expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-            expect(spec[:selector][:$query]).to eq(selector)
-          end.and_call_original
+          expect(view).to receive(:special_selector).and_call_original
         end
 
         it 'creates a special query selector' do
-          view.each do |doc|
+          expect(query_spec[:selector][:$orderby]).to eq(options[:sort])
+        end
+
+        it 'iterates over all of the documents' do
+          returned.each do |doc|
             expect(doc).to have_key('field')
           end
         end
@@ -341,15 +363,11 @@ describe Mongo::Collection::View do
           end
 
           before do
-            expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-              expect(spec[:selector][:$query]).to eq(selector)
-            end.and_call_original
+            expect(view).to receive(:special_selector).and_call_original
           end
 
-          it'creates a special query selector' do
-            expect {
-              view.to_a
-            }.to raise_error(Mongo::Error::OperationFailure)
+          it 'creates a special query selector' do
+            expect(query_spec[:selector][:$hint]).to eq(options[:hint])
           end
         end
       end
@@ -361,32 +379,176 @@ describe Mongo::Collection::View do
         end
 
         before do
-          expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-            expect(spec[:selector][:$query]).to eq(selector)
-          end.and_call_original
+          expect(view).to receive(:special_selector).and_call_original
         end
 
         it 'creates a special query selector' do
+          expect(query_spec[:selector][:$comment]).to eq(options[:comment])
+        end
+
+        it 'iterates over all of the documents' do
+          returned.each do |doc|
+            expect(doc).to have_key('field')
+          end
+        end
+      end
+
+      context 'when the cluster is sharded', if: sharded? do
+
+        before do
+          allow(authorized_collection.cluster).to receive(:sharded?).and_return(true)
+          expect(view).to receive(:special_selector).and_call_original
+        end
+
+        it 'iterates over all of the documents' do
           view.each do |doc|
             expect(doc).to have_key('field')
           end
         end
       end
 
-      context 'when the cluster is sharded' do
+      context 'when a modifier document is provided' do
+
+        let(:options) do
+          { :modifiers => {
+                            :$orderby => {'x' => Mongo::Index::ASCENDING }
+                          }
+          }
+        end
 
         before do
-          expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-            expect(spec[:selector][:$query]).to eq(selector)
-          end.and_call_original
+          expect(view).to receive(:special_selector).and_call_original
         end
 
         it 'creates a special query selector' do
+          expect(query_spec[:selector][:$orderby]).to eq(options[:modifiers][:$orderby])
+        end
+
+        it 'iterates over all of the documents' do
           view.each do |doc|
             expect(doc).to have_key('field')
           end
         end
+
+        context 'when $explain is specified' do
+          let(:options) do
+            { :modifiers => {
+                             :$explain => 1
+                            }
+            }
+          end
+
+          let(:explain) do
+            view.to_a.first
+          end
+
+          it 'executes an explain' do
+            expect(explain['cursor'] == 'BasicCursor' ||
+                       explain['queryPlanner']).to be_truthy
+          end
+
+        end
+
+        context 'when an option is also provided' do
+
+          context 'when $orderby and sort are specified' do
+
+            let(:options) do
+              { :modifiers => {
+                               :$orderby => { 'x' => Mongo::Index::ASCENDING }
+                              },
+                :sort => { 'x' => Mongo::Index::DESCENDING }
+              }
+            end
+
+            it 'overrides the modifier value with the option value' do
+              expect(query_spec[:selector][:$orderby]).to eq(options[:sort])
+            end
+          end
+
+          context 'when $comment and comment are specified' do
+
+            let(:options) do
+              { :modifiers => {
+                               :$comment => 'query1'
+                              },
+                :comment => 'query2'
+              }
+            end
+
+            it 'overrides the modifier value with the option value' do
+              expect(query_spec[:selector][:$comment]).to eq(options[:comment])
+            end
+          end
+
+          context 'when $hint and hint are specified' do
+
+            let(:options) do
+              { :modifiers => {
+                               :$hint => 'x'
+                              },
+                :hint => 'y'
+              }
+            end
+
+            it 'overrides the modifier value with the option value' do
+              expect(query_spec[:selector][:$hint]).to eq(options[:hint])
+            end
+
+          end
+
+          context 'when $maxScan and max_scan are specified' do
+
+            let(:options) do
+              { :modifiers => {
+                               :$maxScan => 4
+                              },
+                :max_scan => 5
+              }
+            end
+
+            it 'overrides the modifier value with the option value' do
+              expect(query_spec[:selector][:$maxScan]).to eq(options[:max_scan])
+            end
+          end
+
+          context 'when $maxTimeMS and max_time_ms are specified' do
+
+            let(:options) do
+              { :modifiers => {
+                               :$maxTimeMS => 100
+                              },
+                :max_time_ms => 200
+              }
+            end
+
+            it 'overrides the modifier value with the option value' do
+              expect(query_spec[:selector][:$maxTimeMS]).to eq(options[:max_time_ms])
+            end
+          end
+
+          context 'when $query and a selector are specified' do
+
+            let(:selector) do
+              { 'y' => 1 }
+            end
+
+            let(:options) do
+              { :modifiers => {
+                                :$query => { 'field' => 1 }
+                              }
+              }
+            end
+
+            it 'overrides the modifier value with the option value' do
+              expect(query_spec[:selector][:$query]).to eq(selector)
+            end
+          end
+
+
+        end
       end
+
     end
 
     context 'when there are no special fields' do