telegram-bot-ruby 1.0.0.rc1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d6220dcbd9e12cc3ab22702dfbff66853f8cdc83fcf78ed59d63f2740051c29
-  data.tar.gz: 1b50037b1b26470cdbbc7624d484ac38403f23eccfc7586788232a391ac0c6bf
+  metadata.gz: 5b61e5af1f53cd133496f945bc7642b2a79e12a1d2be92faca3e45246b51dba5
+  data.tar.gz: de0024292072dfa7dcc74ffa6c66ba4e30d470652bcdcd5d9b193a8cea66f420
 SHA512:
-  metadata.gz: 8fc94125380ac64cd590da0ff841db37e7aaa4ee06d14bceb7a6a2d5a46e1747633479af81adeddfabd5a3006c79d5be331936417fda2aabb20a76de5d4fe211
-  data.tar.gz: a4c09c3f00dae5d38f612f78fb70a24c6f2d6443be25da47b9fd45661dc3b9d2c5185e5f73c9aa5a7b71c6c74b57677ca53e9182d42b0396d372d4837a6af0f9
+  metadata.gz: dab03a9d65d7582dce03bb6f5a8aea981a507f8011e2e618264177182c132c4fda82d1fc80da0590d3196e07e145e586c665af1fa8e9fd5fdfbcd8c36439bad2
+  data.tar.gz: 1b165086c50ee02e77298c575712551462c58bdb3f963a70ab823d2c9cffffdf23551af8caa3ad484e47bca3d89505f5656ae05c15648b37e6e84cc73e308011

data/.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+max_line_length = 120
+trim_trailing_whitespace = true

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         ruby:
           - 2.7
-          - 3.1
+          - 3.2
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -31,10 +31,7 @@ jobs:
       matrix:
         ruby:
           - 2.7
-          - 3.1
-    env:
-      BOT_API_ENV: test
-      BOT_API_TOKEN: ${{ secrets.BOT_API_TOKEN }}
+          - 3.2
     steps:
       - name: Checkout
         uses: actions/checkout@v3

data/.github/workflows/stale.yml

@@ -0,0 +1,19 @@
+---
+name: Close stale issues and PRs
+on:
+  schedule:
+    - cron: 40 * * * *
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v7
+        with:
+          days-before-close: 7
+          days-before-stale: 60
+          stale-issue-label: stale
+          stale-issue-message: This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days.
+          stale-pr-label: stale
+          stale-pr-message: This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days.
+          operations-per-run: 500

data/.gitignore

@@ -3,4 +3,5 @@ Gemfile.lock
 .bundle/
 .env
 pkg/
+tmp/
 vendor/bundle/

data/.rspec

@@ -1,2 +1,3 @@
 --require spec_helper
 --color
+--warnings

data/.rubocop.yml

@@ -2,6 +2,7 @@
 require:
   - rubocop-rake
   - rubocop-rspec
+  - rubocop-performance
 
 AllCops:
   NewCops: enable
@@ -10,18 +11,22 @@ AllCops:
 Style/Documentation:
   Enabled: false
 
-Style/FrozenStringLiteralComment:
-  Exclude:
-    - bin/console
-
 Metrics/BlockLength:
   AllowedMethods:
     - context
     - describe
     - task
+Metrics/ClassLength:
+  Exclude:
+    - lib/telegram/bot/api/endpoints.rb
+Metrics/MethodLength:
+  Exclude:
+    - spec/**/*
 
 Layout/LineLength:
   Max: 120
-  Exclude:
-    - telegram-bot-ruby.gemspec
-    - examples/*.rb
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+RSpec/NestedGroups:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 2.0.0
+
+### Added
+
+- [Bot API 7.0](https://core.telegram.org/bots/api#december-29-2023)
+
+### Changed
+
+- API method calls now return corresponding response objects ([#285](https://github.com/atipugin/telegram-bot-ruby/pull/285), thx [@AlexWayfer](https://github.com/AlexWayfer))
+
+## 1.0.0
+
+- Replace [virtus](https://github.com/solnic/virtus) with [dry-struct](https://github.com/dry-rb/dry-struct)
+- Use [zeitwerk](https://github.com/fxn/zeitwerk) for code loading
+- Implement [Bot API 6.4](https://core.telegram.org/bots/api#december-30-2022)
+- Implement [Bot API 6.5](https://core.telegram.org/bots/api#february-3-2023)
+
 ## 0.23.0
 
 - Rename `Telegram::Bot.configuration` options:

data/Gemfile

@@ -3,3 +3,16 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'dotenv', '~> 2.8'
+gem 'nokogiri', '~> 1.13'
+gem 'pry'
+gem 'rake', '~> 13.0'
+
+gem 'rspec', '~> 3.4'
+gem 'vcr', '~> 6.0'
+
+gem 'rubocop', '~> 1.54.1'
+gem 'rubocop-performance', '~> 1.18'
+gem 'rubocop-rake', '~> 0.6.0'
+gem 'rubocop-rspec', '~> 2.22.0'

data/LICENSE

@@ -11,4 +11,3 @@
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. You just DO WHAT THE FUCK YOU WANT TO.
-

data/README.md

@@ -7,12 +7,29 @@ Ruby wrapper for [Telegram's Bot API](https://core.telegram.org/bots/api).
 [![Maintainability](https://api.codeclimate.com/v1/badges/7e61fbf5bec86e118fb1/maintainability)](https://codeclimate.com/github/atipugin/telegram-bot-ruby/maintainability)
 [![Say Thanks!](https://img.shields.io/badge/Say%20Thanks!-🦉-1EAEDB.svg)](https://saythanks.io/to/atipugin)
 
+## 🚧 Upgrading to 1.0
+
+Since v1.0 `telegram-bot-ruby` uses [`dry-struct`](https://github.com/dry-rb/dry-struct)
+instead of [`virtus`](https://github.com/solnic/virtus).
+This means that type objects are now immutable and you can't change them after initialization:
+
+```ruby
+# This won't work
+kb = Telegram::Bot::Types::ReplyKeyboardRemove.new
+kb.remove_keyboard = true
+
+# You have to set attributes in constructor instead
+kb = Telegram::Bot::Types::ReplyKeyboardRemove.new(remove_keyboard: true)
+```
+
+Please make sure it doesn't break your existing code before upgrading to 1.0.
+
 ## Installation
 
 Add following line to your Gemfile:
 
 ```ruby
-gem 'telegram-bot-ruby'
+gem 'telegram-bot-ruby', '~> 1.0'
 ```
 
 And then execute:
@@ -29,7 +46,8 @@ gem install telegram-bot-ruby
 
 ## Usage
 
-First things first, you need to [obtain a token](https://core.telegram.org/bots#6-botfather) for your bot. Then create your Telegram bot like this:
+First things first, you need to [obtain a token](https://core.telegram.org/bots#6-botfather) for your bot.
+Then create your Telegram bot like this:
 
 ```ruby
 require 'telegram/bot'
@@ -48,7 +66,10 @@ Telegram::Bot::Client.run(token) do |bot|
 end
 ```
 
-Note that `bot.api` object implements [Telegram Bot API methods](https://core.telegram.org/bots/api#available-methods) as is. So you can invoke any method inside the block without any problems. All methods are available in both *snake_case* and *camelCase* notations.
+Note that `bot.api` object implements
+[Telegram Bot API methods](https://core.telegram.org/bots/api#available-methods) as is.
+So you can invoke any method inside the block without any problems.
+All methods are available in both *snake_case* and *camelCase* notations.
 
 If you need to start a bot in development mode you have to pass `environment: :test`:
 
@@ -58,15 +79,35 @@ Telegram::Bot::Client.run(token, environment: :test) do |bot|
 end
 ```
 
-Same thing about `message` object - it implements [Message](https://core.telegram.org/bots/api#message) spec, so you always know what to expect from it.
+Same thing about `message` object: it implements [Message](https://core.telegram.org/bots/api#message) spec,
+so you always know what to expect from it.
+
+To gracefully stop the bot, for example by `INT` signal (Ctrl-C), call the `bot.stop` method:
+
+```ruby
+bot = Telegram::Bot::Client.new(token)
+
+Signal.trap('INT') do
+  bot.stop
+end
+
+bot.listen do |message|
+  # it will be in an infinity loop until `bot.stop` command
+  # (with a small delay for the current `fetch_updates` request)
+end
+```
 
 ## Webhooks
 
-If you are going to use [webhooks](https://core.telegram.org/bots/api#setwebhook) instead of [long polling](https://core.telegram.org/bots/api#getupdates), you need to implement your own webhook callbacks server. Take a look at [this repo](https://github.com/solyaris/BOTServer) as an example.
+If you are going to use [webhooks](https://core.telegram.org/bots/api#setwebhook)
+instead of [long polling](https://core.telegram.org/bots/api#getupdates),
+you need to implement your own webhook callbacks server.
+Take a look at [this repo](https://github.com/solyaris/BOTServer) as an example.
 
 ## Proxy
 
-As some countries block access to Telegram, you can set up your own proxy and use it to access Telegram API. In this case you need to configure API url:
+As some countries block access to Telegram, you can set up your own proxy and use it to access Telegram API.
+In this case you need to configure API URL:
 
 ```ruby
 Telegram::Bot::Client.run(token, url: 'https://proxy.example.com') do |bot|
@@ -76,7 +117,8 @@ end
 
 ## Custom keyboards
 
-You can use your own [custom keyboards](https://core.telegram.org/bots#keyboards). Here is an example:
+You can use your own [custom keyboards](https://core.telegram.org/bots#keyboards).
+Here is an example:
 
 ```ruby
 bot.listen do |message|
@@ -116,7 +158,8 @@ end
 
 ## Inline keyboards
 
-[Bot API 2.0](https://core.telegram.org/bots/2-0-intro) brought us new inline keyboards. Example:
+[Bot API 2.0](https://core.telegram.org/bots/2-0-intro) brought us new inline keyboards.
+Example:
 
 ```ruby
 bot.listen do |message|
@@ -164,13 +207,25 @@ bot.listen do |message|
 end
 ```
 
-Now, with `inline` mode enabled, your `message` object can be an instance of [Message](https://core.telegram.org/bots/api#message), [InlineQuery](https://core.telegram.org/bots/api#inlinequery) or [ChosenInlineResult](https://core.telegram.org/bots/api#choseninlineresult). That's why you need to check type of each message and decide how to handle it.
+Now, with `inline` mode enabled, your `message` object can be an instance of
+[Message](https://core.telegram.org/bots/api#message),
+[InlineQuery](https://core.telegram.org/bots/api#inlinequery) or
+[ChosenInlineResult](https://core.telegram.org/bots/api#choseninlineresult).
+That's why you need to check type of each message and decide how to handle it.
 
-Using `answer_inline_query` you can send query results to user. `results` field must be an array of [query result objects](https://core.telegram.org/bots/api#inlinequeryresult).
+Using `answer_inline_query` you can send query results to user.
+`results` field must be an array of [query result objects](https://core.telegram.org/bots/api#inlinequeryresult).
 
 ## File upload
 
-Your bot can even upload files ([photos](https://core.telegram.org/bots/api#sendphoto), [audio](https://core.telegram.org/bots/api#sendaudio), [documents](https://core.telegram.org/bots/api#senddocument), [stickers](https://core.telegram.org/bots/api#sendsticker), [video](https://core.telegram.org/bots/api#sendvideo)) to Telegram servers. Just like this:
+Your bot can even upload files
+([photos](https://core.telegram.org/bots/api#sendphoto),
+[audio](https://core.telegram.org/bots/api#sendaudio),
+[documents](https://core.telegram.org/bots/api#senddocument),
+[stickers](https://core.telegram.org/bots/api#sendsticker),
+[video](https://core.telegram.org/bots/api#sendvideo))
+to Telegram servers.
+Just like this:
 
 ```ruby
 bot.listen do |message|
@@ -184,7 +239,9 @@ end
 
 ## Logging
 
-By default, bot doesn't log anything (uses `NullLoger`). You can change this behavior and provide your own logger class. See example below:
+By default, bot doesn't log anything (uses `NullLoger`).
+You can change this behavior and provide your own logger class.
+See example below:
 
 ```ruby
 Telegram::Bot::Client.run(token, logger: Logger.new($stderr)) do |bot|
@@ -197,7 +254,8 @@ end
 
 ## Connection adapters
 
-Since version `0.5.0` we rely on [faraday](https://github.com/lostisland/faraday) under the hood. You can use any of supported adapters (for example, `net/http/persistent`):
+Since version `0.5.0` we rely on [faraday](https://github.com/lostisland/faraday) under the hood.
+You can use any of supported adapters (for example, `net/http/persistent`):
 
 ```ruby
 require 'net/http/persistent'
@@ -209,14 +267,15 @@ end
 
 ## Boilerplates
 
-If you don't know how to setup database for your bot or how to use it with different languages here are some boilerplates which can help you to start faster:
+If you don't know how to setup database for your bot or how to use it with different languages
+here are some boilerplates which can help you to start faster:
 
 - [Ruby Telegram Bot boilerplate](https://github.com/telegram-bots/ruby-telegram-bot-boilerplate)
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (git checkout -b my-new-feature)
-3. Commit your changes (git commit -am 'Add some feature')
-4. Push to the branch (git push origin my-new-feature)
-5. Create new Pull Request
+1. Fork it.
+2. Create your feature branch (`git checkout -b my-new-feature`).
+3. Commit your changes (`git commit -am 'Add some feature'`).
+4. Push to the branch (`git push origin my-new-feature`).
+5. Create a new Pull Request.

data/Rakefile

@@ -18,7 +18,7 @@ task default: :spec
 
 desc 'Dump type definitions from docs to YAML'
 task :dump_type_attributes do
-  require File.expand_path('lib/telegram/bot', __dir__)
+  require_relative 'lib/telegram/bot'
   require 'nokogiri'
   require 'open-uri'
   require 'yaml'
@@ -30,6 +30,8 @@ task :dump_type_attributes do
   # Fetch and parse docs
   doc = Nokogiri::HTML(URI.open('https://core.telegram.org/bots/api').read)
 
+  next_type_element_names = %w[table h4]
+
   result = types.to_h do |type|
     # This is very hacky but working way to find table containing attributes for
     # given type. Basic idea is to find heading with type and then iterate until
@@ -38,23 +40,23 @@ task :dump_type_attributes do
     element = doc.at_xpath(%{//h4[text() = "#{type}"]})
     loop do
       element = element.next_element
-      break if %w[table h4].include?(element.name)
+      break if next_type_element_names.include?(element.name)
     end
 
     attributes = element.xpath('.//tbody//tr').map do |el|
       cells = el.children.select { |c| c.name == 'td' }
       {
         'name' => cells[0].text,
-        'required' => !cells[2].text.start_with?('Optional.')
-      }
+        'type' => cells[1].text,
+        'required' => !cells[2].text.start_with?('Optional.'),
+        'required_value' =>
+          cells[2].text.match(/^.+, (?:must be (?<found_type>\w+)|always “(?<found_type>\w+)”)$/)&.[](:found_type)
+      }.compact
     end
 
     [type, attributes]
   end
 
   # Write everything to fixture file
-  File.write(
-    File.expand_path('spec/support/type_attributes.yml', __dir__),
-    result.to_yaml
-  )
+  File.write "#{__dir__}/spec/support/type_attributes.yml", result.to_yaml
 end

data/bin/console

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'pry'
 
-require File.expand_path('../lib/telegram/bot', __dir__)
+require_relative '../lib/telegram/bot'
 
 Pry.start

data/lib/telegram/bot/api/endpoints.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+module Telegram
+  module Bot
+    class Api
+      ENDPOINTS = {
+        'getUpdates' => Types::Array.of(Types::Update),
+        'setWebhook' => Types::Bool,
+        'deleteWebhook' => Types::Bool,
+        'getWebhookInfo' => Types::WebhookInfo,
+        'getMe' => Types::User,
+        'sendMessage' => Types::Message,
+        'forwardMessage' => Types::Message,
+        'forwardMessages' => Types::Array.of(Types::MessageId),
+        'sendPhoto' => Types::Message,
+        'sendAudio' => Types::Message,
+        'sendDocument' => Types::Message,
+        'sendVideo' => Types::Message,
+        'sendVoice' => Types::Message,
+        'sendVideoNote' => Types::Message,
+        'sendMediaGroup' => Types::Array.of(Types::Message),
+        'sendLocation' => Types::Message,
+        'editMessageLiveLocation' => Types::Message | Types::Bool,
+        'stopMessageLiveLocation' => Types::Message | Types::Bool,
+        'sendVenue' => Types::Message,
+        'sendContact' => Types::Message,
+        'sendChatAction' => Types::Bool,
+        'setMessageReaction' => Types::Bool,
+        'getUserProfilePhotos' => Types::UserProfilePhotos,
+        'getFile' => Types::File,
+        'banChatMember' => Types::Bool,
+        'unbanChatMember' => Types::Bool,
+        'restrictChatMember' => Types::Bool,
+        'promoteChatMember' => Types::Bool,
+        'leaveChat' => Types::Bool,
+        'getChat' => Types::Chat,
+        'getChatAdministrators' => Types::Array.of(Types::ChatMember),
+        'exportChatInviteLink' => Types::String,
+        'setChatPhoto' => Types::Bool,
+        'deleteChatPhoto' => Types::Bool,
+        'setChatTitle' => Types::Bool,
+        'setChatDescription' => Types::Bool,
+        'pinChatMessage' => Types::Bool,
+        'unpinChatMessage' => Types::Bool,
+        'getChatMembersCount' => Types::Integer,
+        'getChatMember' => Types::ChatMember,
+        'setChatStickerSet' => Types::Bool,
+        'deleteChatStickerSet' => Types::Bool,
+        'answerCallbackQuery' => Types::Bool,
+        'getUserChatBoosts' => Types::UserChatBoosts,
+        'editMessageText' => Types::Message | Types::Bool,
+        'editMessageCaption' => Types::Message | Types::Bool,
+        'editMessageReplyMarkup' => Types::Message | Types::Bool,
+        'deleteMessage' => Types::Bool,
+        'deleteMessages' => Types::Bool,
+        'sendSticker' => Types::Message,
+        'getStickerSet' => Types::StickerSet,
+        'uploadStickerFile' => Types::File,
+        'createNewStickerSet' => Types::Bool,
+        'addStickerToSet' => Types::Bool,
+        'setStickerPositionInSet' => Types::Bool,
+        'deleteStickerFromSet' => Types::Bool,
+        'answerInlineQuery' => Types::Bool,
+        'sendInvoice' => Types::Message,
+        'answerShippingQuery' => Types::Bool,
+        'answerPreCheckoutQuery' => Types::Bool,
+        'sendGame' => Types::Message,
+        'setGameScore' => Types::Message | Types::Bool,
+        'getGameHighScores' => Types::Array.of(Types::GameHighScore),
+        'setPassportDataErrors' => Types::Bool,
+        'editMessageMedia' => Types::Message | Types::Bool,
+        'sendAnimation' => Types::Message,
+        'sendPoll' => Types::Message,
+        'stopPoll' => Types::Poll,
+        'setChatPermissions' => Types::Bool,
+        'setChatAdministratorCustomTitle' => Types::Bool,
+        'sendDice' => Types::Message,
+        'getMyCommands' => Types::Array.of(Types::BotCommand),
+        'setMyCommands' => Types::Bool,
+        'deleteMyCommands' => Types::Bool,
+        'setStickerSetThumbnail' => Types::Bool,
+        'logOut' => Types::Bool,
+        'close' => Types::Bool,
+        'copyMessage' => Types::MessageId,
+        'copyMessages' => Types::Array.of(Types::MessageId),
+        'createChatInviteLink' => Types::ChatInviteLink,
+        'editChatInviteLink' => Types::ChatInviteLink,
+        'revokeChatInviteLink' => Types::ChatInviteLink,
+        'approveChatJoinRequest' => Types::Bool,
+        'declineChatJoinRequest' => Types::Bool,
+        'banChatSenderChat' => Types::Bool,
+        'unbanChatSenderChat' => Types::Bool,
+        'answerWebAppQuery' => Types::SentWebAppMessage,
+        'setChatMenuButton' => Types::Bool,
+        'getChatMenuButton' => Types::MenuButtonDefault | Types::MenuButtonCommands | Types::MenuButtonWebApp,
+        'setMyDefaultAdministratorRights' => Types::Bool,
+        'getMyDefaultAdministratorRights' => Types::ChatAdministratorRights,
+        'createInvoiceLink' => Types::String,
+        'editGeneralForumTopic' => Types::Bool,
+        'closeGeneralForumTopic' => Types::Bool,
+        'reopenGeneralForumTopic' => Types::Bool,
+        'hideGeneralForumTopic' => Types::Bool,
+        'unhideGeneralForumTopic' => Types::Bool,
+        'unpinAllGeneralForumTopicMessages' => Types::Bool,
+        'setMyName' => Types::Bool,
+        'getMyName' => Types::BotName,
+        'setMyDescription' => Types::Bool,
+        'getMyDescription' => Types::BotDescription,
+        'setMyShortDescription' => Types::Bool,
+        'getMyShortDescription' => Types::BotShortDescription
+      }.freeze
+    end
+  end
+end

data/lib/telegram/bot/api.rb

@@ -3,34 +3,6 @@
 module Telegram
   module Bot
     class Api
-      ENDPOINTS = %w[
-        getUpdates setWebhook deleteWebhook getWebhookInfo getMe sendMessage
-        forwardMessage sendPhoto sendAudio sendDocument sendVideo sendVoice
-        sendVideoNote sendMediaGroup sendLocation editMessageLiveLocation
-        stopMessageLiveLocation sendVenue sendContact sendChatAction
-        getUserProfilePhotos getFile kickChatMember unbanChatMember
-        restrictChatMember promoteChatMember leaveChat getChat
-        getChatAdministrators exportChatInviteLink setChatPhoto deleteChatPhoto
-        setChatTitle setChatDescription pinChatMessage unpinChatMessage
-        getChatMembersCount getChatMember setChatStickerSet deleteChatStickerSet
-        answerCallbackQuery editMessageText editMessageCaption
-        editMessageReplyMarkup deleteMessage sendSticker getStickerSet
-        uploadStickerFile createNewStickerSet addStickerToSet
-        setStickerPositionInSet deleteStickerFromSet answerInlineQuery
-        sendInvoice answerShippingQuery answerPreCheckoutQuery
-        sendGame setGameScore getGameHighScores setPassportDataErrors
-        editMessageMedia sendAnimation sendPoll stopPoll setChatPermissions
-        setChatAdministratorCustomTitle sendDice getMyCommands setMyCommands
-        deleteMyCommands setStickerSetThumb logOut close copyMessage
-        createChatInviteLink editChatInviteLink revokeChatInviteLink
-        approveChatJoinRequest declineChatJoinRequest banChatSenderChat
-        unbanChatSenderChat answerWebAppQuery setChatMenuButton
-        getChatMenuButton setMyDefaultAdministratorRights
-        getMyDefaultAdministratorRights createInvoiceLink editGeneralForumTopic
-        closeGeneralForumTopic reopenGeneralForumTopic hideGeneralForumTopic
-        unhideGeneralForumTopic
-      ].freeze
-
       attr_reader :token, :url, :environment
 
       def initialize(token, url: 'https://api.telegram.org', environment: :production)
@@ -39,27 +11,41 @@ module Telegram
         @environment = environment.downcase.to_sym
       end
 
+      def connection
+        @connection ||= Faraday.new(url: url) do |faraday|
+          faraday.request :multipart
+          faraday.request :url_encoded
+          faraday.adapter Telegram::Bot.configuration.adapter
+          faraday.options.timeout = Telegram::Bot.configuration.connection_timeout
+          faraday.options.open_timeout = Telegram::Bot.configuration.connection_open_timeout
+        end
+      end
+
       def method_missing(method_name, *args, &block)
         endpoint = method_name.to_s
         endpoint = camelize(endpoint) if endpoint.include?('_')
 
-        ENDPOINTS.include?(endpoint) ? call(endpoint, *args) : super
+        return super unless ENDPOINTS.key?(endpoint)
+
+        result = call(endpoint, *args)
+
+        return result['ok'] unless (result = result['result'])
+
+        ENDPOINTS[endpoint].call(result)
       end
 
       def respond_to_missing?(*args)
         method_name = args[0].to_s
         method_name = camelize(method_name) if method_name.include?('_')
 
-        ENDPOINTS.include?(method_name) || super
+        ENDPOINTS.key?(method_name) || super
       end
 
       def call(endpoint, raw_params = {})
         params = build_params(raw_params)
         path = build_path(endpoint)
-        response = conn.post(path, params)
-        unless response.status == 200
-          raise Exceptions::ResponseError.new(response), 'Telegram API has returned the error.'
-        end
+        response = connection.post(path, params)
+        raise Exceptions::ResponseError.new(response: response) unless response.status == 200
 
         JSON.parse(response.body)
       end
@@ -95,16 +81,6 @@ module Telegram
         words.drop(1).map(&:capitalize!)
         words.join
       end
-
-      def conn
-        @conn ||= Faraday.new(url: url) do |faraday|
-          faraday.request :multipart
-          faraday.request :url_encoded
-          faraday.adapter Telegram::Bot.configuration.adapter
-          faraday.options.timeout = Telegram::Bot.configuration.connection_timeout
-          faraday.options.open_timeout = Telegram::Bot.configuration.connection_open_timeout
-        end
-      end
     end
   end
 end

data/lib/telegram/bot/client.rb

@@ -22,18 +22,17 @@ module Telegram
 
       def listen(&block)
         logger.info('Starting bot')
-        running = true
-        Signal.trap('INT') { running = false }
-        fetch_updates(&block) while running
-        exit
+        @running = true
+        fetch_updates(&block) while @running
       end
 
-      def fetch_updates
-        response = api.getUpdates(options)
-        return unless response['ok']
+      def stop
+        @running = false
+      end
 
-        response['result'].each do |data|
-          yield handle_update(Types::Update.new(data))
+      def fetch_updates
+        api.getUpdates(options).each do |update|
+          yield handle_update(update)
         end
       rescue Faraday::TimeoutError, Faraday::ConnectionFailed
         retry