grape-slack-bot 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34be79021e713fec3adb16eaf1006303d01fb3e5da025daba80aa28ee6400bd8
-  data.tar.gz: 7c978813cafc6cb78c97d8db3001e90a9f5961eac73269e0c748e0b4fedcebc5
+  metadata.gz: 99c07a4830556a1a896dea28c85f7fade663c8b49b6e649d084e2bf115a8eacd
+  data.tar.gz: 6dcce44e9edaf18c97f62dbf65fa248d6b309caad9e9ed6dcf7cdf327a16f063
 SHA512:
-  metadata.gz: 1c55b60b6ea73f8528daee36229b9556f8c1fbe885caebd135181d561ed73629e5ebe4784ff2e7cdb9f3d581acc758db493112571f1d0c0eea8824e1613bd6ee
-  data.tar.gz: ed3c34753a2affe1dc01031ebc43af4fd5dea85279cf09cab6272893f81930f5099de57716dbf2cd0f4d5a63166175721bfe657234ead03ba094186f62f8babf
+  metadata.gz: 64c24157366d85a69449488dde1aa029f562afde69e0b3c210241d2e4778675842ed9003012f9f19193e0ef04d5a45f48f0acd70bfae9a55cc831667d4c0ee25
+  data.tar.gz: a399297e42b45b7be8bd05587abeb9150fba0276953c1771a46c05bbaee7b29361181cb16fc5b672d58bd68fcfe869b706166dd664261b61ac86e45bd633b3a7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 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.rb

@@ -22,5 +22,5 @@ require 'slack_bot/pager'
 require 'slack_bot/grape_extension'
 
 module SlackBot
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.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.2
 platform: ruby
 authors:
 - Andrei Makarov