mongo 2.1.0.beta → 2.2.0

data/spec/mongo/collection/view_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Mongo::Collection::View do
 
-  let(:selector) do
+  let(:filter) do
     {}
   end
 
@@ -11,7 +11,7 @@ describe Mongo::Collection::View do
   end
 
   let(:view) do
-    described_class.new(authorized_collection, selector, options)
+    described_class.new(authorized_collection, filter, options)
   end
 
   after do
@@ -29,10 +29,10 @@ describe Mongo::Collection::View do
       end
     end
 
-    context 'when the views have the same collection, selector, and options' do
+    context 'when the views have the same collection, filter, and options' do
 
       let(:other) do
-        described_class.new(authorized_collection, selector, options)
+        described_class.new(authorized_collection, filter, options)
       end
 
       it 'returns true' do
@@ -47,7 +47,7 @@ describe Mongo::Collection::View do
       end
 
       let(:other) do
-        described_class.new(other_collection, selector, options)
+        described_class.new(other_collection, filter, options)
       end
 
       it 'returns false' do
@@ -55,14 +55,14 @@ describe Mongo::Collection::View do
       end
     end
 
-    context 'when two views have a different selector' do
+    context 'when two views have a different filter' do
 
-      let(:other_selector) do
+      let(:other_filter) do
         { 'name' => 'Emily' }
       end
 
       let(:other) do
-        described_class.new(authorized_collection, other_selector, options)
+        described_class.new(authorized_collection, other_filter, options)
       end
 
       it 'returns false' do
@@ -77,7 +77,7 @@ describe Mongo::Collection::View do
       end
 
       let(:other) do
-        described_class.new(authorized_collection, selector, other_options)
+        described_class.new(authorized_collection, filter, other_options)
       end
 
       it 'returns false' do
@@ -96,8 +96,8 @@ describe Mongo::Collection::View do
       expect(view.options).not_to be(view_clone.options)
     end
 
-    it 'dups the selector' do
-      expect(view.selector).not_to be(view_clone.selector)
+    it 'dups the filter' do
+      expect(view.filter).not_to be(view_clone.filter)
     end
 
     it 'references the same collection' do
@@ -119,463 +119,37 @@ describe Mongo::Collection::View do
       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
-
-        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 'iterates over all of the documents' do
-          returned.each do |doc|
-            expect(doc).to have_key('field')
-          end
-        end
-      end
-
-      context 'when batch size is specified' do
-
-        let(:options) do
-          { :batch_size => 5 }
-        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 'iterates over all of the documents' do
-          returned.each do |doc|
-            expect(doc).to have_key('field')
-          end
-        end
-      end
-
-      context 'when no limit is specified' do
-
-        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 'iterates over all of the documents' do
-          returned.each do |doc|
-            expect(doc).to have_key('field')
-          end
-        end
-      end
-
-      context 'when batch size is greater than limit' do
-
-        let(:options) do
-          { :batch_size => 5, :limit => 3 }
-        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 'iterates over all of the documents' do
-          returned.each do |doc|
-            expect(doc).to have_key('field')
-          end
-        end
-      end
-
-      context 'when limit is greater than batch size' do
-
-        let(:options) do
-          { :limit => 5, :batch_size => 3 }
-        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 'iterates over all of the documents' do
-          returned.each do |doc|
-            expect(doc).to have_key('field')
-          end
-        end
-      end
-
-      context 'when the selector has special fields' do
-
-        context 'when a snapshot option is specified' do
-
-          let(:options) do
-            { :snapshot => true }
-          end
-
-          before do
-            expect(view).to receive(:special_selector).and_call_original
-          end
-
-          it 'creates a special query selector' do
-            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
-        end
-
-        context 'when a max_scan option is provided' do
-
-          let(:options) do
-            { :max_scan => 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][:$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
-        end
-
-        context 'when a show_disk_loc option is provided' do
-
-          let(:options) do
-            { :show_disk_loc => true }
-          end
-
-          before do
-            expect(view).to receive(:special_selector).and_call_original
-          end
-
-          it 'creates a special query selector' do
-            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')
-            end
-          end
-        end
-      end
-
-      context 'when sorting' do
-
-        let(:options) do
-          { :sort => {'x' => Mongo::Index::ASCENDING }}
-        end
-
-        before do
-          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[:sort])
-        end
-
-        it 'iterates over all of the documents' do
-          returned.each do |doc|
-            expect(doc).to have_key('field')
-          end
-        end
-      end
-
-      context 'when providing a hint' do
-
-        context 'when the hint is bad' do
-
-          let(:options) do
-            { :hint => { 'x' => Mongo::Index::ASCENDING }}
-          end
-
-          before do
-            expect(view).to receive(:special_selector).and_call_original
-          end
-
-          it 'creates a special query selector' do
-            expect(query_spec[:selector][:$hint]).to eq(options[:hint])
-          end
-        end
-      end
-
-      context 'when providing a comment' do
-
-        let(:options) do
-          { :comment => 'query1' }
-        end
-
-        before do
-          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
+    context 'when a block is not provided' do
 
-        it 'iterates over all of the documents' do
-          view.each do |doc|
-            expect(doc).to have_key('field')
-          end
-        end
+      let(:enumerator) do
+        view.each
       end
 
-      context 'when a modifier document is provided' do
-
-        let(:options) do
-          { :modifiers => {
-                            :$orderby => {'x' => Mongo::Index::ASCENDING }
-                          }
-          }
-        end
-
-        before do
-          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
-
-
+      it 'returns an enumerator' do
+        enumerator.each do |doc|
+          expect(doc).to have_key('field')
         end
       end
-
     end
 
-    context 'when there are no special fields' do
+    describe '#close_query' do
 
-      before do
-        expect(Mongo::Operation::Read::Query).to receive(:new) do |spec|
-          expect(spec[:selector]).to eq(selector)
-        end.and_call_original
+      let(:options) do
+        { :batch_size => 1 }
       end
 
-      it 'creates a normal query spec' do
-        view.each do |doc|
-          expect(doc).to have_key('field')
-        end
+      let(:cursor) do
+        view.instance_variable_get(:@cursor)
       end
-    end
-
-    context 'when a block is not provided' do
 
-      let(:enumerator) do
-        view.each
+      before do
+        view.to_enum.next
+        cursor.instance_variable_set(:@cursor_id, 1) unless find_command_enabled?
       end
 
-      it 'returns an enumerator' do
-        enumerator.each do |doc|
-          expect(doc).to have_key('field')
-        end
+      it 'sends a kill cursors command for the cursor' do
+        expect(cursor).to receive(:kill_cursors).and_call_original
+        view.close_query
       end
     end
   end
@@ -583,10 +157,10 @@ describe Mongo::Collection::View do
   describe '#hash' do
 
     let(:other) do
-      described_class.new(authorized_collection, selector, options)
+      described_class.new(authorized_collection, filter, options)
     end
 
-    it 'returns a unique value based on collection, selector, options' do
+    it 'returns a unique value based on collection, filter, options' do
       expect(view.hash).to eq(other.hash)
     end
 
@@ -597,7 +171,7 @@ describe Mongo::Collection::View do
       end
 
       let(:other) do
-        described_class.new(other_collection, selector, options)
+        described_class.new(other_collection, filter, options)
       end
 
       it 'returns different hash values' do
@@ -605,14 +179,14 @@ describe Mongo::Collection::View do
       end
     end
 
-    context 'when two views only have different selectors' do
+    context 'when two views only have different filter' do
 
-      let(:other_selector) do
+      let(:other_filter) do
         { 'name' => 'Emily' }
       end
 
       let(:other) do
-        described_class.new(authorized_collection, other_selector, options)
+        described_class.new(authorized_collection, other_filter, options)
       end
 
       it 'returns different hash values' do
@@ -627,7 +201,7 @@ describe Mongo::Collection::View do
       end
 
       let(:other) do
-        described_class.new(authorized_collection, selector, other_options)
+        described_class.new(authorized_collection, filter, other_options)
       end
 
       it 'returns different hash values' do
@@ -638,53 +212,111 @@ describe Mongo::Collection::View do
 
   describe '#initialize' do
 
-    let(:options) do
-      { :limit => 5 }
-    end
+    context 'when the filter is not a valid document' do
 
-    it 'sets the collection' do
-      expect(view.collection).to eq(authorized_collection)
-    end
+      let(:filter) do
+        'y'
+      end
 
-    it 'sets the selector' do
-      expect(view.selector).to eq(selector)
+      let(:options) do
+        { limit: 5 }
+      end
+
+      it 'raises an error' do
+        expect do
+          view
+        end.to raise_error(Mongo::Error::InvalidDocument)
+      end
     end
 
-    it 'dups the selector' do
-      expect(view.selector).not_to be(selector)
+    context 'when the filter and options are standard' do
+
+      let(:filter) do
+        { 'name' => 'test' }
+      end
+
+      let(:options) do
+        { 'sort' => { 'name' => 1 }}
+      end
+
+      it 'parses a standard filter' do
+        expect(view.filter).to eq(filter)
+      end
+
+      it 'parses standard options' do
+        expect(view.options).to eq(options)
+      end
     end
 
-    it 'sets the options' do
-      expect(view.options).to eq(options)
+    context 'when the filter contains modifiers' do
+
+      let(:filter) do
+        { :$query => { :name => 'test' }, :$comment => 'testing' }
+      end
+
+      let(:options) do
+        { :sort => { name: 1 }}
+      end
+
+      it 'parses a standard filter' do
+        expect(view.filter).to eq('name' => 'test')
+      end
+
+      it 'parses standard options' do
+        expect(view.options).to eq('sort' => { 'name' => 1 }, 'comment' => 'testing')
+      end
     end
 
-    it 'dups the options' do
-      expect(view.options).not_to be(options)
+    context 'when the options contain modifiers' do
+
+      let(:filter) do
+        { 'name' => 'test' }
+      end
+
+      let(:options) do
+        { :sort => { name: 1 }, :modifiers => { :$comment => 'testing'}}
+      end
+
+      it 'parses a standard filter' do
+        expect(view.filter).to eq('name' => 'test')
+      end
+
+      it 'parses standard options' do
+        expect(view.options).to eq('sort' => { 'name' => 1 }, 'comment' => 'testing')
+      end
     end
 
-    context 'when the selector is not a valid document' do
+    context 'when the filter and options both contain modifiers' do
 
-      let(:selector) do
-        'y'
+      let(:filter) do
+        { :$query => { 'name' => 'test' }, :$hint => { name: 1 }}
       end
 
-      it 'raises an error' do
-        expect do
-          view
-        end.to raise_error(Mongo::Error::InvalidDocument)
+      let(:options) do
+        { :sort => { name: 1 }, :modifiers => { :$comment => 'testing' }}
+      end
+
+      it 'parses a standard filter' do
+        expect(view.filter).to eq('name' => 'test')
+      end
+
+      it 'parses standard options' do
+        expect(view.options).to eq(
+          'sort' => { 'name' => 1 }, 'comment' => 'testing', 'hint' => { 'name' => 1 }
+        )
       end
     end
   end
 
   describe '#inspect' do
 
-    context 'when there is a namespace, selector, and options' do
+    context 'when there is a namespace, filter, and options' do
 
       let(:options) do
-        { :limit => 5 }
+        { 'limit' => 5 }
       end
 
-      let(:selector) do
+      let(:filter) do
         { 'name' => 'Emily' }
       end
 
@@ -696,8 +328,8 @@ describe Mongo::Collection::View do
         expect(view.inspect).to match(/.*#{authorized_collection.namespace}.*/)
       end
 
-      it 'returns a string containing the selector' do
-        expect(view.inspect).to match(/.*#{selector.inspect}.*/)
+      it 'returns a string containing the filter' do
+        expect(view.inspect).to match(/.*#{filter.inspect}.*/)
       end
 
       it 'returns a string containing the options' do