telegram_meetup_bot 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0b6bb180e431520c43ac177e3afbc0b705f16cf
-  data.tar.gz: eab2300653e6d119aeecb18573e86955153a80b0
+  metadata.gz: e496544d412e4ded058528c0ce1c62bb97976f29
+  data.tar.gz: 09d7b861bf4b309629e8ae37784883659366f2bb
 SHA512:
-  metadata.gz: 453de1b09b75f1350be93ea83b4ffcbc5e0908d372826a489c9268f7e97ae673e7b91830f40f80f17a89067a4126b9a157f3d18f77f7c5c6bf438320688389fc
-  data.tar.gz: 700aa76255a6106c6473014bdbf7b7dfdbe35c310bfa4758bcf55b7f4a5846bd6a7d7415d3c9bbb86114346c1de4965ea29482d83d62338af54ce216cc40b5fd
+  metadata.gz: c6d95c65a742dd485d7e5ab208cad2dd02df26722d001a0f933b06271d948fbc76734b3ad19fdbe8895a31261a8606ca98d68293d39b07895e8bc70c33b2b40d
+  data.tar.gz: fcfd3a73e91218d3fb5a74ed5330f623cb667c99ccb5621e02ce4d58d4cae876992bef309ef3b7826109ada4bc4b27d51f3799c253a402771184d93f0d1bc45a

data/README.md

@@ -26,9 +26,10 @@ Generate sample configurations:
 
     $ telegram_meetup_bot --generate
 
-You should specify your bot_token in ```~/.telegram_meetup_bot/config.yml```.
+You should specify your bot_token and bot_name in ```~/.telegram_meetup_bot/config.yml```.
 ```
 bot_token: 'insert your token here'
+bot_name: 'meetup_dev_bot'
 redis_host: 'localhost'
 redis_port: '6379'
 redis_key: 'meetup_bot'

data/config_samples/config.yml

@@ -1,4 +1,5 @@
 bot_token: 'insert your token here'
+bot_name: 'meetup_dev_bot'
 redis_host: 'localhost'
 redis_port: '6379'
 redis_key: 'meetup_bot'

data/lib/telegram_meetup_bot/client.rb

@@ -10,8 +10,10 @@ module TelegramMeetupBot
       begin
         Telegram::Bot::Client.run(token) do |bot|
           bot.listen do |message|
-            messenger = Messenger.new(api: bot.api, chat_id: message.chat.id)
-            CommandsHandler.new(message: message, messenger: messenger).process
+            if message.text
+              messenger = Messenger.new(api: bot.api, chat_id: message.chat.id)
+              CommandsHandler.new(message: message, messenger: messenger).process
+            end
           end
         end
       rescue Telegram::Bot::Exceptions::ResponseError => e

data/lib/telegram_meetup_bot/initializers/config_loader.rb

@@ -4,7 +4,7 @@ module TelegramMeetupBot
   module Initializers
     class ConfigLoader < Base
       FILE_NAME = 'config.yml'
-      AVAILABLE_KEYS = %w(bot_token redis_key redis_port redis_host)
+      AVAILABLE_KEYS = %w(bot_token bot_name redis_key redis_port redis_host)
 
       class << self
         def storage
@@ -15,6 +15,10 @@ module TelegramMeetupBot
           @configurations['bot_token']
         end
 
+        def bot_name
+          @configurations['bot_name']
+        end
+
         private
 
         def redis_key

data/lib/telegram_meetup_bot/message_parser.rb

@@ -13,7 +13,10 @@ module TelegramMeetupBot
     end
 
     def command
-      parse_message { |words| words.first }
+      parse_message do |words|
+        cmd, bot_name = words.first.split('@')
+        cmd if bot_name.nil? || bot_name == Initializers::ConfigLoader.bot_name
+      end
     end
 
     def params
@@ -23,7 +26,7 @@ module TelegramMeetupBot
     private
 
     def parse_message(&block)
-      if message.text[0] == '/' && message.text.length > 1
+      if message.text && message.text[0] == '/' && message.text.length > 1
         yield message.text[1..-1].split(' ')
       end
     end

data/lib/telegram_meetup_bot/version.rb

@@ -1,3 +1,3 @@
 module TelegramMeetupBot
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/telegram_meetup_bot/message_parser_spec.rb

@@ -28,10 +28,26 @@ RSpec.describe TelegramMeetupBot::MessageParser do
     end
 
     context "when message with params" do
-      let(:message) { instance_double('message', text: '/date 08.11.1998', from: from) }
+      let(:message) { instance_double('message', text: '/date 08.11.07', from: from) }
 
       it { expect(subject.command).to eq('date') }
-      it { expect(subject.params).to eq(['08.11.1998']) }
+      it { expect(subject.params).to eq(['08.11.07']) }
+    end
+
+    context "when command contain @ and username equal to bot" do
+      before { allow(TelegramMeetupBot::Initializers::ConfigLoader).to receive(:bot_name).and_return('test_bot')}
+      let(:message) { instance_double('message', text: '/today_list@test_bot', from: from) }
+
+      it { expect(subject.command).to eq('today_list') }
+      it { expect(subject.params).to eq([]) }
+    end
+
+    context "when command contain @ and username isn't equal to bot" do
+      before { allow(TelegramMeetupBot::Initializers::ConfigLoader).to receive(:bot_name).and_return('production_bot')}
+      let(:message) { instance_double('message', text: '/today_list@test_bot', from: from) }
+
+      it { expect(subject.command).to eq(nil) }
+      it { expect(subject.params).to eq([]) }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telegram_meetup_bot
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Timur Yanberdin