kybus-bot 0.5.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcb4039ffd0fa38cadb57ba4a6a0813d5c105590677f1e6f6a7ef85fa6ee2365
-  data.tar.gz: abf1c8941afd74565c25e012b3eec8e94e17d1e0a42a83b2bc20be1eceac0192
+  metadata.gz: 7751ec07a20b41b400f7d49dbc5dcb8b4951a3dd07a4ea32f0cccefb9985336e
+  data.tar.gz: 1806738e2740b0d626b19a11ae843503fb5171516ef80a64d644ab70c3520dc1
 SHA512:
-  metadata.gz: f1e09cd5437c55dbfc6a38df6c3f8ff1383f6f2974538e3ec2ebd380ea38db0e12cd9ce8ba82b87de15bd1200fef0d610ab1e81ee34c644e5fd064f564a31bd7
-  data.tar.gz: 159c13cb384b3168647e572544cdb96098a4d11b8ae4ed7c1143ba562fd0c52eccdf9295729f97e1614ef44d020681bd9615dc064522664114a3c211d9319566
+  metadata.gz: deabacf971edc2c6b8dbe52736ba5c1bcb6a95aa1bc4253bef5b13de7d37b10068111c618aa5f05f171c0bfb721a546e4a4a3f66781a6773a4c318c644338a3a
+  data.tar.gz: e8b73239aa929d94a85cc831eb8515411a76e6f19fbb1a5d6d3fff7b2157130f328de70e1b0f27e08c8f5af1a5696c6d9da52c56ef6e371edf252bfea18cf4ee

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

@@ -11,12 +11,38 @@ 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_reader :attachment
+        attr_reader :attachment, :message_id
+
+        class DebugFile
+          def initialize(path)
+            @path = path
+          end
+
+          def to_json(obj)
+            to_h.to_json(obj)
+          end
+
+          def file_name
+            @path
+          end
+
+          def download
+            File.read(@path)
+          end
+
+          def to_h
+            { path: @path }
+          end
+        end
 
         def initialize(text, channel, attachment = nil)
+          super()
           @text = text
           @channel = channel
           @attachment = attachment
+          @@message_id ||= 0
+          @@message_id += 1
+          @message_id = @@message_id + 1
         end
 
         # Returns the channel id
@@ -36,6 +62,14 @@ module Kybus
         def has_attachment?
           !!attachment
         end
+
+        def reply?
+          @reply
+        end
+
+        def is_private?
+          true
+        end
       end
 
       # This class simulates a message chat with a user.
@@ -66,7 +100,7 @@ module Kybus
           DebugMessage.new(@pending_messages.shift, @name)
         end
 
-        def send_data(message, attachment)
+        def send_data(message, _attachment)
           return unless @echo
 
           puts "Sending message to channel: #{@name}"
@@ -79,6 +113,7 @@ module Kybus
         def answer(message, attachment = nil)
           send_data(message, attachment)
           @state = :open
+          DebugMessage.new(message, @name)
         end
       end
 
@@ -92,6 +127,8 @@ module Kybus
           end
         end
 
+        attr_accessor :last_message
+
         # It receives a hash with the configurations:
         # - name: the name of the channel
         # - channels a key value, where the key is a name and the value the
@@ -111,12 +148,8 @@ module Kybus
           loop do
             raise NoMoreMessageException if @channels.values.all?(&:empty?)
 
-            msg = @channels.values.find(&:open?)
-            return msg.read_message if msg
-
-            # :nocov: #
-            sleep(1)
-            # :nocov: #
+            open_channel = @channels.values.find(&:open?)
+            return @last_message = open_channel.read_message if open_channel
           end
         end
 
@@ -131,7 +164,7 @@ module Kybus
         end
 
         # interface for sending video
-        def send_video(channel_name, video_url)
+        def send_video(channel_name, video_url, _caption = nil)
           channel(channel_name).answer("VIDEO: #{video_url}")
         end
 
@@ -141,10 +174,35 @@ module Kybus
         end
 
         # interface for sending image
-        def send_image(channel_name, image_url)
+        def send_image(channel_name, image_url, _caption = nil)
           channel(channel_name).answer("IMG: #{image_url}")
         end
 
+        # interface for sending image
+        def send_document(channel_name, doc_url)
+          channel(channel_name).answer("DOC: #{doc_url}")
+        end
+
+        def file_builder(data)
+          case data
+          when DebugMessage::DebugFile
+            data
+          when Hash
+            DebugMessage::DebugFile.new(data[:path])
+          end
+        end
+
+        include Kybus::Logger
+
+        def message_builder(msg)
+          log_info('Building message object', msg:, msg_class: msg.class.name)
+          msg
+        end
+
+        def mention(user)
+          "@#{user}"
+        end
+
         # changes echo config
         def echo=(toogle)
           @channels.each { |_, channel| channel.echo = toogle }

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

@@ -11,6 +11,7 @@ module Kybus
       class DiscordMessage < Kybus::Bot::Message
         # It receives a string with the raw text and the id of the channel
         def initialize(msg)
+          super
           @message = msg
         end
 
@@ -45,6 +46,9 @@ module Kybus
       # This adapter is intended to be used on unit tests and development.
       class Discord
         include ::Kybus::Logger
+
+        attr_reader :last_message, :client
+
         # It receives a hash with the configurations:
         # - name: the name of the channel
         # - channels a key value, where the key is a name and the value the
@@ -60,8 +64,6 @@ module Kybus
           @client.run(:async)
         end
 
-        attr_reader :client
-
         def mention(id)
           "<@!#{id}>"
         end
@@ -70,17 +72,15 @@ module Kybus
         def read_message
           # take the first message from the first open message,
           loop do
-            if @pool.empty?
-              sleep(0.1)
-            else
-              break
-            end
+            break unless @pool.empty?
+
+            sleep(0.1)
           end
-          DiscordMessage.new(@pool.shift)
+          @last_message = DiscordMessage.new(@pool.shift)
         end
 
         # interface for sending messages
-        def send_message(channel_name, contents)
+        def send_message(channel_name, contents, _caption = nil)
           puts "#{channel_name} => #{contents}" if @config['debug']
           channel = @client.channel(channel_name)
           if channel

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

@@ -1,100 +1,20 @@
 # frozen_string_literal: true
 
 require 'telegram/bot'
+require 'faraday'
+require_relative 'telegram_file'
+require_relative 'telegram_message'
 
 module Kybus
   module Bot
-    # :nodoc: #
     module Adapter
-      # :nodoc: #
-      # Wraps a debugging message inside a class.
-      class TelegramMessage < Kybus::Bot::Message
-        # It receives a string with the raw text and the id of the channel
-        def initialize(message)
-          @message = message
-        end
-
-        def reply?
-          !!@message.reply_to_message
-        end
-
-        def replied_message
-          TelegramMessage.new(@message.reply_to_message)
-        end
-
-        # Returns the channel id
-        def channel_id
-          @message.chat.id
-        end
-
-        # Returns the message contents
-        def raw_message
-          @message.to_s
-        end
-
-        def is_private?
-          @message.chat.type == 'private'
-        end
-
-        def has_attachment?
-          !!@message.document
-        end
-
-        def attachment
-          @message.document
-        end
-
-        def user
-          @message.from.id
-        end
-      end
-
-      class TelegramFile
-        extend Kybus::DRY::ResourceInjector
-        attr_reader :id
-        def initialize(message)
-          if message.is_a?(String)
-            @id = message
-          elsif message.is_a?(Hash)
-            @id = message['id'] || message[:id]
-          elsif message.is_a?(TelegramFile)
-            @id = message.id
-          else
-            @id = message.file_id
-          end
-        end
-
-        def to_h
-          {
-            provide: 'telegram',
-            id: @id
-          }
-        end
-
-        def cli
-          @cli ||= TelegramFile.resource(:cli)
-        end
-
-        def meta
-          @meta ||= cli.api.get_file(file_id: @id)
-        end
-
-        def original_name
-          meta.dig('result', 'file_name')
-        end
-
-        def download
-          token = cli.api.token
-          file_path = meta.dig('result', 'file_path')
-          path = "https://api.telegram.org/file/bot#{token}/#{file_path}"
-          Faraday.get(path).body
-        end
-      end
-
       ##
       # This adapter is intended to be used on unit tests and development.
       class Telegram
         include ::Kybus::Logger
+
+        attr_reader :last_message
+
         # It receives a hash with the configurations:
         # - name: the name of the channel
         # - channels a key value, where the key is a name and the value the
@@ -113,10 +33,12 @@ module Kybus
             @client.listen do |message|
               log_info('Received message', message: message.to_h,
                                            from: message.from.to_h)
-              return TelegramMessage.new(message)
+              return @last_message = TelegramMessage.new(message)
             end
           rescue ::Telegram::Bot::Exceptions::ResponseError => e
+            # :nocov:
             log_error('An error ocurred while calling to Telegram API', e)
+            # :nocov:
           end
         end
 
@@ -124,39 +46,44 @@ module Kybus
           "[user](tg://user?id=#{id})"
         end
 
-
         # interface for sending messages
         def send_message(channel_name, contents)
           puts "#{channel_name} => #{contents}" if @config['debug']
           @client.api.send_message(chat_id: channel_name, text: contents)
-        rescue ::Telegram::Bot::Exceptions::ResponseError => err
-          return if err[:error_code] == '403'
+          # :nocov:
+        rescue ::Telegram::Bot::Exceptions::ResponseError => e
+          return if e[:error_code] == '403'
         end
+        # :nocov:
 
         # interface for sending video
-        def send_video(channel_name, video_url)
-          file = Faraday::UploadIO.new(video_url, 'video/mp4')
-          @client.api.send_video(chat_id: channel_name, audio: file)
+        def send_video(channel_name, video_url, comment = nil)
+          file = Faraday::FilePart.new(video_url, 'video/mp4')
+          @client.api.send_video(chat_id: channel_name, video: file, caption: comment)
         end
 
         # interface for sending uadio
         def send_audio(channel_name, audio_url)
-          file = Faraday::UploadIO.new(audio_url, 'audio/mp3')
+          file = Faraday::FilePart.new(audio_url, 'audio/mp3')
           @client.api.send_audio(chat_id: channel_name, audio: file)
         end
 
         # interface for sending image
-        def send_image(channel_name, image_url)
-          file = Faraday::UploadIO.new(image_url, 'image/jpeg')
-          @client.api.send_photo(chat_id: channel_name, photo: file)
+        def send_image(channel_name, image_url, comment = nil)
+          file = Faraday::FilePart.new(image_url, 'image/jpeg')
+          @client.api.send_photo(chat_id: channel_name, photo: file, caption: comment)
         end
 
         # interface for sending document
         def send_document(channel_name, image_url)
-          file = Faraday::UploadIO.new(image_url, 'application/octect-stream')
+          file = Faraday::FilePart.new(image_url, 'application/octect-stream')
           @client.api.send_document(chat_id: channel_name, document: file)
         end
 
+        def message_builder(raw_message)
+          TelegramMessage.new(raw_message)
+        end
+
         def file_builder(file)
           TelegramFile.new(file)
         end

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'telegram/bot'
+require 'faraday'
+
+module Kybus
+  module Bot
+    # :nodoc: #
+    module Adapter
+      class TelegramFile
+        extend Kybus::DRY::ResourceInjector
+        attr_reader :id
+
+        def initialize(message)
+          @id = case message
+                when String
+                  message
+                when Hash
+                  message['id'] || message[:id]
+                when TelegramFile
+                  message.id
+                else
+                  message.file_id
+                end
+        end
+
+        def to_h
+          {
+            provide: 'telegram',
+            id: @id
+          }
+        end
+
+        def cli
+          @cli ||= TelegramFile.resource(:cli)
+        end
+
+        def meta
+          @meta ||= cli.api.get_file(file_id: @id)
+        end
+
+        def original_name
+          meta.dig('result', 'file_name')
+        end
+
+        def file_name
+          original_name
+        end
+
+        def download
+          token = cli.api.token
+          file_path = meta.dig('result', 'file_path')
+          path = "https://api.telegram.org/file/bot#{token}/#{file_path}"
+          Faraday.get(path).body
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'telegram/bot'
+require 'faraday'
+
+module Kybus
+  module Bot
+    # :nodoc: #
+    module Adapter
+      # :nodoc: #
+      # Wraps a debugging message inside a class.
+      class TelegramMessage < Kybus::Bot::Message
+        # It receives a string with the raw text and the id of the channel
+        def initialize(message)
+          super()
+          @message = message
+        end
+
+        def reply?
+          @message.respond_to?(:reply_to_message) && @message.reply_to_message
+        end
+
+        def replied_message
+          TelegramMessage.new(@message.reply_to_message)
+        end
+
+        # Returns the channel id
+        def channel_id
+          @message.chat.id
+        end
+
+        def message_id
+          @message.respond_to?(:message_id) ? @message.message_id : @message['result']['message_id']
+        end
+
+        # Returns the message contents
+        def raw_message
+          @message.to_s
+        end
+
+        def is_private?
+          @message.chat.type == 'private'
+        end
+
+        def has_attachment?
+          !!attachment
+        end
+
+        def attachment
+          (@message.respond_to?(:document) && @message&.document) ||
+            (@message.respond_to?(:photo) && @message.photo&.last) ||
+            (@message.respond_to?(:audio) && @message&.audio)
+        end
+
+        def user
+          @message.from.id
+        end
+      end
+    end
+  end
+end