grape-slack-bot 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d1e2ef3d6febf5115a2d8276cb673f6ed5559ee9a3db93116bd7171bade5bf0
-  data.tar.gz: ec20059fae8d6c3198ac5d989d8a61913a780f3b45c4345c7b744d46a31e50f7
+  metadata.gz: 82392f6ebad8f2ffdf5eb575cfb6c76773567805144202cd8d9ca3124fc7352e
+  data.tar.gz: 8829c6658a0577206e927f1750b4d5c063c4666abc1d37b2428134ec65f05358
 SHA512:
-  metadata.gz: 2be7aab3a38801d1b8e8f1581badb224a9e3767f638805c69d1a7efcf59ad8e8be75589a49c636c2fe0793591f431063ea824688fbf8cce1647020151bc970c1
-  data.tar.gz: 36821a7bc17bf1641c3d0a8da65497ec46a35713b7b71abed8a95c38c7cff276d501483c8d378c56105bd60669b421d31ae879f0de15f09c4d42143de2d2f6dc
+  metadata.gz: 23f3d1b7e26aa66af1e8e0a0f0ca74c4b534b016a341aed1c1d47746e46a9df9d6280eb1a5671d75a331ed6f36c79e16cd08e37486ce521d051d656b1966ffd6
+  data.tar.gz: e1f2d01b86e6134a49f92f2a84d5ed9f7943a1a80f8b6c528f941f5de431dbd8fdff48c13d03407a79db1a93846acc32cc9d32055975dcc20e2565f13830444a

data/README.md

@@ -141,6 +141,7 @@ SlackBot::Config.configure do
 
   # TODO: Register event handlers
   event :app_home_opened, MySlackBot::AppHomeOpenedEvent
+  interaction MySlackBot::AppHomeInteraction
 
   # TODO: Register slash command handlers
   slash_command_endpoint :game, MySlackBot::Game::MenuCommand do

data/lib/slack_bot/command.rb

@@ -46,7 +46,7 @@ module SlackBot
 
     private
 
-    def open_modal(view_name, context: nil)
+    def render_view(view_name, context: nil)
       view = self.class.view_klass.new(
         args: args,
         current_user: @current_user,
@@ -54,13 +54,17 @@ module SlackBot
         context: context,
         config: config
       )
-      payload = view.send(view_name)
+      view.send(view_name)
+    end
+
+    def open_modal(view_name, context: nil)
+      view_payload = render_view(view_name, context: context)
       self.class.interaction_klass.open_modal(
         trigger_id: params[:trigger_id],
         channel_id: params[:channel_id],
         class_name: self.class.name,
         user: @current_user,
-        payload: payload,
+        payload: view_payload,
         config: config
       )
       render_response

data/lib/slack_bot/config.rb

@@ -21,12 +21,18 @@ module SlackBot
       @callback_user_finder_method = method_lambda
     end
 
+    def interaction(interaction_klass, handler_name: nil)
+      handler_name ||= interaction_klass.name
+      handler_class(handler_name, interaction_klass)
+    end
+
     def event_handlers
       @event_handlers ||= {}
     end
 
-    def event(event_type, event_klass)
-      handler_class(event_klass.name, event_klass)
+    def event(event_type, event_klass, handler_name: nil)
+      handler_name ||= event_klass.name
+      handler_class(handler_name, event_klass)
       event_handlers[event_type.to_sym] = event_klass
     end
 
@@ -34,12 +40,17 @@ module SlackBot
       event_handlers[event_type.to_sym]
     end
 
-    def slash_command_endpoint(url_token, command_klass = nil, &block)
+    def slash_command_endpoint(url_token, command_klass = nil, handler_name: nil, &block)
       @slash_command_endpoints ||= {}
       @slash_command_endpoints[url_token.to_sym] ||=
         begin
           endpoint =
-            SlashCommandEndpointConfig.new(url_token, command_klass: command_klass, config: self)
+            SlashCommandEndpointConfig.new(
+              url_token,
+              command_klass: command_klass,
+              config: self,
+              handler_name: handler_name
+            )
           endpoint.instance_eval(&block) if block_given?
           endpoint
         end
@@ -81,16 +92,19 @@ module SlackBot
 
   class SlashCommandEndpointConfig
     attr_reader :url_token, :command_klass, :routes, :config
-    def initialize(url_token, config:, command_klass: nil, routes: {})
+    def initialize(url_token, config:, command_klass: nil, routes: {}, handler_name: nil)
       @url_token = url_token
       @command_klass = command_klass
       @routes = routes
       @config = config
 
-      config.handler_class(command_klass.name, command_klass) if command_klass.present?
+      if command_klass.present?
+        handler_name ||= command_klass.name
+        config.handler_class(handler_name, command_klass)
+      end
     end
 
-    def command(command_token, command_klass, &block)
+    def command(command_token, command_klass, handler_name: nil, &block)
       @command_configs ||= {}
       @command_configs[command_token.to_sym] ||=
         begin
@@ -98,7 +112,8 @@ module SlackBot
             SlashCommandConfig.new(
               command_klass: command_klass,
               token: command_token,
-              endpoint: self
+              endpoint: self,
+              handler_name: handler_name
             )
           command.instance_eval(&block) if block_given?
           command
@@ -127,14 +142,16 @@ module SlackBot
     end
 
     attr_accessor :command_klass, :token, :parent_configs, :endpoint
-    def initialize(command_klass:, token:, endpoint:, parent_configs: [])
+    def initialize(command_klass:, token:, endpoint:, parent_configs: [], handler_name: nil)
       @command_klass = command_klass
       @token = token
       @parent_configs = parent_configs || []
       @endpoint = endpoint
 
       endpoint.routes[full_token] = self
-      endpoint.config.handler_class(command_klass.name, command_klass)
+
+      handler_name ||= command_klass.name
+      endpoint.config.handler_class(handler_name, command_klass)
     end
 
     def argument_command(argument_token, klass = nil, &block)

data/lib/slack_bot/event.rb

@@ -32,12 +32,20 @@ module SlackBot
       params["event"]["type"]
     end
 
+    def render_view(view_name, context: nil)
+      view = self.class.view_klass.new(
+        args: callback&.args,
+        current_user: current_user,
+        params: params,
+        context: context,
+        config: config
+      )
+      view.send(view_name)
+    end
+
     def publish_view(view_method_name, context: nil)
       user_id = params["event"]["user"]
-      view =
-        self.class.view_klass
-          .new(current_user: current_user, params: params, context: context)
-          .send(view_method_name)
+      view = render_view(view_method_name, context: context)
       view = view.merge(callback_id: callback.id) if callback.present?
       view = view.merge(private_metadata: metadata) if metadata.present?
       response =

data/lib/slack_bot/interaction.rb

@@ -13,7 +13,7 @@ module SlackBot
       payload:,
       class_name:,
       user:,
-      channel_id:,
+      channel_id: nil,
       config: nil
     )
       callback =
@@ -91,20 +91,33 @@ module SlackBot
       payload["actions"]
     end
 
+    def render_view(view_name, context: nil)
+      view = self.class.view_klass.new(
+        args: callback&.args,
+        current_user: current_user,
+        params: params,
+        context: context,
+        config: config
+      )
+      view.send(view_name)
+    end
+
+    def open_modal(view_name, context: nil)
+      view_payload = render_view(view_name, context: context)
+      self.class.open_modal(
+        trigger_id: payload["trigger_id"],
+        payload: view_payload,
+        class_name: self.class.name,
+        user: current_user,
+        config: config
+      )
+    end
+
     def update_modal(view_name, context: nil)
       return if callback.blank?
 
       view_id = payload["view"]["id"]
-      args = callback.args
-      view =
-        self.class.view_klass.new(
-          args: args,
-          current_user: current_user,
-          params: params,
-          context: context,
-          config: config
-        )
-      payload = view.send(view_name)
+      payload = render_view(view_name, context: context)
 
       self.class.update_modal(
         view_id: view_id,

data/lib/slack_bot.rb

@@ -22,5 +22,5 @@ require 'slack_bot/pager'
 require 'slack_bot/grape_extension'
 
 module SlackBot
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-slack-bot
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Andrei Makarov