slack-ruby-bot-server 1.2.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce55bd11d1164eaaa7985395b77ac8d104f69adfd1a5d3ccd1e6a195e02aceb2
-  data.tar.gz: '08700bcdc5768db23d313ac4cdde14c4b315f83f407b26fcff764b0249d5ca31'
+  metadata.gz: 6481784d4c29658a885d478d88734ff06e79ee6f9a30ec895e4c5872fecbd50b
+  data.tar.gz: 28d14d45d3f338d9a002a8e7ab697cc3dd4c70e9103b8b68fd86382b7a7ac20b
 SHA512:
-  metadata.gz: 4f2585a8f933f806ff9cb998e58d7a03efda4a0aee1afeccd5f07289156e37c8ccf9092058b19413a22986031c0a82cca7dd35a9f6dbc9d7211d0823b363e708
-  data.tar.gz: b5139b404dfc9c6c1b5027286126438e81da1c577805aedd3273f07e5e0f2ee9fdb89572d32f652d2e9c8f372c062b74c5ae948b4b2a0347383b908ac29648b9
+  metadata.gz: 71d5b984953b8137f3636f501d38fcac2023ebc4b9633a90b4d5dbd30ddec03a2ecfd661eb2c647c01e80e6f847eccd76e8f7b9d69918d3839573032628d633e
+  data.tar.gz: b021b45e89ae3f85932e8fde979bf082a47d05fe527d27017edb4ea76717517fcb21c13a87c757fb988188d6435a4039d6433bbe5edc07bcc50e0cfc5acfe18e

data/.github/workflows/danger.yml

@@ -19,5 +19,5 @@ jobs:
       run: |
         bundle install
         # the personal token is public, this is ok, base64 encode to avoid tripping Github
-        TOKEN=$(echo -n NWY1ZmM5MzEyMzNlYWY4OTZiOGU3MmI3MWQ3Mzk0MzgxMWE4OGVmYwo= | base64 --decode)
+        TOKEN=$(echo -n Z2hwX0xNQ3VmanBFeTBvYkZVTWh6NVNqVFFBOEUxU25abzBqRUVuaAo= | base64 --decode)
         DANGER_GITHUB_API_TOKEN=$TOKEN bundle exec danger --verbose

data/.github/workflows/test-mongodb.yml

@@ -10,6 +10,8 @@ jobs:
           - { 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 }
     name: test (ruby=${{ matrix.entry.ruby }}, mongoid=${{ matrix.entry.mongoid }}, mongodb=${{ matrix.entry.mongodb }})
     steps:
       - uses: actions/checkout@v2
@@ -17,6 +19,8 @@ jobs:
         with:
           ruby-version: ${{ matrix.entry.ruby }}
       - uses: browser-actions/setup-geckodriver@latest
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
       - run: geckodriver --version
       - uses: supercharge/mongodb-github-action@1.7.0
         with:

data/.github/workflows/test-postgresql.yml

@@ -8,6 +8,8 @@ jobs:
       matrix:
         entry:
           - { ruby: 2.6.2, postgresql: 11 }
+          - { ruby: 3.1.1, postgresql: 11 }
+          - { ruby: 3.1.1, postgresql: 14 }
     name: test (ruby=${{ matrix.entry.ruby }}, postgresql=${{ matrix.entry.postgresql }})
     steps:
       - uses: actions/checkout@v2
@@ -15,6 +17,8 @@ jobs:
         with:
           ruby-version: ${{ matrix.entry.ruby }}
       - uses: browser-actions/setup-geckodriver@latest
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
       - run: geckodriver --version
       - uses: harmon758/postgresql-action@v1
         with:

data/.gitignore

@@ -6,5 +6,6 @@ log
 .env
 *.swp
 Gemfile.lock
+Gemfile.danger.lock
 .ruby-version
 pkg

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ### Changelog
 
+#### 2.0.0 (2023/02/20)
+
+* [#145](https://github.com/slack-ruby/slack-ruby-bot-server/pull/145): Added support for Ruby 3.1 - [@dblock](https://github.com/dblock).
+* [#146](https://github.com/slack-ruby/slack-ruby-bot-server/pull/146): Added support for MongoDB 5.0 - [@dblock](https://github.com/dblock).
+* [#147](https://github.com/slack-ruby/slack-ruby-bot-server/pull/147): Added support for PostgreSQL 14 - [@dblock](https://github.com/dblock).
+* [#155](https://github.com/slack-ruby/slack-ruby-bot-server/pull/155): Enable mongoid to get connection URI from ENV for test - [@crazyoptimist](https://github.com/crazyoptimist).
+* [#157](https://github.com/slack-ruby/slack-ruby-bot-server/pull/157): Added test env setup guide for linux users - [@crazyoptimist](https://github.com/crazyoptimist).
+* [#158](https://github.com/slack-ruby/slack-ruby-bot-server/pull/158): Replace `cursor_pagination` with `pagy_cursor` - [@crazyoptimist](https://github.com/crazyoptimist).
+* [#160](https://github.com/slack-ruby/slack-ruby-bot-server/pull/160): Document upgrading to 2.0.0 - [@crazyoptimist](https://github.com/crazyoptimist).
+* [#161](https://github.com/slack-ruby/slack-ruby-bot-server/pull/161): Removed unused `ext` module - [@dblock](https://github.com/dblock).
+* [#162](https://github.com/slack-ruby/slack-ruby-bot-server/pull/162): Fix: scopes are comma-separated - [@dblock](https://github.com/dblock).
+
 #### 1.2.1 (2022/03/06)
 
 * [#140](https://github.com/slack-ruby/slack-ruby-bot-server/pull/140): Fix: `NameError` for `Boolean` types with mongoid >= 7.3.0 - [@dblock](https://github.com/dblock).

data/CONTRIBUTING.md

@@ -35,6 +35,13 @@ bundle install
 bundle exec rake
 ```
 
+If you are a linux user, you will need to install [geckodriver](https://github.com/mozilla/geckodriver/releases), [firefox](https://download-installer.cdn.mozilla.net/pub/firefox/releases/), and `Xvfb`.  
+And, to get a display for the headless browser, run `Xvfb` manually. You can see more explanations [here](http://elementalselenium.com/tips/38-headless).
+
+```
+xvfb-run --auto-servernum bundle exec rake
+```
+
 ## Write Tests
 
 Try to write a test that reproduces the problem you're trying to fix or describes a feature that you want to build.

data/Gemfile

@@ -7,9 +7,9 @@ when 'mongoid' then
   gem 'mongoid-scroll'
   gem 'mongoid-shell'
 when 'activerecord' then
-  gem 'activerecord', '~> 5.0.0'
-  gem 'otr-activerecord', '~> 1.2.1'
-  gem 'cursor_pagination' # rubocop:disable Bundler/OrderedGems
+  gem 'activerecord', '~> 6.0.0'
+  gem 'otr-activerecord'
+  gem 'pagy_cursor'
   gem 'pg'
 when nil
   warn "Missing ENV['DATABASE_ADAPTER']."
@@ -22,18 +22,19 @@ gemspec
 group :development, :test do
   gem 'bundler'
   gem 'byebug'
-  gem 'capybara', '~> 2.15.1'
+  gem 'capybara', '~> 3.36.0'
   gem 'database_cleaner', '~> 1.8.5'
   gem 'fabrication'
   gem 'faker'
   gem 'faraday', '0.17.5'
   gem 'hyperclient', '~> 0.9.3'
+  gem 'rack', '~> 2.2.3'
   gem 'rack-server-pages'
   gem 'rack-test'
   gem 'rake'
   gem 'rspec'
   gem 'rubocop', '0.81.0'
-  gem 'selenium-webdriver', '~> 3.4.4'
+  gem 'selenium-webdriver', '~> 4.1.0'
   gem 'vcr'
   gem 'webmock'
   gem 'webrick', '~> 1.6.1'

data/README.md

@@ -40,7 +40,7 @@ A library that contains a web server and a RESTful [Grape](http://github.com/rub
 
 ## Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-bot-server. See [UPGRADING](UPGRADING.md) when upgrading from an older version. See [MIGRATING](MIGRATING.md) for help with migrating Legacy Slack Apps to Granular Scopes.
+You're reading the documentation for the **stable** release of slack-ruby-bot-server, 2.0.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version. See [MIGRATING](MIGRATING.md) for help with migrating Legacy Slack Apps to Granular Scopes.
 
 ## Make Your Own
 
@@ -65,14 +65,14 @@ gem 'slack-ruby-bot-server'
 
 #### ActiveRecord
 
-Use ActiveRecord with, for example, PostgreSQL via [pg](https://github.com/ged/ruby-pg). Add the `activerecord`, `pg`, `otr-activerecord` and `cursor_pagination` gems to your Gemfile.
+Use ActiveRecord with, for example, PostgreSQL via [pg](https://github.com/ged/ruby-pg). Add the `activerecord`, `pg`, `otr-activerecord` and `pagy_cursor` gems to your Gemfile.
 
 ```
 gem 'pg'
 gem 'activerecord', require: 'active_record'
 gem 'slack-ruby-bot-server'
 gem 'otr-activerecord'
-gem 'cursor_pagination'
+gem 'pagy_cursor'
 ```
 
 Configure the database connection in `config/postgresql.yml`. 

data/UPGRADING.md

@@ -1,6 +1,18 @@
 Upgrading Slack-Ruby-Bot-Server
 ===============================
 
+### Upgrading to >= 2.0.0
+
+#### Replaced Pagination Gem for ActiveRecord
+
+[`cursor_pagination`](https://github.com/Kukunin/cursor_pagination) is abandoned and no longer maintained. It is repaced with [`pagy_cursor`](https://github.com/Uysim/pagy-cursor).
+
+If you're using ActiveRecord, replace `cursor_pagination` with `pagy_cursor` in the Gemfile.
+
+```ruby
+gem 'pagy_cursor'
+```
+
 ### Upgrading to >= 1.2.0
 
 #### New Team Fields

data/lib/slack-ruby-bot-server/api/helpers/cursor_helpers.rb

@@ -25,6 +25,8 @@ module SlackRubyBotServer
             results
           end
         elsif SlackRubyBotServer::Config.activerecord?
+          include Pagy::Cursor::Backend
+
           def paginate_by_cursor(coll, options)
             raise 'Both cursor and offset parameters are present, these are mutually exclusive.' if params.key?(:offset) && params.key?(:cursor)
 
@@ -33,12 +35,16 @@ module SlackRubyBotServer
             results[:total_count] = coll.count(:all) if params[:total_count]
             coll = coll.offset(params[:offset].to_i) if params.key?(:offset)
             sort_options = {}
+            cursor_direction = :after
             sort_order(options).each do |order|
               sort_options[order[:column]] = { reverse: true } if order[:direction] == :desc
+              cursor_direction = :before if order[:column] == coll.primary_key && order[:direction] == :desc
             end
-            coll = coll.cursor(params[:cursor], columns: sort_options).per(size)
+            cursor_vars = { items: size }
+            cursor_vars[cursor_direction] = params[:cursor].to_i if params.key?(:cursor)
+            pagy_cursor, coll = pagy_cursor(coll, cursor_vars, { order: sort_options })
             results[:results] = coll.to_a
-            results[:next] = coll.next_cursor.to_s unless coll.last_page?
+            results[:next] = coll.last[:id].to_s if pagy_cursor.has_more?
             results
           end
         end

data/lib/slack-ruby-bot-server/config/database_adapters/activerecord.rb

@@ -1,5 +1,8 @@
 require_relative '../../models/team/activerecord.rb'
 
+require 'pagy'
+require 'pagy_cursor/pagy/extras/cursor'
+
 module SlackRubyBotServer
   module DatabaseAdapter
     def self.check!

data/lib/slack-ruby-bot-server/config/pagy.rb

@@ -0,0 +1,236 @@
+# frozen_string_literal: true
+
+# Pagy initializer file (6.0.0)
+# Customize only what you really need and notice that the core Pagy works also without any of the following lines.
+# Should you just cherry pick part of this file, please maintain the require-order of the extras
+
+# Pagy DEFAULT Variables
+# See https://ddnexus.github.io/pagy/docs/api/pagy#variables
+# All the Pagy::DEFAULT are set for all the Pagy instances but can be overridden per instance by just passing them to
+# Pagy.new|Pagy::Countless.new|Pagy::Calendar::*.new or any of the #pagy* controller methods
+
+# Instance variables
+# See https://ddnexus.github.io/pagy/docs/api/pagy#instance-variables
+# Pagy::DEFAULT[:page]   = 1                                  # default
+# Pagy::DEFAULT[:items]  = 20                                 # default
+# Pagy::DEFAULT[:outset] = 0                                  # default
+
+# Other Variables
+# See https://ddnexus.github.io/pagy/docs/api/pagy#other-variables
+# Pagy::DEFAULT[:size]       = [1,4,4,1]                       # default
+# Pagy::DEFAULT[:page_param] = :page                           # default
+# The :params can be also set as a lambda e.g ->(params){ params.exclude('useless').merge!('custom' => 'useful') }
+# Pagy::DEFAULT[:params]     = {}                              # default
+# Pagy::DEFAULT[:fragment]   = '#fragment'                     # example
+# Pagy::DEFAULT[:link_extra] = 'data-remote="true"'            # example
+# Pagy::DEFAULT[:i18n_key]   = 'pagy.item_name'                # default
+# Pagy::DEFAULT[:cycle]      = true                            # example
+# Pagy::DEFAULT[:request_path] = "/foo"                        # example
+
+# Extras
+# See https://ddnexus.github.io/pagy/docs/extras
+
+# Backend Extras
+
+# Array extra: Paginate arrays efficiently, avoiding expensive array-wrapping and without overriding
+# See https://ddnexus.github.io/pagy/docs/extras/array
+# require 'pagy/extras/array'
+
+# Calendar extra: Add pagination filtering by calendar time unit (year, quarter, month, week, day)
+# See https://ddnexus.github.io/pagy/docs/extras/calendar
+# require 'pagy/extras/calendar'
+# Default for each unit
+# Pagy::Calendar::Year::DEFAULT[:order]     = :asc        # Time direction of pagination
+# Pagy::Calendar::Year::DEFAULT[:format]    = '%Y'        # strftime format
+#
+# Pagy::Calendar::Quarter::DEFAULT[:order]  = :asc        # Time direction of pagination
+# Pagy::Calendar::Quarter::DEFAULT[:format] = '%Y-Q%q'    # strftime format
+#
+# Pagy::Calendar::Month::DEFAULT[:order]    = :asc        # Time direction of pagination
+# Pagy::Calendar::Month::DEFAULT[:format]   = '%Y-%m'     # strftime format
+#
+# Pagy::Calendar::Week::DEFAULT[:order]     = :asc        # Time direction of pagination
+# Pagy::Calendar::Week::DEFAULT[:format]    = '%Y-%W'     # strftime format
+#
+# Pagy::Calendar::Day::DEFAULT[:order]      = :asc        # Time direction of pagination
+# Pagy::Calendar::Day::DEFAULT[:format]     = '%Y-%m-%d'  # strftime format
+#
+# Uncomment the following lines, if you need calendar localization without using the I18n extra
+# module LocalizePagyCalendar
+#   def localize(time, opts)
+#     ::I18n.l(time, **opts)
+#   end
+# end
+# Pagy::Calendar.prepend LocalizePagyCalendar
+
+# Countless extra: Paginate without any count, saving one query per rendering
+# See https://ddnexus.github.io/pagy/docs/extras/countless
+# require 'pagy/extras/countless'
+# Pagy::DEFAULT[:countless_minimal] = false   # default (eager loading)
+
+# Elasticsearch Rails extra: Paginate `ElasticsearchRails::Results` objects
+# See https://ddnexus.github.io/pagy/docs/extras/elasticsearch_rails
+# Default :pagy_search method: change only if you use also
+# the searchkick or meilisearch extra that defines the same
+# Pagy::DEFAULT[:elasticsearch_rails_pagy_search] = :pagy_search
+# Default original :search method called internally to do the actual search
+# Pagy::DEFAULT[:elasticsearch_rails_search] = :search
+# require 'pagy/extras/elasticsearch_rails'
+
+# Headers extra: http response headers (and other helpers) useful for API pagination
+# See http://ddnexus.github.io/pagy/extras/headers
+# require 'pagy/extras/headers'
+# Pagy::DEFAULT[:headers] = { page: 'Current-Page',
+#                            items: 'Page-Items',
+#                            count: 'Total-Count',
+#                            pages: 'Total-Pages' }     # default
+
+# Meilisearch extra: Paginate `Meilisearch` result objects
+# See https://ddnexus.github.io/pagy/docs/extras/meilisearch
+# Default :pagy_search method: change only if you use also
+# the elasticsearch_rails or searchkick extra that define the same method
+# Pagy::DEFAULT[:meilisearch_pagy_search] = :pagy_search
+# Default original :search method called internally to do the actual search
+# Pagy::DEFAULT[:meilisearch_search] = :ms_search
+# require 'pagy/extras/meilisearch'
+
+# Metadata extra: Provides the pagination metadata to Javascript frameworks like Vue.js, react.js, etc.
+# See https://ddnexus.github.io/pagy/docs/extras/metadata
+# you must require the frontend helpers internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
+# require 'pagy/extras/frontend_helpers'
+# require 'pagy/extras/metadata'
+# For performance reasons, you should explicitly set ONLY the metadata you use in the frontend
+# Pagy::DEFAULT[:metadata] = %i[scaffold_url page prev next last]   # example
+
+# Searchkick extra: Paginate `Searchkick::Results` objects
+# See https://ddnexus.github.io/pagy/docs/extras/searchkick
+# Default :pagy_search method: change only if you use also
+# the elasticsearch_rails or meilisearch extra that defines the same
+# DEFAULT[:searchkick_pagy_search] = :pagy_search
+# Default original :search method called internally to do the actual search
+# Pagy::DEFAULT[:searchkick_search] = :search
+# require 'pagy/extras/searchkick'
+# uncomment if you are going to use Searchkick.pagy_search
+# Searchkick.extend Pagy::Searchkick
+
+# Frontend Extras
+
+# Bootstrap extra: Add nav, nav_js and combo_nav_js helpers and templates for Bootstrap pagination
+# See https://ddnexus.github.io/pagy/docs/extras/bootstrap
+# require 'pagy/extras/bootstrap'
+
+# Bulma extra: Add nav, nav_js and combo_nav_js helpers and templates for Bulma pagination
+# See https://ddnexus.github.io/pagy/docs/extras/bulma
+# require 'pagy/extras/bulma'
+
+# Foundation extra: Add nav, nav_js and combo_nav_js helpers and templates for Foundation pagination
+# See https://ddnexus.github.io/pagy/docs/extras/foundation
+# require 'pagy/extras/foundation'
+
+# Materialize extra: Add nav, nav_js and combo_nav_js helpers for Materialize pagination
+# See https://ddnexus.github.io/pagy/docs/extras/materialize
+# require 'pagy/extras/materialize'
+
+# Navs extra: Add nav_js and combo_nav_js javascript helpers
+# Notice: the other frontend extras add their own framework-styled versions,
+# so require this extra only if you need the unstyled version
+# See https://ddnexus.github.io/pagy/docs/extras/navs
+# require 'pagy/extras/navs'
+
+# Semantic extra: Add nav, nav_js and combo_nav_js helpers for Semantic UI pagination
+# See https://ddnexus.github.io/pagy/docs/extras/semantic
+# require 'pagy/extras/semantic'
+
+# UIkit extra: Add nav helper and templates for UIkit pagination
+# See https://ddnexus.github.io/pagy/docs/extras/uikit
+# require 'pagy/extras/uikit'
+
+# Multi size var used by the *_nav_js helpers
+# See https://ddnexus.github.io/pagy/docs/extras/navs#steps
+# Pagy::DEFAULT[:steps] = { 0 => [2,3,3,2], 540 => [3,5,5,3], 720 => [5,7,7,5] }   # example
+
+# Feature Extras
+
+# Gearbox extra: Automatically change the number of items per page depending on the page number
+# See https://ddnexus.github.io/pagy/docs/extras/gearbox
+# require 'pagy/extras/gearbox'
+# set to false only if you want to make :gearbox_extra an opt-in variable
+# Pagy::DEFAULT[:gearbox_extra] = false               # default true
+# Pagy::DEFAULT[:gearbox_items] = [15, 30, 60, 100]   # default
+
+# Items extra: Allow the client to request a custom number of items per page with an optional selector UI
+# See https://ddnexus.github.io/pagy/docs/extras/items
+# require 'pagy/extras/items'
+# set to false only if you want to make :items_extra an opt-in variable
+# Pagy::DEFAULT[:items_extra] = false    # default true
+# Pagy::DEFAULT[:items_param] = :items   # default
+# Pagy::DEFAULT[:max_items]   = 100      # default
+
+# Overflow extra: Allow for easy handling of overflowing pages
+# See https://ddnexus.github.io/pagy/docs/extras/overflow
+# require 'pagy/extras/overflow'
+# Pagy::DEFAULT[:overflow] = :empty_page    # default  (other options: :last_page and :exception)
+
+# Support extra: Extra support for features like: incremental, infinite, auto-scroll pagination
+# See https://ddnexus.github.io/pagy/docs/extras/support
+# require 'pagy/extras/support'
+
+# Trim extra: Remove the page=1 param from links
+# See https://ddnexus.github.io/pagy/docs/extras/trim
+# require 'pagy/extras/trim'
+# set to false only if you want to make :trim_extra an opt-in variable
+# Pagy::DEFAULT[:trim_extra] = false # default true
+
+# Standalone extra: Use pagy in non Rack environment/gem
+# See https://ddnexus.github.io/pagy/docs/extras/standalone
+# require 'pagy/extras/standalone'
+# Pagy::DEFAULT[:url] = 'http://www.example.com/subdir'  # optional default
+
+# Rails
+# Enable the .js file required by the helpers that use javascript
+# (pagy*_nav_js, pagy*_combo_nav_js, and pagy_items_selector_js)
+# See https://ddnexus.github.io/pagy/docs/extras#javascript
+
+# With the asset pipeline
+# Sprockets need to look into the pagy javascripts dir, so add it to the assets paths
+# Rails.application.config.assets.paths << Pagy.root.join('javascripts')
+
+# I18n
+
+# Pagy internal I18n: ~18x faster using ~10x less memory than the i18n gem
+# See https://ddnexus.github.io/pagy/docs/api/frontend#i18n
+# Notice: No need to configure anything in this section if your app uses only "en"
+# or if you use the i18n extra below
+#
+# Examples:
+# load the "de" built-in locale:
+# Pagy::I18n.load(locale: 'de')
+#
+# load the "de" locale defined in the custom file at :filepath:
+# Pagy::I18n.load(locale: 'de', filepath: 'path/to/pagy-de.yml')
+#
+# load the "de", "en" and "es" built-in locales:
+# (the first passed :locale will be used also as the default_locale)
+# Pagy::I18n.load({ locale: 'de' },
+#                 { locale: 'en' },
+#                 { locale: 'es' })
+#
+# load the "en" built-in locale, a custom "es" locale,
+# and a totally custom locale complete with a custom :pluralize proc:
+# (the first passed :locale will be used also as the default_locale)
+# Pagy::I18n.load({ locale: 'en' },
+#                 { locale: 'es', filepath: 'path/to/pagy-es.yml' },
+#                 { locale: 'xyz',  # not built-in
+#                   filepath: 'path/to/pagy-xyz.yml',
+#                   pluralize: lambda{ |count| ... } )
+
+# I18n extra: uses the standard i18n gem which is ~18x slower using ~10x more memory
+# than the default pagy internal i18n (see above)
+# See https://ddnexus.github.io/pagy/docs/extras/i18n
+# require 'pagy/extras/i18n'
+
+# Default i18n key
+# Pagy::DEFAULT[:i18n_key] = 'pagy.item_name'   # default
+
+# When you are done setting your own default freeze it, so it will not get changed accidentally
+Pagy::DEFAULT.freeze

data/lib/slack-ruby-bot-server/config.rb

@@ -53,7 +53,7 @@ module SlackRubyBotServer
     end
 
     def oauth_scope_s
-      oauth_scope&.join('+')
+      oauth_scope&.join(',')
     end
 
     def activerecord?

data/lib/slack-ruby-bot-server/ext/bson/object_id.rb

@@ -1,12 +1,14 @@
 # see https://groups.google.com/forum/#!msg/mongoid/MaXFVw7D_4s/T3sl6Flg428J
-module BSON
-  class ObjectId
-    def as_json(_options = {})
-      to_s
-    end
+if defined?(:BSON)
+  module BSON
+    class ObjectId
+      def as_json(_options = {})
+        to_s
+      end
 
-    def to_bson_key(encoded = ''.force_encoding(BINARY))
-      to_s.to_bson_key(encoded)
+      def to_bson_key(encoded = ''.force_encoding(BINARY))
+        to_s.to_bson_key(encoded)
+      end
     end
   end
 end

data/lib/slack-ruby-bot-server/ext.rb

@@ -1,3 +1,2 @@
-%w[bson/object_id grape/sort_extension].each do |ext|
-  require_relative "ext/#{ext}"
-end
+require_relative 'ext/bson/object_id'
+require_relative 'ext/grape/sort_extension'

data/lib/slack-ruby-bot-server/version.rb

@@ -1,3 +1,3 @@
 module SlackRubyBotServer
-  VERSION = '1.2.1'.freeze
+  VERSION = '2.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Daniel Doubrovkine
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - dblock@dblock.org
 executables: []
@@ -202,10 +202,10 @@ files:
 - lib/slack-ruby-bot-server/config.rb
 - lib/slack-ruby-bot-server/config/database_adapters/activerecord.rb
 - lib/slack-ruby-bot-server/config/database_adapters/mongoid.rb
+- lib/slack-ruby-bot-server/config/pagy.rb
 - lib/slack-ruby-bot-server/ext.rb
 - lib/slack-ruby-bot-server/ext/bson/object_id.rb
 - lib/slack-ruby-bot-server/ext/grape/sort_extension.rb
-- lib/slack-ruby-bot-server/ext/mongoid/slack-ruby-bot/commands/base.rb
 - lib/slack-ruby-bot-server/info.rb
 - lib/slack-ruby-bot-server/loggable.rb
 - lib/slack-ruby-bot-server/models/team/activerecord.rb
@@ -230,7 +230,7 @@ files:
 homepage: https://github.com/slack-ruby/slack-ruby-bot-server
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -245,8 +245,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: A Grape API serving a Slack bot to multiple teams.
 test_files: []

data/lib/slack-ruby-bot-server/ext/mongoid/slack-ruby-bot/commands/base.rb

@@ -1,22 +0,0 @@
-module SlackRubyBot
-  module Commands
-    class Base
-      class << self
-        alias _invoke invoke
-
-        def invoke(client, data)
-          _invoke client, data
-        rescue Mongoid::Errors::Validations => e
-          logger.info "#{name.demodulize.upcase}: #{client.owner}, error - #{e.document.class}, #{e.document.errors.to_hash}"
-          client.say(channel: data.channel, text: e.document.errors.first[1])
-          true
-        rescue StandardError => e
-          logger.info "#{name.demodulize.upcase}: #{client.owner}, #{e.class}: #{e}"
-          logger.debug e.backtrace.join("\n")
-          client.say(channel: data.channel, text: e.message)
-          true
-        end
-      end
-    end
-  end
-end