Merge pull request #690 from estolfo/RUBY-1025-collections-info

RUBY-1025 Make sure collections info returns all results

Author: estolfo

lib/mongo/database/view.rb

@@ -51,8 +51,9 @@ class View
       def collection_names(options = {})
         @batch_size = options[:batch_size]
         server = next_primary
+        @limit = -1 if server.features.list_collections_enabled?
         collections_info(server).collect do |info|
-          server.context.features.list_collections_enabled? ?
+          server.features.list_collections_enabled? ?
             info[Database::NAME] : info[Database::NAME].sub("#{@database.name}.", '')
         end
       end
@@ -80,7 +81,7 @@ def list_collections
       def initialize(database)
         @database = database
         @batch_size =  nil
-        @limit = -1
+        @limit = nil
         @collection = @database[Database::COMMAND]
       end
 

lib/mongo/operation/commands/collections_info.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/operation/commands/collections_info/result'
+
 module Mongo
   module Operation
 

lib/mongo/operation/commands/collections_info/result.rb

@@ -0,0 +1,39 @@
+# Copyright (C) 2014-2015 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  module Operation
+    class CollectionsInfo
+
+      # Defines custom behaviour of results when query the system.namespaces
+      # collection.
+      #
+      # @since 2.1.0
+      class Result < Operation::Result
+
+        # Get the namespace for the cursor.
+        #
+        # @example Get the namespace.
+        #   result.namespace
+        #
+        # @return [ String ] The namespace.
+        #
+        # @since 2.1.0
+        def namespace
+          Database::NAMESPACES
+        end
+      end
+    end
+  end
+end

lib/mongo/operation/commands/list_indexes/result.rb

@@ -110,6 +110,7 @@ def cursor_document
         def first_document
           @first_document ||= reply.documents[0]
         end
-      end end
+      end
+    end
   end
 end

spec/mongo/database_spec.rb

@@ -93,6 +93,26 @@
         expect(database.collection_names(batch_size: 1).to_a).to include('users')
       end
     end
+
+    context 'when there are more collections than the initial batch size' do
+
+      before do
+        200.times do |i|
+          database["#{i}_dalmatians"].create
+        end
+      end
+
+      after do
+        200.times do |i|
+          database["#{i}_dalmatians"].drop
+        end
+      end
+
+      it 'returns all collections' do
+        expect(database.collection_names.select { |c| c =~ /dalmatians/}.size).to eq(200)
+      end
+
+    end
   end
 
   describe '#list_collections' do