Merge pull request #112 from dblock/multiple-events

Added support for multiple .on events as an argument.

Author: dblock

CHANGELOG.md

@@ -5,6 +5,7 @@
 * Your contribution here.
 * [#111](https://github.com/slack-ruby/slack-ruby-bot-server/pull/111): Removed dependency on Virtus - [@dblock](https://github.com/dblock).
 * [#110](https://github.com/slack-ruby/slack-ruby-bot-server/pull/110): Fix ActiveRecord sample app - [@CeeBeeUK](https://github.com/CeeBeeUK).
+* [#112](https://github.com/slack-ruby/slack-ruby-bot-server/pull/112): Added support for multiple `.on` events as an argument - [@dblock](https://github.com/dblock).
 
 #### 0.11.1 (2019/5/17)
 

README.md

@@ -138,6 +138,10 @@ You can introduce custom behavior into the service lifecycle via callbacks. This
 ```ruby
 instance = SlackRubyBotServer::Service.instance
 
+instance.on :started, :stopped do |team|
+  # team has been started or stopped
+end
+
 instance.on :created do |team, error, options|
   # a new team has been registered
 end

lib/slack-ruby-bot-server/service.rb

@@ -17,8 +17,10 @@ def initialize
       @callbacks = Hash.new { |h, k| h[k] = [] }
     end
 
-    def on(type, &block)
-      @callbacks[type.to_s] << block
+    def on(*types, &block)
+      Array(types).each do |type|
+        @callbacks[type.to_s] << block
+      end
     end
 
     def create!(team, options = {})

spec/slack-ruby-bot-server/service_spec.rb

@@ -87,6 +87,42 @@ def initialize(options = {})
       expect(@events).to eq %w[starting started stopping stopped]
     end
   end
+  context 'multiple callbacks' do
+    before do
+      @events = []
+      SlackRubyBotServer::Service.instance.tap do |instance|
+        instance.on :starting, :stopping do |team|
+          expect(team).to_not be_nil
+          @events << 'call'
+        end
+      end
+    end
+    it 'invokes starting and stopping callbacks' do
+      allow_any_instance_of(SlackRubyBotServer::Server).to receive(:start_async)
+      SlackRubyBotServer::Service.instance.start!(team)
+      allow_any_instance_of(SlackRubyBotServer::Server).to receive(:stop!)
+      SlackRubyBotServer::Service.instance.stop!(team)
+      expect(@events).to eq %w[call call]
+    end
+  end
+  context 'multiple callback blocks' do
+    before do
+      @events = []
+      SlackRubyBotServer::Service.instance.tap do |instance|
+        instance.on :starting, :starting do |team|
+          expect(team).to_not be_nil
+          @events << 'starting'
+        end
+      end
+    end
+    it 'invokes starting and stopping callbacks' do
+      allow_any_instance_of(SlackRubyBotServer::Server).to receive(:start_async)
+      SlackRubyBotServer::Service.instance.start!(team)
+      allow_any_instance_of(SlackRubyBotServer::Server).to receive(:stop!)
+      SlackRubyBotServer::Service.instance.stop!(team)
+      expect(@events).to eq %w[starting starting]
+    end
+  end
   context 'overriding service_class' do
     let(:service_class) do
       Class.new(SlackRubyBotServer::Service) do