lib/mongoid/criterion/scrollable.rb in mongoid-scroll-0.1.0 vs lib/mongoid/criterion/scrollable.rb in mongoid-scroll-0.2.0

@@ -1,31 +1,31 @@
 module Mongoid
   module Criterion
     module Scrollable
 
       def scroll(cursor = nil, &block)
-        c = self
+        criteria = self
         # we don't support scrolling over a criteria with multiple fields
-        if c.options[:sort] && c.options[:sort].keys.count != 1
-          sort = c.options[:sort].keys.join(", ")
-          raise Mongoid::Scroll::Errors::MultipleSortFieldsError.new(sort: sort)
+        if criteria.options[:sort] && criteria.options[:sort].keys.size != 1
+          raise Mongoid::Scroll::Errors::MultipleSortFieldsError.new(sort: criteria.options[:sort])
+        elsif ! criteria.options.has_key?(:sort) || criteria.options[:sort].empty?
+          # introduce a default sort order if there's none
+          criteria = criteria.asc(:_id)
         end
-        # introduce a default sort order if there's none
-        c = c.asc(:_id) if (! c.options[:sort]) || c.options[:sort].empty?
         # scroll field and direction
-        scroll_field = c.options[:sort].keys.first
-        scroll_direction = c.options[:sort].values.first.to_i == 1 ? '$gt' : '$lt'
+        scroll_field = criteria.options[:sort].keys.first
+        scroll_direction = criteria.options[:sort].values.first.to_i == 1 ? '$gt' : '$lt'
         # scroll cursor from the parameter, with value and tiebreak_id
-        field = c.klass.fields[scroll_field.to_s]
-        cursor_options = { field: field, direction: scroll_direction }
+        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?
-          c.where(cursor.criteria).each do |record|
+          criteria.where(cursor.criteria).each do |record|
             yield record, Mongoid::Scroll::Cursor.from_record(record, cursor_options)
           end
         else
-          c
+          criteria
         end
       end
 
     end
   end