RUBY-2565 Make View#count respect skip and limit (#2219)

Author: comandeo-mongo

lib/mongo/collection.rb

@@ -457,14 +457,14 @@ def count(filter = nil, options = {})
     # @param [ Hash ] filter A filter for matching documents.
     # @param [ Hash ] options Options for the operation.
     #
-    # @option opts :skip [ Integer ] The number of documents to skip.
-    # @option opts :hint [ Hash ] Override default index selection and force
+    # @option options :skip [ Integer ] The number of documents to skip.
+    # @option options :hint [ Hash ] Override default index selection and force
     #   MongoDB to use a specific index for the query. Requires server version 3.6+.
-    # @option opts :limit [ Integer ] Max number of docs to count.
-    # @option opts :max_time_ms [ Integer ] The maximum amount of time to allow the
+    # @option options :limit [ Integer ] Max number of docs to count.
+    # @option options :max_time_ms [ Integer ] The maximum amount of time to allow the
     #   command to run.
-    # @option opts [ Hash ] :read The read preference options.
-    # @option opts [ Hash ] :collation The collation to use.
+    # @option options :read [ Hash ] The read preference options.
+    # @option options :collation [ Hash ] The collation to use.
     #
     # @return [ Integer ] The document count.
     #

lib/mongo/collection/view/readable.rb

@@ -152,6 +152,7 @@ def comment(comment = nil)
         #     * $near should be replaced with $geoWithin with $center
         #     * $nearSphere should be replaced with $geoWithin with $centerSphere
         def count(opts = {})
+          opts = Utils.shallow_symbolize_keys(@options.merge(opts))
           cmd = { :count => collection.name, :query => filter }
           cmd[:skip] = opts[:skip] if opts[:skip]
           cmd[:hint] = opts[:hint] if opts[:hint]
@@ -193,11 +194,13 @@ def count(opts = {})
         #   command to run.
         # @option opts [ Hash ] :read The read preference options.
         # @option opts [ Hash ] :collation The collation to use.
+        # @option opts [ Mongo::Session ] :session The session to use for the operation.
         #
         # @return [ Integer ] The document count.
         #
         # @since 2.6.0
         def count_documents(opts = {})
+          opts = Utils.shallow_symbolize_keys(@options.merge(opts))
           pipeline = [:'$match' => filter]
           pipeline << { :'$skip' => opts[:skip] } if opts[:skip]
           pipeline << { :'$limit' => opts[:limit] } if opts[:limit]

spec/mongo/collection/view/readable_spec.rb

@@ -600,6 +600,67 @@
         end
       end
     end
+
+    context 'with limit' do
+      let(:limit) { 6 }
+
+      it 'respects view limit' do
+        expect(view.limit(limit).count).to eq(limit)
+      end
+
+      it 'respects limit given as parameter' do
+        expect(view.count(limit: limit)).to eq(limit)
+      end
+    end
+
+    context 'with skip' do
+      let(:skip) { 6 }
+      let(:expected) { 4 }
+
+      it 'respects view skip' do
+        expect(view.skip(skip).count).to eq(expected)
+      end
+
+      it 'respects skip given as parameter' do
+        expect(view.count(skip: skip)).to eq(expected)
+      end
+    end
+  end
+
+  describe '#count_documents' do
+    let(:documents) do
+      (1..10).map{ |i| { field: "test#{i}" }}
+    end
+
+    before do
+      authorized_collection.delete_many
+      authorized_collection.insert_many(documents)
+    end
+
+    context 'with limit' do
+      let(:limit) { 6 }
+
+      it 'respects view limit' do
+        expect(view.limit(limit).count_documents).to eq(limit)
+      end
+
+      it 'respects limit given as parameter' do
+        expect(view.count_documents(limit: limit)).to eq(limit)
+      end
+    end
+
+    context 'with skip' do
+      let(:skip) { 6 }
+      let(:expected) { 4 }
+
+      it 'respects view skip' do
+        expect(view.skip(skip).count_documents).to eq(expected)
+      end
+
+      it 'respects skip given as parameter' do
+        expect(view.count_documents(skip: skip)).to eq(expected)
+      end
+    end
   end
 
   describe "#estimated_document_count" do