Merge pull request #140 from dblock/name-error

Fix: NameError for Boolean with Mongoid 7.3.0.

Author: dblock

.travis.yml

@@ -15,7 +15,23 @@ matrix:
         - xvfb
         - postgresql
     - rvm: 2.6.2
-      env: DATABASE_ADAPTER=mongoid
+      env:
+        - DATABASE_ADAPTER=mongoid
+        - MONGOID_VERSION=6.4.8
+      services:
+        - xvfb
+        - mongodb
+    - rvm: 2.6.2
+      env:
+        - DATABASE_ADAPTER=mongoid
+        - MONGOID_VERSION=7.2.3
+      services:
+        - xvfb
+        - mongodb
+    - rvm: 2.6.2
+      env:
+        - DATABASE_ADAPTER=mongoid
+        - MONGOID_VERSION=7.3.0
       services:
         - xvfb
         - mongodb

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 #### 1.2.1 (Next)
 
+* [#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).
 * Your contribution here.
 
 #### 1.2.0 (2020/11/27)

Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 case ENV['DATABASE_ADAPTER']
 when 'mongoid' then
   gem 'kaminari-mongoid'
-  gem 'mongoid'
+  gem 'mongoid', ENV['MONGOID_VERSION'] || '~> 7.3.0'
   gem 'mongoid-scroll'
   gem 'mongoid-shell'
 when 'activerecord' then
@@ -23,10 +23,10 @@ group :development, :test do
   gem 'bundler'
   gem 'byebug'
   gem 'capybara', '~> 2.15.1'
-  gem 'database_cleaner'
+  gem 'database_cleaner', '~> 1.8.5'
   gem 'fabrication'
   gem 'faker'
-  gem 'hyperclient'
+  gem 'hyperclient', '~> 0.9.3'
   gem 'rack-server-pages'
   gem 'rack-test'
   gem 'rake'
@@ -35,6 +35,7 @@ group :development, :test do
   gem 'selenium-webdriver', '~> 3.4.4'
   gem 'vcr'
   gem 'webmock'
+  gem 'webrick', '~> 1.6.1'
 end
 
 group :test do

lib/slack-ruby-bot-server/api/endpoints/teams_endpoint.rb

@@ -19,7 +19,7 @@ class TeamsEndpoint < Grape::API
 
           desc 'Get all the teams.'
           params do
-            optional :active, type: Boolean, desc: 'Return active teams only.'
+            optional :active, type: ::Grape::API::Boolean, desc: 'Return active teams only.'
             use :pagination
           end
           sort Team::SORT_ORDERS

lib/slack-ruby-bot-server/api/presenters/team_presenter.rb

@@ -10,7 +10,7 @@ module TeamPresenter
         property :team_id, type: String, desc: 'Slack team ID.'
         property :name, type: String, desc: 'Team name.'
         property :domain, type: String, desc: 'Team domain.'
-        property :active, type: Boolean, desc: 'Team is active.'
+        property :active, type: ::Grape::API::Boolean, desc: 'Team is active.'
         property :created_at, type: DateTime, desc: 'Date/time when the team was created.'
         property :updated_at, type: DateTime, desc: 'Date/time when the team was accepted, declined or canceled.'
 

lib/slack-ruby-bot-server/models/team/mongoid.rb

@@ -10,7 +10,7 @@ class Team
   field :token, type: String
   field :oauth_scope, type: String
   field :oauth_version, type: String, default: 'v1'
-  field :active, type: Boolean, default: true
+  field :active, type: Mongoid::Boolean, default: true
   field :bot_user_id, type: String
   field :activated_user_id, type: String
   field :activated_user_access_token, type: String

spec/spec_helper.rb

@@ -5,6 +5,7 @@
 
 require 'hyperclient'
 require 'webmock/rspec'
+require 'rack/test'
 require 'slack-ruby-bot-server/rspec'
 
 Dir[File.join(__dir__, 'support', '**/*.rb')].each do |file|