grape-slack-bot 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99c07a4830556a1a896dea28c85f7fade663c8b49b6e649d084e2bf115a8eacd
-  data.tar.gz: 6dcce44e9edaf18c97f62dbf65fa248d6b309caad9e9ed6dcf7cdf327a16f063
+  metadata.gz: 669dbf492365849f4628ed362f0a047e70d15cb80a62a236260be26d76fbaacc
+  data.tar.gz: e17819f3afa4096b5623c4a8d19f6443522c2010d528ac6a14fefc17fb3c3309
 SHA512:
-  metadata.gz: 64c24157366d85a69449488dde1aa029f562afde69e0b3c210241d2e4778675842ed9003012f9f19193e0ef04d5a45f48f0acd70bfae9a55cc831667d4c0ee25
-  data.tar.gz: a399297e42b45b7be8bd05587abeb9150fba0276953c1771a46c05bbaee7b29361181cb16fc5b672d58bd68fcfe869b706166dd664261b61ac86e45bd633b3a7
+  metadata.gz: 05de3c891473d52722c368bd587e7a90b7d8e9eaa96c4f6bd59bd4bbb5f867c265e2fab1b2e95076abd8b75c0dd9460a51ea460909afd538e9c0c0962fe8250c
+  data.tar.gz: c80d3a362202a526df44c32dad70270109ef344180d7d83d27cca9a24c9f308d422c7f8f91215a0a31b357ef2e86d14771b048f344051a7bc48ca27f80fa73d1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.3.0
+
+* Clean up callback arguments, remove unused `method_name`
+
+# 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

data/lib/slack_bot/callback.rb

@@ -14,19 +14,18 @@ module SlackBot
       nil
     end
 
-    def self.create(class_name:, method_name:, user:, channel_id: nil, config: nil)
+    def self.create(class_name:, user:, channel_id: nil, config: nil)
       callback =
-        new(class_name: class_name, method_name: method_name, user: user, channel_id: channel_id, config: config)
+        new(class_name: class_name, user: user, channel_id: channel_id, config: config)
       callback.save
       callback
     end
 
     attr_reader :id, :data, :args, :config
-    def initialize(id: nil, class_name: nil, method_name: nil, user: nil, channel_id: nil, extra: nil, config: nil)
+    def initialize(id: nil, class_name: nil, user: nil, channel_id: nil, extra: nil, config: nil)
       @id = id
       @data = {
         class_name: class_name,
-        method_name: method_name,
         user_id: user&.id,
         channel_id: channel_id,
         extra: extra

data/lib/slack_bot/command.rb

@@ -48,7 +48,7 @@ module SlackBot
 
     private
 
-    def open_modal(view_name, method_name: nil, context: nil)
+    def open_modal(view_name, context: nil)
       view = self.class.view_klass.new(
         args: args,
         current_user: @current_user,
@@ -61,7 +61,6 @@ module SlackBot
         trigger_id: params[:trigger_id],
         channel_id: params[:channel_id],
         class_name: self.class.name,
-        method_name: method_name,
         user: @current_user,
         payload: payload,
         config: config

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/interaction.rb

@@ -12,7 +12,6 @@ module SlackBot
       trigger_id:,
       payload:,
       class_name:,
-      method_name:,
       user:,
       channel_id:,
       config: nil
@@ -20,7 +19,6 @@ module SlackBot
       callback =
         Callback.create(
           class_name: class_name,
-          method_name: method_name,
           user: user,
           channel_id: channel_id,
           config: config
@@ -45,7 +43,6 @@ module SlackBot
       view_id:,
       payload:,
       class_name: nil,
-      method_name: nil,
       user: nil,
       channel_id: nil,
       config: nil
@@ -54,7 +51,6 @@ module SlackBot
       callback ||=
         Callback.create(
           class_name: class_name,
-          method_name: method_name,
           user: user,
           channel_id: channel_id,
           config: config

data/lib/slack_bot.rb

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

data/spec/slack_bot/callback_spec.rb

@@ -4,7 +4,6 @@ describe SlackBot::Callback do
   subject(:callback) {
     described_class.new(
       class_name: "Test",
-      method_name: "test",
       user: user,
       channel_id: "test_channel_id",
       extra: { test: "test" },
@@ -34,7 +33,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" }, args: "" } }
+      let(:data) { { class_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)
@@ -43,7 +42,6 @@ describe SlackBot::Callback do
         expect(find.user).to eq(user)
         expect(find.user_id).to eq(1)
         expect(find.channel_id).to eq("test_channel_id")
-        expect(find.method_name).to eq("test")
         expect(find.extra).to eq({ test: "test" })
       end
     end
@@ -58,21 +56,20 @@ describe SlackBot::Callback do
   end
 
   describe ".create" do
-    subject(:create) { described_class.create(class_name: "Test", method_name: "test", user: user, channel_id: "test_channel_id", config: config) }
+    subject(:create) { described_class.create(class_name: "Test", user: user, channel_id: "test_channel_id", 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: nil
       }, expires_in: 1.hour)
     end
 
-    let(:data) { { class_name: "Test", method_name: "test", user_id: 1, channel_id: "test_channel_id", extra: nil } }
+    let(:data) { { class_name: "Test", user_id: 1, channel_id: "test_channel_id", extra: nil } }
 
     it "returns callback" do
       expect(create).to be_a(described_class)
@@ -81,7 +78,6 @@ describe SlackBot::Callback do
       expect(create.user).to eq(user)
       expect(create.user_id).to eq(1)
       expect(create.channel_id).to eq("test_channel_id")
-      expect(create.method_name).to eq("test")
       expect(create.extra).to eq(nil)
     end
   end
@@ -94,7 +90,6 @@ describe SlackBot::Callback do
     let(:data) {
       {
         class_name: "Test",
-        method_name: "test",
         user_id: 1,
         channel_id: "test_channel_id",
         extra: { test: "test" },
@@ -113,7 +108,6 @@ describe SlackBot::Callback do
       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
 
@@ -131,7 +125,6 @@ describe SlackBot::Callback do
     let(:callback) {
       described_class.new(
         class_name: "Test",
-        method_name: "test",
         user: user,
         channel_id: "test_channel_id",
         extra: { test: "test" },
@@ -144,7 +137,6 @@ describe SlackBot::Callback 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" }
@@ -165,7 +157,6 @@ describe SlackBot::Callback do
       described_class.new(
         id: "test_callback_id",
         class_name: "Test",
-        method_name: "test",
         user: user,
         channel_id: "test_channel_id",
         extra: { test: "test" },
@@ -177,7 +168,6 @@ describe SlackBot::Callback 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" },

metadata

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