Skip to content

Commit 06b5792

Browse files
committed
Use Grape::API::Boolean instead of Virtus.
1 parent 7a8cdf9 commit 06b5792

File tree

5 files changed

+24
-28
lines changed

5 files changed

+24
-28
lines changed

CHANGELOG.md

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,55 +3,56 @@
33
#### 0.11.2 (Next)
44

55
* Your contribution here.
6+
* [#111](https://github.com/slack-ruby/slack-ruby-bot-server/pull/111): Removed dependency on Virtus - [@dblock](https://github.com/dblock).
67
* [#110](https://github.com/slack-ruby/slack-ruby-bot-server/pull/110): Fix ActiveRecord sample app - [@CeeBeeUK](https://github.com/CeeBeeUK).
78

89
#### 0.11.1 (2019/5/17)
910

10-
* [#104](https://github.com/slack-ruby/slack-ruby-bot-server/pull/104): Lock async-websocket at a compatible 0.8.0 version - [@dblock](https://github.com/dblock).
11+
* [#104](https://github.com/slack-ruby/slack-ruby-bot-server/pull/104): Locked async-websocket at a compatible 0.8.0 version - [@dblock](https://github.com/dblock).
1112

1213
#### 0.11.0 (2019/4/12)
1314

1415
* [#101](https://github.com/slack-ruby/slack-ruby-bot-server/pull/101): Removed legacy migrations, including `SLACK_API_TOKEN`, team `name`, `team_id` and `active` - [@dblock](https://github.com/dblock).
1516
* [#98](https://github.com/slack-ruby/slack-ruby-bot-server/pull/98): Removed `unicorn` from gem dependencies - [@dblock](https://github.com/dblock).
16-
* [#90](https://github.com/slack-ruby/slack-ruby-bot-server/pull/90): Update ActiveRecord sample app to support ENV variables in `postgresql.yml` - [@ashkan18](https://github.com/ashkan18).
17+
* [#90](https://github.com/slack-ruby/slack-ruby-bot-server/pull/90): Updated ActiveRecord sample app to support ENV variables in `postgresql.yml` - [@ashkan18](https://github.com/ashkan18).
1718

1819
#### 0.10.0 (2019/3/23)
1920

2021
* [#97](https://github.com/slack-ruby/slack-ruby-bot-server/pull/97): Added `Config#service_class` to override the `SlackRubyBotServer::Service.instance` singleton - [@dblock](https://github.com/dblock).
2122
* [#96](https://github.com/slack-ruby/slack-ruby-bot-server/pull/96): Added `Team#bot_user_id`, `activated_user_id` and `activated_user_access_token` - [@dblock](https://github.com/dblock).
22-
* [#95](https://github.com/slack-ruby/slack-ruby-bot-server/pull/95): Expose the optional `state` parameter that is returned from the Add to Slack button - [@aok-solutions](https://github.com/aok-solutions).
23+
* [#95](https://github.com/slack-ruby/slack-ruby-bot-server/pull/95): Exposed the optional `state` parameter that is returned from the Add to Slack button - [@aok-solutions](https://github.com/aok-solutions).
2324

2425
#### 0.9.0 (2019/2/25)
2526

2627
* [#93](https://github.com/slack-ruby/slack-ruby-bot-server/pull/93): Removed ping worker in favor of slack-ruby-client lower level ping - [@dblock](https://github.com/dblock).
2728

2829
#### 0.8.3 (2019/1/17)
2930

30-
* [#88](https://github.com/slack-ruby/slack-ruby-bot-server/issues/88): Fix: compatibility with Grape 1.2.x - [@dblock](https://github.com/dblock).
31+
* [#88](https://github.com/slack-ruby/slack-ruby-bot-server/issues/88): Fixed compatibility with Grape 1.2.x - [@dblock](https://github.com/dblock).
3132

3233
#### 0.8.2 (2018/10/11)
3334

34-
* [#80](https://github.com/slack-ruby/slack-ruby-bot-server/pull/80): Fix: closed stream when closing connection in ping worker - [@dblock](https://github.com/dblock).
35+
* [#80](https://github.com/slack-ruby/slack-ruby-bot-server/pull/80): Fixed closed stream when closing connection in ping worker - [@dblock](https://github.com/dblock).
3536

3637
#### 0.8.1 (2018/9/20)
3738

38-
* [#79](https://github.com/slack-ruby/slack-ruby-bot-server/pull/79): Fix: ping worker terminates on a failed restart - [@dblock](https://github.com/dblock).
39+
* [#79](https://github.com/slack-ruby/slack-ruby-bot-server/pull/79): Fixed ping worker terminates on a failed restart - [@dblock](https://github.com/dblock).
3940

4041
#### 0.8.0 (2018/9/8)
4142

42-
* [#75](https://github.com/slack-ruby/slack-ruby-bot-server/pull/75): Default to `async-websocket` instead of `celluloid-io` - [@dblock](https://github.com/dblock).
43-
* [#76](https://github.com/slack-ruby/slack-ruby-bot-server/pull/76): Adjust wait time on restart on Slack::Web::Api::Errors::TooManyRequestsError - [@dblock](https://github.com/dblock).
43+
* [#75](https://github.com/slack-ruby/slack-ruby-bot-server/pull/75): Defaulted to `async-websocket` instead of `celluloid-io` - [@dblock](https://github.com/dblock).
44+
* [#76](https://github.com/slack-ruby/slack-ruby-bot-server/pull/76): Adjusted wait time on restart on Slack::Web::Api::Errors::TooManyRequestsError - [@dblock](https://github.com/dblock).
4445

4546
#### 0.7.0 (2018/8/22)
4647

47-
* [#60](https://github.com/slack-ruby/slack-ruby-bot-server/pull/60): Log caught Standard::Error backtrace at debug-level - [@alexagranov](https://github.com/alexagranov).
48+
* [#60](https://github.com/slack-ruby/slack-ruby-bot-server/pull/60): Logged caught Standard::Error backtrace at debug-level - [@alexagranov](https://github.com/alexagranov).
4849
* [#65](https://github.com/slack-ruby/slack-ruby-bot-server/pull/65): Updated Capybara and selenium-webdriver - [@dblock](https://github.com/dblock).
4950
* [#67](https://github.com/slack-ruby/slack-ruby-bot-server/pull/67): Only load the OTR::ActiveRecord::ConnectionManagement middleware when the OTR module is included. This module isn't needed when using Rails - [@darbyfrey](https://github.com/darbyfrey).
5051
* [#74](https://github.com/slack-ruby/slack-ruby-bot-server/pull/74): Added ping worker, will restart offline bots - [@dblock](https://github.com/dblock).
5152

5253
#### 0.6.1 (2017/3/29)
5354

54-
* [#54](https://github.com/slack-ruby/slack-ruby-bot-server/pull/54): Removing one more Mongoid dependency when rescuing from _invoke - [@alexagranov](https://github.com/alexagranov).
55+
* [#54](https://github.com/slack-ruby/slack-ruby-bot-server/pull/54): Removed one more Mongoid dependency when rescuing from _invoke - [@alexagranov](https://github.com/alexagranov).
5556
* [#53](https://github.com/slack-ruby/slack-ruby-bot-server/pull/53): No need for `otr-activerecord` if using activerecord under Rails - [@alexagranov](https://github.com/alexagranov).
5657

5758
#### 0.6.0 (2017/3/12)
@@ -62,17 +63,17 @@
6263

6364
#### 0.5.0 (2017/2/9)
6465

65-
* [#43](https://github.com/slack-ruby/slack-ruby-bot-server/pull/43): Fix: `cannot load kaminari/grape` - [@dblock](https://github.com/dblock).
66-
* [#43](https://github.com/slack-ruby/slack-ruby-bot-server/pull/43): Fix: `undefined method '[]' for nil:NilClass` in APIs - [@dblock](https://github.com/dblock).
67-
* [#28](https://github.com/slack-ruby/slack-ruby-bot-server/pull/28): Use slack-ruby-danger gem - [@dblock](https://github.com/dblock).
68-
* [#31](https://github.com/slack-ruby/slack-ruby-bot-server/pull/31): Adds MONGODB_URI as environment variable for MongoDB - [@corprew](https://github.com/corprew).
66+
* [#43](https://github.com/slack-ruby/slack-ruby-bot-server/pull/43): Fixed `cannot load kaminari/grape` - [@dblock](https://github.com/dblock).
67+
* [#43](https://github.com/slack-ruby/slack-ruby-bot-server/pull/43): Fixed `undefined method '[]' for nil:NilClass` in APIs - [@dblock](https://github.com/dblock).
68+
* [#28](https://github.com/slack-ruby/slack-ruby-bot-server/pull/28): Used `slack-ruby-danger` gem - [@dblock](https://github.com/dblock).
69+
* [#31](https://github.com/slack-ruby/slack-ruby-bot-server/pull/31): Added `MONGODB_URI` as environment variable for MongoDB - [@corprew](https://github.com/corprew).
6970

7071
#### 0.4.0 (2016/8/29)
7172

7273
* [#25](https://github.com/slack-ruby/slack-ruby-bot-server/pull/25): Added [danger](http://danger.systems), PR linting - [@dblock](https://github.com/dblock).
7374
* The `reset` and `resetting` callbacks have been removed - [@dblock](https://github.com/dblock).
7475
* Callbacks receive `team` and `error`, but no longer `server` - [@dblock](https://github.com/dblock).
75-
* [#23](https://github.com/slack-ruby/slack-ruby-bot-server/issues/23): Fix: server-side removal of bot doesn't deactivate it - [@dblock](https://github.com/dblock).
76+
* [#23](https://github.com/slack-ruby/slack-ruby-bot-server/issues/23): Fixed server-side removal of bot doesn't deactivate it - [@dblock](https://github.com/dblock).
7677

7778
#### 0.3.1 (2016/7/10)
7879

@@ -96,13 +97,13 @@
9697

9798
* Initial public release - [@dblock](https://github.com/dblock).
9899
* Renamed slack-bot-server to slack-ruby-bot-server - [@dblock](https://github.com/dblock).
99-
* [#11](https://github.com/slack-ruby/slack-ruby-bot-server/pull/11): Turn project into gem - [@tmsrjs](https://github.com/tmsrjs).
100-
* Use `celluloid-io` instead of `faye-websocket`, upgrade to slack-ruby-bot 0.8.0 - [@dblock](https://github.com/dblock).
100+
* [#11](https://github.com/slack-ruby/slack-ruby-bot-server/pull/11): Turned project into gem - [@tmsrjs](https://github.com/tmsrjs).
101+
* Used `celluloid-io` instead of `faye-websocket`, upgrade to slack-ruby-bot 0.8.0 - [@dblock](https://github.com/dblock).
101102
* Fixed `SlackRubyBotServer#reset` - [@dblock](https://github.com/dblock).
102-
* Use Grape 0.15.x - [@dblock](https://github.com/dblock).
103+
* Used Grape 0.15.x - [@dblock](https://github.com/dblock).
103104
* Removed OOB GC - [@dblock](https://github.com/dblock).
104-
* Use Unicorn instead of Puma - [@dblock](https://github.com/dblock).
105-
* Fix: wait for EventMachine reactor to start - [@dblock](https://github.com/dblock).
106-
* Use an OOB GC - [@dblock](https://github.com/dblock).
107-
* Defer start, much faster - [@dblock](https://github.com/dblock).
105+
* Used Unicorn instead of Puma - [@dblock](https://github.com/dblock).
106+
* Fixed wait for EventMachine reactor to start - [@dblock](https://github.com/dblock).
107+
* Used an OOB GC - [@dblock](https://github.com/dblock).
108+
* Deferred start, much faster - [@dblock](https://github.com/dblock).
108109
* Backported changes from slack-metabot and slack-shellbot - [@dblock](https://github.com/dblock).

Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ when 'mongoid' then
77
gem 'mongoid-scroll'
88
gem 'mongoid-shell'
99
when 'activerecord' then
10-
gem 'virtus'
11-
1210
gem 'activerecord', '~> 5.0.0'
1311
gem 'otr-activerecord', '~> 1.2.1'
1412
gem 'cursor_pagination' # rubocop:disable Bundler/OrderedGems

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ def self.init!
2828
end
2929
end
3030

31-
::Boolean = Virtus::Attribute::Boolean
31+
::Boolean = Grape::API::Boolean

sample_apps/sample_app_activerecord/Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
source 'https://rubygems.org'
22

3-
gem 'virtus'
4-
53
gem 'activerecord', '~> 5.0.0', require: 'active_record'
64
gem 'newrelic-slack-ruby-bot'
75
gem 'otr-activerecord', '~> 1.2.1'

sample_apps/sample_app_activerecord/spec/spec_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
require 'active_record'
66
require 'database_cleaner'
7-
require 'virtus'
87
require 'slack-ruby-bot-server/rspec'
98

109
db_config = YAML.safe_load(File.read(File.expand_path('../config/postgresql.yml', __dir__)), [], [], true)[ENV['RACK_ENV']]

0 commit comments

Comments
 (0)