kybus-bot 0.11.1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6027eb3dbf33a839ee3b209eda5c8175a75372a3b03021cf171d07794f9ba1b2
-  data.tar.gz: 1271955a903acbbebecec80eca93302f144bd97ec70b93ad6c2d6171381942a7
+  metadata.gz: 5621cdb73308df7a7580e484959a825170aa1e9028c3ad55950c86a4ca6f5a2c
+  data.tar.gz: caec550063dfc742d65687f8c8dda7de87cb91acb4409c9b81ac823e52843f14
 SHA512:
-  metadata.gz: bee0655c5cc486692a84b0e63cace81b3c0028cd10c88699d486d0e05714acb866f9afc68708b66e1bc3a5c5d94aebc43a04ceb875c99331d7d600faea02d39c
-  data.tar.gz: db7c59187ff02ca0931382d4ad49a9483047dff4ac6c55217aa68ffbcc6c6a9caa5ef4d5416b773e0a51c280e019d6865f359cb70f5689b9b127c6401190e0e7
+  metadata.gz: 98558bf269ec8e876e76eeca9c0ecbc308424db2dd14697f1ef8813e42e917fb1603875a6c3cf541ba5707ec0c2c3e6d86fbd972c13c95e8a0b8f39d5e664a65
+  data.tar.gz: bf47207fae0a45f1608470f480175a9ae4084a96080197bece81c2f793d87c4a4fc5b41bd743c838a6359e64fc743ef94d2014b81b9d4c766e0c29ecc7d73451

data/lib/kybus/bot/adapters/debug.rb

@@ -11,6 +11,7 @@ module Kybus
       # Wraps a debugging message inside a class.
       class DebugMessage < Kybus::Bot::Message
         # It receives a string with the raw text and the id of the channel
+        attr_accessor :replied_message
         attr_reader :attachment, :message_id
 
         class DebugFile
@@ -67,7 +68,7 @@ module Kybus
         end
 
         def reply?
-          @reply
+          !!@replied_message
         end
 
         def is_private?
@@ -91,6 +92,8 @@ module Kybus
           @echo = echo
         end
 
+        attr_reader :last_sent_message
+
         # Checks if there are messages open or that has not been answered
         def open?
           @state == :open
@@ -120,7 +123,7 @@ module Kybus
         def answer(message, attachment = nil)
           send_data(message, attachment)
           @state = :open
-          DebugMessage.new(message, @name)
+          @last_sent_message = DebugMessage.new(message, @name)
         end
       end
 
@@ -199,10 +202,7 @@ module Kybus
           end
         end
 
-        include Kybus::Logger
-
         def message_builder(msg)
-          log_info('Building message object', msg:, msg_class: msg.class.name)
           msg
         end
 

data/lib/kybus/bot/base.rb

@@ -44,7 +44,7 @@ module Kybus
         @definitions = Kybus::Bot::CommandDefinition.new
         repository = create_repository(configs)
         command_factory = CommandStateFactory.new(repository, @definitions)
-        @executor = create_executor(configs, command_factory)
+        create_executor(configs, command_factory)
         register_default_command
         register_abort_handler
         build_forker(configs)
@@ -70,8 +70,9 @@ module Kybus
       end
 
       def handle_job(job, args, channel_id)
-        @executor.execution_context.load_state!(channel_id)
+        @executor.load_state!(channel_id)
         @forker.handle_job(job, args)
+        @executor.save_state!
       end
 
       def run
@@ -92,7 +93,7 @@ module Kybus
         definitions.register_command(klass, params, &)
       end
 
-      def register_job(name, args, &)
+      def register_job(name, args = {}, &)
         @forker.register_command(name, args, &)
       end
 
@@ -100,6 +101,10 @@ module Kybus
         @forker.fork(name, args, dsl)
       end
 
+      def invoke_job_with_delay(name, delay, args)
+        @forker.fork(name, args, dsl, delay:)
+      end
+
       def rescue_from(klass, &)
         definitions.register_command(klass, [], &)
       end
@@ -119,12 +124,12 @@ module Kybus
       end
 
       def create_executor(configs, command_factory)
-        if configs['sidekiq']
-          require_relative 'sidekiq_command_executor'
-          Kybus::Bot::SidekiqCommandExecutor.new(self, command_factory, configs)
-        else
-          Kybus::Bot::CommandExecutor.new(self, command_factory, configs['inline_args'])
-        end
+        @executor = if configs['sidekiq']
+                      require_relative 'sidekiq_command_executor'
+                      Kybus::Bot::SidekiqCommandExecutor.new(self, command_factory, configs)
+                    else
+                      Kybus::Bot::CommandExecutor.new(self, command_factory, configs['inline_args'])
+                    end
       end
 
       def register_default_command

data/lib/kybus/bot/command/command_state.rb

@@ -20,7 +20,7 @@ module Kybus
       end
 
       def to_h
-        { command: command.name, data: @data.to_h.merge(last_message: @data[:last_message]&.to_h) }
+        { command: command&.name, data: @data.to_h.merge(last_message: @data[:last_message]&.to_h) }
       end
 
       def clear_command
@@ -40,6 +40,10 @@ module Kybus
       end
 
       def last_message
+        if @data[:last_message].is_a?(String)
+          @data[:last_message] =
+            SerializedMessage.from_json(parse_json(@data[:last_message]))
+        end
         @data[:last_message]
       end
 
@@ -80,9 +84,11 @@ module Kybus
       end
 
       def metadata
+        @data[:metadata] = parse_json(@data[:metadata]) if @data[:metadata].is_a?(String)
         @data[:metadata] || {}
       end
 
+      include Kybus::Logger
       def save!
         backup = @data.clone
         serialize_data!
@@ -107,7 +113,7 @@ module Kybus
 
       def serialize_data!
         %i[params files last_message metadata].each do |param|
-          @data[param] = @data[param].to_json
+          @data[param] = @data[param].to_json unless @data[param].is_a?(String)
         end
       end
     end

data/lib/kybus/bot/command_executor.rb

@@ -45,7 +45,7 @@ module Kybus
       end
 
       def process_message(message)
-        setup_execution_context(message)
+        load_state!(message.channel_id)
         @parameter_saver.save_token!(message)
         msg = @command_handler.run_command_or_prepare!
         save_execution_context!
@@ -84,12 +84,17 @@ module Kybus
         execution_context.next_param = param
       end
 
-      private
+      def load_state!(channel_id)
+        @execution_context = ExecutionContest.new(channel_id, @channel_factory)
+        @dsl.state = @execution_context.state
+      end
 
-      def setup_execution_context(message)
-        @execution_context = ExecutionContest.new(message.channel_id, @channel_factory)
+      def save_state!
+        @dsl.state.save!
       end
 
+      private
+
       def set_state_command(command, args)
         state.command = command
         command.params.zip(args).each do |param, value|

data/lib/kybus/bot/dsl_methods.rb

@@ -77,6 +77,10 @@ module Kybus
         state&.command&.name
       end
 
+      def save_metadata!
+        state.save!
+      end
+
       def redirect(*)
         @bot.redirect(*)
       end
@@ -88,6 +92,10 @@ module Kybus
       def fork(command, arguments = {})
         @bot.invoke_job(command, arguments)
       end
+
+      def fork_with_delay(command, delay, arguments = {})
+        @bot.invoke_job_with_delay(command, delay, arguments)
+      end
     end
   end
 end

data/lib/kybus/bot/forkers/base.rb

@@ -38,13 +38,13 @@ module Kybus
           @command_definition.register_command(command, arguments, &)
         end
 
-        def fork(command, arguments, dsl)
+        def fork(command, arguments, dsl, delay: 0)
           job_definition = @command_definition[command]
           raise JobNotFound if job_definition.nil?
 
           raise JobNotReady unless job_definition.ready?(arguments)
 
-          invoke(command, arguments, job_definition, dsl)
+          invoke(command, arguments, job_definition, dsl, delay:)
         end
 
         def handle_job(command, args)
@@ -53,7 +53,6 @@ module Kybus
             @args = args
             instance_eval(&job_definition.block)
           end
-          log_info('Job Executed', command:, args:)
         end
       end
     end

data/lib/kybus/bot/forkers/lambda_sqs_forker.rb

@@ -17,8 +17,9 @@ module Kybus
           @queue_url = @client.get_queue_url(queue_name: @queue).queue_url
         end
 
-        def invoke(command, args, _job_definition, dsl)
-          @client.send_message(queue_url: @queue_url, message_body: make_message(command, args, dsl).to_json)
+        def invoke(command, args, _job_definition, dsl, delay: 0)
+          @client.send_message(queue_url: @queue_url,
+                               message_body: make_message(command, args, dsl).to_json, delay_seconds: delay)
         end
 
         def make_message(command, args, dsl)

data/lib/kybus/bot/forkers/thread_forker.rb

@@ -4,10 +4,10 @@ module Kybus
   module Bot
     module Forkers
       class ThreadForker < Base
-        def invoke(command, args, _job_definition, _dsl)
+        def invoke(command, args, _job_definition, dsl, delay: 0)
           Thread.new do
-            log_info('Forking job', command:)
-            handle_job(command, args)
+            sleep(delay) if delay.positive?
+            @bot.handle_job(command, args, dsl.state.channel_id)
           end
         end
       end

data/lib/kybus/bot/test.rb

@@ -5,6 +5,17 @@ require_relative 'adapters/debug'
 
 module Kybus
   module Bot
+    module Forkers
+      class NoForker < Base
+        def invoke(command, args, _job_definition, dsl, delay: 0)
+          sleep(delay) if delay.positive?
+          @bot.handle_job(command, args, dsl.state.channel_id)
+        end
+      end
+
+      register_forker('nofork', NoForker)
+    end
+
     class Base
       CONFIG = {
         'name' => 'test',
@@ -17,6 +28,9 @@ module Kybus
           'name' => 'debug',
           'echo' => false,
           'channels' => { 'testing' => [] }
+        },
+        'forker' => {
+          'provider' => 'nofork'
         }
       }.freeze
 
@@ -31,7 +45,6 @@ module Kybus
       def receives(msg, attachments = nil)
         attachments = Adapter::DebugMessage::DebugFile.new(attachments) if attachments
         msg = Adapter::DebugMessage.new(msg, @default_channel_id, attachments)
-        log_info('Received message', channel: @default_channel_id, msg: msg.raw_message)
         provider.last_message = msg
         executor.process_message(msg)
       end
@@ -39,6 +52,17 @@ module Kybus
       def expects(method)
         executor.dsl.expects(method)
       end
+
+      def replies(msg, attachments = nil)
+        reply = @provider.channel(current_channel).last_sent_message
+        raise 'NoPreviousMessageToReply' if reply.nil?
+
+        attachments = Adapter::DebugMessage::DebugFile.new(attachments) if attachments
+        msg = Adapter::DebugMessage.new(msg, @default_channel_id, attachments)
+        msg.replied_message = reply
+        provider.last_message = msg
+        executor.process_message(msg)
+      end
     end
   end
 end

data/lib/kybus/bot/version.rb

@@ -2,6 +2,6 @@
 
 module Kybus
   module Bot
-    VERSION = '0.11.1'
+    VERSION = '0.11.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kybus-bot
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.3
 platform: ruby
 authors:
 - Gilberto Vargas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-09 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kybus-core