telegram_meetup_bot 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51b03a0ff454da1c34c353fc829be95338d0870f
-  data.tar.gz: e910a57c53883471c023b55bf860d8ee52bbbc3d
+  metadata.gz: 2cb81754b8ece1419aa6058ecabd7e8a4462d88a
+  data.tar.gz: 24f686b8db1e4768a1361f8ac52551166d44b4fe
 SHA512:
-  metadata.gz: 23e565091e85d53839829905fe0f02e73713bf26be623b983b8c9c5beb633245122444ce04dc627e9ec955a441edb36be6b99d804d3f576e1db8ab66ffba351c
-  data.tar.gz: 5f731f29fa8e8da8fd9c2d35f5e8107eee8f2a6c0e0c0d65de2bb9ec3d45e200bc5616c5c7e7d8c469d27d8494d57683495bfc7f115aed39eafc739455e8032a
+  metadata.gz: e93de5d8f13463d74a26c3084af467c9973e168a4616a60e1e9ed49f921efb0e875fe216f0b279192ab9f44a0eb042f1d8497998313f8a821ddcbbd6ed9eb94c
+  data.tar.gz: 2d06f6fe0d08cd2ea9b87f7009636ea71bac05d0e83452706507b699c9dd70a14f524df6132c02ee824a612a91e81daa1ccec0099cc6e5bb1b2a4759cf74503b

data/README.md

@@ -35,7 +35,11 @@ bot_name: 'meetup_dev_bot'
 redis_host: 'localhost'
 redis_port: '6379'
 redis_key: 'meetup_bot'
+botan_key: ''
 ```
+
+The gem supports [botan.io](http://botan.io/) – free telegram analytics tool. All you have to do is obtain botan_key and specify it in ```config.yml```.
+
 If you use more than one bot per redis server, use different redis_keys for each of them.
 
 Also you could change sample responses in ```~/.telegram_meetup_bot/responses.yml```. It uses templates ```%first_name%``` and ```%date%``` to display actual name and date in messages.

data/config_samples/config.yml

@@ -3,3 +3,4 @@ bot_name: 'meetup_dev_bot'
 redis_host: 'localhost'
 redis_port: '6379'
 redis_key: 'meetup_bot'
+botan_key: ''

data/lib/telegram_meetup_bot.rb

@@ -1,4 +1,5 @@
 require 'telegram/bot'
+require 'telegram/bot/botan'
 require 'redis'
 
 require 'telegram_meetup_bot/version'
@@ -11,6 +12,7 @@ require 'telegram_meetup_bot/calendar'
 require 'telegram_meetup_bot/commands_handler'
 require 'telegram_meetup_bot/params_parser'
 require 'telegram_meetup_bot/handler_helper'
+require 'telegram_meetup_bot/botan'
 
 module TelegramMeetupBot
   def self.run(config_path)

data/lib/telegram_meetup_bot/botan.rb

@@ -0,0 +1,14 @@
+module TelegramMeetupBot
+  class Botan
+    attr_reader :bot, :author_id
+
+    def initialize(args)
+      @bot = args.fetch(:bot)
+      @author_id = args.fetch(:author_id)
+    end
+
+    def track(command)
+      bot.track(command, author_id)
+    end
+  end
+end

data/lib/telegram_meetup_bot/client.rb

@@ -1,5 +1,7 @@
 module TelegramMeetupBot
   class Client
+    TIMEOUT = 1
+
     attr_reader :token
 
     def initialize(token)
@@ -7,20 +9,37 @@ module TelegramMeetupBot
     end
 
     def run
-      begin
-        Telegram::Bot::Client.run(token) do |bot|
-          bot.listen do |message|
-            if message.text
-              messenger = Messenger.new(api: bot.api, chat_id: message.chat.id)
-              CommandsHandler.new(message: message, messenger: messenger).process
-            end
-          end
+      Telegram::Bot::Client.run(token) do |bot|
+        bot.enable_botan!(botan_key) if botan_key
+        bot.listen do |message|
+          process_message(bot, message) if message.text
         end
-      rescue Telegram::Bot::Exceptions::ResponseError => e
-        puts e
-        sleep 1
-        retry # run again on telegram server error
       end
+    rescue Telegram::Bot::Exceptions::ResponseError => e
+      write_log_and_sleep(e)
+      retry # run again on telegram server error
+    end
+
+    private
+
+    def process_message(bot, message)
+      messenger = Messenger.new(api: bot.api, chat_id: message.chat.id)
+      botan = Botan.new(bot: bot, author_id: message.from.id) if botan_key
+
+      CommandsHandler.new(
+        message: message,
+        messenger: messenger,
+        botan: botan
+      ).process
+    end
+
+    def botan_key
+      Initializers::ConfigLoader.botan_key
+    end
+
+    def write_log_and_sleep(error)
+      puts "#{Time.now}: #{error}"
+      sleep TIMEOUT
     end
   end
 end

data/lib/telegram_meetup_bot/commands_handler.rb

@@ -2,7 +2,7 @@ module TelegramMeetupBot
   class CommandsHandler
     COMMANDS = %w(date list cancel help cal)
     BLACK_LIST = %w(me)
-    attr_reader :command, :params, :helper
+    attr_reader :command, :params, :helper, :botan
 
     def initialize(args)
       parser = MessageParser.new(args.fetch(:message))
@@ -13,12 +13,14 @@ module TelegramMeetupBot
         command: @command,
         messenger: args.fetch(:messenger)
       )
+      @botan = args[:botan]
     end
 
     def process
       return if BLACK_LIST.include?(command)
 
       call_command(command)
+      botan.track(command) if botan
       helper.send_empty_username_notification unless helper.author_has_username?
     end
 

data/lib/telegram_meetup_bot/initializers/config_loader.rb

@@ -1,8 +1,10 @@
 module TelegramMeetupBot
   module Initializers
     class ConfigLoader < Base
+      EMPTY = ''
       FILE_NAME = 'config.yml'
-      AVAILABLE_KEYS = %w(bot_token bot_name redis_key redis_port redis_host)
+      AVAILABLE_KEYS = %w(bot_token bot_name redis_key
+        redis_port redis_host botan_key)
 
       class << self
         def storage
@@ -17,6 +19,14 @@ module TelegramMeetupBot
           @configurations['bot_name']
         end
 
+        def botan_key
+          @key ||= if @configurations['botan_key'] == EMPTY
+            nil
+          else
+            @configurations['botan_key']
+          end
+        end
+
         private
 
         def redis_key

data/lib/telegram_meetup_bot/version.rb

@@ -1,3 +1,3 @@
 module TelegramMeetupBot
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/telegram_meetup_bot.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop"
 
   spec.add_dependency 'redis'
-  spec.add_dependency 'telegram-bot-ruby', ">= 0.3.5"
+  spec.add_dependency 'telegram-bot-ruby', ">= 0.3.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram_meetup_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Timur Yanberdin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.11
 description: 
 email:
 - yanberdint@gmail.com
@@ -126,6 +126,7 @@ files:
 - config_samples/config.yml
 - config_samples/responses.yml
 - lib/telegram_meetup_bot.rb
+- lib/telegram_meetup_bot/botan.rb
 - lib/telegram_meetup_bot/calendar.rb
 - lib/telegram_meetup_bot/client.rb
 - lib/telegram_meetup_bot/commands_handler.rb