mongoid-scroll 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 614ee5395d9475c74547769cefbfd7c531b09d45
-  data.tar.gz: 9a61c61ce360c352a4b69fd770eca27f1ee9a6c7
+  metadata.gz: b18caa6adcba10267216ab4c06890232de3ec0cd
+  data.tar.gz: b05d520e679bb1d49806470546a546624f0574bf
 SHA512:
-  metadata.gz: 05e6f26d88ad8515bb3d0871bed4ea5386d3fb801300394ffedbdb4529833b2fb19ed73da362267e35cba02fba6b11c74e4d8ca4bfecb93cb389bc2408967c84
-  data.tar.gz: 3511a0273d3c198987a5812cfb137083216373e6602d03cbfe828ad0fa8c65d4fc577c20598bb1a8239c480d4f891d2179fa89e382b942347e01a063c4bd18a1
+  metadata.gz: 7c4c3bbe7deeb838e893f3c19de0160b64b9e4ee66d7c12dbca872181e56c51416c0355d87acb3dd5a33db0d504b11f396c4a59559c2592bf78c74437e9fba66
+  data.tar.gz: b5a55c6f00c90ae8eed3f3ee3153d07b17159d8c7129b4e5dab3d4719a9d6147804ba20cd00e2c6b8825638f3d77102dafd3556557b6deb92664c79cd4002911

data/.rubocop.yml

@@ -1,64 +1,8 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
   Exclude:
     - vendor/**/*
     - gemfiles/vendor/**/*
 
-LineLength:
-  Enabled: false
-
-MethodLength:
-  Enabled: false
-
-ClassLength:
-  Enabled: false
-
-Documentation:
-  # don't require classes to be documented
-  Enabled: false
-
-CollectionMethods:
-  # don't prefer map to collect, recuce to inject
-  Enabled: false
-
-Encoding:
-  # no need to always specify encoding
-  Enabled: false
-
-Void:
-  # == operator used in void context in specs
-  Enabled: false
-
-SignalException:
-  # prefer raise to fail
-  EnforcedStyle: only_raise
-
-RaiseArgs:
-  # don't care for what kind of raise
-  Enabled: false
-
-PerlBackrefs:
-  # TODO: regular expression matching with $1, $2, etc.
-  Enabled: false
-
-BlockNesting:
-  # TODO: fix too much nesting
-  Max: 4
-
-Lambda:
-  # TODO: replace all lambda with -> or Proc
-  Enabled: false
-
-Blocks:
-  # allow multi-line blocks like expect { }
-  Enabled: false
-
-WordArray:
-  # %w vs. [ '', ... ]
-  Enabled: false
-
-CyclomaticComplexity:
-  Enabled: false
-
-FileName:
-  Enabled: false
 

data/.rubocop_todo.yml

@@ -0,0 +1,42 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-07-07 10:17:35 -0400 using RuboCop version 0.32.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 4
+Metrics/AbcSize:
+  Max: 70
+
+# Offense count: 5
+Metrics/CyclomaticComplexity:
+  Max: 11
+
+# Offense count: 78
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 170
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 26
+
+# Offense count: 3
+Metrics/PerceivedComplexity:
+  Max: 12
+
+# Offense count: 12
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: Exclude.
+Style/FileName:
+  Enabled: false
+
+# Offense count: 6
+# Configuration parameters: SupportedStyles.
+Style/RaiseArgs:
+  EnforcedStyle: compact

data/.travis.yml

@@ -11,6 +11,7 @@ rvm:
 env:
   - MONGOID_VERSION=3
   - MONGOID_VERSION=4
+  - MONGOID_VERSION=5.0.0.beta
 
 language: ruby
 

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.3.1 (7/27/2015)
+------------
+
+* Compatibility with Mongoid 5.x beta - [@dblock](https://github.com/dblock).
+* [#4](https://github.com/dblock/mongoid-scroll/pull/4): Fix: support chaining `$or` criteria - [@sweir27](https://github.com/sweir27).
+* [#5](https://github.com/dblock/mongoid-scroll/pull/5): Fix: embeddable objects now returned in pagination - [@sweir27](https://github.com/sweir27).
+
 0.3.0 (1/7/2014)
 ----------------
 

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
 
@@ -12,9 +12,10 @@ else
 end
 
 group :development, :test do
-  gem "rake"
-  gem "bundler"
-  gem "rspec", "~> 2.9"
-  gem "faker"
-  gem "rubocop", "0.24.0"
+  gem 'rake'
+  gem 'bundler'
+  gem 'rspec', '~> 3.0'
+  gem 'rspec-its'
+  gem 'faker'
+  gem 'rubocop', '0.32.1'
 end

data/README.md

@@ -1,8 +1,19 @@
-Mongoid::Scroll [![Build Status](https://travis-ci.org/dblock/mongoid-scroll.png?branch=master)](https://travis-ci.org/dblock/mongoid-scroll)
+Mongoid::Scroll
 ===============
 
+[![Gem Version](http://img.shields.io/gem/v/mongoid-scroll.svg)](http://badge.fury.io/rb/mongoid-scroll)
+[![Build Status](http://img.shields.io/travis/dblock/mongoid-scroll.svg)](https://travis-ci.org/dblock/mongoid-scroll)
+[![Dependency Status](https://gemnasium.com/dblock/mongoid-scroll.svg)](https://gemnasium.com/dblock/mongoid-scroll)
+[![Code Climate](https://codeclimate.com/github/dblock/mongoid-scroll.svg)](https://codeclimate.com/github/dblock/mongoid-scroll)
+
+
 Mongoid extension that enables infinite scrolling for `Mongoid::Criteria` and `Moped::Query`.
 
+Compatibility
+-------------
+
+This gem supports Mongoid 3, 4 and 5 beta.
+
 Demo
 ----
 

data/lib/mongoid-scroll.rb

@@ -8,8 +8,8 @@ require 'mongoid/scroll/mongoid'
 require 'mongoid/scroll/errors'
 require 'mongoid/scroll/cursor'
 
-require 'moped/scrollable'
+require 'moped/scrollable' if Object.const_defined?(:Moped)
 require 'mongoid/criterion/scrollable'
 
-Moped::Query.send(:include, Moped::Scrollable)
+Moped::Query.send(:include, Moped::Scrollable) if Object.const_defined?(:Moped)
 Mongoid::Criteria.send(:include, Mongoid::Criterion::Scrollable)

data/lib/mongoid/criterion/scrollable.rb

@@ -5,7 +5,7 @@ module Mongoid
         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)
@@ -19,7 +19,9 @@ module Mongoid
         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

data/lib/mongoid/scroll/cursor.rb

@@ -37,7 +37,7 @@ module Mongoid
         return unless value
         parts = value.split(':')
         unless parts.length >= 2
-          raise Mongoid::Scroll::Errors::InvalidCursorError.new(cursor: value)
+          fail Mongoid::Scroll::Errors::InvalidCursorError.new(cursor: value)
         end
         id = parts[-1]
         value = parts[0...-1].join(':')
@@ -56,7 +56,7 @@ module Mongoid
           elsif options && (field = options[:field])
             [field.type.to_s, field.name.to_s]
           else
-            raise ArgumentError.new 'Missing options[:field_name] and/or options[:field_type].'
+            fail ArgumentError.new 'Missing options[:field_name] and/or options[:field_type].'
           end
         end
 
@@ -70,7 +70,7 @@ module Mongoid
           when 'Float' then value.to_f
           when 'Integer' then value.to_i
           else
-            raise Mongoid::Scroll::Errors::UnsupportedFieldTypeError.new(field: field_name, type: field_type)
+            fail Mongoid::Scroll::Errors::UnsupportedFieldTypeError.new(field: field_name, type: field_type)
           end
         end
 
@@ -79,11 +79,11 @@ module Mongoid
           when 'BSON::ObjectId', 'Moped::BSON::ObjectId' then value
           when 'String' then value.to_s
           when 'Date' then Time.utc(value.year, value.month, value.day).to_i
-          when 'DateTime', 'Time' then value.to_i
+          when 'DateTime', 'Time' then value.utc.to_i
           when 'Float' then value.to_f
           when 'Integer' then value.to_i
           else
-            raise Mongoid::Scroll::Errors::UnsupportedFieldTypeError.new(field: field_name, type: field_type)
+            fail Mongoid::Scroll::Errors::UnsupportedFieldTypeError.new(field: field_name, type: field_type)
           end
         end
       end

data/lib/mongoid/scroll/mongoid.rb

@@ -1,7 +1,7 @@
 module Mongoid
   module Scroll
     def self.mongoid3?
-      ::Mongoid.const_defined? :Observer
+      Mongoid::VERSION =~ /^3\./
     end
   end
 end

data/lib/mongoid/scroll/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Scroll
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/lib/moped/scrollable.rb

@@ -11,7 +11,7 @@ module Moped
       query.operation.limit = operation.limit
       # we don't support scrolling over a criteria with multiple fields
       if query.operation.selector['$orderby'] && query.operation.selector['$orderby'].keys.size != 1
-        raise Mongoid::Scroll::Errors::MultipleSortFieldsError.new(sort: query.operation.selector['$orderby'])
+        fail Mongoid::Scroll::Errors::MultipleSortFieldsError.new(sort: query.operation.selector['$orderby'])
       elsif !query.operation.selector.key?('$orderby') || query.operation.selector['$orderby'].empty?
         # introduce a default sort order if there's none
         query.sort(_id: 1)

data/spec/mongoid/criteria_spec.rb

@@ -1,18 +1,13 @@
 require 'spec_helper'
 
 describe Mongoid::Criteria do
-  context 'scrollable' do
-    subject do
-      Feed::Item
-    end
-    it ':scroll' do
-      subject.should.respond_to? :scroll
-    end
-  end
   context 'with multiple sort fields' do
     subject do
       Feed::Item.desc(:name).asc(:value)
     end
+    it ':scroll' do
+      expect(subject).to respond_to(:scroll)
+    end
     it 'raises Mongoid::Scroll::Errors::MultipleSortFieldsError' do
       expect { subject.scroll }.to raise_error Mongoid::Scroll::Errors::MultipleSortFieldsError,
                                                /You're attempting to scroll over data with a sort order that includes multiple fields: name, value./
@@ -23,7 +18,7 @@ describe Mongoid::Criteria do
       Feed::Item.all
     end
     it 'adds a default sort by _id' do
-      subject.scroll.options[:sort].should == { '_id' => 1 }
+      expect(subject.scroll.options[:sort]).to eq('_id' => 1)
     end
   end
   context 'with data' do
@@ -32,7 +27,7 @@ describe Mongoid::Criteria do
         Feed::Item.create!(
           a_string: i.to_s,
           a_integer: i,
-          a_datetime: DateTime.new(2013, i + 1, 21, 1, 42, 3),
+          a_datetime: DateTime.new(2013, i + 1, 21, 1, 42, 3, 'UTC'),
           a_date: Date.new(2013, i + 1, 21),
           a_time: Time.at(Time.now.to_i + i)
         )
@@ -44,8 +39,8 @@ describe Mongoid::Criteria do
         Feed::Item.all.scroll do |record, _next_cursor|
           records << record
         end
-        records.size.should == 10
-        records.should eq Feed::Item.all.to_a
+        expect(records.size).to eq 10
+        expect(records).to eq Feed::Item.all.to_a
       end
     end
     { a_string: String, a_integer: Integer, a_date: Date, a_datetime: DateTime }.each_pair do |field_name, field_type|
@@ -55,8 +50,8 @@ describe Mongoid::Criteria do
           Feed::Item.asc(field_name).scroll do |record, _next_cursor|
             records << record
           end
-          records.size.should == 10
-          records.should eq Feed::Item.all.to_a
+          expect(records.size).to eq 10
+          expect(records).to eq Feed::Item.all.to_a
         end
         it 'scrolls all with a break' do
           records = []
@@ -65,27 +60,28 @@ describe Mongoid::Criteria do
             records << record
             cursor = next_cursor
           end
-          records.size.should == 5
+          expect(records.size).to eq 5
           Feed::Item.asc(field_name).scroll(cursor) do |record, next_cursor|
             records << record
             cursor = next_cursor
           end
-          records.size.should == 10
-          records.should eq Feed::Item.all.to_a
+          expect(records.size).to eq 10
+          expect(records).to eq Feed::Item.all.to_a
         end
         it 'scrolls in descending order' do
           records = []
           Feed::Item.desc(field_name).limit(3).scroll do |record, _next_cursor|
             records << record
           end
-          records.size.should == 3
-          records.should eq Feed::Item.desc(field_name).limit(3).to_a
+          expect(records.size).to eq 3
+          expect(records).to eq Feed::Item.desc(field_name).limit(3).to_a
         end
         it 'map' do
-          record = Feed::Item.desc(field_name).limit(3).scroll.map { |r, _| r }.last
-          cursor = Mongoid::Scroll::Cursor.from_record(record,  field_type: field_type, field_name: field_name)
-          cursor.should_not be_nil
-          cursor.to_s.split(':').should == [
+          record = Feed::Item.desc(field_name).limit(3).scroll.map { |r| r }.last
+          expect(record).to_not be nil
+          cursor = Mongoid::Scroll::Cursor.from_record(record, field_type: field_type, field_name: field_name)
+          expect(cursor).to_not be nil
+          expect(cursor.to_s.split(':')).to eq [
             Mongoid::Scroll::Cursor.transform_field_value(field_type, field_name, record.send(field_name)).to_s,
             record.id.to_s
           ]
@@ -93,6 +89,63 @@ describe Mongoid::Criteria do
       end
     end
   end
+  context 'with logic in initial criteria' do
+    before :each do
+      3.times do |i|
+        Feed::Item.create!(
+          name: "Feed Item #{i}",
+          a_string: i.to_s,
+          a_integer: i,
+          a_datetime: DateTime.new(2015, i + 1, 21, 1, 42, 3, 'UTC'),
+          a_date: Date.new(2016, i + 1, 21),
+          a_time: Time.new(2015, i + 1, 22, 1, 2, 3)
+        )
+      end
+      Feed::Item.create!(
+        name: 'Feed Item 3',
+        a_string: '3',
+        a_integer: 3,
+        a_datetime: DateTime.new(2015, 3, 2, 1, 2, 3),
+        a_date: Date.new(2012, 2, 3),
+        a_time: Time.new(2014, 2, 2, 1, 2, 3)
+      )
+    end
+    it 'respects original criteria with OR logic' do
+      criteria = Feed::Item.where(
+        '$or' => [{ :a_time.gt => Time.new(2015, 7, 22, 1, 2, 3) }, { :a_time.lte => Time.new(2015, 7, 22, 1, 2, 3), :a_date.gte => Date.new(2015, 7, 30) }]
+      ).asc(:a_time)
+      records = []
+      cursor = nil
+      criteria.limit(2).scroll do |record, next_cursor|
+        records << record
+        cursor = next_cursor
+      end
+      expect(records.size).to eq 2
+      expect(records.map(&:name)).to eq ['Feed Item 0', 'Feed Item 1']
+      records = []
+      criteria.limit(2).scroll(cursor) do |record, next_cursor|
+        records << record
+        cursor = next_cursor
+      end
+      expect(records.size).to eq 1
+      expect(records.map(&:name)).to eq ['Feed Item 2']
+    end
+  end
+  context 'with embeddable objects' do
+    before do
+      @item = Feed::Item.create! a_integer: 1, name: 'item'
+      @embedded_item = Feed::EmbeddedItem.create! name: 'embedded', item: @item
+    end
+    it 'respects embedded queries' do
+      records = []
+      criteria = @item.embedded_items.limit(2)
+      criteria.scroll do |record, _next_cursor|
+        records << record
+      end
+      expect(records.size).to eq 1
+      expect(records.map(&:name)).to eq ['embedded']
+    end
+  end
   context 'with overlapping data' do
     before :each do
       3.times { Feed::Item.create! a_integer: 5 }
@@ -102,7 +155,7 @@ describe Mongoid::Criteria do
       # natural order isn't necessarily going to be the same as _id order
       # if a document is updated and grows in size, it may need to be relocated and
       # thus cause the natural order to change
-      Feed::Item.order_by('$natural' => 1).to_a.should_not eq Feed::Item.order_by(_id: 1).to_a
+      expect(Feed::Item.order_by('$natural' => 1).to_a).to_not eq(Feed::Item.order_by(_id: 1).to_a)
     end
     [{ a_integer: 1 }, { a_integer: -1 }].each do |sort_order|
       it "scrolls by #{sort_order}" do
@@ -112,12 +165,12 @@ describe Mongoid::Criteria do
           records << record
           cursor = next_cursor
         end
-        records.size.should == 2
+        expect(records.size).to eq 2
         Feed::Item.order_by(sort_order).scroll(cursor) do |record, _next_cursor|
           records << record
         end
-        records.size.should == 3
-        records.should eq Feed::Item.all.sort(_id: sort_order[:a_integer]).to_a
+        expect(records.size).to eq 3
+        expect(records).to eq Feed::Item.all.sort(_id: sort_order[:a_integer]).to_a
       end
     end
   end

data/spec/mongoid/scroll_cursor_spec.rb

@@ -22,12 +22,12 @@ describe Mongoid::Scroll::Cursor do
     end
     its(:value) { should eq feed_item.a_string }
     its(:tiebreak_id) { should eq feed_item.id }
-    its(:criteria) {
+    its(:criteria) do
       should eq('$or' => [
         { 'a_string' => { '$gt' => feed_item.a_string } },
         { 'a_string' => feed_item.a_string, :_id => { '$gt' => feed_item.id } }
       ])
-    }
+    end
   end
   context 'an integer field cursor' do
     let(:feed_item) { Feed::Item.create!(a_integer: 10) }
@@ -36,27 +36,27 @@ describe Mongoid::Scroll::Cursor do
     end
     its(:value) { should eq feed_item.a_integer }
     its(:tiebreak_id) { should eq feed_item.id }
-    its(:criteria) {
+    its(:criteria) do
       should eq('$or' => [
         { 'a_integer' => { '$gt' => feed_item.a_integer } },
         { 'a_integer' => feed_item.a_integer, :_id => { '$gt' => feed_item.id } }
       ])
-    }
+    end
   end
   context 'a date/time field cursor' do
-    let(:feed_item) { Feed::Item.create!(a_datetime: DateTime.new(2013, 12, 21, 1, 42, 3)) }
+    let(:feed_item) { Feed::Item.create!(a_datetime: DateTime.new(2013, 12, 21, 1, 42, 3, 'UTC')) }
     subject do
-      Mongoid::Scroll::Cursor.new "#{feed_item.a_datetime.to_i}:#{feed_item.id}", field_name: 'a_datetime', field_type: DateTime
+      Mongoid::Scroll::Cursor.new "#{feed_item.a_datetime.utc.to_i}:#{feed_item.id}", field_name: 'a_datetime', field_type: DateTime
     end
     its(:value) { should eq feed_item.a_datetime }
     its(:tiebreak_id) { should eq feed_item.id }
-    its(:to_s) { should eq "#{feed_item.a_datetime.to_i}:#{feed_item.id}" }
-    its(:criteria) {
+    its(:to_s) { should eq "#{feed_item.a_datetime.utc.to_i}:#{feed_item.id}" }
+    its(:criteria) do
       should eq('$or' => [
         { 'a_datetime' => { '$gt' => feed_item.a_datetime } },
         { 'a_datetime' => feed_item.a_datetime, :_id => { '$gt' => feed_item.id } }
       ])
-    }
+    end
   end
   context 'a date field cursor' do
     let(:feed_item) { Feed::Item.create!(a_date: Date.new(2013, 12, 21)) }
@@ -66,12 +66,12 @@ describe Mongoid::Scroll::Cursor do
     its(:value) { should eq feed_item.a_date }
     its(:tiebreak_id) { should eq feed_item.id }
     its(:to_s) { should eq "#{feed_item.a_date.to_datetime.to_i}:#{feed_item.id}" }
-    its(:criteria) {
+    its(:criteria) do
       should eq('$or' => [
         { 'a_date' => { '$gt' => feed_item.a_date.to_datetime } },
         { 'a_date' => feed_item.a_date.to_datetime, :_id => { '$gt' => feed_item.id } }
       ])
-    }
+    end
   end
   context 'a time field cursor' do
     let(:feed_item) { Feed::Item.create!(a_time: Time.new(2013, 12, 21, 1, 2, 3)) }
@@ -81,12 +81,12 @@ describe Mongoid::Scroll::Cursor do
     its(:value) { should eq feed_item.a_time }
     its(:tiebreak_id) { should eq feed_item.id }
     its(:to_s) { should eq "#{feed_item.a_time.to_i}:#{feed_item.id}" }
-    its(:criteria) {
+    its(:criteria) do
       should eq('$or' => [
         { 'a_time' => { '$gt' => feed_item.a_time } },
         { 'a_time' => feed_item.a_time, :_id => { '$gt' => feed_item.id } }
       ])
-    }
+    end
   end
   context 'a time field cursor with a field option' do
     let(:feed_item) { Feed::Item.create!(a_time: Time.new(2013, 12, 21, 1, 2, 3)) }
@@ -96,26 +96,26 @@ describe Mongoid::Scroll::Cursor do
     its(:value) { should eq feed_item.a_time }
     its(:tiebreak_id) { should eq feed_item.id }
     its(:to_s) { should eq "#{feed_item.a_time.to_i}:#{feed_item.id}" }
-    its(:criteria) {
+    its(:criteria) do
       should eq('$or' => [
         { 'a_time' => { '$gt' => feed_item.a_time } },
         { 'a_time' => feed_item.a_time, :_id => { '$gt' => feed_item.id } }
       ])
-    }
+    end
   end
   context 'an array field cursor' do
-    let(:feed_item) { Feed::Item.create!(a_array: ['x', 'y']) }
+    let(:feed_item) { Feed::Item.create!(a_array: %w(x y)) }
     it 'is not supported' do
-      expect {
+      expect do
         Mongoid::Scroll::Cursor.from_record feed_item, field_name: 'a_array', field_type: Array
-      }.to raise_error Mongoid::Scroll::Errors::UnsupportedFieldTypeError, /The type of the field 'a_array' is not supported: Array./
+      end.to raise_error Mongoid::Scroll::Errors::UnsupportedFieldTypeError, /The type of the field 'a_array' is not supported: Array./
     end
   end
   context 'an invalid field cursor' do
     it 'raises ArgumentError' do
-      expect {
+      expect do
         Mongoid::Scroll::Cursor.new 'invalid:whatever', {}
-      }.to raise_error ArgumentError
+      end.to raise_error ArgumentError
     end
   end
 end

data/spec/moped/query_spec.rb

@@ -6,7 +6,7 @@ describe Moped::Query do
       Mongoid.default_session['feed_items'].find
     end
     it ':scroll' do
-      subject.should.respond_to? :scroll
+      expect(subject).to respond_to(:scroll)
     end
   end
   context 'with multiple sort fields' do
@@ -23,7 +23,7 @@ describe Moped::Query do
       Mongoid.default_session['feed_items'].find
     end
     it 'adds a default sort by _id' do
-      subject.scroll.operation.selector['$orderby'].should == { _id: 1 }
+      expect(subject.scroll.operation.selector['$orderby']).to eq(_id: 1)
     end
   end
   context 'with data' do
@@ -32,7 +32,7 @@ describe Moped::Query do
         Mongoid.default_session['feed_items'].insert(
           a_string: i.to_s,
           a_integer: i,
-          a_datetime: DateTime.mongoize(DateTime.new(2013, i + 1, 21, 1, 42, 3)),
+          a_datetime: DateTime.mongoize(DateTime.new(2013, i + 1, 21, 1, 42, 3, 'UTC')),
           a_date: Date.mongoize(Date.new(2013, i + 1, 21)),
           a_time: Time.mongoize(Time.at(Time.now.to_i + i))
         )
@@ -44,50 +44,48 @@ describe Moped::Query do
         Mongoid.default_session['feed_items'].find.scroll do |record, _next_cursor|
           records << record
         end
-        records.size.should == 10
-        records.should eq Mongoid.default_session['feed_items'].find.to_a
+        expect(records.size).to eq 10
+        expect(records).to eq Mongoid.default_session['feed_items'].find.to_a
       end
     end
     { a_string: String, a_integer: Integer, a_date: Date, a_datetime: DateTime }.each_pair do |field_name, field_type|
       context field_type do
         it 'scrolls all with a block' do
           records = []
-          Mongoid.default_session['feed_items'].find.sort(field_name => 1).scroll(nil,  field_type: field_type) do |record, _next_cursor|
+          Mongoid.default_session['feed_items'].find.sort(field_name => 1).scroll(nil, field_type: field_type) do |record, _next_cursor|
             records << record
           end
-          records.size.should == 10
-          records.should eq Mongoid.default_session['feed_items'].find.to_a
+          expect(records.size).to eq 10
+          expect(records).to eq Mongoid.default_session['feed_items'].find.to_a
         end
         it 'scrolls all with a break' do
           records = []
           cursor = nil
-          Mongoid.default_session['feed_items'].find.sort(field_name => 1).limit(5).scroll(nil,  field_type: field_type) do |record, next_cursor|
+          Mongoid.default_session['feed_items'].find.sort(field_name => 1).limit(5).scroll(nil, field_type: field_type) do |record, next_cursor|
             records << record
             cursor = next_cursor
           end
-          records.size.should == 5
-          Mongoid.default_session['feed_items'].find.sort(field_name => 1).scroll(cursor,  field_type: field_type) do |record, next_cursor|
+          expect(records.size).to eq 5
+          Mongoid.default_session['feed_items'].find.sort(field_name => 1).scroll(cursor, field_type: field_type) do |record, next_cursor|
             records << record
             cursor = next_cursor
           end
-          records.size.should == 10
-          records.should eq Mongoid.default_session['feed_items'].find.to_a
+          expect(records.size).to eq 10
+          expect(records).to eq Mongoid.default_session['feed_items'].find.to_a
         end
         it 'scrolls in descending order' do
           records = []
-          Mongoid.default_session['feed_items'].find.sort(field_name => -1).limit(3).scroll(nil,  field_type: field_type, field_name: field_name) do |record, _next_cursor|
+          Mongoid.default_session['feed_items'].find.sort(field_name => -1).limit(3).scroll(nil, field_type: field_type, field_name: field_name) do |record, _next_cursor|
             records << record
           end
-          records.size.should == 3
-          records.should eq Mongoid.default_session['feed_items'].find.sort(field_name => -1).limit(3).to_a
+          expect(records.size).to eq 3
+          expect(records).to eq Mongoid.default_session['feed_items'].find.sort(field_name => -1).limit(3).to_a
         end
         it 'map' do
-          record = Mongoid.default_session['feed_items'].find.limit(3).scroll(nil,  field_type: field_type, field_name: field_name).map {
-            |r, _| r
-          }.last
-          cursor = Mongoid::Scroll::Cursor.from_record(record,  field_type: field_type, field_name: field_name)
-          cursor.should_not be_nil
-          cursor.to_s.split(':').should == [
+          record = Mongoid.default_session['feed_items'].find.limit(3).scroll(nil, field_type: field_type, field_name: field_name).map { |r| r }.last
+          cursor = Mongoid::Scroll::Cursor.from_record(record, field_type: field_type, field_name: field_name)
+          expect(cursor).to_not be nil
+          expect(cursor.to_s.split(':')).to eq [
             Mongoid::Scroll::Cursor.transform_field_value(field_type, field_name, record[field_name.to_s]).to_s,
             record['_id'].to_s
           ]
@@ -104,7 +102,7 @@ describe Moped::Query do
       # natural order isn't necessarily going to be the same as _id order
       # if a document is updated and grows in size, it may need to be relocated and
       # thus cause the natural order to change
-      Feed::Item.order_by('$natural' => 1).to_a.should_not eq Feed::Item.order_by(_id: 1).to_a
+      expect(Feed::Item.order_by('$natural' => 1).to_a).to_not eq Feed::Item.order_by(_id: 1).to_a
     end
     [{ a_integer: 1 }, { a_integer: -1 }].each do |sort_order|
       it "scrolls by #{sort_order}" do
@@ -114,13 +112,13 @@ describe Moped::Query do
           records << record
           cursor = next_cursor
         end
-        records.size.should == 2
+        expect(records.size).to eq 2
         Mongoid.default_session['feed_items'].find.sort(sort_order).scroll(cursor) do |record, _next_cursor|
           records << record
         end
-        records.size.should == 3
-        records.should eq Mongoid.default_session['feed_items'].find.sort(_id: sort_order[:a_integer]).to_a
+        expect(records.size).to eq 3
+        expect(records).to eq Mongoid.default_session['feed_items'].find.sort(_id: sort_order[:a_integer]).to_a
       end
     end
   end
-end
+end if Object.const_defined?(:Moped)

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rubygems'
 require 'rspec'
+require 'rspec/its'
 require 'mongoid-scroll'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each do |f|

data/spec/support/feed/embedded_item.rb

@@ -0,0 +1,9 @@
+module Feed
+  class EmbeddedItem
+    include Mongoid::Document
+
+    field :name, type: String
+
+    embedded_in :item, inverse_of: :embedded_items
+  end
+end

data/spec/support/feed/item.rb

@@ -9,5 +9,7 @@ module Feed
     field :a_date, type: Date
     field :a_time, type: Time
     field :a_array, type: Array
+
+    embeds_many :embedded_items
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-scroll
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Daniel Doubrovkine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -48,6 +48,7 @@ files:
 - .gitignore
 - .rspec
 - .rubocop.yml
+- .rubocop_todo.yml
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -76,6 +77,7 @@ files:
 - spec/mongoid/scroll_spec.rb
 - spec/moped/query_spec.rb
 - spec/spec_helper.rb
+- spec/support/feed/embedded_item.rb
 - spec/support/feed/item.rb
 homepage: http://github.com/dblock/mongoid-scroll
 licenses:
@@ -97,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mongoid extensions to enable infinite scroll.