Support mongoid 6.

.travis.yml

@@ -17,17 +17,9 @@ matrix:
       env: MONGOID_VERSION=4
     - rvm: 2.3.1
       env: MONGOID_VERSION=5
-    - rvm: 2.3.0
-    - rvm: 2.2.5
-    - rvm: 2.1.10
-    - rvm: 2.0.0
-    - rvm: 1.9.3
-    - rvm: rbx-2
-    - rvm: ruby-head
-    - rvm: jruby-head
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-2
+    - rvm: 2.3.1
+      env: MONGOID_VERSION=6
+    - rvm: 2.3.1
+      env: MONGOID_VERSION=HEAD
 
 bundler_args: --without development

CHANGELOG.md

@@ -1,6 +1,7 @@
 0.3.5 (Next)
 ------------
 
+* [#11](https://github.com/mongoid/mongoid-scroll/pull/11): Compatibility with Mongoid 6 - [@dblock](https://github.com/dblock).
 * Your contribution here.
 
 0.3.4 (2015/10/22)

Gemfile

@@ -2,7 +2,11 @@ source 'http://rubygems.org'
 
 gemspec
 
-case version = ENV['MONGOID_VERSION'] || '~> 5.0'
+case version = ENV['MONGOID_VERSION'] || '~> 6.0'
+when 'HEAD'
+  gem 'mongoid', github: 'mongodb/mongoid'
+when /6/
+  gem 'mongoid', '~> 6.0'
 when /5/
   gem 'mongoid', '~> 5.0'
 when /4/

lib/mongoid/scroll/cursor.rb

@@ -14,7 +14,11 @@ def criteria
         compare_direction = direction == 1 ? '$gt' : '$lt'
         cursor_criteria = { field_name => { compare_direction => mongo_value } } if mongo_value
         tiebreak_criteria = { field_name => mongo_value, :_id => { compare_direction => tiebreak_id } } if mongo_value && tiebreak_id
-        cursor_selector = Origin::Selector.new
+        cursor_selector = if Mongoid::Compatibility::Version.mongoid6?
+                            Mongoid::Criteria::Queryable::Selector.new
+                          else
+                            Origin::Selector.new
+                          end
         cursor_selector.merge!('$or' => [cursor_criteria, tiebreak_criteria].compact) if cursor_criteria || tiebreak_criteria
         cursor_selector.__evolve_object_id__
       end