grape-slack-bot 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34be79021e713fec3adb16eaf1006303d01fb3e5da025daba80aa28ee6400bd8
-  data.tar.gz: 7c978813cafc6cb78c97d8db3001e90a9f5961eac73269e0c748e0b4fedcebc5
+  metadata.gz: 3472ece85beebd447e192f73013849e3e37a366fdc22b4f4864ef0908f58f502
+  data.tar.gz: 7f25928036698338c354238d9615ccd980d136a0c88056be1a1989304c95eae9
 SHA512:
-  metadata.gz: 1c55b60b6ea73f8528daee36229b9556f8c1fbe885caebd135181d561ed73629e5ebe4784ff2e7cdb9f3d581acc758db493112571f1d0c0eea8824e1613bd6ee
-  data.tar.gz: ed3c34753a2affe1dc01031ebc43af4fd5dea85279cf09cab6272893f81930f5099de57716dbf2cd0f4d5a63166175721bfe657234ead03ba094186f62f8babf
+  metadata.gz: a2902bfc733cd9aec81df154e0c43ac2bfe9eca7fd6105cb7b6d2f1ea1631daae093e2a96698388accaf35b46c4da826218333bab3c78bed7781c17583e01312
+  data.tar.gz: 04a70f1a3a5251d44d2b4bb21cdaa113296d50c51b0fae010f27f5c1a7caeb5b41eb635c6d349672701a5aef13c58f39249f8e740a2310ab5024dd822e7341ce

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.2.3
+
+* Minor fix for Events API
+
+# 1.2.2
+
+* `SlackBot::Callback.find` method will raise `SlackBot::Errors::CallbackNotFound` if callback is not resolved or has wrong data
+
 # 1.2.1
 
 * Extract `SlackBot::Logger` to separate file

data/lib/slack_bot/callback.rb

@@ -6,8 +6,12 @@ module SlackBot
     CALLBACK_CACHE_KEY = "slack-bot-callback".freeze
 
     def self.find(id, config: nil)
+      return if id.blank?
+
       callback = new(id: id, config: config)
       callback.reload
+    rescue SlackBot::Errors::CallbackNotFound
+      nil
     end
 
     def self.create(class_name:, method_name:, user:, channel_id: nil, config: nil)
@@ -34,6 +38,7 @@ module SlackBot
     def reload
       @data = read_data
       SlackBot::DevConsole.log_check("SlackBot::Callback#read_data: #{id} | #{data}")
+      raise SlackBot::Errors::CallbackNotFound if data.nil?
 
       parse_args
       self
@@ -83,7 +88,7 @@ module SlackBot
     private
 
     def parse_args
-      args.raw_args = data&.dig(:args)
+      args.raw_args = data.fetch(:args)
     end
 
     def serialize_args

data/lib/slack_bot/errors.rb

@@ -18,6 +18,9 @@ module SlackBot
     class MenuOptionsNotImplemented < SlackBot::Error
     end
 
+    class CallbackNotFound < SlackBot::Error
+    end
+
     class SlackResponseError < SlackBot::Error
       attr_reader :error, :data, :payload
       def initialize(error, data: nil, payload: nil)

data/lib/slack_bot/event.rb

@@ -22,11 +22,11 @@ module SlackBot
       params["event"]["type"]
     end
 
-    def publish_view(view_method_name)
+    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)
+          .new(current_user: current_user, params: params, context: context)
           .send(view_method_name)
       response =
         SlackBot::ApiClient.new.views_publish(user_id: user_id, view: view)

data/lib/slack_bot/grape_extension.rb

@@ -84,11 +84,9 @@ module SlackBot
 
         def handle_block_actions_view(view:, user:, params:)
           callback_id = view&.dig("callback_id")
-          callback = SlackBot::Callback.find(callback_id, config: config)
 
-          if callback.blank?
-            raise "Callback not found"
-          end
+          callback = SlackBot::Callback.find(callback_id, config: config)
+          raise SlackBot::Errors::CallbackNotFound.new if callback.blank?
 
           SlackBot::DevConsole.log_check "SlackApi::Interactions##{__method__}: #{callback.id} #{callback.extra} #{callback.user_id} #{user&.id}"
 

data/lib/slack_bot.rb

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

data/spec/slack_bot/callback_spec.rb

@@ -34,7 +34,7 @@ describe SlackBot::Callback do
     end
 
     context "when callback is found" do
-      let(:data) { { class_name: "Test", method_name: "test", user_id: 1, channel_id: "test_channel_id", extra: { test: "test" } } }
+      let(:data) { { class_name: "Test", method_name: "test", user_id: 1, channel_id: "test_channel_id", extra: { test: "test" }, args: "" } }
 
       it "returns callback" do
         expect(find).to be_a(described_class)
@@ -47,6 +47,14 @@ describe SlackBot::Callback do
         expect(find.extra).to eq({ test: "test" })
       end
     end
+
+    context "when callback is not found" do
+      let(:data) { nil }
+
+      it "returns nil" do
+        expect(find).to eq(nil)
+      end
+    end
   end
 
   describe ".create" do
@@ -79,15 +87,112 @@ describe SlackBot::Callback do
   end
 
   describe "#reload" do
+    subject(:reload) { callback.reload }
+    let(:callback) {
+      described_class.new(id: "test_callback_id", config: config)
+    }
+    let(:data) {
+      {
+        class_name: "Test",
+        method_name: "test",
+        user_id: 1,
+        channel_id: "test_channel_id",
+        extra: { test: "test" },
+        args: ""
+      }
+    }
+
+    before do
+      allow(callback_storage_instance).to receive(:read).with("slack-bot-callback:test_callback_id").and_return(data)
+    end
 
+    it "returns callback" do
+      expect(reload).to be_a(described_class)
+      expect(reload.id).to eq("test_callback_id")
+      expect(reload.class_name).to eq("Test")
+      expect(reload.user).to eq(user)
+      expect(reload.user_id).to eq(1)
+      expect(reload.channel_id).to eq("test_channel_id")
+      expect(reload.method_name).to eq("test")
+      expect(reload.extra).to eq({ test: "test" })
+    end
+
+    context "when callback is not found" do
+      let(:data) { nil }
+
+      it "raises error" do
+        expect { reload }.to raise_error(SlackBot::Errors::CallbackNotFound)
+      end
+    end
   end
 
   describe "#save" do
+    subject(:save) { callback.save }
+    let(:callback) {
+      described_class.new(
+        class_name: "Test",
+        method_name: "test",
+        user: user,
+        channel_id: "test_channel_id",
+        extra: { test: "test" },
+        config: config
+      )
+    }
+
+    before do
+      allow_any_instance_of(described_class).to receive(:generate_id).and_return("test_callback_id")
+      allow(callback_storage_instance).to receive(:write).with("slack-bot-callback:test_callback_id", {
+        args: "",
+        class_name: "Test",
+        method_name: "test",
+        user_id: 1,
+        channel_id: "test_channel_id",
+        extra: { test: "test" }
+      }, expires_in: 1.hour)
+    end
 
+    it "returns callback" do
+      expect { save }.not_to raise_error
+      expect(callback).to be_a(described_class)
+      expect(callback.id).to eq("test_callback_id")
+      expect(callback.args).to be_a(SlackBot::Args)
+    end
   end
 
   describe "#update" do
+    subject(:update) { callback.update(payload) }
+    let(:callback) {
+      described_class.new(
+        id: "test_callback_id",
+        class_name: "Test",
+        method_name: "test",
+        user: user,
+        channel_id: "test_channel_id",
+        extra: { test: "test" },
+        config: config
+      )
+    }
 
+    before do
+      allow(callback_storage_instance).to receive(:write).with("slack-bot-callback:test_callback_id", {
+        args: "",
+        class_name: "Test",
+        method_name: "test",
+        user_id: 1,
+        channel_id: "test_channel_id",
+        extra: { test: "test" },
+        test: "test"
+      }, expires_in: 1.hour)
+    end
+
+    let(:payload) { { test: "test" } }
+
+    it "returns callback" do
+      expect { update }.not_to raise_error
+      expect(callback).to be_a(described_class)
+      expect(callback.id).to eq("test_callback_id")
+      expect(callback.args).to be_a(SlackBot::Args)
+    end
   end
 
   describe "#destroy" do

metadata

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