mongoid-scroll 0.3.2 → 0.3.7

data/spec/mongoid/scroll_cursor_spec.rb

@@ -17,21 +17,21 @@ describe Mongoid::Scroll::Cursor do
   end
   context 'an id field cursor' do
     let(:feed_item) { Feed::Item.create!(a_string: 'astring') }
-    field_type = Mongoid::Scroll.mongoid3? ? Moped::BSON::ObjectId : BSON::ObjectId
+    field_type = Mongoid::Compatibility::Version.mongoid3? ? Moped::BSON::ObjectId : BSON::ObjectId
     subject do
       Mongoid::Scroll::Cursor.new "#{feed_item.id}:#{feed_item.id}", field_name: '_id', field_type: field_type, direction: 1
     end
     its(:value) { should eq feed_item.id.to_s }
     its(:tiebreak_id) { should eq feed_item.id }
     its(:criteria) do
-      if Mongoid::Scroll.mongoid3?
+      if Mongoid::Compatibility::Version.mongoid3?
         should eq('$or' => [
-          { '_id' => { '$gt' => Moped::BSON::ObjectId("#{feed_item.id}") } }
-        ])
+                    { '_id' => { '$gt' => Moped::BSON::ObjectId(feed_item.id.to_s) } }
+                  ])
       else
         should eq('$or' => [
-          { '_id' => { '$gt' => BSON::ObjectId("#{feed_item.id}") } }
-        ])
+                    { '_id' => { '$gt' => BSON::ObjectId(feed_item.id.to_s) } }
+                  ])
       end
     end
   end
@@ -44,9 +44,9 @@ describe Mongoid::Scroll::Cursor do
     its(:tiebreak_id) { should eq feed_item.id }
     its(:criteria) do
       should eq('$or' => [
-        { 'a_string' => { '$gt' => feed_item.a_string } },
-        { 'a_string' => feed_item.a_string, '_id' => { '$gt' => feed_item.id } }
-      ])
+                  { '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
@@ -58,9 +58,9 @@ describe Mongoid::Scroll::Cursor do
     its(:tiebreak_id) { should eq feed_item.id }
     its(:criteria) do
       should eq('$or' => [
-        { 'a_integer' => { '$gt' => feed_item.a_integer } },
-        { 'a_integer' => feed_item.a_integer, '_id' => { '$gt' => feed_item.id } }
-      ])
+                  { '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
@@ -73,9 +73,9 @@ describe Mongoid::Scroll::Cursor do
     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 } }
-      ])
+                  { '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
@@ -88,9 +88,9 @@ describe Mongoid::Scroll::Cursor do
     its(:to_s) { should eq "#{feed_item.a_date.to_datetime.to_i}:#{feed_item.id}" }
     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 } }
-      ])
+                  { '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
@@ -103,9 +103,9 @@ describe Mongoid::Scroll::Cursor do
     its(:to_s) { should eq "#{feed_item.a_time.to_i}:#{feed_item.id}" }
     its(:criteria) do
       should eq('$or' => [
-        { 'a_time' => { '$gt' => feed_item.a_time } },
-        { 'a_time' => feed_item.a_time, '_id' => { '$gt' => feed_item.id } }
-      ])
+                  { '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
@@ -118,13 +118,13 @@ describe Mongoid::Scroll::Cursor do
     its(:to_s) { should eq "#{feed_item.a_time.to_i}:#{feed_item.id}" }
     its(:criteria) do
       should eq('$or' => [
-        { 'a_time' => { '$gt' => feed_item.a_time } },
-        { 'a_time' => feed_item.a_time, '_id' => { '$gt' => feed_item.id } }
-      ])
+                  { '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: %w(x y)) }
+    let(:feed_item) { Feed::Item.create!(a_array: %w[x y]) }
     it 'is not supported' do
       expect do
         Mongoid::Scroll::Cursor.from_record feed_item, field_name: 'a_array', field_type: Array

data/spec/moped/query_spec.rb

@@ -1,124 +1,126 @@
 require 'spec_helper'
 
-describe Moped::Query do
-  context 'scrollable' do
-    subject do
-      Mongoid.default_session['feed_items'].find
-    end
-    it ':scroll' do
-      expect(subject).to respond_to(:scroll)
-    end
-  end
-  context 'with multiple sort fields' do
-    subject do
-      Mongoid.default_session['feed_items'].find.sort(name: 1, value: -1)
-    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./
-    end
-  end
-  context 'with no sort' do
-    subject do
-      Mongoid.default_session['feed_items'].find
+if Object.const_defined?(:Moped)
+  describe Moped::Query do
+    context 'scrollable' do
+      subject do
+        Mongoid.default_session['feed_items'].find
+      end
+      it ':scroll' do
+        expect(subject).to respond_to(:scroll)
+      end
     end
-    it 'adds a default sort by _id' do
-      expect(subject.scroll.operation.selector['$orderby']).to eq(_id: 1)
+    context 'with multiple sort fields' do
+      subject do
+        Mongoid.default_session['feed_items'].find.sort(name: 1, value: -1)
+      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./
+      end
     end
-  end
-  context 'with data' do
-    before :each do
-      10.times do |i|
-        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, 'UTC')),
-          a_date: Date.mongoize(Date.new(2013, i + 1, 21)),
-          a_time: Time.mongoize(Time.at(Time.now.to_i + i))
-        )
+    context 'with no sort' do
+      subject do
+        Mongoid.default_session['feed_items'].find
+      end
+      it 'adds a default sort by _id' do
+        expect(subject.scroll.operation.selector['$orderby']).to eq(_id: 1)
       end
     end
-    context 'default' do
-      it 'scrolls all' do
-        records = []
-        Mongoid.default_session['feed_items'].find.scroll do |record, _next_cursor|
-          records << record
+    context 'with data' do
+      before :each do
+        10.times do |i|
+          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, 'UTC')),
+            a_date: Date.mongoize(Date.new(2013, i + 1, 21)),
+            a_time: Time.mongoize(Time.at(Time.now.to_i + i))
+          )
         end
-        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
+      context 'default' do
+        it 'scrolls all' 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.scroll do |record, _next_cursor|
             records << record
           end
           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
+      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|
+              records << record
+            end
+            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|
+              records << record
+              cursor = next_cursor
+            end
+            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
+            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|
+              records << record
+            end
+            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)
+            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
+            ]
+          end
+        end
+      end
+    end
+    context 'with overlapping data', if: MongoDB.mmapv1? do
+      before :each do
+        3.times { Feed::Item.create! a_integer: 5 }
+        Feed::Item.first.update_attributes!(name: Array(1000).join('a'))
+      end
+      it 'natural order is different from order by id' 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
+        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
           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(sort_order).limit(2).scroll do |record, next_cursor|
             records << record
             cursor = next_cursor
           end
-          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
-          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|
+          expect(records.size).to eq 2
+          Mongoid.default_session['feed_items'].find.sort(sort_order).scroll(cursor) do |record, _next_cursor|
             records << record
           end
           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)
-          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
-          ]
-        end
-      end
-    end
-  end
-  context 'with overlapping data' do
-    before :each do
-      3.times { Feed::Item.create! a_integer: 5 }
-      Feed::Item.first.update_attributes!(name: Array(1000).join('a'))
-    end
-    it 'natural order is different from order by id' 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
-      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
-        records = []
-        cursor = nil
-        Mongoid.default_session['feed_items'].find.sort(sort_order).limit(2).scroll do |record, next_cursor|
-          records << record
-          cursor = next_cursor
-        end
-        expect(records.size).to eq 2
-        Mongoid.default_session['feed_items'].find.sort(sort_order).scroll(cursor) do |record, _next_cursor|
-          records << record
+          expect(records).to eq Mongoid.default_session['feed_items'].find.sort(sort_order.merge(_id: sort_order[:a_integer])).to_a
         end
-        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 if Object.const_defined?(:Moped)
+end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rubygems'
 require 'rspec'
 require 'rspec/its'
+require 'database_cleaner'
 require 'mongoid-scroll'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each do |f|
@@ -15,7 +16,11 @@ Mongoid.configure do |config|
 end
 
 RSpec.configure do |config|
+  config.before :all do
+    Mongoid.logger.level = Logger::INFO
+    Mongo::Logger.logger.level = Logger::INFO if Mongoid::Compatibility::Version.mongoid5_or_newer?
+  end
   config.before :each do
-    Mongoid.purge!
+    DatabaseCleaner.clean
   end
 end

data/spec/support/feed/item.rb

@@ -10,6 +10,10 @@ module Feed
     field :a_time, type: Time
     field :a_array, type: Array
 
-    embeds_many :embedded_items
+    embeds_many :embedded_items, class_name: 'Feed::EmbeddedItem'
+
+    publisher_options = { class_name: 'Feed::Publisher' }
+    publisher_options[:optional] = true if Mongoid::Compatibility::Version.mongoid6? || Mongoid::Compatibility::Version.mongoid7?
+    belongs_to :publisher, publisher_options
   end
 end

data/spec/support/feed/publisher.rb

@@ -0,0 +1,9 @@
+module Feed
+  class Publisher
+    include Mongoid::Document
+
+    field :name, type: String
+
+    has_many :items
+  end
+end

data/spec/support/mongodb.rb

@@ -0,0 +1,9 @@
+module MongoDB
+  def self.mmapv1?
+    if Mongoid.respond_to?(:default_session)
+      Mongoid.default_session.command(serverStatus: 1)['storageEngine']['name'] == 'mmapv1'
+    else
+      Mongoid.default_client.command(serverStatus: 1).first['storageEngine']['name'] == 'mmapv1'
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-scroll
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.7
 platform: ruby
 authors:
 - Daniel Doubrovkine
 - Frank Macreery
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: mongoid-compatibility
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: dblock@dblock.org
 executables: []
 extensions: []
@@ -51,15 +65,19 @@ files:
 - ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- Dangerfile
 - Gemfile
 - LICENSE.md
 - README.md
+- RELEASING.md
 - Rakefile
+- examples/mongo_ruby_driver_scroll_feed.rb
 - examples/mongoid_scroll_feed.rb
 - examples/moped_scroll_feed.rb
 - lib/config/locales/en.yml
+- lib/mongo/scrollable.rb
 - lib/mongoid-scroll.rb
-- lib/mongoid/criterion/scrollable.rb
+- lib/mongoid/criteria/scrollable.rb
 - lib/mongoid/scroll/cursor.rb
 - lib/mongoid/scroll/errors.rb
 - lib/mongoid/scroll/errors/base.rb
@@ -67,11 +85,11 @@ files:
 - lib/mongoid/scroll/errors/multiple_sort_fields_error.rb
 - lib/mongoid/scroll/errors/no_such_field_error.rb
 - lib/mongoid/scroll/errors/unsupported_field_type_error.rb
-- lib/mongoid/scroll/mongoid.rb
 - lib/mongoid/scroll/version.rb
 - lib/mongoid_scroll.rb
 - lib/moped/scrollable.rb
 - mongoid-scroll.gemspec
+- spec/mongo/collection_view_spec.rb
 - spec/mongoid/criteria_spec.rb
 - spec/mongoid/scroll_cursor_spec.rb
 - spec/mongoid/scroll_spec.rb
@@ -79,11 +97,13 @@ files:
 - spec/spec_helper.rb
 - spec/support/feed/embedded_item.rb
 - spec/support/feed/item.rb
-homepage: http://github.com/dblock/mongoid-scroll
+- spec/support/feed/publisher.rb
+- spec/support/mongodb.rb
+homepage: http://github.com/mongoid/mongoid-scroll
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,9 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Mongoid extensions to enable infinite scroll.
 test_files: []