mongo 2.0.6 → 2.1.0

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
@@ -66,6 +66,39 @@ describe Mongo::Collection::View::MapReduce do
       end
     end
 
+    context 'when out is in the options' do
+
+      after do
+        authorized_client['output_collection'].delete_many
+      end
+
+      context 'when out is a string' do
+
+        let(:options) do
+          { :out => 'output_collection' }
+        end
+
+        it 'iterates over the documents in the result' do
+          map_reduce.each do |document|
+            expect(document[:value]).to_not be_nil
+          end
+        end
+      end
+
+      context 'when out is a document' do
+
+        let(:options) do
+          { :out => {  replace: 'output_collection' } }
+        end
+
+        it 'iterates over the documents in the result' do
+          map_reduce.each do |document|
+            expect(document[:value]).to_not be_nil
+          end
+        end
+      end
+    end
+
     context 'when out is inline' do
 
       let(:new_map_reduce) do
@@ -82,7 +115,7 @@ describe Mongo::Collection::View::MapReduce do
     context 'when out is a collection' do
 
       after do
-        authorized_client['output_collection'].find.delete_many
+        authorized_client['output_collection'].delete_many
       end
 
       context 'when the option is to replace' do
@@ -135,6 +168,17 @@ describe Mongo::Collection::View::MapReduce do
           expect(new_map_reduce.count).to eq(2)
         end
       end
+
+      context 'when the option is a collection name' do
+
+        let(:new_map_reduce) do
+          map_reduce.out('output_collection')
+        end
+
+        it 'fetches the results from the collection' do
+          expect(new_map_reduce.count).to eq(2)
+        end
+      end
     end
 
     context 'when the view has a selector' do
@@ -169,7 +213,7 @@ describe Mongo::Collection::View::MapReduce do
         end
 
         it 'includes the selector in the operation spec' do
-          expect(map_reduce.send(:map_reduce_spec)[:selector][:query]).to eq(selector[:$query])
+          expect(map_reduce.send(:map_reduce_spec)[:selector][:query]).to eq(BSON::Document.new(selector[:$query]))
         end
       end
     end
@@ -250,6 +294,57 @@ describe Mongo::Collection::View::MapReduce do
         expect(map_reduce.send(:map_reduce_spec)[:selector][:out]).to eq(inline: 1)
       end
     end
+
+    context 'when out is specified in the options' do
+
+      let(:location) do
+        { replace: 'testing' }
+      end
+
+      let(:options) do
+        { :out => location }
+      end
+
+      it 'sets the out value' do
+        expect(map_reduce.out).to eq(location)
+      end
+
+      it 'includes the out value in the operation spec' do
+        expect(map_reduce.send(:map_reduce_spec)[:selector][:out]).to be(location)
+      end
+    end
+
+    context 'when out is not inline' do
+
+      let(:location) do
+        { replace: 'testing' }
+      end
+
+      let(:options) do
+        { :out => location }
+      end
+
+      it 'does not allow the operation on a secondary' do
+        expect(map_reduce.send(:secondary_ok?)).to be(false)
+      end
+
+      context 'when the context is not a valid server for writing' do
+
+        it 'reroutes the operation to a primary' do
+          allow(map_reduce).to receive(:valid_server?).and_return(false)
+          expect(Mongo::Logger.logger).to receive(:warn?).and_call_original
+          map_reduce.to_a
+        end
+      end
+
+      context 'when the context is a valid server for writing' do
+
+        it 'does not reroute the operation to a primary' do
+          expect(Mongo::Logger.logger).not_to receive(:warn?)
+          map_reduce.to_a
+        end
+      end
+    end
   end
 
   describe '#scope' do
@@ -316,7 +411,7 @@ describe Mongo::Collection::View::MapReduce do
     end
 
     it 'includes the sort object in the operation spec' do
-      expect(map_reduce.send(:map_reduce_spec)[:selector][:sort]).to be(sort)
+      expect(map_reduce.send(:map_reduce_spec)[:selector][:sort][:name]).to eq(sort[:name])
     end
   end
 

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
@@ -419,6 +465,28 @@ describe Mongo::Collection::View::Readable do
     end
   end
 
+  describe '#max_value' do
+
+    let(:new_view) do
+      view.max_value(_id: 1)
+    end
+
+    it 'sets the value in the options' do
+      expect(new_view.max_value).to eq('_id' => 1)
+    end
+  end
+
+  describe '#min_value' do
+
+    let(:new_view) do
+      view.min_value(_id: 1)
+    end
+
+    it 'sets the value in the options' do
+      expect(new_view.min_value).to eq('_id' => 1)
+    end
+  end
+
   describe '#no_cursor_timeout' do
 
     let(:new_view) do
@@ -479,6 +547,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 +601,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 +766,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