telegram-bot 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be687b63c630f76cc65ca33e41da8314503ca12f
-  data.tar.gz: 97a72626bb37dbdd7c60a733391e80d234980280
+  metadata.gz: 6965124480bcaf8247399876641d9f7a27380592
+  data.tar.gz: 4ac406cca75f4c864a07b0b98eca019aa4c39f9b
 SHA512:
-  metadata.gz: 47dc2b51b69704ac5ab9f9638ea0419c714597387f2dece46409c6d57e35dd0ff12df09f2c5c72a76ffb23c7a30e251406b0f41d83d9a0c545599174c41b1e19
-  data.tar.gz: e6c1fbd85e95a560c28175129329bd3565aa0957df803cbe2efbafabdd70fcd381c4f20ce23c9eadf988620d841d8bae23991bbb93f0d89edc593f0f895ee20c
+  metadata.gz: 5c9cf79f27c144401dacd15cd59047ccf9a695070eca66b08537246f9aa061bb81bfb05954e8d720b84f9cd40b3bf30f40dfd43e75da8a49e76ae6bd4b4851f6
+  data.tar.gz: 0262b407a6c583eeeff2fb3d3ef011d709bb1eba8f788b3cf80cb95a769e8d25deec7fcd9ce83d5404e4131188b76a39e014204ba257fdb790e3d4646e1f3a82

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.11.0
+
+- Remove Bot::StaleChat in favor of Bot::Forbidden, as Telegram adds more
+  and more new descriptions.
+  Please open an issue if you face a problem.
+
 # 0.10.2
 
 - Support `(edited_)channel_post` updates.

data/README.md

@@ -100,7 +100,7 @@ bot.get_me.class # => Telegram::Bot::Types::User
 ```
 
 Any API request error will raise `Telegram::Bot::Error` with description in its message.
-Special `Telegram::Bot::StaleChat` is raised when bot can't post messages to the chat anymore.
+Special `Telegram::Bot::Forbidden` is raised when bot can't post messages to the chat anymore.
 
 ### Controller
 

data/lib/telegram/bot.rb

@@ -6,26 +6,7 @@ module Telegram
   module Bot
     class Error < StandardError; end
     class NotFound < Error; end
-
-    # Error class for events when chat is not available anymore for bot.
-    # While Telegram has same error codes for different messages and there is no
-    # official docs for this error codes it uses `description` to
-    # check response.
-    class StaleChat < Error
-      DESCRIPTIONS = [
-        'Bot was blocked',
-        'bot was kicked',
-        "can't write to",
-        'group chat is deactivated',
-      ].freeze
-
-      class << self
-        def match_response?(response)
-          description = response['description'].to_s
-          DESCRIPTIONS.any? { |x| description[x] }
-        end
-      end
-    end
+    class Forbidden < Error; end
 
     autoload :Async,              'telegram/bot/async'
     autoload :Botan,              'telegram/bot/botan'

data/lib/telegram/bot/client.rb

@@ -46,18 +46,20 @@ module Telegram
         @base_uri = format URL_TEMPLATE, self.token
       end
 
-      def request(action, body = {}) # rubocop:disable PerceivedComplexity
+      def request(action, body = {})
         res = http_request("#{base_uri}#{action}", self.class.prepare_body(body))
         status = res.status
         return JSON.parse(res.body) if 300 > status
         result = JSON.parse(res.body) rescue nil # rubocop:disable RescueModifier
-        err_msg = "#{res.reason}: #{result && result['description'] || '-'}"
+        err_msg = result && result['description'] || '-'
         if result
-          # NotFound is raised only for valid responses from Telegram
-          raise NotFound, err_msg if 404 == status
-          raise StaleChat, err_msg if StaleChat.match_response?(result)
+          # This errors are raised only for valid responses from Telegram
+          case status
+          when 403 then raise Forbidden, err_msg
+          when 404 then raise NotFound, err_msg
+          end
         end
-        raise Error, err_msg
+        raise Error, "#{res.reason}: #{err_msg}"
       end
 
       # Splited to the sections similar to API docs.

data/lib/telegram/bot/version.rb

@@ -1,6 +1,6 @@
 module Telegram
   module Bot
-    VERSION = '0.10.2'.freeze
+    VERSION = '0.11.0'.freeze
 
     def self.gem_version
       Gem::Version.new VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Max Melentiev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Library for building Telegram Bots with Rails integration