mongoid-scroll 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6408a43ccf6d68cedb7f2cfa984be3f3e66cf63f29c79eaaa506a8eb671da84b
-  data.tar.gz: 44b25144b153ef375a1425b61e1a431b10c8eaa71293c246d13d550bdfe168ca
+  metadata.gz: d9e2af0b05c25202ce0f2c1e87b760a0d41c7f534c0675f90a513e249949b503
+  data.tar.gz: 83b648b0c1c8073ef6cf3dccdaa071051784f95b6db85ecddc079e30706e512a
 SHA512:
-  metadata.gz: ebab5c9fd5bf4de86d4e5c8305b67dea439842c57b335d9934a29c611029683cccaa8b059ffefeb7e308c832b6a8fc54de399dc828075c157b7c94aacdd48143
-  data.tar.gz: c187f3dfb04d7908c7332b1bec0d0a0c535125fcd232161faf8f17da65e121bd9b5168e7a703c25894d0495411737f6c6ea470bb8279f51f1d4d385b1e8728be
+  metadata.gz: 9582fb4fb8da92db5d65fbb076578bb0ff732e2073c7e0f1c095deee6fe399939712917752ac4f656ea81937f986d0475d622f3193fbeef56f35a1e4b306cc53
+  data.tar.gz: a245b4f08c1546e92b9ed1bc8d260391a935ad3d2079f5d7eaa8effe0954da187b1cf6f12846bc9aefe05a4e2475aeda4fc952ef611e209e3a637ce99d0bf908

data/.github/workflows/ci.yml

@@ -5,6 +5,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         entry:
           - { ruby: '2.7', mongodb: '4.4', mongoid: '6' }
@@ -19,15 +20,23 @@ jobs:
           - { ruby: '3.2', mongodb: '7.0', mongoid: '8' }
           - { ruby: '3.3', mongodb: '6.0', mongoid: '9' }
           - { ruby: '3.3', mongodb: '7.0', mongoid: '9' }
+          - { ruby: '3.4', mongodb: '8.0', mongoid: '9' }
+          - { ruby: '4.0', mongodb: '8.0', mongoid: '9', coverage: 'true' }
     name: test (ruby=${{ matrix.entry.ruby }}, mongodb=${{ matrix.entry.mongodb }}), mongoid=${{ matrix.entry.mongoid }})
     env:
       MONGOID_VERSION: ${{ matrix.entry.mongoid }}
+      COVERAGE: ${{ matrix.entry.coverage }}
+    services:
+      mongodb:
+        image: mongo:${{ matrix.entry.mongodb }}
+        ports: ['27017:27017']
+        options: >-
+          --health-cmd "mongosh --quiet --eval 'db.adminCommand({ping: 1})' || mongo --quiet --eval 'db.adminCommand({ping: 1})'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
     steps:
-      - name: Set up MongoDB ${{ matrix.entry.mongodb }}
-        uses: supercharge/mongodb-github-action@1.8.0
-        with:
-          mongodb-version: ${{ matrix.entry.mongodb }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v7
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -38,17 +47,9 @@ jobs:
       - name: Run examples
         run: bundle exec ruby examples/feed.rb
       - name: Report Coverage
+        if: ${{ matrix.entry.coverage == 'true' }}
         uses: coverallsapp/github-action@v2
         with:
-          flag-name: run-${{ join(matrix.*, '-') }}
-          parallel: true
-
-  upload-coverage:
-    needs: test
-    if: ${{ always() }}
-    runs-on: ubuntu-latest
-    steps:
-    - name: Upload Code Coverage Report
-      uses: coverallsapp/github-action@v2
-      with:
-        parallel-finished: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          file: coverage/.resultset.json
+          format: simplecov

data/.github/workflows/danger-comment.yml

@@ -0,0 +1,9 @@
+name: Danger Comment
+on:
+  workflow_run:
+    workflows: [Danger]
+    types: [completed]
+jobs:
+  comment:
+    uses: numbata/danger-pr-comment/.github/workflows/danger-comment.yml@v0.1.0
+    secrets: inherit

data/.github/workflows/danger.yml

@@ -1,17 +1,11 @@
-name: PR Linter
-on: [pull_request]
+name: Danger
+on:
+  pull_request:
+    types: [opened, reopened, edited, synchronize]
 jobs:
   danger:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-          bundler-cache: true
-      - run: |
-          # Personal access token for dangerpr-bot - public, but base64 encoded to avoid tripping up GitHub
-          TOKEN=$(echo -n Z2hwX0xNQ3VmanBFeTBvYkZVTWh6NVNqVFFBOEUxU25abzBqRUVuaAo= | base64 --decode)
-          DANGER_GITHUB_API_TOKEN=$TOKEN bundle exec danger --verbose
+    uses: numbata/danger-pr-comment/.github/workflows/danger-run.yml@v0.1.0
+    with:
+      ruby-version: '3.4'
+      bundler-cache: true
+    secrets: inherit

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 2.0.1 (2026/10/15)
+
+* [#48](https://github.com/mongoid/mongoid-scroll/issues/48): Raise `NoSuchFieldError` when a sort or cursor refers to a field no longer defined on the model - [@dblock](https://github.com/dblock).
+* [#51](https://github.com/mongoid/mongoid-scroll/pull/51): Report SimpleCov coverage to Coveralls once per build without duplicate gem uploads and refresh CI and coverage badges - [@dblock](https://github.com/dblock).
+* [#50](https://github.com/mongoid/mongoid-scroll/pull/50): Modernize CI through Ruby 4.0, Mongoid 9 and MongoDB 8; fix Mongoid 9 dependency selection, database cleaner compatibility and invalid Danger workflow references - [@dblock](https://github.com/dblock).
+* [#49](https://github.com/mongoid/mongoid-scroll/pull/49): Migrate Danger to danger-pr-comment workflow - [@dblock](https://github.com/dblock).
+
 ### 2.0.0 (2024/09/07)
 
 * [#38](https://github.com/mongoid/mongoid-scroll/pull/38): Add `previous_cursor` - [@GCorbel](https://github.com/GCorbel).

data/Dangerfile

@@ -1 +1,5 @@
-danger.import_dangerfile(gem: 'mongoid-danger')
+# frozen_string_literal: true
+
+danger.import_dangerfile(gem: 'danger-pr-comment')
+
+changelog.check!

data/Gemfile

@@ -1,9 +1,10 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
-case version = ENV['MONGOID_VERSION'] || '~> 7.0'
+case version = ENV['MONGOID_VERSION'] || '9'
 when 'HEAD' then gem 'mongoid', github: 'mongodb/mongoid'
+when /^9/  then gem 'mongoid', '~> 9.0'
 when /8/    then gem 'mongoid', '~> 8.0'
 when /7/    then gem 'mongoid', '~> 7.0'
 when /6/    then gem 'mongoid', '~> 6.0'
@@ -11,14 +12,21 @@ else gem 'mongoid', version
 end
 
 group :development, :test do
+  gem 'base64'
+  gem 'benchmark'
+  gem 'bigdecimal'
   gem 'bundler'
-  gem 'coveralls_reborn', require: false
-  gem 'database_cleaner', '~> 1.8.5'
+  gem 'danger', require: false
+  gem 'danger-changelog', require: false
+  gem 'danger-pr-comment', require: false
+  gem 'database_cleaner-mongoid', '~> 2.0'
   gem 'faker'
-  gem 'mongoid-danger', '~> 0.2.0', require: false
+  gem 'logger'
+  gem 'mutex_m'
   gem 'rake'
   gem 'rspec', '~> 3.0'
   gem 'rspec-its'
+  gem 'simplecov', '>= 0.22', require: false
   gem 'rubocop', '1.66.1'
   gem 'rubocop-rake'
   gem 'rubocop-rspec'

data/README.md

@@ -14,9 +14,8 @@
 # Mongoid::Scroll
 
 [![Gem Version](https://badge.fury.io/rb/mongoid-scroll.svg)](https://badge.fury.io/rb/mongoid-scroll)
-[![Build Status](https://github.com/mongoid/mongoid-scroll/actions/workflows/ci.yml/badge.svg)](https://github.com/mongoid/mongoid-scroll/actions/workflows/ci.yml)
+[![CI](https://github.com/mongoid/mongoid-scroll/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/mongoid/mongoid-scroll/actions/workflows/ci.yml?query=branch%3Amaster)
 [![Coverage Status](https://coveralls.io/repos/github/mongoid/mongoid-scroll/badge.svg?branch=master)](https://coveralls.io/github/mongoid/mongoid-scroll?branch=master)
-[![Code Climate](https://codeclimate.com/github/mongoid/mongoid-scroll.svg)](https://codeclimate.com/github/mongoid/mongoid-scroll)
 
 Mongoid extension that enables infinite scrolling for `Mongoid::Criteria` and `Mongo::Collection::View`.
 
@@ -75,6 +74,8 @@ end
 
 Resume iterating using the saved cursor and save the cursor to go backwards.
 
+If the sort field or a saved cursor's field is no longer defined on the model, `scroll` raises `Mongoid::Scroll::Errors::NoSuchFieldError`. A defined field with a `nil` value is not considered missing.
+
 ```ruby
 Feed::Item.desc(:position).limit(5).scroll(saved_iterator.next_cursor) do |record, iterator|
   # each record, one-by-one

data/RELEASING.md

@@ -1,64 +1,48 @@
-Releasing Mongoid::Scroll
-=========================
+# Releasing Mongoid::Scroll
 
-There're no particular rules about when to release mongoid-scroll. Release bug fixes frequently, features not so frequently and breaking API changes rarely.
+Use the upstream checkout on clean `master`, verify `origin` is `mongoid/mongoid-scroll`, and run `git pull --ff-only`. Follow semantic versioning: patch for fixes, minor for backward-compatible features, major for breaking changes.
 
-### Release
+## Prepare
 
-Run tests, check that all tests succeed locally.
+Set `lib/mongoid/scroll/version.rb` to the release version, date its `CHANGELOG.md` section using `YYYY/MM/DD`, and remove the contribution placeholder.
 
-```
+```sh
 bundle install
-rake
-```
-
-Check that the last build succeeded in [Github Actions](https://github.com/mongoid/mongoid-scroll/actions) for all supported platforms.
-
-Check that the version in [lib/mongoid/scroll/version.rb](lib/mongoid/scroll/version.rb) is the one you are releasing.
-
-Change "Next Release" in [CHANGELOG.md](CHANGELOG.md) to the new version.
-
-```
-### 0.4.0 (2018/12/24)
-```
-
-Remove the line with "* Your contribution here.", since there will be no more contributions to this release.
-
-Commit your changes.
-
-```
-git add CHANGELOG.md lib/mongoid-scroll/version.rb
-git commit -m "Preparing for release, 0.4.0."
+bundle exec rake
+git add CHANGELOG.md lib/mongoid/scroll/version.rb RELEASING.md
+git commit -m "Preparing for release, 2.0.1."
 git push origin master
 ```
 
-Release.
+## Publish RubyGems and GitHub
 
+```sh
+bundle exec rake release
 ```
-$ rake release
 
-mongoid-scroll 0.4.0 built to pkg/mongoid-scroll-0.4.0.gem.
-Tagged v0.4.0.
-Pushed git commits and tags.
-Pushed mongoid-scroll 0.4.0 to rubygems.org.
-```
+The task builds the gem, pushes its tag, and publishes to RubyGems. Complete MFA when prompted. If interrupted, inspect the tag and RubyGems version before retrying; never move a published tag. If only publication is missing, resume with `gem push pkg/mongoid-scroll-2.0.1.gem`.
 
-### Prepare for the Next Version
-
-Add the next release to [CHANGELOG.md](CHANGELOG.md).
+A tag is not a GitHub release. After confirming RubyGems publication, create the matching GitHub release with changelog notes:
 
+```sh
+version=2.0.1
+notes="$(mktemp)"
+awk -v version="$version" '
+  /^### / {
+    if (found) exit
+    if ($2 == version) found = 1
+    next
+  }
+  found { print }
+' CHANGELOG.md > "$notes"
+gh release create "v$version" --repo mongoid/mongoid-scroll --verify-tag --title "$version" --notes-file "$notes" --latest
+rm "$notes"
+curl --fail --silent --show-error "https://rubygems.org/api/v2/rubygems/mongoid-scroll/versions/$version.json"
+gh release view "v$version" --repo mongoid/mongoid-scroll
 ```
-### 0.4.1 (Next)
 
-* Your contribution here.
-```
+Verify both the published gem and non-draft GitHub release before declaring completion.
 
-Increment the minor version, modify [lib/mongoid-scroll/version.rb](lib/mongoid-scroll/version.rb).
+## Prepare the Next Version
 
-Commit your changes.
-
-```
-git add CHANGELOG.md lib/mongoid-scroll/version.rb
-git commit -m "Preparing for next release, 0.4.1."
-git push origin master
-```
+Increment the development patch version in `lib/mongoid/scroll/version.rb` (for example, `2.0.2`). Add `### 2.0.2 (Next)` with a contribution placeholder above the released changelog section. Commit and push those changes to `master`, leaving the released tag unchanged.

data/examples/feed.rb

@@ -1,6 +1,7 @@
 require 'bundler'
 Bundler.setup(:default, :development)
 
+require 'logger'
 require 'mongoid-scroll'
 require 'faker'
 

data/lib/mongoid/criteria/scrollable/fields.rb

@@ -5,12 +5,18 @@ module Mongoid
       module Fields
         private
 
+        def scroll_model_field(field_name)
+          klass.fields[field_name.to_s] ||
+            raise(Mongoid::Scroll::Errors::NoSuchFieldError.new(field: field_name))
+        end
+
         def raise_mismatched_sort_fields_error!(cursor, criteria_cursor_options)
           diff = cursor.sort_options.reject { |k, v| criteria_cursor_options[k] == v }
           raise Mongoid::Scroll::Errors::MismatchedSortFieldsError.new(diff: diff)
         end
 
         def different_sort_fields?(cursor, criteria_cursor_options)
+          scroll_model_field(cursor.field_name)
           criteria_cursor_options[:field_type] = criteria_cursor_options[:field_type].to_s
           criteria_cursor_options[:field_name] = criteria_cursor_options[:field_name].to_s
           criteria_cursor_options != cursor.sort_options

data/lib/mongoid/criteria/scrollable.rb

@@ -92,7 +92,7 @@ module Mongoid
 
       def scroll_field_type(criteria)
         scroll_field = scroll_field(criteria)
-        field = criteria.klass.fields[scroll_field.to_s]
+        field = scroll_model_field(scroll_field)
         field.foreign_key? && field.object_id_field? ? BSON::ObjectId : field.type
       end
     end

data/lib/mongoid/scroll/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Scroll
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

data/spec/mongoid/criteria_spec.rb

@@ -42,6 +42,37 @@ describe Mongoid::Criteria do
         end
       end
 
+      context 'with a missing field' do
+        it 'rejects a sort field that is not defined on the model' do
+          expect do
+            Feed::Item.asc(:removed_field).scroll(cursor_type)
+          end.to raise_error Mongoid::Scroll::Errors::NoSuchFieldError, /does not exist: removed_field/
+        end
+
+        it 'rejects a cursor whose field is no longer defined on the model' do
+          cursor = cursor_type.new(nil, field_name: 'removed_field', field_type: String)
+          expect do
+            Feed::Item.asc(:name).scroll(cursor)
+          end.to raise_error Mongoid::Scroll::Errors::NoSuchFieldError, /does not exist: removed_field/
+        end
+
+        it 'does not confuse a nil field value with a missing field' do
+          record = Feed::Item.create!
+          cursor = cursor_type.from_record(record, field: record.fields['name'])
+          expect { Feed::Item.asc(:name).scroll(cursor) }.not_to raise_error
+        end
+
+        if cursor_type == Mongoid::Scroll::Base64EncodedCursor
+          it 'rejects a serialized cursor whose field is no longer defined on the model' do
+            cursor = cursor_type.new(nil, field_name: 'removed_field', field_type: String)
+            saved_cursor = cursor_type.new(cursor.to_s)
+            expect do
+              Feed::Item.asc(:name).scroll(saved_cursor)
+            end.to raise_error Mongoid::Scroll::Errors::NoSuchFieldError, /does not exist: removed_field/
+          end
+        end
+      end
+
       context 'with data' do
         before do
           10.times do |i|

data/spec/spec_helper.rb

@@ -1,15 +1,19 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'coveralls'
-Coveralls.wear! do
-  add_filter 'spec'
+if ENV['COVERAGE'] == 'true'
+  require 'simplecov'
+  SimpleCov.start do
+    track_files 'lib/**/*.rb'
+    add_filter '/spec/'
+  end
 end
 
 require 'rubygems'
 require 'rspec'
 require 'rspec/its'
-require 'database_cleaner'
+require 'logger'
+require 'database_cleaner/mongoid'
 require 'mongoid-scroll'
 
 Time.zone ||= 'EST'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-scroll
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Daniel Doubrovkine
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-07 00:00:00.000000000 Z
+date: 2026-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
+- ".github/workflows/danger-comment.yml"
 - ".github/workflows/danger.yml"
 - ".gitignore"
 - ".rspec"
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Mongoid extensions to enable infinite scroll.