lib/mongoid/criterion/scrollable.rb in mongoid-scroll-0.3.0 vs lib/mongoid/criterion/scrollable.rb in mongoid-scroll-0.3.1

@@ -3,11 +3,11 @@
     module Scrollable
       def scroll(cursor = nil, &_block)
         criteria = self
         # we don't support scrolling over a criteria with multiple fields
         if criteria.options[:sort] && criteria.options[:sort].keys.size != 1
-          raise Mongoid::Scroll::Errors::MultipleSortFieldsError.new(sort: criteria.options[:sort])
+          fail Mongoid::Scroll::Errors::MultipleSortFieldsError.new(sort: criteria.options[:sort])
         elsif !criteria.options.key?(:sort) || criteria.options[:sort].empty?
           # introduce a default sort order if there's none
           criteria = criteria.asc(:_id)
         end
         # scroll field and direction
@@ -17,10 +17,12 @@
         field = criteria.klass.fields[scroll_field.to_s]
         cursor_options = { field_type: field.type, field_name: scroll_field, direction: scroll_direction }
         cursor = cursor.is_a?(Mongoid::Scroll::Cursor) ? cursor : Mongoid::Scroll::Cursor.new(cursor, cursor_options)
         # scroll
         if block_given?
-          criteria.where(cursor.criteria).order_by(_id: scroll_direction).each do |record|
+          cursor_criteria = criteria.dup
+          cursor_criteria.selector = { '$and' => [criteria.selector, cursor.criteria] }
+          cursor_criteria.order_by(_id: scroll_direction).each do |record|
             yield record, Mongoid::Scroll::Cursor.from_record(record, cursor_options)
           end
         else
           criteria
         end