grape-slack-bot 1.5.8 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b60e4e6431b476b397857caf09be7d11d1f2215e4ab5ab912e77c1289ab5285
-  data.tar.gz: 5a11a97b7ed08470a83163f4c77fa52eb895bdbe260159c87c2fbae1c302fe58
+  metadata.gz: c4cd56999a5a9b67729fe61e5f95a79f6a0ab89aeafaa43f7537b4501fe6b81a
+  data.tar.gz: 867a61f2c1f28c82f1c0d3e5bef97ecf6602176c7d89fe221d57c8161048b628
 SHA512:
-  metadata.gz: 669f0d6b4b8b5475b5fdcfe58d281d9b3b0f3f49fa6b083469708789cbf2fa2202d2cb427a78148a9502154325680a4c6d3f254e10367a25b17441c9b91fcfcf
-  data.tar.gz: 8c0e1357083e27ec6477c7cfd9a9f029178bfc38ad68af451af1cee21e16261744b6268782cdd9aada62aae83bfcae328182647f7157f4385ff5ca3de6701a9b
+  metadata.gz: 1bed9b092db2eaa13610c7e892663d2d5313321d49dc5e097b7278a1d12f9e47d812e101f153892b8b3d7a71cb5141a2fc189fd5689f54cbcd36ae747e7510f3
+  data.tar.gz: bce0459566f928181c2bef05062109d11f2633717c06e60841b2001c003bf0d317b92f234ed1eb7b0fdba0424120fd7fe6886f7753cedc3a2f784c3cd03a78c1

data/lib/slack_bot/command.rb

@@ -1,12 +1,10 @@
+require 'slack_bot/concerns/interaction_klass'
+require 'slack_bot/concerns/view_klass'
+
 module SlackBot
   class Command
-    def self.interaction(klass)
-      define_singleton_method(:interaction_klass) { klass }
-    end
-
-    def self.view(klass)
-      define_singleton_method(:view_klass) { klass }
-    end
+    include SlackBot::Concerns::InteractionKlass
+    include SlackBot::Concerns::ViewKlass
 
     attr_reader :current_user, :params, :args, :config
     def initialize(current_user:, params:, args:, config: nil)
@@ -48,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,
@@ -56,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/concerns/interaction_klass.rb

@@ -0,0 +1,17 @@
+module SlackBot::Concerns
+  module InteractionKlass
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def interaction_klass
+        raise SlackBot::Errors::InteractionClassNotImplemented.new(name)
+      end
+
+      def interaction(klass)
+        define_singleton_method(:interaction_klass) { klass }
+      end
+    end
+  end
+end

data/lib/slack_bot/concerns/pager_klass.rb

@@ -0,0 +1,17 @@
+module SlackBot::Concerns
+  module PagerKlass
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def pager_klass
+        SlackBot::Pager
+      end
+
+      def pager(klass)
+        define_singleton_method(:pager_klass) { klass }
+      end
+    end
+  end
+end

data/lib/slack_bot/concerns/view_klass.rb

@@ -0,0 +1,17 @@
+module SlackBot::Concerns
+  module ViewKlass
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def view_klass
+        raise SlackBot::Errors::ViewClassNotImplemented.new(name)
+      end
+
+      def view(klass)
+        define_singleton_method(:view_klass) { klass }
+      end
+    end
+  end
+end

data/lib/slack_bot/errors.rb

@@ -31,6 +31,20 @@ module SlackBot
       end
     end
 
+    class InteractionClassNotImplemented < SlackBot::Error
+      attr_reader :class_name
+      def initialize(class_name)
+        @class_name = class_name
+      end
+    end
+
+    class ViewClassNotImplemented < SlackBot::Error
+      attr_reader :class_name
+      def initialize(class_name)
+        @class_name = class_name
+      end
+    end
+
     class SlackResponseError < SlackBot::Error
       attr_reader :error, :data, :payload
       def initialize(error, data: nil, payload: nil)

data/lib/slack_bot/event.rb

@@ -1,12 +1,10 @@
+require 'slack_bot/concerns/interaction_klass'
+require 'slack_bot/concerns/view_klass'
+
 module SlackBot
   class Event
-    def self.interaction(klass)
-      define_singleton_method(:interaction_klass) { klass }
-    end
-
-    def self.view(klass)
-      define_singleton_method(:view_klass) { klass }
-    end
+    include SlackBot::Concerns::InteractionKlass
+    include SlackBot::Concerns::ViewKlass
 
     attr_reader :current_user, :params, :config, :callback, :metadata
     def initialize(current_user: nil, params: nil, callback: nil, config: nil)
@@ -34,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

@@ -1,19 +1,19 @@
 require 'active_support/core_ext/object'
 
+require 'slack_bot/concerns/view_klass'
+
 module SlackBot
   class Interaction
-    SlackViewsReply = Data.define(:callback_id, :view_id)
+    SlackViewsReply = Struct.new(:callback_id, :view_id)
 
-    def self.view(klass)
-      define_singleton_method(:view_klass) { klass }
-    end
+    include SlackBot::Concerns::ViewKlass
 
     def self.open_modal(
       trigger_id:,
       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/view.rb

@@ -1,14 +1,9 @@
 require 'active_support/core_ext/hash/indifferent_access'
+require 'slack_bot/concerns/pager_klass'
 
 module SlackBot
   class View
-    def self.pager_klass
-      SlackBot::Pager
-    end
-
-    def self.pager(klass)
-      define_singleton_method(:pager_klass) { klass }
-    end
+    include SlackBot::Concerns::PagerKlass
 
     attr_reader :args, :current_user, :params, :context, :config
     def initialize(current_user:, params:, args: nil, context: nil, config: nil)

data/lib/slack_bot.rb

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

data/spec/slack_bot/event_spec.rb

@@ -1,5 +1,74 @@
 require 'spec_helper'
 
 describe SlackBot::Event do
+  let(:current_user) { double(:current_user) }
+  let(:params) { double(:params) }
+  let(:callback) { double(:callback) }
+  let(:config) { double(:config) }
 
+  subject do
+    described_class.new(
+      current_user: current_user,
+      params: params,
+      callback: callback,
+      config: config
+    )
+  end
+
+  describe '.view_klass' do
+    it 'raises exception' do
+      expect { subject.class.view_klass }.to raise_error(SlackBot::Errors::ViewClassNotImplemented)
+    end
+
+    context "when view is called" do
+      before do
+        subject.class.view :view_name
+      end
+      it 'returns view_name' do
+        expect(subject.class.view_klass).to eq(:view_name)
+      end
+    end
+  end
+
+  describe '.interaction_klass' do
+    it 'raises exception' do
+      expect { subject.class.interaction_klass }.to raise_error(SlackBot::Errors::InteractionClassNotImplemented)
+    end
+    context "when interaction is called" do
+      before do
+        subject.class.interaction :interaction_name
+      end
+      it 'returns interaction_name' do
+        expect(subject.class.interaction_klass).to eq(:interaction_name)
+      end
+    end
+  end
+
+  describe '#initialize' do
+    it 'sets current_user' do
+      expect(subject.current_user).to eq(current_user)
+    end
+
+    it 'sets params' do
+      expect(subject.params).to eq(params)
+    end
+
+    it 'sets callback' do
+      expect(subject.callback).to eq(callback)
+    end
+
+    it 'sets config' do
+      expect(subject.config).to eq(config)
+    end
+  end
+
+  describe '#call' do
+    it 'returns nil' do
+      expect(subject.call).to eq(nil)
+    end
+  end
+
+  describe '#publish_view' do
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-slack-bot
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.6.1
 platform: ruby
 authors:
 - Andrei Makarov
@@ -167,6 +167,9 @@ files:
 - lib/slack_bot/callback.rb
 - lib/slack_bot/callback_storage.rb
 - lib/slack_bot/command.rb
+- lib/slack_bot/concerns/interaction_klass.rb
+- lib/slack_bot/concerns/pager_klass.rb
+- lib/slack_bot/concerns/view_klass.rb
 - lib/slack_bot/config.rb
 - lib/slack_bot/dev_console.rb
 - lib/slack_bot/error.rb