Fix ActiveRecord and Mongoid sample apps and configuration.

dblock · dblock · commit 515f6b72d6b3 · 2025-09-29T09:15:58.000-04:00
diff --git a/.github/workflows/test-mongodb.yml b/.github/workflows/test-mongodb.yml
@@ -1,13 +1,12 @@
 ---
-name: test
+name: test-mongodb
 on: [push, pull_request]
 jobs:
   test:
     runs-on: ubuntu-latest
     name: test
     env:
       DATABASE_ADAPTER: mongoid
-      BUNDLE_GEMFILE: Gemfile
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/test-postgresql.yml b/.github/workflows/test-postgresql.yml
@@ -1,5 +1,5 @@
 ---
-name: test
+name: test-postgresql
 on: [push, pull_request]
 jobs:
   test:
@@ -18,7 +18,6 @@ jobs:
     env:
       DATABASE_ADAPTER: activerecord
       DATABASE_URL: postgres://test:password@localhost/slack_ruby_bot_server_slack_test
-      BUNDLE_GEMFILE: Gemfile
       RACK_ENV: test
     steps:
       - uses: actions/checkout@v2
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-09-29 12:37:09 UTC using RuboCop version 1.81.1.
+# on 2025-09-29 13:15:53 UTC using RuboCop version 1.81.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
@@ -102,3 +102,18 @@ RSpec/SpecFilePathFormat:
 RSpec/SubjectStub:
   Exclude:
     - 'spec/slack-ruby-bot-server-rtm/server_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - '**/*.arb'
+    - 'sample_apps/sample_app_activerecord/db/schema.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/GlobalStdStream:
+  Exclude:
+    - 'spec/database_adapters/activerecord/activerecord.rb'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 ### Changelog
 
-#### 0.2.1 (Next)
+#### 0.3.0 (Next)
 
+* [#2](https://github.com/slack-ruby/slack-ruby-bot-server-rtm/pull/2): Replace Travis-CI with GHA - [@dblock](https://github.com/dblock).
 * Your contribution here.
 
 #### 0.2.0 (2020/11/27)
diff --git a/Gemfile b/Gemfile
@@ -8,11 +8,12 @@ when 'mongoid'
   gem 'mongoid'
   gem 'mongoid-scroll'
 when 'activerecord'
-  gem 'activerecord', '~> 5.0.0'
-  gem 'otr-activerecord', '~> 1.2.1'
-  gem 'virtus'
-  gem 'cursor_pagination' # rubocop:disable Bundler/OrderedGems
+  gem 'activerecord'
+  gem 'mutex_m'
+  gem 'otr-activerecord'
+  gem 'pagy_cursor'
   gem 'pg'
+  gem 'virtus'
 when nil
   warn "Missing ENV['DATABASE_ADAPTER']."
 else
diff --git a/README.md b/README.md
@@ -2,7 +2,8 @@ Slack Ruby Bot Server RealTime (RTM) Extension
 ==============================================
 
 [![Gem Version](https://badge.fury.io/rb/slack-ruby-bot-server-rtm.svg)](https://badge.fury.io/rb/slack-ruby-bot-server-rtm)
-[![Build Status](https://travis-ci.org/slack-ruby/slack-ruby-bot-server-rtm.svg?branch=main)](https://travis-ci.org/slack-ruby/slack-ruby-bot-server-rtm)
+[![test-postgresql](https://github.com/slack-ruby/slack-ruby-bot-server-rtm/actions/workflows/test-postgresql.yml/badge.svg)](https://github.com/slack-ruby/slack-ruby-bot-server-rtm/actions/workflows/test-postgresql.yml)
+[![test-mongodb](https://github.com/slack-ruby/slack-ruby-bot-server-rtm/actions/workflows/test-mongodb.yml/badge.svg)](https://github.com/slack-ruby/slack-ruby-bot-server-rtm/actions/workflows/test-mongodb.yml)
 
 # Table of Contents
 
diff --git a/lib/slack-ruby-bot-server-rtm/version.rb b/lib/slack-ruby-bot-server-rtm/version.rb
@@ -2,6 +2,6 @@
 
 module SlackRubyBotServer
   module RealTime
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end
diff --git a/sample_apps/sample_app_activerecord/Gemfile b/sample_apps/sample_app_activerecord/Gemfile
@@ -2,17 +2,19 @@
 
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 5.0.0', require: 'active_record'
+gem 'activerecord'
+gem 'mutex_m'
 gem 'newrelic-slack-ruby-bot'
-gem 'otr-activerecord', '~> 1.2.1'
+gem 'otr-activerecord'
+gem 'pagy_cursor'
 gem 'pg'
 gem 'rack-server-pages'
 gem 'rack-test'
 gem 'slack-ruby-bot-server-rtm', path: '../../'
 gem 'unicorn'
 
 group :development, :test do
-  gem 'standalone_migrations', '~> 5.2'
+  gem 'standalone_migrations'
 end
 
 group :test do
diff --git a/sample_apps/sample_app_activerecord/config.ru b/sample_apps/sample_app_activerecord/config.ru
@@ -12,7 +12,7 @@ ActiveRecord::Base.establish_connection(
   YAML.safe_load(
     ERB.new(
       File.read('config/postgresql.yml')
-    ).result, [], [], true
+    ).result, aliases: true
   )[ENV.fetch('RACK_ENV', nil)]
 )
 
diff --git a/sample_apps/sample_app_activerecord/config/postgresql.yml b/sample_apps/sample_app_activerecord/config/postgresql.yml
@@ -11,6 +11,7 @@ development:
 test:
   <<: *default
   database: slack_ruby_bot_server_test
+  url: <%= ENV["DATABASE_URL"] || 'postgres://localhost/slack_ruby_bot_server_test' %>
 
 production:
   <<: *default
diff --git a/sample_apps/sample_app_activerecord/db/schema.rb b/sample_apps/sample_app_activerecord/db/schema.rb
@@ -1,33 +1,31 @@
-# frozen_string_literal: true
-
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20_201_125_164_500) do
+ActiveRecord::Schema[8.0].define(version: 20_201_125_164_500) do
   # These are extensions that must be enabled in order to support this database
-  enable_extension 'plpgsql'
+  enable_extension 'pg_catalog.plpgsql'
 
   create_table 'teams', force: :cascade do |t|
-    t.string   'team_id'
-    t.string   'name'
-    t.boolean  'active', default: true
-    t.string   'domain'
-    t.string   'token'
+    t.string 'team_id'
+    t.string 'name'
+    t.boolean 'active', default: true
+    t.string 'domain'
+    t.string 'token'
     t.datetime 'created_at', null: false
     t.datetime 'updated_at', null: false
-    t.string   'bot_user_id'
-    t.string   'activated_user_id'
-    t.string   'activated_user_access_token'
-    t.string   'oauth_scope'
-    t.string   'oauth_version', default: 'v1', null: false
+    t.string 'bot_user_id'
+    t.string 'activated_user_id'
+    t.string 'activated_user_access_token'
+    t.string 'oauth_scope'
+    t.string 'oauth_version', default: 'v1', null: false
   end
 end
diff --git a/sample_apps/sample_app_activerecord/spec/spec_helper.rb b/sample_apps/sample_app_activerecord/spec/spec_helper.rb
@@ -6,9 +6,12 @@
 
 require 'active_record'
 require 'database_cleaner'
+require 'pagy_cursor'
 require 'slack-ruby-bot-server-rtm/rspec'
 
-db_config = YAML.safe_load(File.read(File.expand_path('../config/postgresql.yml', __dir__)), [], [], true)[ENV.fetch('RACK_ENV', nil)]
+yml = ERB.new(File.read(File.expand_path('../config/postgresql.yml', __dir__))).result
+db_config = YAML.safe_load(yml, aliases: true)[ENV.fetch('RACK_ENV', nil)]
+
 ActiveRecord::Tasks::DatabaseTasks.create(db_config)
 ActiveRecord::Base.establish_connection(db_config)
 
diff --git a/sample_apps/sample_app_mongoid/Gemfile b/sample_apps/sample_app_mongoid/Gemfile
@@ -11,7 +11,7 @@ gem 'mongoid-scroll'
 gem 'unicorn'
 
 group :test do
-  gem 'database_cleaner'
+  gem 'database_cleaner-mongoid'
   gem 'fabrication'
   gem 'faker'
   gem 'rack-test'
diff --git a/sample_apps/sample_app_mongoid/spec/spec_helper.rb b/sample_apps/sample_app_mongoid/spec/spec_helper.rb
@@ -5,25 +5,18 @@
 ENV['RACK_ENV'] = 'test'
 
 require 'mongoid'
-require 'database_cleaner'
+require 'database_cleaner-mongoid'
 require 'slack-ruby-bot-server-rtm/rspec'
 
 Mongoid.load!(File.expand_path('../config/mongoid.yml', __dir__), ENV.fetch('RACK_ENV', nil))
 
 RSpec.configure do |config|
   config.before :suite do
-    Mongo::Logger.logger.level = Logger::INFO
-
     Mongoid::Tasks::Database.create_indexes
+    DatabaseCleaner.start
   end
 
   config.after :suite do
-    Mongoid.purge!
-  end
-
-  config.around do |example|
-    DatabaseCleaner.cleaning do
-      example.run
-    end
+    DatabaseCleaner.clean
   end
 end
diff --git a/spec/database_adapters/activerecord/activerecord.rb b/spec/database_adapters/activerecord/activerecord.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-db_config = YAML.safe_load(File.read(File.expand_path('postgresql.yml', __dir__)), [], [], true)[ENV.fetch('RACK_ENV', nil)]
+yml = ERB.new(File.read(File.expand_path('postgresql.yml', __dir__))).result
+db_config = YAML.safe_load(yml, aliases: true)[ENV.fetch('RACK_ENV', nil)]
+
 ActiveRecord::Tasks::DatabaseTasks.create(db_config)
 ActiveRecord::Base.establish_connection(db_config)
+ActiveRecord::Base.logger ||= Logger.new(STDOUT)
 ActiveRecord::Base.logger.level = :info
diff --git a/spec/database_adapters/activerecord/postgresql.yml b/spec/database_adapters/activerecord/postgresql.yml
@@ -11,7 +11,7 @@ development:
 test:
   <<: *default
   database: slack_ruby_bot_server_slack_test
-  url: <%= ENV["DATABASE_URL"] %>
+  url: <%= ENV["DATABASE_URL"] || 'postgres://localhost/slack_ruby_bot_server_slack_test' %>
 
 production:
   <<: *default

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ ActiveRecord::Base.establish_connection(`
`12`	`12`	`YAML.safe_load(`
`13`	`13`	`ERB.new(`
`14`	`14`	`File.read('config/postgresql.yml')`
`15`		`- ).result, [], [], true`
	`15`	`+ ).result, aliases: true`
`16`	`16`	`)[ENV.fetch('RACK_ENV', nil)]`
`17`	`17`	`)`
`18`	`18`