refactor

Author: GCorbel

lib/mongo/scrollable.rb

@@ -18,7 +18,7 @@ def scroll(cursor_or_type = nil, options = nil, &_block)
       raise_mismatched_sort_fields_error!(cursor, cursor_options) if different_sort_fields?(cursor, cursor_options)
 
       records = nil
-      if cursor.type == :previous && limit
+      if cursor.type == :previous
         # scroll backwards by reversing the sort order, limit and then reverse again
         pipeline = [
           { '$match' => view.selector.merge(cursor.criteria) },

lib/mongoid/criteria/scrollable.rb

@@ -69,7 +69,7 @@ def new_cursor(cursor_type, cursor, cursor_options)
       def find_records(criteria, cursor)
         cursor_criteria = criteria.dup
         cursor_criteria.selector = { '$and' => [criteria.selector, cursor.criteria] }
-        if cursor.type == :previous && criteria.options[:limit]
+        if cursor.type == :previous
           pipeline = [
             { '$match' => cursor_criteria.selector },
             { '$sort' => { cursor.field_name => -cursor.direction } },

spec/mongo/collection_view_spec.rb

@@ -107,26 +107,25 @@
                 expect(cursor.tiebreak_id).to eq record['_id']
               end
               it 'can scroll back with the previous cursor' do
-                cursor = nil
-                first_previous_cursor = nil
-                second_previous_cursor = nil
+                first_iterator = nil
+                second_iterator = nil
+                third_iterator = nil
 
                 Mongoid.default_client['feed_items'].find.sort(field_name => 1).limit(2).scroll(cursor_type, field_type: field_type) do |_, iterator|
-                  cursor = iterator.next_cursor
+                  first_iterator = iterator
                 end
 
-                Mongoid.default_client['feed_items'].find.sort(field_name => 1).limit(2).scroll(cursor, field_type: field_type) do |_, iterator|
-                  cursor = iterator.next_cursor
-                  first_previous_cursor = iterator.previous_cursor
+                Mongoid.default_client['feed_items'].find.sort(field_name => 1).limit(2).scroll(first_iterator.next_cursor, field_type: field_type) do |_, iterator|
+                  second_iterator = iterator
                 end
 
-                Mongoid.default_client['feed_items'].find.sort(field_name => 1).limit(2).scroll(cursor, field_type: field_type) do |_, iterator|
-                  second_previous_cursor = iterator.previous_cursor
+                Mongoid.default_client['feed_items'].find.sort(field_name => 1).limit(2).scroll(second_iterator.next_cursor, field_type: field_type) do |_, iterator|
+                  third_iterator = iterator
                 end
 
                 records = Mongoid.default_client['feed_items'].find.sort(field_name => 1)
-                expect(Mongoid.default_client['feed_items'].find.sort(field_name => 1).limit(2).scroll(first_previous_cursor, field_type: field_type).to_a).to eq(records.limit(2).to_a)
-                expect(Mongoid.default_client['feed_items'].find.sort(field_name => 1).limit(2).scroll(second_previous_cursor, field_type: field_type).to_a).to eq(records.skip(2).limit(2).to_a)
+                expect(Mongoid.default_client['feed_items'].find.sort(field_name => 1).limit(2).scroll(second_iterator.previous_cursor, field_type: field_type).to_a).to eq(records.limit(2).to_a)
+                expect(Mongoid.default_client['feed_items'].find.sort(field_name => 1).limit(2).scroll(third_iterator.previous_cursor, field_type: field_type).to_a).to eq(records.skip(2).limit(2).to_a)
               end
             end
           end

spec/mongoid/criteria_spec.rb

@@ -161,26 +161,25 @@
               end
             end
             it 'can scroll back with the previous cursor' do
-              cursor = nil
-              first_previous_cursor = nil
-              second_previous_cursor = nil
+              first_iterator = nil
+              second_iterator = nil
+              third_iterator = nil
 
               Feed::Item.asc(field_name).limit(2).scroll(cursor_type) do |_, iterator|
-                cursor = iterator.next_cursor
+                first_iterator = iterator
               end
 
-              Feed::Item.asc(field_name).limit(2).scroll(cursor) do |_, iterator|
-                cursor = iterator.next_cursor
-                first_previous_cursor = iterator.previous_cursor
+              Feed::Item.asc(field_name).limit(2).scroll(first_iterator.next_cursor) do |_, iterator|
+                second_iterator = iterator
               end
 
-              Feed::Item.asc(field_name).limit(2).scroll(cursor) do |_, iterator|
-                second_previous_cursor = iterator.previous_cursor
+              Feed::Item.asc(field_name).limit(2).scroll(second_iterator.next_cursor) do |_, iterator|
+                third_iterator = iterator
               end
 
               records = Feed::Item.asc(field_name)
-              expect(Feed::Item.asc(field_name).limit(2).scroll(first_previous_cursor)).to eq(records.limit(2))
-              expect(Feed::Item.asc(field_name).limit(2).scroll(second_previous_cursor)).to eq(records.skip(2).limit(2))
+              expect(Feed::Item.asc(field_name).limit(2).scroll(second_iterator.previous_cursor)).to eq(records.limit(2))
+              expect(Feed::Item.asc(field_name).limit(2).scroll(third_iterator.previous_cursor)).to eq(records.skip(2).limit(2))
             end
           end
         end