botup 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ff5e5ebf1b3fe664afda09447d2d6222a040f7c
-  data.tar.gz: 2dfd7eead22e9ff7ca90b4ce105fd5b04e5d599d
+  metadata.gz: 3c603c0ddf02ac224105e1b3a0f9749ba8ed118b
+  data.tar.gz: 84b3c8721dd37268f33cf0e04e176e6ae7539e79
 SHA512:
-  metadata.gz: 3647400ec02cd3ff27779ac5919533fceed072b7eab9f4bcc3ed82ecbfa9b0162f587d4d4dcfa849b782d6c633fd03b46152c5f82d9fa829c3e31435018dffc5
-  data.tar.gz: 48b0c2aef0eef38712903aa2c5a911e023f189d70d6700c038d268c42f368180eca98c620a67000b929747149806d5db4435bfed39e5f14ee7e9bef94718b8dc
+  metadata.gz: 1a322d7667d52598815b3b3c4eb51cfee014d853a9c3d5eec100363fbbb882aa694a3e236c34c28f2cc68c9358ad5d2ece2604168c7e644276248d10725f89ad
+  data.tar.gz: 8616548bbd8b66761bb906cff83a0118d4336ed07dd37e73ac4738a2d83e90baef2c40e5b281b1e78383424fe0c1bb30ee623eb1113b4d0852a5778aa17f654c

data/lib/botup/bin/exec.erb

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
-require_relative '<%= "../lib/#{snake_case_name}" %>'
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+
+require '<%= "./lib/#{snake_case_name}" %>'
 
 <%= class_name %>.start_client

data/lib/botup/config/config.yml

@@ -1 +1 @@
-bot_token: 'YOUR_TOKEN_GOES_HERE'
+bot_token: <%= ENV['YOUR_TELEGRAM_TOKEN'] %>

data/lib/botup/templates/client.erb

@@ -8,20 +8,32 @@ module <%= class_name %>
 
     def start
       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)
-              response = CommandsManager.new(message: message, messenger: messenger).call
-              messenger.send_text(response)
-            end
-          end
-        end
-      rescue Telegram::Bot::Exceptions::ResponseError => e
-        puts e
+        respond
+      rescue Telegram::Bot::Exceptions::ResponseError => exception
+        puts exception
         sleep 1
         retry # run again on telegram server error
       end
     end
+
+    private
+
+    def run_client(&block)
+      Telegram::Bot::Client.run(token) do |bot|
+        yield bot if block_given?
+      end
+    end
+
+    def respond
+      run_client do |bot|
+        bot.listen do |message|
+          Responder.new(bot.api, message).call if message.text
+        end
+      end
+    end
+
+    def get_updates(bot, next_offset)
+      bot.api.getUpdates(offset: next_offset, timeout: 20)
+    end
   end
 end

data/lib/botup/templates/commands_manager.erb

@@ -1,5 +1,3 @@
-require_relative 'commands_keeper'
-
 module <%= class_name %>
   class CommandsManager
     include CommandsKeeper

data/lib/botup/templates/configurator.erb

@@ -0,0 +1,23 @@
+module <%= class_name %>
+  module Configurator
+    CONFIG_PATH = 'config/config.yml'.freeze
+
+    module_function
+
+    def bot_token
+      loaded['bot_token']
+    end
+
+    def loaded
+      YAML.load(erb_result)
+    end
+
+    def yaml_file
+      File.read(CONFIG_PATH)
+    end
+
+    def erb_result
+      ERB.new(yaml_file).result
+    end
+  end
+end

data/lib/botup/templates/core_file.erb

@@ -3,16 +3,16 @@ require 'yaml'
 
 $:.unshift("#{Dir.pwd}/lib")
 
+require '<%= snake_case_name %>/configurator'
 require '<%= snake_case_name %>/client'
 require '<%= snake_case_name %>/messenger'
 require '<%= snake_case_name %>/message_parser'
 require '<%= snake_case_name %>/commands_keeper'
 require '<%= snake_case_name %>/commands_manager'
+require '<%= snake_case_name %>/responder'
 
 module <%= class_name %>
-  CONFIGURATION = YAML.load_file("#{Dir.pwd}/config/config.yml")
-
-  def self.start_client
-    Client.new(CONFIGURATION['bot_token']).start
-  end
+def self.start_client
+  Client.new(Configurator.bot_token).start
+end
 end

data/lib/botup/templates/message_parser.erb

@@ -17,9 +17,17 @@ module <%= class_name %>
     private
 
     def parse_message
-      if message.text && message.text[0] == '/' && message.text.length > 1
+      if  message_present? && message_starts_with_slash?
         message.text[1..-1].split(' ')
       end
     end
+
+    def message_present?
+      message.text && message.text.length > 1
+    end
+
+    def message_starts_with_slash?
+      message.text[0] == '/'
+    end
   end
 end

data/lib/botup/templates/responder.erb

@@ -0,0 +1,23 @@
+module <%= class_name %>
+  class Responder
+    attr_reader :api, :message
+
+    def initialize(api, message)
+      @api, @message = api, message
+    end
+
+    def call
+      messenger.send_text(parsed_response)
+    end
+
+    private
+
+    def messenger
+      @messenger ||= Messenger.new(api: api, chat_id: message.chat.id)
+    end
+
+    def parsed_response
+      @parsed_response ||= CommandsManager.new(message: message, messenger: messenger).call
+    end
+  end
+end

data/lib/botup/version.rb

@@ -1,3 +1,3 @@
 module Botup
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: botup
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Emil Shakirov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,9 +49,11 @@ files:
 - lib/botup/templates/client.erb
 - lib/botup/templates/commands_keeper.erb
 - lib/botup/templates/commands_manager.erb
+- lib/botup/templates/configurator.erb
 - lib/botup/templates/core_file.erb
 - lib/botup/templates/message_parser.erb
 - lib/botup/templates/messenger.erb
+- lib/botup/templates/responder.erb
 - lib/botup/version.rb
 homepage: https://github.com/vaihtovirta/botup
 licenses:
@@ -73,9 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Telegram bot boilerplate generator
 test_files: []
-has_rdoc: