Add Ruby 3 and Mongo 5 to CI (#14)

Author: crazyoptimist

.github/workflows/test-mongodb.yml

@@ -8,8 +8,8 @@ jobs:
       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: 2.7.2, mongoid: 7.3.0, mongodb: 5.0 }
+          - { ruby: 3.1.1, mongoid: 7.3.0, mongodb: 5.0 }
     name: test (ruby=${{ matrix.entry.ruby }}, mongoid=${{ matrix.entry.mongoid }}, mongodb=${{ matrix.entry.mongodb }})
     steps:
       - uses: actions/checkout@v2
@@ -25,4 +25,5 @@ jobs:
           bundle exec rake spec
         env:
           DATABASE_ADAPTER: mongoid
+          DATABASE_URL: "mongodb://localhost"
           MONGOID_VERSION: ${{ matrix.entry.mongoid }}

.github/workflows/test-postgresql.yml

@@ -8,15 +8,16 @@ jobs:
       matrix:
         entry:
           - { ruby: 2.6.2, postgresql: 11 }
-          - { ruby: 2.6.2, postgresql: 14 }
+          - { ruby: 2.7.2, postgresql: 14 }
+          - { ruby: 3.1.1, postgresql: 14 }
     name: test (ruby=${{ matrix.entry.ruby }}, postgresql=${{ matrix.entry.postgresql }})
     services:
       postgres:
         image: postgres:${{ matrix.entry.postgresql }}
         env:
           POSTGRES_USER: test
           POSTGRES_PASSWORD: password
-          POSTGRES_DB: slack_ruby_bot_server_slack_test
+          POSTGRES_DB: slack_ruby_bot_server_events_test
         ports:
           - 5432:5432
         # needed because the postgres container does not provide a healthcheck
@@ -32,4 +33,4 @@ jobs:
           bundle exec rake spec
         env:
           DATABASE_ADAPTER: activerecord
-          DATABASE_URL: postgres://test:password@localhost/slack_ruby_bot_server_slack_test
+          DATABASE_URL: postgres://test:password@localhost/slack_ruby_bot_server_events_test

CHANGELOG.md

@@ -3,21 +3,22 @@
 #### 0.3.2 (Next)
 
 * [#13](https://github.com/slack-ruby/slack-ruby-bot-server-events/pull/13): Replace Travis CI with Github Actions - [@CrazyOptimist](https://github.com/CrazyOptimist).
-* Your contribution here.
 * [#10](https://github.com/slack-ruby/slack-ruby-bot-server-events/pull/10): Fix actions endpoint for block dropdowns - [@maths22](https://github.com/maths22).
+* [#14](https://github.com/slack-ruby/slack-ruby-bot-server-events/pull/14): Added support for Ruby 3.1 - [@CrazyOptimist](https://github.com/CrazyOptimist).
+* Your contribution here.
 
-#### 0.3.1 (2/4/2021)
+#### 0.3.1 (2021/02/04)
 
 * [#9](https://github.com/slack-ruby/slack-ruby-bot-server-events/pull/9): Provide default value when actions are missing in payload - [@nijave](https://github.com/nijave).
 
-#### 0.3.0 (12/30/2020)
+#### 0.3.0 (2020/12/30)
 
 * [#6](https://github.com/slack-ruby/slack-ruby-bot-server-events/pull/6): Add support for block_actions interaction type - [@CrazyOptimist](https://github.com/CrazyOptimist).
 
-#### 0.2.0 (07/19/2020)
+#### 0.2.0 (2020/07/19)
 
 * Include action type in actions callbacks - [@dblock](https://github.com/dblock).
 
-#### 0.1.0 (07/19/2020)
+#### 0.1.0 (2020/07/19)
 
 * Initial public release - [@dblock](https://github.com/dblock).

Gemfile

@@ -8,10 +8,10 @@ when 'mongoid' then
   gem 'mongoid'
   gem 'mongoid-scroll'
 when 'activerecord' then
-  gem 'activerecord', '~> 5.0.0'
-  gem 'otr-activerecord', '~> 1.2.1'
+  gem 'activerecord'
+  gem 'otr-activerecord'
   gem 'virtus'
-  gem 'cursor_pagination' # rubocop:disable Bundler/OrderedGems
+  gem 'cursor_pagination', github: 'dblock/cursor_pagination', branch: 'misc' # rubocop:disable Bundler/OrderedGems
   gem 'pg'
 when nil
   warn "Missing ENV['DATABASE_ADAPTER']."

spec/database_adapters/activerecord/activerecord.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-db_config = YAML.safe_load(
-  ERB.new(File.read(
-            File.expand_path('postgresql.yml', __dir__)
-          )).result, [], [], true
-)[ENV['RACK_ENV']]
+yml = ERB.new(File.read(File.expand_path('postgresql.yml', __dir__))).result
+db_config = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
+              ::YAML.safe_load(yml, aliases: true)[ENV['RACK_ENV']]
+            else
+              ::YAML.safe_load(yml, [], [], true)[ENV['RACK_ENV']]
+            end
 ActiveRecord::Tasks::DatabaseTasks.create(db_config)
 ActiveRecord::Base.establish_connection(db_config)
+ActiveRecord::Base.logger ||= Logger.new(STDOUT)
 ActiveRecord::Base.logger.level = :info

spec/database_adapters/activerecord/postgresql.yml

@@ -6,13 +6,13 @@ default: &default
 
 development:
   <<: *default
-  database: slack_ruby_bot_server_slack_development
+  database: slack_ruby_bot_server_events_development
 
 test:
   <<: *default
-  database: slack_ruby_bot_server_slack_test
+  database: slack_ruby_bot_server_events_test
   url: <%= ENV["DATABASE_URL"] %>
 
 production:
   <<: *default
-  database: slack_ruby_bot_server_slack_production
+  database: slack_ruby_bot_server_events_production

spec/database_adapters/mongoid/mongoid.yml

@@ -11,9 +11,7 @@ development:
 test:
   clients:
     default:
-      database: slack-ruby-bot-server-events_test
-      hosts:
-        - 127.0.0.1:27017
+      uri: <%= ENV["DATABASE_URL"] %>
   options:
     raise_not_found_error: false
     use_utc: true