botomizer 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81fad88c2c153f95b4ef9982e697ed9880879e5b
-  data.tar.gz: 979778e05bf58d07b2ad3d0e33db74720251804b
+  metadata.gz: ffea29a66826bae04166449e185b9f4ef54ce99c
+  data.tar.gz: e7a5ffba454e1ddb4d33f92248e11648dde00a83
 SHA512:
-  metadata.gz: e951568444fc8e649b5d2b90f165537800a7a230509672e4f117b19b3d0ac86acdc69784256092d961c357ea219c4a19ecde55db2a0a73f4e382419f8e70e144
-  data.tar.gz: 514d4c4ca7e5309ae3dfba4571029bf9ffb8bf3a5068d5c2596e44783b59986dd9a83ef8d1b8618e134ac40ecb46bb6eac9c0a58bcdc71a60aa248aa32545e18
+  metadata.gz: c9a1c5aca2949b844c5cbecedfb05c781de4b2d8fdbb13eba8b06f558d827b4432180929aac809b839f78e5185784a19f4096a61c2fb2f337966e4ca74b1b642
+  data.tar.gz: 433bdd8eb803ec18e77b62fa0324ddfa1df321859bb51babad9fcaaecdc4aaaed3b342ab726482348b395fa9be9ac05596c083055acb5e917c9b70722aa5927c

data/lib/botomizer/client.rb

@@ -33,30 +33,34 @@ class Botomizer::Client
     @bot
   end
 
+  def cache
+    @cache
+  end
+
   def handle(request, handler)
-    @bot.parse_request(request)
+    bot.parse_request(request)
 
     handler = handler.new(self)
 
-    if @bot.message.cmd?
-      @cache.write(@bot.chat.id, @bot.message.cmd)
+    if bot.message.cmd?
+      @cache.write(bot.chat.id, message.cmd)
     else
-      @bot.message.cmd = @cache.fetch(@bot.chat.id)
+      message.cmd = @cache.fetch(chat.id)
     end
 
-    if handler.respond_to? "cmd_#{@bot.message.cmd}"
-      handler.public_send("cmd_#{@bot.message.cmd}")
+    if handler.respond_to? "cmd_#{message.cmd}"
+      handler.public_send("cmd_#{message.cmd}")
     else
       handler.cmd_fallback
     end
   end
 
   def clean_history
-    @cache.delete(@bot.chat.id)
+    @cache.delete(chat.id)
   end
 
   def send(method, query = {})
-    @bot.send(method, query)
+    bot.send(method, query)
   end
 
   def send!(method, query = {})
@@ -66,7 +70,7 @@ class Botomizer::Client
   end
 
   def send_message(text, options = {})
-    @bot.send_message(text, options)
+    bot.send_message(text, options)
   end
 
   def send_message!(text, options = {})

data/lib/botomizer/exceptions.rb

@@ -5,8 +5,6 @@ module Botomizer
   # Exception raised when you attempt to set a non-existent client
   class UnsupportedClient < Error; end
 
-  class WebhookError < Error; end
-
   class ChatError < Error; end
 
   class MessageError < Error; end

data/lib/botomizer/message.rb

@@ -3,7 +3,7 @@ class Botomizer::Message
 
   def initialize(params)
     @id   = params[:id]
-    @text = params[:text]
+    @text = params[:text].to_s
 
     if @text.index('/') == 0
       sp    = @text.split(' ')

data/lib/botomizer/telegram.rb

@@ -9,11 +9,11 @@ module Botomizer::Telegram
     end
 
     def parse_request(request)
-      message_key = ['message', 'edited_message', 'channel_post', 'edited_channel_post'].detect do |key|
-        request.has_key? key
+      message_key = ['message', 'edited_message', 'channel_post', 'edited_channel_post'].find do |key|
+        request.has_key?(key)
       end
 
-      if message_key
+      unless message_key.nil?
         message = request[message_key]
         @message = Botomizer::Message.new({
             id: message['message_id'],

data/lib/botomizer/telegram/webhook.rb

@@ -8,11 +8,7 @@ class Botomizer::Telegram::Webhook
   end
 
   def set!(url)
-    begin
-      @client.send!('setWebhook', {url: url})
-    rescue Botomizer::ResponseError => e
-      raise Botomizer::WebhookError.new(e)
-    end
+    @client.send!('setWebhook', {url: url})
   end
 
   def info
@@ -24,10 +20,6 @@ class Botomizer::Telegram::Webhook
   end
 
   def delete!
-    begin
-      @client.send!('deleteWebhook')
-    rescue Botomizer::ResponseError => e
-      raise Botomizer::WebhookError.new(e)
-    end
+    @client.send!('deleteWebhook')
   end
 end

data/lib/botomizer/version.rb

@@ -1,3 +1,3 @@
 module Botomizer
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: botomizer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Alex Belenky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,7 +92,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,52 +0,0 @@
-PATH
-  remote: .
-  specs:
-    botomizer (0.1.0)
-      httparty (>= 0.15.6)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    httparty (0.15.6)
-      multi_xml (>= 0.5.2)
-    i18n (0.9.1)
-      concurrent-ruby (~> 1.0)
-    minitest (5.10.3)
-    multi_xml (0.6.0)
-    rake (12.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.4)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 5.1)
-  botomizer!
-  bundler (~> 1.16)
-  rake (> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.0