Merge pull request #178 from dblock/misc-upgrades

dblock · web-flow · commit 0f3a0188adb2 · 2025-09-22T09:05:29.000-04:00
Maintenance
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -4,20 +4,19 @@ on: [pull_request]
 jobs:
   danger:
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: Gemfile.danger      
     steps:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
         bundler-cache: true
     - name: Run Danger
-      env:
-        BUNDLE_GEMFILE: Gemfile.danger      
       run: |
-        bundle install
         # the personal token is public, this is ok, base64 encode to avoid tripping Github
         TOKEN=$(echo -n Z2hwX0xNQ3VmanBFeTBvYkZVTWh6NVNqVFFBOEUxU25abzBqRUVuaAo= | base64 --decode)
         DANGER_GITHUB_API_TOKEN=$TOKEN bundle exec danger --verbose
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: 3.4
           bundler-cache: true
       - name: Run RuboCop
         run: bundle exec rubocop
diff --git a/.github/workflows/test-mongodb.yml b/.github/workflows/test-mongodb.yml
@@ -7,12 +7,15 @@ jobs:
     strategy:
       matrix:
         entry:
-          - { ruby: 2.6.2, mongoid: 6.4.8, mongodb: 4.4 }
-          - { ruby: 2.6.2, mongoid: 7.2.3, mongodb: 4.4 }
-          - { ruby: 2.6.2, mongoid: 7.3.0, mongodb: 4.4 }
-          - { ruby: 3.1.1, mongoid: 7.3.0, mongodb: 4.4 }
-          - { ruby: 3.1.1, mongoid: 7.3.0, mongodb: 5.0 }
-          - { ruby: 3.2.1, mongoid: 7.5.2, mongodb: 5.0 }
+          - { ruby: 3.2, mongoid: 6.4.8, mongodb: 4.4 }
+          - { ruby: 3.2, mongoid: 7.2.3, mongodb: 4.4 }
+          - { ruby: 3.2, mongoid: 7.3.0, mongodb: 4.4 }
+          - { ruby: 3.2, mongoid: 7.3.0, mongodb: 4.4 }
+          - { ruby: 3.3, mongoid: 7.3.0, mongodb: 5.0 }
+          - { ruby: 3.4, mongoid: 7.5.2, mongodb: 5.0 }
+          - { ruby: 3.4, mongoid: 8.1.11, mongodb: 6.0 }
+          - { ruby: 3.4, mongoid: 8.1.11, mongodb: 7.0 }
+          - { ruby: 3.4, mongoid: 8.1.11, mongodb: 8.0 }
     name: test (ruby=${{ matrix.entry.ruby }}, mongoid=${{ matrix.entry.mongoid }}, mongodb=${{ matrix.entry.mongodb }})
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/test-postgresql.yml b/.github/workflows/test-postgresql.yml
@@ -7,10 +7,14 @@ jobs:
     strategy:
       matrix:
         entry:
-          - { ruby: 2.6.2, postgresql: 11, active_record: '~> 6.0.0' }
-          - { ruby: 3.1.1, postgresql: 11, active_record: '~> 6.1.0' }
-          - { ruby: 3.1.1, postgresql: 14, active_record: '~> 7.0.0' }
-          - { ruby: 3.1.1, postgresql: 14, active_record: '~> 7.2.0' }
+          - { ruby: 3.2, postgresql: 11, active_record: '~> 6.0.0' }
+          - { ruby: 3.2, postgresql: 11, active_record: '~> 6.1.0' }
+          - { ruby: 3.2, postgresql: 14, active_record: '~> 7.0.0' }
+          - { ruby: 3.3, postgresql: 14, active_record: '~> 7.2.0' }
+          - { ruby: 3.4, postgresql: 14, active_record: '~> 7.2.0' }
+          - { ruby: 3.4, postgresql: 15, active_record: '~> 8.0.2' }
+          - { ruby: 3.4, postgresql: 16, active_record: '~> 8.0.2' }
+          - { ruby: 3.4, postgresql: 17, active_record: '~> 8.0.2' }
     name: test (ruby=${{ matrix.entry.ruby }}, postgresql=${{ matrix.entry.postgresql }}, active_record=${{ matrix.entry.active_record }})
     steps:
       - uses: actions/checkout@v2
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,14 +1,19 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-07-26 19:57:49 UTC using RuboCop version 1.47.0.
+# on 2025-09-22 12:22:59 UTC using RuboCop version 1.80.2.
 # 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: 2
+# Configuration parameters: Severity.
+Bundler/DuplicatedGroup:
+  Exclude:
+    - 'Gemfile'
+
 # Offense count: 1
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
+# Configuration parameters: Severity.
 Gemspec/RequiredRubyVersion:
   Exclude:
     - 'slack-ruby-bot-server.gemspec'
@@ -38,12 +43,18 @@ Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'lib/slack-ruby-bot-server/models/team/methods.rb'
 
+# Offense count: 1
+Lint/UselessDefined:
+  Exclude:
+    - 'lib/slack-ruby-bot-server/ext/bson/object_id.rb'
+
 # Offense count: 1
 # Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.
 # CheckDefinitionPathHierarchyRoots: lib, spec, test, src
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
+    - 'Rakefile.rb'
     - 'lib/slack-ruby-bot-server.rb'
 
 # Offense count: 1
@@ -62,14 +73,21 @@ Naming/MethodParameterName:
     - 'lib/slack-ruby-bot-server/models/team/mongoid.rb'
     - 'lib/slack-ruby-bot-server/service.rb'
 
-# Offense count: 5
+# Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: separated, grouped
 Style/AccessorGrouping:
   Exclude:
     - 'lib/slack-ruby-bot-server/config.rb'
 
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/CollectionQuerying:
+  Exclude:
+    - 'lib/slack-ruby-bot-server/api/helpers/error_helpers.rb'
+    - 'lib/slack-ruby-bot-server/api/helpers/sort_helpers.rb'
+
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
 ### Changelog
 
-### 2.1.2 (Next)
+### 2.2.0 (Next)
 
-* Your contribution here.
+* [#176](https://github.com/slack-ruby/slack-ruby-bot-server/pull/176): Deps: bump mongoid-scroll to 2.0 - [@markokajzer](https://github.com/markokajzer).
 * [#175](https://github.com/slack-ruby/slack-ruby-bot-server/pull/175): Fix(activerecord): correctly check for database in rails 7.2+ - [@markokajzer](https://github.com/markokajzer).
+* [#178](https://github.com/slack-ruby/slack-ruby-bot-server/pull/178): Add support for Mongoid 8 - [@dblock](https://github.com/dblock).
+* [#178](https://github.com/slack-ruby/slack-ruby-bot-server/pull/178): Cursor-helper now requires mongoid-scroll 2.x - [@dblock](https://github.com/dblock).
+* [#178](https://github.com/slack-ruby/slack-ruby-bot-server/pull/178): Add support for ActiveRecord 8 - [@dblock](https://github.com/dblock).
+* Your contribution here.
 
 ### 2.1.1 (2023/07/25)
 
diff --git a/Gemfile b/Gemfile
@@ -4,8 +4,9 @@ case ENV.fetch('DATABASE_ADAPTER', nil)
 when 'mongoid' then
   gem 'kaminari-mongoid'
   gem 'mongoid', ENV['MONGOID_VERSION'] || '~> 7.3.0'
-  gem 'mongoid-scroll', '~> 1.0.1'
+  gem 'mongoid-scroll', '~> 2.0'
   gem 'mongoid-shell'
+  gem 'mutex_m'
 
   group :development, :test do
     gem 'database_cleaner-mongoid', '~> 2.0.1'
@@ -30,7 +31,7 @@ gemspec
 group :development, :test do
   gem 'bundler'
   gem 'byebug'
-  gem 'capybara', '~> 3.36.0'
+  gem 'capybara', '~> 3.40.0'
   gem 'fabrication'
   gem 'faker'
   gem 'faraday', '0.17.5'
@@ -40,9 +41,9 @@ group :development, :test do
   gem 'rack-test'
   gem 'rake'
   gem 'rspec'
-  gem 'rubocop', '1.47'
-  gem 'selenium-webdriver', '~> 4.1.0'
+  gem 'rubocop', '1.80.2'
+  gem 'selenium-webdriver', '~> 4.35.0'
   gem 'vcr'
   gem 'webmock'
-  gem 'webrick', '~> 1.6.1'
+  gem 'webrick', '~> 1.9.1'
 end
diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@ Slack Ruby Bot Server
 =====================
 
 [![Gem Version](https://badge.fury.io/rb/slack-ruby-bot-server.svg)](https://badge.fury.io/rb/slack-ruby-bot-server)
-[![Code Climate](https://codeclimate.com/github/slack-ruby/slack-ruby-bot-server.svg)](https://codeclimate.com/github/slack-ruby/slack-ruby-bot-server)
 [![mongodb](https://github.com/slack-ruby/slack-ruby-bot-server/actions/workflows/test-mongodb.yml/badge.svg)](https://github.com/slack-ruby/slack-ruby-bot-server/actions/workflows/test-mongodb.yml)
 [![postgresql](https://github.com/slack-ruby/slack-ruby-bot-server/actions/workflows/test-postgresql.yml/badge.svg)](https://github.com/slack-ruby/slack-ruby-bot-server/actions/workflows/test-postgresql.yml)
 [![rubocop](https://github.com/slack-ruby/slack-ruby-bot-server/actions/workflows/rubocop.yml/badge.svg)](https://github.com/slack-ruby/slack-ruby-bot-server/actions/workflows/rubocop.yml)
diff --git a/UPGRADING.md b/UPGRADING.md
@@ -1,6 +1,12 @@
 Upgrading Slack-Ruby-Bot-Server
 ===============================
 
+### Upgrading to >= 2.2.0
+
+#### Cursor Helper Iterator Changes
+
+The mongoid [cursor helper](lib/slack-ruby-bot-server/api/helpers/cursor_helpers.rb) now requires `mongoid-scroll` 2.x, the second argument to `scroll` has changed. See mongoid-scroll [UPGRADING](https://github.com/mongoid/mongoid-scroll/blob/master/UPGRADING.md#upgrading-to--200) for more information.
+
 ### Upgrading to >= 2.0.0
 
 #### Replaced Pagination Gem for ActiveRecord
diff --git a/lib/slack-ruby-bot-server/api/helpers/cursor_helpers.rb b/lib/slack-ruby-bot-server/api/helpers/cursor_helpers.rb
@@ -16,9 +16,9 @@ def paginate_by_cursor(coll, _options)
             coll = coll.skip(params[:offset].to_i) if params.key?(:offset)
             size = (params[:size] || 10).to_i
             coll = coll.limit(size)
-            coll.scroll(params[:cursor]) do |record, next_cursor|
+            coll.scroll(params[:cursor]) do |record, iterator|
               results[:results] << record if record
-              results[:next] = next_cursor.to_s
+              results[:next] = iterator.next_cursor.to_s
               break if results[:results].count >= size
             end
             results[:total_count] = coll.count if params[:total_count] && coll.respond_to?(:count)
diff --git a/lib/slack-ruby-bot-server/api/helpers/sort_helpers.rb b/lib/slack-ruby-bot-server/api/helpers/sort_helpers.rb
@@ -13,7 +13,7 @@ def sort_order(options = {})
             supported_sort_orders = route_sort
             error!("This API doesn't support sorting", 400) if supported_sort_orders.blank?
             unless supported_sort_orders.include?(sort_order)
-              error!("Invalid sort order: #{sort_order}, must be#{supported_sort_orders.count == 1 ? '' : ' one of'} '#{supported_sort_orders.join("', '")}'", 400)
+              error!("Invalid sort order: #{sort_order}, must be#{' one of' unless supported_sort_orders.count == 1} '#{supported_sort_orders.join("', '")}'", 400)
             end
           end
           sort_order = sort_order.split(',').map do |sort_entry|
@@ -50,7 +50,8 @@ def sort(coll, options = {})
               error!("Cannot sort #{coll.class.name}", 500)
             end
           end
-          coll = coll.is_a?(Module) && coll.respond_to?(:all) ? coll.all : coll
+          coll = coll.all if coll.is_a?(Module) && coll.respond_to?(:all)
+          coll
         end
       end
     end
diff --git a/lib/slack-ruby-bot-server/version.rb b/lib/slack-ruby-bot-server/version.rb
@@ -1,3 +1,3 @@
 module SlackRubyBotServer
-  VERSION = '2.1.2'.freeze
+  VERSION = '2.2.0'.freeze
 end
diff --git a/slack-ruby-bot-server.gemspec b/slack-ruby-bot-server.gemspec
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'grape-roar', '>= 0.4.0'
   spec.add_dependency 'grape-swagger'
   spec.add_dependency 'kaminari-grape'
+  spec.add_dependency 'logger'
   spec.add_dependency 'rack-cors'
   spec.add_dependency 'rack-rewrite'
   spec.add_dependency 'rack-server-pages'
diff --git a/spec/integration/teams_spec.rb b/spec/integration/teams_spec.rb
@@ -30,6 +30,7 @@
       it 'includes optional parameter' do
         expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), { state: 'property' })
         visit '/?v1&code=code&state=property'
+        expect(page.find('#messages')).to have_content 'Team successfully registered!'
       end
     end
     context 'homepage' do
@@ -60,6 +61,7 @@
       it 'includes optional parameter' do
         expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), { state: 'property' })
         visit '/?v2&code=code&state=property'
+        expect(page.find('#messages')).to have_content 'Team successfully registered!'
       end
     end
     context 'homepage' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,6 +1,8 @@
 ENV['RACK_ENV'] = 'test'
 ENV['DATABASE_ADAPTER'] ||= 'mongoid'
 
+require 'logger'
+
 Bundler.require
 
 require 'hyperclient'
