v0.16.2

* Update rubopcop [WIP]

* Further rubocop fixes

* Fix rubocop-rails cops

* Fix spec

* Disable rubocop suggestions

* Run rubocop in github actions rather than in codeclimate

.codeclimate.yml

@@ -2,7 +2,3 @@ checks:
   method-complexity:
     config:
       threshold: 6 # should be just fine
-
-plugins:
-  rubocop:
-    enabled: true

.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: Lint & Test
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2'
+          bundler-cache: true
+      - run: bundle exec rubocop
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - '2.7'
+        gemfile:
+          - gemfiles/rails_61.gemfile
+          - gemfiles/rails_60.gemfile
+          - gemfiles/rails_52.gemfile
+          - gemfiles/rails_51.gemfile
+        include:
+          # ruby 3.x
+          - ruby: '3.2'
+            gemfile: gemfiles/rails_71.gemfile
+          - ruby: '3.0'
+            gemfile: gemfiles/rails_61.gemfile
+          - ruby: '3.0'
+            gemfile: gemfiles/rails_60.gemfile
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake spec

.rubocop.yml

@@ -1,15 +1,18 @@
-# Rubocop does not support 2.0
-Gemspec/RequiredRubyVersion: {Enabled: false}
+require: rubocop-rails
 
-Rails: {Enabled: true}
+AllCops:
+  TargetRubyVersion: 2.4
+  NewCops: enable
+  SuggestExtensions: false
+  Exclude:
+    - gemfiles/*
+    - tmp/*
+    - vendor/**/* # for github actions
 
-Layout/AlignParameters:
-  # Disable, till rubocop supports combination of styles.
-  # Use one of this styles where appropriate, keep it clean, compact and readable.
-  Enabled: false
-  # EnforcedStyle:
-  # - with_first_parameter
-  # - with_fixed_indentation
+Gemspec/DevelopmentDependencies: {Enabled: false}
+
+Layout/ArgumentAlignment: {EnforcedStyle: with_fixed_indentation}
+Layout/ParameterAlignment: {EnforcedStyle: with_fixed_indentation}
 
 # Breaks
 #
@@ -19,7 +22,11 @@ Layout/AlignParameters:
 #   )
 Layout/ClosingParenthesisIndentation: {Enabled: false}
 Layout/DotPosition: {EnforcedStyle: trailing}
+Layout/EmptyLineAfterGuardClause: {Enabled: false}
 Layout/FirstParameterIndentation: {EnforcedStyle: consistent}
+Layout/LineContinuationLeadingSpace: {Enabled: false}
+Layout/LineEndStringConcatenationIndentation: {EnforcedStyle: indented}
+Layout/LineLength: {Max: 100}
 # Same as Layout/ClosingParenthesisIndentation
 Layout/MultilineMethodCallBraceLayout: {Enabled: false}
 Layout/MultilineMethodCallIndentation: {EnforcedStyle: indented}
@@ -28,8 +35,16 @@ Layout/SpaceInsideHashLiteralBraces: {EnforcedStyle: no_space}
 
 # Offences named scopes and `expect {}.to change {}`.
 Lint/AmbiguousBlockAssociation: {Enabled: false}
+Lint/EmptyBlock:
+  Exclude:
+    - spec/**/*
 
+Naming/FileName:
+  Exclude:
+    - lib/tasks/telegram-bot.rake
+Naming/MethodParameterName: {MinNameLength: 2}
 Naming/PredicateName: {Enabled: false}
+Naming/RescuedExceptionsVariableName: {PreferredName: exception}
 Naming/VariableNumber: {EnforcedStyle: snake_case}
 
 Style/Alias: {Enabled: false}
@@ -40,16 +55,21 @@ Style/IfUnlessModifier: {Enabled: false}
 # Consistent to other definitions.
 Style/EmptyMethod: {EnforcedStyle: expanded}
 
+Style/Lambda: {EnforcedStyle: literal}
 Style/ModuleFunction: {Enabled: false}
 Style/NestedParenthesizedCalls: {Enabled: false}
 Style/SignalException: {EnforcedStyle: only_raise}
 Style/TrailingCommaInArguments: {Enabled: false}
-Style/TrailingCommaInLiteral: {EnforcedStyleForMultiline: comma}
+Style/TrailingCommaInArrayLiteral: {EnforcedStyleForMultiline: comma}
+Style/TrailingCommaInHashLiteral: {EnforcedStyleForMultiline: comma}
 
 Metrics/AbcSize: {Max: 21}
 # Other metrics are just enough.
 # This one offences all specs, routes and some initializers.
 Metrics/BlockLength: {Enabled: false}
-Metrics/LineLength: {Max: 100}
 Metrics/MethodLength: {Max: 30}
 Metrics/CyclomaticComplexity: {Max: 8}
+
+Rails/IndexWith: {Enabled: false}
+Rails/RakeEnvironment: {Enabled: false}
+Rails/ShortI18n: {Enabled: false}

.travis.yml

@@ -1,34 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-- 2.5
-- 2.4
-gemfile:
-- gemfiles/rails_52.gemfile
-- gemfiles/rails_51.gemfile
-matrix:
-  include:
-  # old rails
-  - rvm: 2.5
-    gemfile: gemfiles/rails_50.gemfile
-  - rvm: 2.5
-    gemfile: gemfiles/rails_42.gemfile
-  # old rubies
-  - rvm: 2.3
-    gemfile: gemfiles/rails_52.gemfile
-  # future rails
-  - rvm: 2.5
-    gemfile: gemfiles/rails_60.gemfile
-  # Allow rails 6 to fail while master branch is used
-  allow_failures:
-  - rvm: 2.5
-    gemfile: gemfiles/rails_60.gemfile
-notifications:
-  email: false
-
-# for 2.5.0 until 2.5.1 is released:
-#   https://github.com/travis-ci/travis-ci/issues/8978
-#   https://github.com/travis-ci/travis-ci/issues/8969#issuecomment-354135622
-before_install:
-  - gem update --system
-  - gem install bundler

Appraisals

@@ -1,26 +1,31 @@
+# frozen_string_literal: true
+
+appraise 'rails-71' do
+  gem 'actionpack', '~> 7.1.0'
+  gem 'railties', '~> 7.1.0'
+end
+
+appraise 'rails-70' do
+  gem 'actionpack', '~> 7.0.0'
+  gem 'railties', '~> 7.0.0'
+end
+
+appraise 'rails-61' do
+  gem 'actionpack', '~> 6.1.0'
+  gem 'railties', '~> 6.1.0'
+end
+
 appraise 'rails-60' do
-  git 'https://github.com/rails/rails.git' do
-    gem 'actionpack', '~> 6.0.0.alpha'
-    gem 'railties', '~> 6.0.0.alpha'
-  end
+  gem 'actionpack', '~> 6.0.0'
+  gem 'railties', '~> 6.0.0'
 end
 
 appraise 'rails-52' do
-  gem 'actionpack', '~> 5.2.0.beta2'
-  gem 'railties', '~> 5.2.0.beta2'
+  gem 'actionpack', '~> 5.2.0'
+  gem 'railties', '~> 5.2.0'
 end
 
 appraise 'rails-51' do
-  gem 'actionpack', '~> 5.1'
-  gem 'railties', '~> 5.1'
-end
-
-appraise 'rails-50' do
-  gem 'actionpack', '~> 5.0'
-  gem 'railties', '~> 5.0'
-end
-
-appraise 'rails-42' do
-  gem 'actionpack', '~> 4.2'
-  gem 'railties', '~> 4.2'
+  gem 'actionpack', '~> 5.1.0'
+  gem 'railties', '~> 5.1.0'
 end

CHANGELOG.md

@@ -1,8 +1,75 @@
 # Unreleased
 
+# 0.16.2
+
+- Update to Bot API 7.3
+- Add `# frozen_string_literal: true` to all source files.
+
+# 0.16.1
+
+- Fix logger in poller mode in rails 7.1
+
+# 0.16.0
+
+- Add `UpdatesController#webhook_request` that is set to `ActionDispatch::Request`
+  in webhook mode.
+- Update to Bot API 6.8
+- Added `chat_join_request` to PAYLOAD_TYPES
+
+# 0.15.7
+
+- Add support for editMessageMedia similar to sendMediaGroup.
+
+# 0.15.6
+
+- Rails 7.0 support.
+- Fix sending File objects in nested objects in sendMediaGroup.
+- Update to Bot API 5.7
+
+# 0.15.4
+
+- Update to Bot API 5.3
+
+# 0.15.3
+
+- Ruby 3.0 support: fix translation helpers.
+
+# 0.15.2
+
+- Ruby 3.0 support. Drop support for Ruby < 2.4.
+
+# 0.15.1
+
+- Rails 6.1 support.
+
+# 0.15.0
+
+- Add `:path` option to `telegram_webhook` route helper.
+- __Breaking change!__ Default route is generated using hashed bot token.
+  Please reconfigure webhook after update (`rake telegram:bot:set_webhook`).
+- Update to Bot API 5.0, add rake tasks for `deleteWebhook`, `close` & `logOut`.
+- Add `server` option for client to support local bot API servers.
+
+# 0.14.4
+
+- Update to Bot API 4.7
+
+# 0.14.3
+
+- Rails 6.0 support.
+- Update to Bot API 4.4.
+
+# 0.14.2
+
+- Add reply helpers: `answer_pre_checkout_query`, `answer_shipping_query`.
+- Update to Bot API 4.3.
+
+# 0.14.1
+
 - Read config from secrets when credentials don't provide it in rails >= 5.2.
 - Remove botan.io support. It's already shut down, so it should not be a braking change.
   https://github.com/botanio/sdk#this-service-will-be-shut-down-on-25th-may-2018
+- Update to Bot API 4.1.
 
 # 0.14.0
 

Gemfile

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec
 
 group :development do
   gem 'appraisal', '~> 2.2'
 
-  gem 'pry', '~> 0.10.1'
-  gem 'pry-byebug', '~> 3.2.0'
-  gem 'sdoc', '~> 0.4.1'
+  gem 'debug', '~> 1.9.2'
+  gem 'sdoc', '~> 2.0.3'
 
-  gem 'telegram-bot-types', '~> 0.6.0'
+  gem 'telegram-bot-types', '~> 0.6.3'
 
-  gem 'rspec', '~> 3.5.0'
-  gem 'rspec-its', '~> 1.1.0'
-  gem 'rspec-rails', '~> 3.5.0'
+  gem 'rspec', '~> 3.12.0'
+  gem 'rspec-its', '~> 1.3.0'
+  gem 'rspec-rails', '~> 4.0.2'
 
-  gem 'rubocop', '~> 0.52.1'
+  gem 'rubocop', '~> 1.59.0'
+  gem 'rubocop-rails', '~> 2.23.1'
 
-  gem 'coveralls', '~> 0.8.2', require: false
+  gem 'coveralls', '~> 0.8.23', require: false
 end

README.md

@@ -2,9 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/telegram-bot.svg)](http://badge.fury.io/rb/telegram-bot)
 [![Code Climate](https://codeclimate.com/github/telegram-bot-rb/telegram-bot/badges/gpa.svg)](https://codeclimate.com/github/telegram-bot-rb/telegram-bot)
-[![Build Status](https://travis-ci.org/telegram-bot-rb/telegram-bot.svg)](https://travis-ci.org/telegram-bot-rb/telegram-bot)
-
-__Breaking changes in v0.14!__ See [upgrade guide](https://github.com/telegram-bot-rb/telegram-bot/wiki/Upgrading-to-0.14).
+[![Lint & Test](https://github.com/telegram-bot-rb/telegram-bot/actions/workflows/ci.yml/badge.svg)](https://github.com/telegram-bot-rb/telegram-bot/actions/workflows/ci.yml)
 
 Tools for developing Telegram bots. Best used with Rails, but can be used in
 [standalone app](https://github.com/telegram-bot-rb/telegram-bot/wiki/Not-rails-application).
@@ -27,9 +25,33 @@ with session, keyboards and inline queries.
 Run it on your local machine in 1 minute!
 
 And here is [app template](https://github.com/telegram-bot-rb/rails_template)
-to generate clean app in seconds.
+to generate new rails app in seconds.
 
-Examples and cookbook in [wiki](https://github.com/telegram-bot-rb/telegram-bot/wiki).
+See examples and cookbook in [the wiki](https://github.com/telegram-bot-rb/telegram-bot/wiki).
+
+## Table of Contents
+
+* [Installation](#installation)
+* [Usage](#usage)
+  * [Configuration](#configuration)
+  * [Configuration in Rails app](#configuration-in-rails-app)
+  * [Client](#client)
+    * [Typed responses](#typed-responses)
+  * [Controller](#controller)
+    * [Reply helpers](#reply-helpers)
+    * [Optional typecasting](#optional-typecasting)
+    * [Session](#session)
+    * [Message context](#message-context)
+    * [Callback queries](#callback-queries)
+  * [Routes in Rails app](#routes-in-rails-app)
+    * [Processing updates](#processing-updates)
+  * [Development & Debugging](#development--debugging)
+  * [Testing](#testing)
+  * [Deployment](#deployment)
+  * [Async mode](#async-mode)
+    * [Limitations](#limitations)
+* [Development](#development)
+* [Contributing](#contributing)
 
 ## Installation
 
@@ -41,11 +63,15 @@ gem 'telegram-bot'
 
 And then execute:
 
-    $ bundle
+```
+bundle
+```
 
 Or install it yourself as:
 
-    $ gem install telegram-bot
+```
+gem install telegram-bot
+```
 
 Require if necessary:
 
@@ -65,7 +91,11 @@ which is used for `Telegram.bot`.
 ```ruby
 Telegram.bots_config = {
   default: DEFAULT_BOT_TOKEN,
-  chat: {token: CHAT_BOT_TOKEN, username: 'chatbot'},
+  chat: {
+    token: CHAT_BOT_TOKEN,
+    username: 'ChatBot', # to support commands with mentions (/help@ChatBot)
+    server: 'http://local.bot.api.server', # for Local Bot API Server
+  },
 }
 
 Telegram.bot.get_updates
@@ -87,6 +117,7 @@ development:
     bot:
       token: TOKEN
       username: SomeBot
+      server: http://local.bot.api.server
 
     # For multiple bots in single app use hash of `internal_bot_id => settings`
     bots:
@@ -100,10 +131,12 @@ development:
 
 For Rails >= 5.2 `Telegram::Bot` searches for config first in credentials and then in secrets.
 To use credentials as config store, add telegram section to credentials instead of secrets using
-`rails credentials:edit`. In this case be aware of that [Rails may not load
+`rails credentials:edit`. In this case be aware of that [Rails < 6.0 may not load
 credentials in dev environment by default](https://github.com/telegram-bot-rb/telegram-bot/issues/74#issuecomment-384205609).
+In Rails >= 6.0 run `rails credentials:edit --environment development` to configure bot
+in each environment.
 
-I suggest not using Rails 5.2 credentials because it can lead to leakage of sesitive data
+I suggest not using Rails 5.2 credentials because it can lead to leakage of sensitive data
 and it's more difficult to use in multiple environments. See
 [secure_credentials](https://github.com/printercu/secure_credentials) gem for better option.
 
@@ -126,9 +159,9 @@ bot.send_message(chat_id: chat_id, text: 'Test')
 ```
 
 There is no magic, they just pass params as is and set `path_suffix`.
-See [`Client`](https://github.com/telegram-bot-rb/telegram-bot/blob/master/lib/telegram/bot/client.rb)
-class for list of available methods. Please open PR or issue if it misses methods from
-new API versions.
+See [list of available methods](https://github.com/telegram-bot-rb/telegram-bot/blob/master/lib/telegram/bot/client/api_methods.txt)
+fetched from [API docs](https://core.telegram.org/bots/api).
+Please open PR or issue if it misses methods from new API versions.
 
 Any API request error will raise `Telegram::Bot::Error` with description in its message.
 Special `Telegram::Bot::Forbidden` is raised when bot can't post messages to the chat anymore.
@@ -165,19 +198,18 @@ Bot controllers like usual rails controllers provides features like callbacks,
 
 ```ruby
 class Telegram::WebhookController < Telegram::Bot::UpdatesController
-  # use callbacks like in any other controllers
+  # use callbacks like in any other controller
   around_action :with_locale
 
-  # Every update can have one of: message, inline_query, chosen_inline_result,
+  # Every update has one of: message, inline_query, chosen_inline_result,
   # callback_query, etc.
-  # Define method with same name to respond to this updates.
+  # Define method with the same name to handle this type of update.
   def message(message)
-    # message can be also accessed via instance method
-    message == self.payload # true
     # store_message(message['text'])
   end
 
-  # This basic methods receives commonly used params:
+  # For the following types of updates commonly used params are passed as arguments,
+  # full payload object is available with `payload` instance method.
   #
   #   message(payload)
   #   inline_query(query, offset)
@@ -188,14 +220,19 @@ class Telegram::WebhookController < Telegram::Bot::UpdatesController
   # Command arguments will be parsed and passed to the method.
   # Be sure to use splat args and default values to not get errors when
   # someone passed more or less arguments in the message.
-  def start!(data = nil, *)
-    # do_smth_with(data)
+  def start!(word = nil, *other_words)
+    # do_smth_with(word)
+
+    # full message object is also available via `payload` instance method:
+    # process_raw_message(payload['text'])
 
     # There are `chat` & `from` shortcut methods.
-    # For callback queries `chat` if taken from `message` when it's available.
+    # For callback queries `chat` is taken from `message` when it's available.
     response = from ? "Hello #{from['username']}!" : 'Hi there!'
+
     # There is `respond_with` helper to set `chat_id` from received message:
     respond_with :message, text: response
+
     # `reply_with` also sets `reply_to_message_id`:
     reply_with :photo, photo: File.open('party.jpg')
   end
@@ -218,10 +255,10 @@ end
 
 #### Reply helpers
 
-There are helpers to respond for basic actions. They just set chat/message/query
-identifiers from update. See
+There are helpers for basic responses. They just set chat/message/query
+identifiers from the update. See
 [`ReplyHelpers`](https://github.com/telegram-bot-rb/telegram-bot/blob/master/lib/telegram/bot/updates_controller/reply_helpers.rb)
-module for more information. Here are this methods signatures:
+module for more information. Here are these methods signatures:
 
 ```ruby
 def respond_with(type, params); end
@@ -229,6 +266,8 @@ def reply_with(type, params); end
 def answer_inline_query(results, params = {}); end
 def answer_callback_query(text, params = {}); end
 def edit_message(type, params = {}); end
+def answer_pre_checkout_query(ok, params = {}); end
+def answer_shipping_query(ok, params = {}); end
 ```
 
 #### Optional typecasting
@@ -362,7 +401,7 @@ end
 ### Routes in Rails app
 
 There is `telegram_webhook` helper for rails app to define routes for webhooks.
-It defines routes at `telegram/#{bot.token}` and connects bots with controller.
+It defines routes at `telegram/#{hash_of(bot.token)}` and connects bots with controller.
 
 ```ruby
 # Most off apps would require
@@ -382,7 +421,7 @@ telegram_webhook TelegramAuctionController, :auction
 telegram_webhook TelegramController, as: :custom_telegram_webhook
 ```
 
-#### Processesing updates
+#### Processing updates
 
 To process update with controller call `.dispatch(bot, update)` on it.
 There are several options to run it automatically:
@@ -391,6 +430,10 @@ There are several options to run it automatically:
 - Use `Telegram::Bot::Middleware` with rack ([example in wiki](https://github.com/telegram-bot-rb/telegram-bot/wiki/Not-rails-application)).
 - Use poller (described in the next section).
 
+When controller runs in webhook mode `Telegram::Bot::Middleware` passes
+`ActionDispatch::Request` object to the `.dispatch` method.
+It's available via `#webhook_request` controller method.
+
 To run action without update (ex., send notifications from jobs),
 you can call `#process` directly. In this case controller can be initialized
 with `:from` and/or `:chat` options instead of `update` object:
@@ -471,10 +514,11 @@ RSpec.describe TelegramWebhooksController, telegram_bot: :rails do
   #   dispatch_command(cmd, *args)
 
   # Available matchers can be found in Telegram::Bot::RSpec::ClientMatchers.
-  it 'shows usage of basic matchers'
-    # The most basic one is #make_telegram_request(bot, endpoint, params_matcher)
-    expect { dispatch_command(:start) }.
-      to make_telegram_request(bot, :sendMessage, hash_including(text: 'msg text'))
+  it 'shows usage of basic matchers' do
+    # The most basic one is #make_telegram_request(bot, action).
+    # It works similar to `receive` matcher and supports chaining `.with(args).exactly(n).times`.
+    expect { dispatch_command(:start) }.to make_telegram_request(bot, :sendMessage).
+      with(hash_including(text: 'msg text'))
 
     # There are some shortcuts for dispatching basic updates and testing responses.
     expect { dispatch_message('Hi') }.to send_telegram_message(bot, /msg regexp/, some: :option)
@@ -499,7 +543,7 @@ end
 
 There is a context for testing bot controller in the way similar to Rails controller tests.
 It's supposed to be a low-level alternative for integration tests. Among the differences is
-that controller tests use a single controller instance for all dispatches in specific exaple,
+that controller tests use a single controller instance for all dispatches in specific example,
 session is stubbed (does not use configured store engine), and update is not serialized
 so it also supports mocks. This can be useful for unit testing, but should not be used as
 the default way to test the bot.

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

bin/console

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'telegram/bot'
 
-require 'pry'
-Pry.start
+require 'irb'
+require 'irb/completion'
+
+IRB.setup(nil)
+IRB::Irb.new.run(IRB.conf)

bin/fetch-telegram-methods

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Fetch list of methods from Telegram docs.
 # Use it to update client.rb.
@@ -6,7 +8,7 @@
 require 'net/http'
 require 'nokogiri'
 
-DOCS_URL = 'https://core.telegram.org/bots/api'.freeze
+DOCS_URL = 'https://core.telegram.org/bots/api'
 
 page_html = Net::HTTP.get(URI(DOCS_URL))
 doc = Nokogiri::HTML(page_html)
@@ -18,14 +20,14 @@ headers = doc.css('h3, h4').
   map { |g| g.map(&:text) }
 
 # Method starts with lowercase and does not have spaces.
-NOT_METHOD_REGEXP = /(\A[^a-z])|\s/
+NOT_METHOD_REGEXP = /(\A[^a-z])|\s/.freeze
 
 # Filter method names.
 method_list = headers.
-  map { |g| g.reject { |x| x.match?(NOT_METHOD_REGEXP) } }.
+  map { |g| g.grep_v(NOT_METHOD_REGEXP) }.
   reject(&:empty?)
 
-api_version = doc.text.match(/^(Bot API ([\d\.]+))\.?$/)
+api_version = doc.text.match(/^(?:Introducing )?(Bot API ([\d\.]+))\.?$/)
 
 result = ['# Generated with bin/fetch-telegram-methods']
 result << "# #{api_version[1]}" if api_version

bin/install_git_hooks

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-root = File.expand_path('../../', __FILE__)
+root = File.expand_path('..', __dir__)
 hooks_dir = "#{root}/bin/git-hooks"
 
 `ls -1 #{hooks_dir}`.each_line.map(&:strip).each do |file|

gemfiles/rails_42.gemfile

@@ -1,21 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "actionpack", "~> 4.2"
-gem "railties", "~> 4.2"
-
-group :development do
-  gem "appraisal", "~> 2.2"
-  gem "pry", "~> 0.10.1"
-  gem "pry-byebug", "~> 3.2.0"
-  gem "sdoc", "~> 0.4.1"
-  gem "telegram-bot-types", "~> 0.6.0"
-  gem "rspec", "~> 3.5.0"
-  gem "rspec-its", "~> 1.1.0"
-  gem "rspec-rails", "~> 3.5.0"
-  gem "rubocop", "~> 0.52.1"
-  gem "coveralls", "~> 0.8.2", require: false
-end
-
-gemspec path: "../"

gemfiles/rails_50.gemfile

@@ -1,21 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "actionpack", "~> 5.0"
-gem "railties", "~> 5.0"
-
-group :development do
-  gem "appraisal", "~> 2.2"
-  gem "pry", "~> 0.10.1"
-  gem "pry-byebug", "~> 3.2.0"
-  gem "sdoc", "~> 0.4.1"
-  gem "telegram-bot-types", "~> 0.6.0"
-  gem "rspec", "~> 3.5.0"
-  gem "rspec-its", "~> 1.1.0"
-  gem "rspec-rails", "~> 3.5.0"
-  gem "rubocop", "~> 0.52.1"
-  gem "coveralls", "~> 0.8.2", require: false
-end
-
-gemspec path: "../"

gemfiles/rails_51.gemfile

@@ -2,20 +2,20 @@
 
 source "https://rubygems.org"
 
-gem "actionpack", "~> 5.1"
-gem "railties", "~> 5.1"
+gem "actionpack", "~> 5.1.0"
+gem "railties", "~> 5.1.0"
 
 group :development do
   gem "appraisal", "~> 2.2"
-  gem "pry", "~> 0.10.1"
-  gem "pry-byebug", "~> 3.2.0"
-  gem "sdoc", "~> 0.4.1"
-  gem "telegram-bot-types", "~> 0.6.0"
-  gem "rspec", "~> 3.5.0"
-  gem "rspec-its", "~> 1.1.0"
-  gem "rspec-rails", "~> 3.5.0"
-  gem "rubocop", "~> 0.52.1"
-  gem "coveralls", "~> 0.8.2", require: false
+  gem "debug", "~> 1.9.2"
+  gem "sdoc", "~> 2.0.3"
+  gem "telegram-bot-types", "~> 0.6.3"
+  gem "rspec", "~> 3.12.0"
+  gem "rspec-its", "~> 1.3.0"
+  gem "rspec-rails", "~> 4.0.2"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
+  gem "coveralls", "~> 0.8.23", require: false
 end
 
 gemspec path: "../"

gemfiles/rails_52.gemfile

@@ -2,20 +2,20 @@
 
 source "https://rubygems.org"
 
-gem "actionpack", "~> 5.2.0.beta2"
-gem "railties", "~> 5.2.0.beta2"
+gem "actionpack", "~> 5.2.0"
+gem "railties", "~> 5.2.0"
 
 group :development do
   gem "appraisal", "~> 2.2"
-  gem "pry", "~> 0.10.1"
-  gem "pry-byebug", "~> 3.2.0"
-  gem "sdoc", "~> 0.4.1"
-  gem "telegram-bot-types", "~> 0.6.0"
-  gem "rspec", "~> 3.5.0"
-  gem "rspec-its", "~> 1.1.0"
-  gem "rspec-rails", "~> 3.5.0"
-  gem "rubocop", "~> 0.52.1"
-  gem "coveralls", "~> 0.8.2", require: false
+  gem "debug", "~> 1.9.2"
+  gem "sdoc", "~> 2.0.3"
+  gem "telegram-bot-types", "~> 0.6.3"
+  gem "rspec", "~> 3.12.0"
+  gem "rspec-its", "~> 1.3.0"
+  gem "rspec-rails", "~> 4.0.2"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
+  gem "coveralls", "~> 0.8.23", require: false
 end
 
 gemspec path: "../"

gemfiles/rails_60.gemfile

@@ -2,22 +2,20 @@
 
 source "https://rubygems.org"
 
-git "https://github.com/rails/rails.git" do
-  gem "actionpack", "~> 6.0.0.alpha"
-  gem "railties", "~> 6.0.0.alpha"
-end
+gem "actionpack", "~> 6.0.0"
+gem "railties", "~> 6.0.0"
 
 group :development do
   gem "appraisal", "~> 2.2"
-  gem "pry", "~> 0.10.1"
-  gem "pry-byebug", "~> 3.2.0"
-  gem "sdoc", "~> 0.4.1"
-  gem "telegram-bot-types", "~> 0.6.0"
-  gem "rspec", "~> 3.5.0"
-  gem "rspec-its", "~> 1.1.0"
-  gem "rspec-rails", "~> 3.5.0"
-  gem "rubocop", "~> 0.52.1"
-  gem "coveralls", "~> 0.8.2", require: false
+  gem "debug", "~> 1.9.2"
+  gem "sdoc", "~> 2.0.3"
+  gem "telegram-bot-types", "~> 0.6.3"
+  gem "rspec", "~> 3.12.0"
+  gem "rspec-its", "~> 1.3.0"
+  gem "rspec-rails", "~> 4.0.2"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
+  gem "coveralls", "~> 0.8.23", require: false
 end
 
 gemspec path: "../"

gemfiles/rails_61.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 6.1.0"
+gem "railties", "~> 6.1.0"
+
+group :development do
+  gem "appraisal", "~> 2.2"
+  gem "debug", "~> 1.9.2"
+  gem "sdoc", "~> 2.0.3"
+  gem "telegram-bot-types", "~> 0.6.3"
+  gem "rspec", "~> 3.12.0"
+  gem "rspec-its", "~> 1.3.0"
+  gem "rspec-rails", "~> 4.0.2"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
+  gem "coveralls", "~> 0.8.23", require: false
+end
+
+gemspec path: "../"

gemfiles/rails_70.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 7.0.0"
+gem "railties", "~> 7.0.0"
+
+group :development do
+  gem "appraisal", "~> 2.2"
+  gem "debug", "~> 1.9.2"
+  gem "sdoc", "~> 2.0.3"
+  gem "telegram-bot-types", "~> 0.6.3"
+  gem "rspec", "~> 3.12.0"
+  gem "rspec-its", "~> 1.3.0"
+  gem "rspec-rails", "~> 4.0.2"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
+  gem "coveralls", "~> 0.8.23", require: false
+end
+
+gemspec path: "../"

gemfiles/rails_71.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 7.1.0"
+gem "railties", "~> 7.1.0"
+
+group :development do
+  gem "appraisal", "~> 2.2"
+  gem "debug", "~> 1.9.2"
+  gem "sdoc", "~> 2.0.3"
+  gem "telegram-bot-types", "~> 0.6.3"
+  gem "rspec", "~> 3.12.0"
+  gem "rspec-its", "~> 1.3.0"
+  gem "rspec-rails", "~> 4.0.2"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
+  gem "coveralls", "~> 0.8.23", require: false
+end
+
+gemspec path: "../"

lib/tasks/telegram-bot.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :telegram do
   namespace :bot do
     desc 'Run poller. It broadcasts Rails.logger to STDOUT in dev like `rails s` do. ' \
@@ -6,23 +8,34 @@ namespace :telegram do
       ENV['BOT_POLLER_MODE'] = 'true'
       Rake::Task['environment'].invoke
       if ENV.fetch('LOG_TO_STDOUT') { Rails.env.development? }.present?
-        console = ActiveSupport::Logger.new(STDERR)
-        Rails.logger.extend ActiveSupport::Logger.broadcast console
+        console = ActiveSupport::Logger.new($stderr)
+        if Rails.logger.respond_to?(:broadcast_to)
+          Rails.logger.broadcast_to(console)
+        else
+          Rails.logger.extend ActiveSupport::Logger.broadcast console
+        end
       end
-      Telegram::Bot::UpdatesPoller.start(ENV['BOT'].try!(:to_sym) || :default)
+      Telegram::Bot::UpdatesPoller.start(ENV['BOT']&.to_sym || :default)
     end
 
     desc 'Set webhook urls for all bots'
     task set_webhook: :environment do
-      routes = Rails.application.routes.url_helpers
-      cert_file = ENV['CERT']
-      cert = File.open(cert_file) if cert_file
-      Telegram.bots.each do |key, bot|
-        route_name = Telegram::Bot::RoutesHelper.route_name_for_bot(bot)
-        url = routes.send("#{route_name}_url")
-        puts "Setting webhook for #{key}..."
-        bot.async(false) { bot.set_webhook(url: url, certificate: cert) }
-      end
+      Telegram::Bot::Tasks.set_webhook
+    end
+
+    desc 'Delete webhooks for all or specific BOT'
+    task :delete_webhook do
+      Telegram::Bot::Tasks.delete_webhook
+    end
+
+    desc 'Perform logOut command for all or specific BOT'
+    task :log_out do
+      Telegram::Bot::Tasks.log_out
+    end
+
+    desc 'Perform `close` command for all or specific BOT'
+    task :close do
+      Telegram::Bot::Tasks.close
     end
   end
 end

lib/telegram/bot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/config_methods'
 
 module Telegram
@@ -12,24 +14,16 @@ module Telegram
     # Raised for valid telegram response with 404 status code.
     class NotFound < Error; end
 
-    module_function
-
-    def deprecation_0_15
-      @deprecation ||= begin
-        require 'active_support/deprecation'
-        ActiveSupport::Deprecation.new('0.15', 'Telegram::Bot')
-      end
-    end
-
     autoload :Async,              'telegram/bot/async'
     autoload :Client,             'telegram/bot/client'
     autoload :ClientStub,         'telegram/bot/client_stub'
     autoload :DebugClient,        'telegram/bot/debug_client'
-    autoload :Initializers,       'telegram/bot/initializers'
     autoload :Middleware,         'telegram/bot/middleware'
     autoload :RSpec,              'telegram/bot/rspec'
+    autoload :Tasks,              'telegram/bot/tasks'
     autoload :UpdatesController,  'telegram/bot/updates_controller'
     autoload :UpdatesPoller,      'telegram/bot/updates_poller'
+    autoload :VERSION,            'telegram/bot/version'
   end
 end
 

lib/telegram/bot/async.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     # Telegram clients can perform requests in async way with
@@ -16,8 +18,8 @@ module Telegram
     # accessible via `Teletgram.bots[id]` in job worker. Or just use
     # `Telegram.bots_config=` for configuration.
     #
-    # Being in async mode `#request` enqueues job instead to perform
-    # http request instead of performing it directly.
+    # Being in async mode `#request` enqueues job to perform
+    # http request instead of performing it immediately.
     # Async behavior is controlled with `#async=` writer
     # and can be enabled/disabled for the block with `#async`:
     #
@@ -29,7 +31,7 @@ module Telegram
     # while `#async(val, &block)` is thread-safe.
     #
     # It can be set with custom job class or classname. By default it defines
-    # job classes for every client class, inherited from ApplicationRecord, which
+    # job classes inherited from ApplicationJob, which
     # can be accessed via `.default_async_job`. You can integrate it with any
     # other job provider by defining a class with `.perform_later(bot_id, *args)`
     # method. See Async::Job for implemetation.
@@ -128,7 +130,7 @@ module Telegram
       #
       # If no block is given returns previously set value or the global one,
       # set by #async=.
-      def async(val = true)
+      def async(val = true) # rubocop:disable Style/OptionalBooleanParameter
         thread_key = object_id
         thread_store = Async.thread_store
         return thread_store.fetch(thread_key) { @async } unless block_given?
@@ -137,7 +139,7 @@ module Telegram
           thread_store[thread_key] = self.class.prepare_async_val(val)
           yield
         ensure
-          if MISSING_VALUE == old_val
+          if old_val == MISSING_VALUE
             thread_store.delete(thread_key)
           else
             thread_store[thread_key] = old_val

lib/telegram/bot/client.rb

@@ -1,13 +1,17 @@
-require 'json'
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/keys'
 require 'httpclient'
 
 module Telegram
   module Bot
     class Client
-      URL_TEMPLATE = 'https://api.telegram.org/bot%<token>s/'.freeze
+      SERVER = 'https://api.telegram.org'
+      URL_TEMPLATE = '%<server>s/bot%<token>s/'
 
+      autoload :RequestBodyFormatter, 'telegram/bot/client/request_body_formatter'
       autoload :TypedResponse, 'telegram/bot/client/typed_response'
-      extend Initializers
+
       prepend Async
       include DebugClient
 
@@ -15,6 +19,16 @@ module Telegram
       include ApiHelper
 
       class << self
+        # Accepts different options to initialize bot.
+        def wrap(input, **options)
+          case input
+          when Symbol then by_id(input) or raise "#{name} #{input.inspect} not configured"
+          when self   then input
+          when Hash   then new(**input.symbolize_keys, **options)
+          else        new(input, **options)
+          end
+        end
+
         def by_id(id)
           Telegram.bots[id]
         end
@@ -24,20 +38,12 @@ module Telegram
           prepend TypedResponse
         end
 
-        # Encodes nested hashes as json.
-        def prepare_body(body)
-          body = body.dup
-          body.each do |k, val|
-            body[k] = val.to_json if val.is_a?(Hash) || val.is_a?(Array)
-          end
-        end
-
         def prepare_async_args(action, body = {})
-          [action.to_s, Async.prepare_hash(prepare_body(body))]
+          [action.to_s, Async.prepare_hash(RequestBodyFormatter.format(body, action))]
         end
 
         def error_for_response(response)
-          result = JSON.parse(response.body) rescue nil # rubocop:disable RescueModifier
+          result = JSON.parse(response.body) rescue nil # rubocop:disable Style/RescueModifier
           return Error.new(response.reason) unless result
           message = result['description'] || '-'
           # This errors are raised only for valid responses from Telegram
@@ -51,15 +57,15 @@ module Telegram
 
       attr_reader :client, :token, :username, :base_uri
 
-      def initialize(token = nil, username = nil, **options)
+      def initialize(token = nil, username = nil, server: SERVER, **options)
         @client = HTTPClient.new
         @token = token || options[:token]
         @username = username || options[:username]
-        @base_uri = format(URL_TEMPLATE, token: self.token)
+        @base_uri = format(URL_TEMPLATE, server: server, token: self.token)
       end
 
       def request(action, body = {})
-        response = http_request("#{base_uri}#{action}", self.class.prepare_body(body))
+        response = http_request("#{base_uri}#{action}", RequestBodyFormatter.format(body, action))
         raise self.class.error_for_response(response) if response.status >= 300
         JSON.parse(response.body)
       end

lib/telegram/bot/client/api_helper.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/inflections'
 
 module Telegram
   module Bot
     class Client
       module ApiHelper
-        METHODS_LIST_FILE = File.expand_path('../api_methods.txt', __FILE__)
+        METHODS_LIST_FILE = File.expand_path('api_methods.txt', __dir__)
 
         class << self
           def methods_list(file = METHODS_LIST_FILE)

lib/telegram/bot/client/api_methods.txt

@@ -1,5 +1,5 @@
 # Generated with bin/fetch-telegram-methods
-# Bot API 4.1
+# Bot API 7.3
 
 getUpdates
 setWebhook
@@ -7,8 +7,13 @@ deleteWebhook
 getWebhookInfo
 
 getMe
+logOut
+close
 sendMessage
 forwardMessage
+forwardMessages
+copyMessage
+copyMessages
 sendPhoto
 sendAudio
 sendDocument
@@ -18,50 +23,104 @@ sendVoice
 sendVideoNote
 sendMediaGroup
 sendLocation
-editMessageLiveLocation
-stopMessageLiveLocation
 sendVenue
 sendContact
+sendPoll
+sendDice
 sendChatAction
+setMessageReaction
 getUserProfilePhotos
 getFile
-kickChatMember
+banChatMember
 unbanChatMember
 restrictChatMember
 promoteChatMember
+setChatAdministratorCustomTitle
+banChatSenderChat
+unbanChatSenderChat
+setChatPermissions
 exportChatInviteLink
+createChatInviteLink
+editChatInviteLink
+revokeChatInviteLink
+approveChatJoinRequest
+declineChatJoinRequest
 setChatPhoto
 deleteChatPhoto
 setChatTitle
 setChatDescription
 pinChatMessage
 unpinChatMessage
+unpinAllChatMessages
 leaveChat
 getChat
 getChatAdministrators
-getChatMembersCount
+getChatMemberCount
 getChatMember
 setChatStickerSet
 deleteChatStickerSet
+getForumTopicIconStickers
+createForumTopic
+editForumTopic
+closeForumTopic
+reopenForumTopic
+deleteForumTopic
+unpinAllForumTopicMessages
+editGeneralForumTopic
+closeGeneralForumTopic
+reopenGeneralForumTopic
+hideGeneralForumTopic
+unhideGeneralForumTopic
+unpinAllGeneralForumTopicMessages
 answerCallbackQuery
+getUserChatBoosts
+getBusinessConnection
+setMyCommands
+deleteMyCommands
+getMyCommands
+setMyName
+getMyName
+setMyDescription
+getMyDescription
+setMyShortDescription
+getMyShortDescription
+setChatMenuButton
+getChatMenuButton
+setMyDefaultAdministratorRights
+getMyDefaultAdministratorRights
 
 editMessageText
 editMessageCaption
 editMessageMedia
+editMessageLiveLocation
+stopMessageLiveLocation
 editMessageReplyMarkup
+stopPoll
 deleteMessage
+deleteMessages
 
 sendSticker
 getStickerSet
+getCustomEmojiStickers
 uploadStickerFile
 createNewStickerSet
 addStickerToSet
 setStickerPositionInSet
 deleteStickerFromSet
+replaceStickerInSet
+setStickerEmojiList
+setStickerKeywords
+setStickerMaskPosition
+setStickerSetTitle
+setStickerSetThumbnail
+setCustomEmojiStickerSetThumbnail
+deleteStickerSet
 
 answerInlineQuery
+answerWebAppQuery
 
 sendInvoice
+createInvoiceLink
 answerShippingQuery
 answerPreCheckoutQuery
 

lib/telegram/bot/client/request_body_formatter.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Telegram
+  module Bot
+    class Client
+      # Encodes nested hashes and arrays as json and extract File objects from them
+      # to the top level. Top-level File objects are handled by httpclient.
+      # More details: https://core.telegram.org/bots/api#sending-files
+      module RequestBodyFormatter
+        extend self
+
+        def format(body, action)
+          body = body.dup
+          case action.to_s
+          when 'sendMediaGroup'
+            extract_files_from_array!(body, :media)
+          when 'editMessageMedia'
+            replace_field(body, :media) do |value|
+              files = {}
+              extract_files_from_hash(value, files).tap { body.merge!(files) }
+            end
+          end
+          body.each do |key, val|
+            body[key] = val.to_json if val.is_a?(Hash) || val.is_a?(Array)
+          end
+        end
+
+        private
+
+        # Detects field by symbol or string name and replaces it with mapped value.
+        def replace_field(hash, field_name)
+          field_name = [field_name.to_sym, field_name.to_s].find { |x| hash.key?(x) }
+          hash[field_name] = yield hash[field_name] if field_name
+        end
+
+        def extract_files_from_array!(hash, field_name)
+          replace_field(hash, field_name) do |value|
+            break value unless value.is_a?(Array)
+            files = {}
+            value.map { |x| extract_files_from_hash(x, files) }.
+              tap { hash.merge!(files) }
+          end
+        end
+
+        # Replace File objects with `attach` URIs. File objects are added into `files` hash.
+        def extract_files_from_hash(hash, files)
+          return hash unless hash.is_a?(Hash)
+          hash.transform_values do |value|
+            if value.is_a?(File)
+              arg_name = "_file#{files.size}"
+              files[arg_name] = value
+              "attach://#{arg_name}"
+            else
+              value
+            end
+          end
+        end
+      end
+    end
+  end
+end

lib/telegram/bot/client/typed_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/client/api_helper'
 require 'active_support/core_ext/string/inflections'
 

lib/telegram/bot/client_stub.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     # Stubbed client for tests. Saves all requests into #requests hash.
@@ -5,11 +7,11 @@ module Telegram
       attr_reader :requests
 
       module StubbedConstructor
-        def new(*args)
+        def new(*args, **kwargs)
           if self == ClientStub || !ClientStub.stub_all?
             super
           else
-            ClientStub.new(*args)
+            ClientStub.new(*args, **kwargs)
           end
         end
       end
@@ -17,7 +19,7 @@ module Telegram
       class << self
         # Any call to Client.new will return ClientStub instance when `enabled` is true.
         # Can be used with a block.
-        def stub_all!(enabled = true)
+        def stub_all!(enabled = true) # rubocop:disable Style/OptionalBooleanParameter
           Client.extend(StubbedConstructor) unless Client < StubbedConstructor
           return @_stub_all = enabled unless block_given?
           begin
@@ -34,7 +36,7 @@ module Telegram
         end
       end
 
-      def initialize(token = nil, username = nil, **options)
+      def initialize(token = nil, username = nil, **options) # rubocop:disable Lint/MissingSuper
         @token = token || options[:token]
         @username = username || options[:username] || token
         reset

lib/telegram/bot/config_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/indifferent_access'
 
@@ -44,7 +46,7 @@ module Telegram
       # from `secrets.yml` merging `telegram['bot']` at `:default` key.
       #
       # Can be overwritten with .bots_config=
-      def bots_config
+      def bots_config # rubocop:disable Metrics/PerceivedComplexity
         @bots_config ||=
           if defined?(Rails.application)
             app = Rails.application

lib/telegram/bot/debug_client.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module DebugClient
-      def debug!(dev = STDOUT)
+      def debug!(dev = $stdout)
         if block_given?
           begin
             old_dev = client.debug_dev

lib/telegram/bot/initializers.rb

@@ -1,21 +0,0 @@
-require 'active_support/core_ext/hash/keys'
-
-module Telegram
-  module Bot
-    module Initializers
-      # Accepts different options to initialize bot.
-      def wrap(input, **options)
-        case input
-        when Symbol then by_id(input) or raise "#{name} #{input.inspect} not configured"
-        when self   then input
-        when Hash   then new(**input.symbolize_keys, **options)
-        else        new(input, **options)
-        end
-      end
-
-      def by_id(_id)
-        raise 'Not implemented'
-      end
-    end
-  end
-end

lib/telegram/bot/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/json'
@@ -16,12 +18,12 @@ module Telegram
       def call(env)
         request = ActionDispatch::Request.new(env)
         update = request.request_parameters
-        controller.dispatch(bot, update)
+        controller.dispatch(bot, update, request)
         [200, {}, ['']]
       end
 
       def inspect
-        "#<#{self.class.name}(#{controller.try!(:name)})>"
+        "#<#{self.class.name}(#{controller&.name})>"
       end
     end
   end

lib/telegram/bot/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/routes_helper'
 
 module Telegram
@@ -10,7 +12,7 @@ module Telegram
       end
 
       config.before_initialize do
-        ::ActionDispatch::Routing::Mapper.send(:include, RoutesHelper)
+        ::ActionDispatch::Routing::Mapper.include RoutesHelper
       end
 
       initializer 'telegram.bot.updates_controller.set_config' do |app|

lib/telegram/bot/routes_helper.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+require 'base64'
+require 'openssl'
+
 require 'telegram/bot'
 require 'active_support/core_ext/array/wrap'
 
@@ -17,10 +22,8 @@ module Telegram
           end || 'telegram_webhook'
         end
 
-        # Replaces colon with underscore so rails don't treat it as
-        # route parameter.
-        def escape_token(token)
-          token && token.tr(':', '_')
+        def token_hash(token)
+          Base64.urlsafe_encode64(OpenSSL::Digest::SHA1.digest(token), padding: false)
         end
       end
 
@@ -34,14 +37,17 @@ module Telegram
       #
       #   # pass additional options
       #   telegram_webhook TelegramController, :default, as: :custom_route_name
-      def telegram_webhook(controller, bot = :default, **options)
+      #
+      #   # Default path is generated using hashed bot token. Override it using:
+      #   telegram_webhook TelegramController, :default, path: 'top/secret'
+      def telegram_webhook(controller, bot = :default, path: nil, **options)
         bot = Client.wrap(bot)
         params = {
           to: Middleware.new(bot, controller),
           as: RoutesHelper.route_name_for_bot(bot),
           format: false,
         }.merge!(options)
-        post("telegram/#{RoutesHelper.escape_token bot.token}", params)
+        post(path || "telegram/#{bot.token && RoutesHelper.token_hash(bot.token)}", params)
         UpdatesPoller.add(bot, controller) if Telegram.bot_poller_mode?
       end
     end

lib/telegram/bot/rspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module RSpec

lib/telegram/bot/rspec/callback_query_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec'
 require 'telegram/bot/rspec/message_helpers'
 
@@ -7,7 +9,7 @@ RSpec.shared_context 'telegram/bot/callback_query' do
 
   subject { -> { dispatch callback_query: payload } }
   let(:payload) { {id: callback_query_id, from: from, message: message, data: data} }
-  let(:callback_query_id) { 11 }
+  let(:callback_query_id) { '11' }
   let(:message_id) { 22 }
   let(:message) { {message_id: message_id, chat: chat, text: 'message text'} }
   let(:data) { raise '`let(:data) { "callback query data here" }` is required' }

lib/telegram/bot/rspec/client_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module RSpec
@@ -61,14 +63,14 @@ module Telegram
 
           attr_reader :performed_requests, :description
 
-          def initialize(bot, action, description: nil)
+          def initialize(bot, action, description: nil) # rubocop:disable Lint/MissingSuper
             @bot = bot
             @action = action
             @description = description || "make #{action} telegram request"
             exactly(1)
           end
 
-          def matches?(proc) # rubocop:disable AbcSize
+          def matches?(proc) # rubocop:disable Metrics/AbcSize
             raise ArgumentError, 'matcher only supports block expectations' unless proc.is_a?(Proc)
             original_requests_count = bot.requests[action].count
             proc.call
@@ -115,15 +117,15 @@ module Telegram
             :arg_list_matcher, :matching_requests_count
 
           def base_message
-            "make #{expectation_type.to_s.tr('_', ' ')} #{expected_number} " \
-              "#{bot.inspect}.#{action} requests,".tap do |msg|
-              msg << " with #{arg_list_matcher}," if arg_list_matcher
-              msg << " but made #{matching_requests_count}"
-              if performed_requests
-                actual_args = performed_requests.map(&:inspect).join(', ')
-                msg << ", and #{performed_requests.count} with #{actual_args}"
-              end
+            msg = "make #{expectation_type.to_s.tr('_', ' ')} #{expected_number} " \
+              "#{bot.inspect}.#{action} requests,"
+            msg += " with #{arg_list_matcher}," if arg_list_matcher
+            msg += " but made #{matching_requests_count}"
+            if performed_requests
+              actual_args = performed_requests.map(&:inspect).join(', ')
+              msg += ", and #{performed_requests.count} with #{actual_args}"
             end
+            msg
           end
         end
 

lib/telegram/bot/rspec/integration.rb

@@ -1,10 +0,0 @@
-require 'telegram/bot'
-Telegram::Bot.deprecation_0_15.warn(
-  "`require 'telegram/bot/rspec/integration'` is deprecated in favor of " \
-  "`require 'telegram/bot/rspec/integration/rails'`"
-)
-require 'telegram/bot/rspec/integration/rails'
-
-Telegram::Bot::RSpec.with_include_context do |config|
-  config.include_context 'telegram/bot/integration/rails', telegram_bot: true
-end

lib/telegram/bot/rspec/integration/poller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/shared'
 
 RSpec.shared_context 'telegram/bot/integration/poller' do

lib/telegram/bot/rspec/integration/rack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/shared'
 require 'rack/test'
 

lib/telegram/bot/rspec/integration/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/shared'
 
 RSpec.shared_context 'telegram/bot/integration/rails', type: :request do

lib/telegram/bot/rspec/integration/shared.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/json'
 require 'telegram/bot'
 require 'telegram/bot/rspec/message_helpers'
@@ -10,5 +12,5 @@ RSpec.shared_context 'telegram/bot/integration/shared' do
 
   let(:bot) { Telegram.bot }
   let(:clear_session?) { described_class.respond_to?(:session_store) }
-  before { described_class.session_store.try!(:clear) if clear_session? }
+  before { described_class.session_store&.clear if clear_session? }
 end

lib/telegram/bot/rspec/message_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Shared helpers for testing message updates.
 RSpec.shared_context 'telegram/bot/message_helpers' do
   let(:default_message_options) { {from: from, chat: chat} }

lib/telegram/bot/tasks.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Telegram
+  module Bot
+    module Tasks
+      extend self
+
+      def set_webhook
+        routes = Rails.application.routes.url_helpers
+        cert_file = ENV.fetch('CERT', nil)
+        cert = File.open(cert_file) if cert_file
+        each_bot do |key, bot|
+          route_name = RoutesHelper.route_name_for_bot(bot)
+          url = routes.send("#{route_name}_url")
+          say("Setting webhook for #{key}...")
+          bot.set_webhook(
+            url: url,
+            certificate: cert,
+            ip_address: ENV.fetch('IP_ADDRESS', nil),
+            drop_pending_updates: drop_pending_updates,
+          )
+        end
+      end
+
+      def delete_webhook
+        each_bot do |key, bot|
+          say("Deleting webhook for #{key}...")
+          bot.delete_webhook(drop_pending_updates: drop_pending_updates)
+        end
+      end
+
+      def log_out
+        each_bot do |key, bot|
+          say("Logging out #{key}...")
+          bot.log_out
+        end
+      end
+
+      def close
+        each_bot do |key, bot|
+          say("Closing #{key}...")
+          bot.close
+        end
+      end
+
+      private
+
+      def say(text)
+        puts(text) unless Rails.env.test? # rubocop:disable Rails/Output
+      end
+
+      def each_bot(&block)
+        id = ENV['BOT']&.to_sym
+        bots = id ? {id => Client.by_id(id)} : Telegram.bots
+        bots.each { |key, bot| bot.async(false) { block[key, bot] } }
+      end
+
+      def drop_pending_updates
+        ENV['DROP_PENDING_UPDATES']&.downcase == 'true'
+      end
+    end
+  end
+end

lib/telegram/bot/updates_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'abstract_controller'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/callbacks'
@@ -7,13 +9,13 @@ module Telegram
   module Bot
     # Base class to create update processors. With callbacks, session and helpers.
     #
-    # Define public methods for each command and they will be called when
-    # update has this command. Message is automatically parsed and
-    # words are passed as method arguments. Be sure to use default values and
+    # Public methods ending with `!` handle messages with commands.
+    # Message text is automatically parsed  into method arguments.
+    # Be sure to use default values and
     # splat arguments in every action method to not get errors, when user
     # sends command without necessary args / with extra args.
     #
-    #     def start(token = nil, *)
+    #     def start!(token = nil, *)
     #       if token
     #         # ...
     #       else
@@ -21,25 +23,21 @@ module Telegram
     #       end
     #     end
     #
-    #     def help(*)
+    #     def help!(*)
     #       respond_with :message, text:
     #     end
     #
     # To process plain text messages (without commands) or other updates just
-    # define public method with name of payload type. They will receive payload
-    # as an argument.
+    # define public method with name of payload type.
+    # By default they receive payload as an argument, but some of them are called
+    # with more usefuk args:
     #
     #     def message(message)
     #       respond_with :message, text: "Echo: #{message['text']}"
     #     end
     #
-    #     def inline_query(query)
-    #       answer_inline_query results_for_query(query), is_personal: true
-    #     end
-    #
-    #     # To process conflicting commands (`/message args`) just use `on_` prefix:
-    #     def on_message(*args)
-    #       # ...
+    #     def inline_query(query, offset)
+    #       answer_inline_query results_for_query(query, offset), is_personal: true
     #     end
     #
     # To process update run:
@@ -51,7 +49,7 @@ module Telegram
     #     ControllerClass.new(bot, from: telegram_user, chat: telegram_chat).
     #       process(:help, *args)
     #
-    class UpdatesController < AbstractController::Base # rubocop:disable ClassLength
+    class UpdatesController < AbstractController::Base # rubocop:disable Metrics/ClassLength
       abstract!
 
       %w[
@@ -73,12 +71,12 @@ module Telegram
       include AbstractController::Callbacks
       # Redefine callbacks with default terminator.
       if ActiveSupport::VERSION::MAJOR >= 5
-        define_callbacks  :process_action,
-                          skip_after_callbacks_if_terminated: true
+        define_callbacks :process_action,
+          skip_after_callbacks_if_terminated: true
       else
-        define_callbacks  :process_action,
-                          terminator: ->(_, result) { result == false },
-                          skip_after_callbacks_if_terminated: true
+        define_callbacks :process_action,
+          terminator: ->(_, result) { result == false },
+          skip_after_callbacks_if_terminated: true
       end
 
       include Commands
@@ -91,17 +89,30 @@ module Telegram
 
       extend Session::ConfigMethods
 
-      PAYLOAD_TYPES = %w[
+      PAYLOAD_TYPES = Set.new(%w[
         message
         edited_message
         channel_post
         edited_channel_post
+        business_connection
+        business_message
+        edited_business_message
+        deleted_business_messages
+        message_reaction
+        message_reaction_count
         inline_query
         chosen_inline_result
         callback_query
         shipping_query
         pre_checkout_query
-      ].freeze
+        poll
+        poll_answer
+        my_chat_member
+        chat_member
+        chat_join_request
+        chat_boost
+        removed_chat_boost
+      ].freeze)
 
       class << self
         # Initialize controller and process update.
@@ -110,41 +121,63 @@ module Telegram
         end
 
         def payload_from_update(update)
-          update && PAYLOAD_TYPES.find do |type|
-            item = update[type]
-            return [item, type] if item
+          case update
+          when nil then nil
+          when Hash
+            # faster lookup for the case when telegram-bot-types is not used
+            update.find do |type, item|
+              return [item, type] if PAYLOAD_TYPES.include?(type)
+            end
+          else
+            payload_from_typed_update(update)
+          end
+        end
+
+        private
+
+        def payload_from_typed_update(update)
+          PAYLOAD_TYPES.find do |type|
+            begin
+              item = update[type]
+              return [item, type] if item
+            rescue Exception # rubocop:disable Lint/RescueException
+              # dry-rb raises exception if field is not defined in schema
+            end
           end
         end
       end
 
-      attr_internal_reader :update, :bot, :payload, :payload_type
+      attr_internal_reader :bot, :payload, :payload_type, :update, :webhook_request
       delegate :username, to: :bot, prefix: true, allow_nil: true
 
-      # Second argument can be either update object with hash access & string
+      # `update` can be either update object with hash access & string
       # keys or Hash with `:from` or `:chat` to override this values and assume
       # that update is nil.
-      def initialize(bot = nil, update = nil)
+      # ActionDispatch::Request object is passed in `webhook_request` when bot running
+      # in webhook mode.
+      def initialize(bot = nil, update = nil, webhook_request = nil) # rubocop:disable Lint/MissingSuper
         if update.is_a?(Hash) && (update.key?(:from) || update.key?(:chat))
           options = update
           update = nil
         end
-        @_update = update
         @_bot = bot
-        @_chat, @_from = options && options.values_at(:chat, :from)
+        @_update = update
+        @_chat, @_from = options&.values_at(:chat, :from)
         @_payload, @_payload_type = self.class.payload_from_update(update)
+        @_webhook_request = webhook_request
       end
 
       # Accessor to `'chat'` field of payload. Also tries `'chat'` in `'message'`
       # when there is no such field in payload.
       #
       # Can be overriden with `chat` option for #initialize.
-      def chat
-        @_chat ||=
+      def chat # rubocop:disable Metrics/PerceivedComplexity
+        @_chat ||= # rubocop:disable Naming/MemoizedInstanceVariableName
           if payload
             if payload.is_a?(Hash)
-              payload['chat'] || payload['message'] && payload['message']['chat']
+              payload['chat'] || (payload['message'] && payload['message']['chat'])
             else
-              payload.try(:chat) || payload.try(:message).try!(:chat)
+              payload.try(:chat) || payload.try(:message)&.chat
             end
           end
       end
@@ -152,7 +185,8 @@ module Telegram
       # Accessor to `'from'` field of payload. Can be overriden with `from` option
       # for #initialize.
       def from
-        @_from ||= payload && payload['from']
+        @_from ||= # rubocop:disable Naming/MemoizedInstanceVariableName
+          payload.is_a?(Hash) ? payload['from'] : payload.try(:from)
       end
 
       # Processes current update.
@@ -210,10 +244,14 @@ module Telegram
         [payload_type, [payload['data']]]
       end
 
+      def action_for_poll_answer
+        [payload_type, [payload['poll_id'], payload['option_ids']]]
+      end
+
       # Silently ignore unsupported messages to not fail when user crafts
       # an update with usupported command, callback query context, etc.
       def action_missing(action, *_args)
-        logger.debug { "The action '#{action}' is not defined in #{self.class.name}" } if logger
+        logger&.debug { "The action '#{action}' is not defined in #{self.class.name}" }
         nil
       end
 

lib/telegram/bot/updates_controller/callback_query_context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController

lib/telegram/bot/updates_controller/commands.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
       #  Support for parsing commands
       module Commands
-        CMD_REGEX = %r{\A/([a-z\d_]{,31})(@(\S+))?(\s|$)}i
+        CMD_REGEX = %r{\A/([a-z\d_]{,31})(@(\S+))?(\s|$)}i.freeze
 
         class << self
           # Fetches command from text message. All subsequent words are returned
@@ -34,7 +36,7 @@ module Telegram
         def action_for_message
           cmd, args = Commands.command_from_text(payload['text'], bot_username)
           return unless cmd
-          [[action_for_command(cmd), type: :command, command: cmd], args]
+          [[action_for_command(cmd), {type: :command, command: cmd}], args]
         end
 
         alias_method :action_for_channel_post, :action_for_message

lib/telegram/bot/updates_controller/instrumentation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
@@ -23,8 +25,8 @@ module Telegram
         def process_action(*args)
           raw_payload = {
             controller: self.class.name,
-            action:     action_name,
-            update:     update,
+            action: action_name,
+            update: update,
           }
           Instrumentation.instrument(:start_processing, raw_payload.dup)
           Instrumentation.instrument(:process_action, raw_payload) do |payload|
@@ -49,7 +51,7 @@ module Telegram
         private
 
         # A hook invoked every time a before callback is halted.
-        def halted_callback_hook(filter)
+        def halted_callback_hook(filter, *)
           Instrumentation.instrument(:halted_callback, filter: filter)
         end
 
@@ -61,14 +63,14 @@ module Telegram
         #   end
         #
         # :api: plugin
-        def cleanup_view_runtime #:nodoc:
+        def cleanup_view_runtime # :nodoc:
           yield
         end
 
         # Every time after an action is processed, this method is invoked
         # with the payload, so you can add more information.
         # :api: plugin
-        def append_info_to_payload(_payload) #:nodoc:
+        def append_info_to_payload(_payload) # :nodoc:
         end
 
         module ClassMethods
@@ -76,7 +78,7 @@ module Telegram
           # controller process action. This method should return an array
           # with the messages to be added.
           # :api: plugin
-          def log_process_action(_payload) #:nodoc:
+          def log_process_action(_payload) # :nodoc:
             []
           end
         end

lib/telegram/bot/updates_controller/log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/log_subscriber'
 
 module Telegram
@@ -8,7 +10,7 @@ module Telegram
           info do
             payload = event.payload
             "Processing by #{payload[:controller]}##{payload[:action]}\n" \
-            "  Update: #{payload[:update].to_json}"
+              "  Update: #{payload[:update].to_json}"
           end
         end
 
@@ -17,7 +19,7 @@ module Telegram
             payload   = event.payload
             additions = UpdatesController.log_process_action(payload)
             message = "Completed in #{event.duration.round}ms"
-            message << " (#{additions.join(' | ')})" if additions.present?
+            message += " (#{additions.join(' | ')})" if additions.present?
             message
           end
         end

lib/telegram/bot/updates_controller/message_context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
@@ -11,7 +13,7 @@ module Telegram
       #       respond_with :message, text: 'Where are you?'
       #     end
       #
-      #     def set_location_from_messge(city = nil, *)
+      #     def set_location_from_message(city = nil, *)
       #       # update
       #     end
       #
@@ -48,12 +50,12 @@ module Telegram
         # it has higher priority than contextual action.
         def action_for_message
           val = message_context_session.delete(:context)
-          context = val && val.to_s
-          super || context && begin
-            args = payload['text'].try!(:split) || []
+          context = val&.to_s
+          super || (context && begin
+            args = payload['text']&.split || []
             action = action_for_message_context(context)
-            [[action, type: :message_context, context: context], args]
-          end
+            [[action, {type: :message_context, context: context}], args]
+          end)
         end
 
         # Save context for the next request.

lib/telegram/bot/updates_controller/reply_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
@@ -21,7 +23,7 @@ module Telegram
           respond_with(type, params)
         end
 
-        # Same as reply_with, but for inline queries.
+        # Same as respond_with, but for inline queries.
         def answer_inline_query(results, params = {})
           params = params.merge(
             inline_query_id: payload['id'],
@@ -30,7 +32,7 @@ module Telegram
           bot.answer_inline_query(params)
         end
 
-        # Same as reply_with, but for callback queries.
+        # Same as respond_with, but for callback queries.
         def answer_callback_query(text, params = {})
           params = params.merge(
             callback_query_id: payload['id'],
@@ -39,12 +41,29 @@ module Telegram
           bot.answer_callback_query(params)
         end
 
+        # Same as respond_with, but for pre checkout queries.
+        def answer_pre_checkout_query(ok, params = {})
+          params = params.merge(
+            pre_checkout_query_id: payload['id'],
+            ok: ok,
+          )
+          bot.answer_pre_checkout_query(params)
+        end
+
+        def answer_shipping_query(ok, params = {})
+          params = params.merge(
+            shipping_query_id: payload['id'],
+            ok: ok,
+          )
+          bot.answer_shipping_query(params)
+        end
+
         # Edit message from callback query.
         def edit_message(type, params = {})
           params =
-            if message_id = payload['inline_message_id'] # rubocop:disable AssignmentInCondition
+            if message_id = payload['inline_message_id'] # rubocop:disable Lint/AssignmentInCondition
               params.merge(inline_message_id: message_id)
-            elsif message = payload['message'] # rubocop:disable AssignmentInCondition
+            elsif message = payload['message'] # rubocop:disable Lint/AssignmentInCondition
               params.merge(chat_id: message['chat']['id'], message_id: message['message_id'])
             else
               raise 'Can not edit message without `inline_message_id` or `message`'

lib/telegram/bot/updates_controller/rescue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/rescuable'
 
 module Telegram
@@ -11,7 +13,7 @@ module Telegram
 
         def process_action(*)
           super
-        rescue Exception => exception # rubocop:disable RescueException
+        rescue Exception => exception # rubocop:disable Lint/RescueException
           rescue_with_handler(exception) || raise
         end
       end

lib/telegram/bot/updates_controller/rspec_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/updates_controller/testing'
 require 'telegram/bot/rspec/message_helpers'
 require 'telegram/bot/rspec/callback_query_helpers'
@@ -13,8 +15,9 @@ RSpec.shared_context 'telegram/bot/updates_controller' do
       x.extend Telegram::Bot::UpdatesController::Testing
     end
   end
-  let(:controller_args) { [bot, deep_stringify(update)] }
+  let(:controller_args) { [bot, deep_stringify(update), webhook_request] }
   let(:update) { {payload_type => payload} }
+  let(:webhook_request) { nil }
   let(:payload_type) { :some_type }
   let(:payload) { double(:payload) }
   let(:bot) { Telegram::Bot::ClientStub.new(bot_name) }
@@ -22,8 +25,8 @@ RSpec.shared_context 'telegram/bot/updates_controller' do
   let(:session) { controller.send(:session) }
 
   # Process update.
-  def dispatch(update = self.update, bot = self.bot)
-    controller.dispatch_again(bot, deep_stringify(update))
+  def dispatch(update = self.update, bot = self.bot, webhook_request = self.webhook_request)
+    controller.dispatch_again(bot, deep_stringify(update), webhook_request)
   end
 
   # Same as `.as_json` but mocks-friendly.

lib/telegram/bot/updates_controller/session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/session/abstract/id'
 require 'active_support/cache'
 
@@ -27,7 +29,8 @@ module Telegram
         protected
 
         def session
-          @_session ||= self.class.build_session(session_key)
+          @_session ||= # rubocop:disable Naming/MemoizedInstanceVariableName
+            self.class.build_session(session_key)
         end
 
         def session_key
@@ -41,7 +44,7 @@ module Telegram
         class SessionHash < Rack::Session::Abstract::SessionHash
           attr_reader :id
 
-          def initialize(store, id)
+          def initialize(store, id) # rubocop:disable Lint/MissingSuper
             @store = store
             @id = id
           end
@@ -65,13 +68,13 @@ module Telegram
 
           def commit
             return unless loaded?
-            data = to_hash.delete_if { |_, v| v.nil? }
+            data = to_hash.compact
             @store.write(id, data)
           end
         end
 
         class NullSessionHash < Session::SessionHash
-          def initialize
+          def initialize # rubocop:disable Lint/MissingSuper
             @data = {}
             @loaded = true
             @exists = true

lib/telegram/bot/updates_controller/testing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
@@ -5,9 +7,9 @@ module Telegram
         IVARS_TO_KEEP = %i[@_session].freeze
 
         # Perform multiple dispatches on same instance.
-        def dispatch_again(bot = nil, update = nil)
+        def dispatch_again(bot = nil, update = nil, webhook_request = nil)
           recycle!
-          initialize(bot, update)
+          initialize(bot, update, webhook_request)
           dispatch
         end
 
@@ -16,7 +18,7 @@ module Telegram
         # everything will be rewriten with #initialize.
         #
         # With `full` set to `true` it'll clear all cached instance variables.
-        def recycle!(full = false)
+        def recycle!(full = false) # rubocop:disable Style/OptionalBooleanParameter
           return unless full
           (instance_variables - IVARS_TO_KEEP).each do |ivar|
             remove_instance_variable(ivar)
@@ -27,7 +29,8 @@ module Telegram
 
         # Stubs session.
         def session
-          @_session ||= Session::NullSessionHash.new
+          @_session ||= # rubocop:disable Naming/MemoizedInstanceVariableName
+            Session::NullSessionHash.new
         end
       end
     end

lib/telegram/bot/updates_controller/translation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
@@ -12,15 +14,15 @@ module Telegram
 
         module ClassMethods
           # Class-level helper for lazy translations.
-          def translate(key, options = {})
+          def translate(key, **options)
             key = "#{controller_path.tr('/', '.')}#{key}" if key.to_s.start_with?('.')
-            I18n.translate(key, options)
+            I18n.translate(key, **options)
           end
           alias :t :translate
         end
 
         # See toplevel description.
-        def translate(key, options = {})
+        def translate(key, **options)
           if key.to_s.start_with?('.')
             path = controller_path.tr('/', '.')
             defaults = [:"#{path}#{key}"]
@@ -28,7 +30,7 @@ module Telegram
             options[:default] = defaults.flatten
             key = "#{path}.#{action_name_i18n_key}#{key}"
           end
-          I18n.translate(key, options)
+          I18n.translate(key, **options)
         end
         alias :t :translate
 

lib/telegram/bot/updates_controller/typed_update.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
       # Include this module to type cast update to Virtus model
       # using `telegram-bot-types` gem (install this gem first).
       module TypedUpdate
-        def initialize(bot = nil, update = nil)
+        def initialize(bot = nil, update = nil, webhook_request = nil)
           update = Types::Update.new(update) if update && !update.is_a?(Types::Update)
           super
         end

lib/telegram/bot/updates_poller.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     # Supposed to be used in development environments only.
     class UpdatesPoller
       class << self
-        @@instances = {} # rubocop:disable ClassVars
+        @@instances = {} # rubocop:disable Style/ClassVars
 
         def instances
           @@instances
@@ -36,7 +38,7 @@ module Telegram
       end
 
       def log(&block)
-        logger.info(&block) if logger
+        logger&.info(&block)
       end
 
       def start
@@ -50,13 +52,13 @@ module Telegram
         ensure
           @running = false
         end
-        log { 'Stoped polling bot updates.' }
+        log { 'Stopped polling bot updates.' }
       end
 
       def run
         while running
           updates = fetch_updates
-          process_updates(updates) if updates && updates.any?
+          process_updates(updates) if updates&.any?
         end
       end
 
@@ -82,8 +84,8 @@ module Telegram
             process_update(update)
           end
         end
-      rescue StandardError => e
-        logger.error { ([e.message] + e.backtrace).join("\n") } if logger
+      rescue StandardError => exception
+        logger&.error { ([exception.message] + exception.backtrace).join("\n") }
       end
 
       # Override this method to setup custom error collector.
@@ -102,10 +104,8 @@ module Telegram
       end
 
       if defined?(Rails.application) && Rails.application.respond_to?(:reloader)
-        def reloading_code
-          Rails.application.reloader.wrap do
-            yield
-          end
+        def reloading_code(&block)
+          Rails.application.reloader.wrap(&block)
         end
       else
         def reloading_code

lib/telegram/bot/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
-    VERSION = '0.14.1'.freeze
+    VERSION = '0.16.2'
 
     def self.gem_version
       Gem::Version.new VERSION

spec/integration/requests/default_bot_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 
 RSpec.describe DefaultBotController, telegram_bot: :rails do
@@ -10,4 +12,13 @@ RSpec.describe DefaultBotController, telegram_bot: :rails do
     subject { -> { dispatch_command :load_session } }
     it { should_not raise_error }
   end
+
+  describe '#dispatch' do
+    it 'provides webhook_request' do
+      expect(described_class).to receive(:dispatch).
+        with(bot, hash_including('message'), instance_of(ActionDispatch::Request)).
+        and_call_original
+      dispatch_message :test
+    end
+  end
 end

spec/integration/requests/named_bot_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 
 RSpec.describe NamedBotController, telegram_bot: :rails do

spec/integration/requests/other_bot_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'integration_helper'
 
 RSpec.describe OtherBotController, telegram_bot: :rails do

spec/integration/tasks_spec.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'integration_helper'
+
+RSpec.describe Telegram::Bot::Tasks, type: :request do
+  include Telegram::Bot::RSpec::ClientMatchers
+
+  def stub_env(new_values)
+    new_values.stringify_keys!
+    old_values = ENV.to_h.slice(new_values.keys)
+    new_values.each { |k, v| ENV[k] = v.to_s }
+    yield
+  ensure
+    new_values.each_key { |k| ENV[k] = old_values[k] }
+  end
+
+  shared_examples 'uses BOT envar' do |bot_matcher|
+    it 'runs for all bots by default' do
+      matcher = Telegram.bots.values.map { |x| instance_exec(x, &bot_matcher) }.reduce(&:and)
+      expect(subject).to matcher
+    end
+
+    context 'when BOT specified' do
+      around { |ex| stub_env(BOT: :other) { ex.run } }
+
+      it 'runs for this bot only' do
+        expect(subject).to instance_exec(Telegram.bots[:other], &bot_matcher)
+      end
+    end
+  end
+
+  describe '#log_out' do
+    subject { -> { described_class.log_out } }
+    include_examples 'uses BOT envar', ->(bot) { make_telegram_request(bot, :logOut) }
+  end
+
+  describe '#close' do
+    subject { -> { described_class.close } }
+    include_examples 'uses BOT envar', ->(bot) { make_telegram_request(bot, :close) }
+  end
+
+  describe '#set_webhook' do
+    subject { -> { described_class.set_webhook } }
+    include_examples 'uses BOT envar', ->(bot) { make_telegram_request(bot, :setWebhook) }
+
+    context 'with options in env' do
+      around do |ex|
+        stub_env(IP_ADDRESS: '1.2.3.4', DROP_PENDING_UPDATES: 'TrUe') do
+          ex.run
+        end
+      end
+      include_examples 'uses BOT envar', ->(bot) {
+        make_telegram_request(bot, :setWebhook).with(hash_including(
+          ip_address: '1.2.3.4',
+          drop_pending_updates: true,
+        ))
+      }
+    end
+  end
+
+  describe '#delete_webhook' do
+    subject { -> { described_class.delete_webhook } }
+    include_examples 'uses BOT envar', ->(bot) { make_telegram_request(bot, :deleteWebhook) }
+
+    context 'with options in env' do
+      around { |ex| stub_env(DROP_PENDING_UPDATES: 'TrUe') { ex.run } }
+      include_examples 'uses BOT envar', ->(bot) {
+        make_telegram_request(bot, :deleteWebhook).with(hash_including(
+          drop_pending_updates: true,
+        ))
+      }
+    end
+  end
+end

spec/integration_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/rails'
 require 'action_controller'
 require 'action_dispatch'
@@ -14,6 +16,7 @@ class TestApplication < Rails::Application
   config.eager_load = false
   config.log_level = :debug
   config.action_dispatch.show_exceptions = false
+  routes.default_url_options = {host: 'test.rpsec'}
 
   telegram_config = {
     bot: 'default_token',

spec/spec_helper.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'pathname'
-require 'pry'
+require 'debug'
 require 'rspec/its'
 
 if ENV['CI']
@@ -10,7 +12,7 @@ elsif ENV.key?('COV')
   SimpleCov.start
 end
 
-GEM_ROOT = Pathname.new File.expand_path('../..', __FILE__)
+GEM_ROOT = Pathname.new File.expand_path('..', __dir__)
 
 $LOAD_PATH.unshift GEM_ROOT.join('lib')
 require 'telegram/bot'
@@ -18,7 +20,7 @@ require 'telegram/bot/updates_controller/rspec_helpers'
 require 'telegram/bot/types'
 require 'active_support/json'
 
-Dir[GEM_ROOT.join('spec/support/**/*.rb')].each { |f| require f }
+Dir[GEM_ROOT.join('spec/support/**/*.rb')].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

spec/support/examples/async.rb

@@ -1,4 +1,6 @@
-RSpec.shared_examples 'async' do |request_args: -> {}|
+# frozen_string_literal: true
+
+RSpec.shared_examples 'async' do |request_args:|
   let(:instance) { described_class.new(token: token, id: id, async: async) }
   let(:id) { :default_bot }
   let(:async) { true }
@@ -103,7 +105,7 @@ RSpec.shared_examples 'async' do |request_args: -> {}|
   end
 
   describe '#request' do
-    subject { ->(*args) { instance.request(*(args.empty? ? self.args : args)) } }
+    subject { ->(*args) { instance.request(*args) } }
     let(:args, &request_args)
     let(:result) { double(:result) }
 
@@ -112,7 +114,7 @@ RSpec.shared_examples 'async' do |request_args: -> {}|
         expect(instance).to_not receive(:http_request)
         expect(described_class).to receive(:prepare_async_args).with(*args) { args }
         expect(instance.async).to receive(:perform_later).with(id.to_s, *args) { result }
-        expect(subject.call).to eq result
+        expect(subject.call(*args)).to eq result
       end
     end
 
@@ -131,12 +133,11 @@ RSpec.shared_examples 'async' do |request_args: -> {}|
     context 'when async is disabled' do
       let(:async) { false }
       let(:result) { double(status: 200, body: '{"test":"ok"}') }
-      let(:args, &request_args)
 
       it 'performs request immediately' do
         expect(instance).to receive(:request).with(*args).and_call_original
         expect(instance).to receive(:http_request) { result }
-        expect(subject[]).to eq 'test' => 'ok'
+        expect(subject.call(*args)).to eq 'test' => 'ok'
       end
     end
   end

spec/support/examples/initializers.rb

@@ -1,65 +0,0 @@
-RSpec.shared_examples 'initializers' do |config_method = :bots|
-  describe '.wrap' do
-    subject { described_class.wrap(input, **options) }
-    let(:options) { {} }
-    let(:result) { double(:result) }
-    let(:username) { 'username' }
-
-    context 'when input is a string' do
-      let(:input) { token }
-
-      it 'treats string as token' do
-        expect(described_class).to receive(:new).with(token, {}) { result }
-        should eq result
-      end
-
-      context 'and additional options are given' do
-        let(:options) { {id: :test} }
-
-        it 'passes them to initializer' do
-          expect(described_class).to receive(:new).with(input, **options) { result }
-          should eq result
-        end
-      end
-    end
-
-    context 'when input is a hash' do
-      let(:input) { {token: token, 'username' => username, other: :options} }
-
-      it 'passes it with symbolized keys' do
-        expect(described_class).to receive(:new).with(**input.symbolize_keys) { result }
-        should eq result
-      end
-
-      context 'and additional options are given' do
-        let(:options) { {id: :test} }
-
-        it 'passes them to initializer' do
-          expect(described_class).to receive(:new).
-            with(**input.symbolize_keys, **options) { result }
-          should eq result
-        end
-      end
-    end
-
-    context 'when input is an instance of described_class' do
-      let!(:input) { instance }
-
-      it 'returns input' do
-        expect(described_class).to_not receive(:new)
-        should eq input
-      end
-    end
-
-    context 'when input is a Symbol' do
-      let(:input) { :client_1 }
-      before { allow(Telegram).to receive(config_method) { {client_1: instance} } }
-      it { should eq Telegram.send(config_method)[:client_1] }
-
-      context 'and there is no such bot' do
-        let(:input) { :invalid }
-        it { expect { subject }.to raise_error(/not configured/) }
-      end
-    end
-  end
-end

spec/support/examples/integration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples 'shared integration examples' do
   let(:bot) { Telegram::Bot::ClientStub.new('token') }
   let(:controller_class) do

spec/telegram/bot/async_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::Async::Job do
   let(:job_class) do
     described_class = self.described_class

spec/telegram/bot/client/request_body_formatter_spec.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+RSpec.describe Telegram::Bot::Client::RequestBodyFormatter do
+  describe '.format' do
+    subject { described_class.format(input, action) }
+    let(:action) { :sendMessage }
+
+    context 'when plain hash is given' do
+      let(:input) { {a: 1, b: '2', c: nil} }
+      it { should eq input }
+    end
+
+    context 'when nested hash is given' do
+      let(:input) { {a: 1, b: '2', c: [1, 2], d: {a: 1}, e: {b: []}} }
+
+      it 'encodes nested hashes to json' do
+        expected = input.dup
+        %i[c d e].each { |x| expected[x] = expected[x].to_json }
+        should eq expected
+      end
+    end
+
+    context 'with sendMediaGroup action' do
+      let(:action) { :sendMediaGroup }
+      let(:input) { {media: [{a: file_1}, {'b' => file_2, c: 123}, {d: 456}], x: 789} }
+      let(:file_1) { File.new(__FILE__) }
+      let(:file_2) { File.new(__FILE__) }
+
+      it 'extracts files to the top-level' do
+        should eq(
+          media: [
+            {a: 'attach://_file0'},
+            {b: 'attach://_file1', c: 123},
+            {d: 456},
+          ].to_json,
+          x: 789,
+          '_file0' => file_1,
+          '_file1' => file_2,
+        )
+      end
+
+      context 'and input has string keys' do
+        let(:input) { super().stringify_keys }
+        it 'extracts files to the top-level' do
+          should eq(
+            'media' => [
+              {a: 'attach://_file0'},
+              {b: 'attach://_file1', c: 123},
+              {d: 456},
+            ].to_json,
+            'x' => 789,
+            '_file0' => file_1,
+            '_file1' => file_2,
+          )
+        end
+      end
+
+      context 'without media' do
+        let(:input) { {a: 1, b: '2', c: nil} }
+        it { should eq input }
+      end
+    end
+
+    context 'with editMessageMedia action' do
+      let(:action) { :editMessageMedia }
+      let(:input) { {media: {a: file, b: 123}, x: 789} }
+      let(:file) { File.new(__FILE__) }
+
+      it 'extracts files to the top-level' do
+        should eq(
+          media: {a: 'attach://_file0', b: 123}.to_json,
+          x: 789,
+          '_file0' => file,
+        )
+      end
+
+      context 'and input has string keys' do
+        let(:input) { super().stringify_keys }
+        it 'extracts files to the top-level' do
+          should eq(
+            'media' => {a: 'attach://_file0', b: 123}.to_json,
+            'x' => 789,
+            '_file0' => file,
+          )
+        end
+      end
+
+      context 'without media' do
+        let(:input) { {a: 1, b: '2', c: nil} }
+        it { should eq input }
+      end
+    end
+  end
+end

spec/telegram/bot/client/typed_response_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::Client::TypedResponse do
   let(:bot) { Telegram::Bot::Client.new('token').tap { |x| x.extend described_class } }
 

spec/telegram/bot/client_spec.rb

@@ -1,57 +1,128 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::Client do
   let(:instance) { described_class.new 'token' }
   let(:token) { 'token' }
 
-  include_examples 'initializers'
   it_behaves_like 'async', request_args: -> { [double(:action), {body: :content}] }
 
-  describe '.prepare_body' do
-    subject { described_class.prepare_body(input) }
+  describe '.wrap' do
+    subject { described_class.wrap(input, **options) }
+    let(:options) { {} }
+    let(:result) { double(:result) }
+    let(:username) { 'username' }
 
-    context 'when plain hash is given' do
-      let(:input) { {a: 1, b: '2', c: nil} }
-      it { should eq input }
+    context 'when input is a string' do
+      let(:input) { token }
+
+      it 'treats string as token' do
+        expect(described_class).to receive(:new) do |*args, **kwargs|
+          expect([*args, kwargs]).to eq([token, {}]) # not using .with to support ruby 2.x and 3.x
+          result
+        end
+        should eq result
+      end
+
+      context 'and additional options are given' do
+        let(:options) { {id: :test} }
+
+        it 'passes them to initializer' do
+          expect(described_class).to receive(:new).with(input, **options) { result }
+          should eq result
+        end
+      end
     end
 
-    context 'when nested hash is given' do
-      let(:input) { {a: 1, b: '2', c: [1, 2], d: {a: 1}, e: {b: []}} }
+    context 'when input is a hash' do
+      let(:input) { {token: token, 'username' => username, other: :options} }
 
-      it 'encodes nested hashes to json' do
-        expected = input.dup
-        %i[c d e].each { |x| expected[x] = expected[x].to_json }
-        should eq expected
+      it 'passes it with symbolized keys' do
+        expect(described_class).to receive(:new).with(**input.symbolize_keys) { result }
+        should eq result
+      end
+
+      context 'and additional options are given' do
+        let(:options) { {id: :test} }
+
+        it 'passes them to initializer' do
+          expect(described_class).to receive(:new).
+            with(**input.symbolize_keys, **options) { result }
+          should eq result
+        end
+      end
+    end
+
+    context 'when input is an instance of described_class' do
+      let!(:input) { instance }
+
+      it 'returns input' do
+        expect(described_class).to_not receive(:new)
+        should eq input
+      end
+    end
+
+    context 'when input is a Symbol' do
+      let(:input) { :client_1 }
+      before { allow(Telegram).to receive(:bots) { {client_1: instance} } }
+      it { should eq Telegram.bots[:client_1] }
+
+      context 'and there is no such bot' do
+        let(:input) { :invalid }
+        it { expect { subject }.to raise_error(/not configured/) }
       end
     end
   end
 
   describe '.prepare_async_args' do
     subject { described_class.prepare_async_args(*input) }
-    let(:input) { [:action, a: 1, b: :sym, c: [:other], 'd' => 'str'] }
-    it { should eq ['action', a: 1, b: 'sym', c: '["other"]', 'd' => 'str'] }
+    let(:input) { [:action, {a: 1, b: :sym, c: [:other], 'd' => 'str'}] }
+    it { should eq ['action', {a: 1, b: 'sym', c: '["other"]', 'd' => 'str'}] }
   end
 
   describe '.new' do
-    subject { described_class.new(*args) }
+    subject { described_class.new(*args, **kwargs) }
+    let(:args) { [] }
+    let(:kwargs) { {} }
+    let(:token) { 'secret' }
+    let(:username) { 'superbot' }
 
     context 'when multiple args are given' do
-      let(:args) { %w[secret superbot] }
-      its(:token) { should eq args[0] }
-      its(:username) { should eq args[1] }
-      its(:base_uri) { should include args[0] }
+      let(:args) { [token, username] }
+      its(:token) { should eq token }
+      its(:username) { should eq username }
+      its(:base_uri) { should eq "#{described_class::SERVER}/bot#{token}/" }
     end
 
     context 'when hash is given' do
-      let(:args) { [token: 'secret', username: 'superbot'] }
-      its(:token) { should eq args[0][:token] }
-      its(:username) { should eq args[0][:username] }
-      its(:base_uri) { should include args[0][:token] }
+      let(:kwargs) { {token: 'secret', username: 'superbot'} }
+      its(:token) { should eq token }
+      its(:username) { should eq username }
+      its(:base_uri) { should eq "#{described_class::SERVER}/bot#{token}/" }
+    end
+
+    context 'with custom server' do
+      let(:server) { 'http://my.server' }
+      let(:args) { [token, username] }
+      let(:kwargs) { {server: server} }
+      its(:base_uri) { should eq "#{server}/bot#{token}/" }
+
+      context 'and hash options' do
+        let(:kwargs) { {token: token, username: username, server: server} }
+        its(:base_uri) { should eq "#{server}/bot#{token}/" }
+      end
     end
   end
 
   describe '#request' do
     subject { -> { instance.request(action, request_body) } }
     let(:action) { :some_action }
-    let(:url) { "#{format(described_class::URL_TEMPLATE, token: token)}#{action}" }
+    let(:url) do
+      base_uri = format(described_class::URL_TEMPLATE,
+        server: described_class::SERVER,
+        token: token,
+      )
+      "#{base_uri}#{action}"
+    end
     let(:request_body) { double(:body) }
     let(:prepared_body) { double(:prepared_body) }
     let(:response) { HTTP::Message.new_response(body).tap { |x| x.status = status } }
@@ -60,7 +131,8 @@ RSpec.describe Telegram::Bot::Client do
     let(:body) { body_json.to_json }
     let(:body_json) { {'param' => 'val', 'description' => 'some description'} }
     before do
-      expect(described_class).to receive(:prepare_body).with(request_body) { prepared_body }
+      expect(Telegram::Bot::Client::RequestBodyFormatter).
+        to receive(:format).with(request_body, action) { prepared_body }
       expect(instance).to receive(:http_request).with(url, prepared_body) { response }
     end
     around { |ex| Telegram::Bot::ClientStub.stub_all!(false) { ex.run } }

spec/telegram/bot/client_stub_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::ClientStub do
   describe '#stub_all!' do
     let(:client) { Telegram::Bot::Client.new('token', 'bot_name') }
-    let(:clients) { ['token', token: 'token2'].map(&Telegram::Bot::Client.method(:wrap)) }
+    let(:clients) { ['token', {token: 'token2'}].map(&Telegram::Bot::Client.method(:wrap)) }
 
     shared_examples 'constructors' do |expected_class|
       it 'makes Client.new return ClientStub' do
@@ -37,11 +39,13 @@ RSpec.describe Telegram::Bot::ClientStub do
   end
 
   describe '#new' do
-    subject { described_class.new(*args) }
+    subject { described_class.new(*args, **kwargs) }
+    let(:args) { [] }
+    let(:kwargs) { {} }
 
     context 'when only username is given' do
-      let(:args) { 'superbot' }
-      its(:username) { should eq args }
+      let(:args) { ['superbot'] }
+      its(:username) { should eq args[0] }
     end
 
     context 'when username and token are given' do
@@ -51,9 +55,9 @@ RSpec.describe Telegram::Bot::ClientStub do
     end
 
     context 'when hash config is given' do
-      let(:args) { [token: 'token', username: 'superbot'] }
-      its(:token) { should eq args[0][:token] }
-      its(:username) { should eq args[0][:username] }
+      let(:kwargs) { {token: 'token', username: 'superbot'} }
+      its(:token) { should eq kwargs[:token] }
+      its(:username) { should eq kwargs[:username] }
     end
   end
 end

spec/telegram/bot/config_methods_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::ConfigMethods do
   let(:registry) do
     Object.new.tap do |x|

spec/telegram/bot/middleware_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/mock'
 
 RSpec.describe Telegram::Bot::Middleware do
@@ -11,7 +13,7 @@ RSpec.describe Telegram::Bot::Middleware do
     let(:env) do
       Rack::MockRequest.env_for('/',
         method: :post,
-        input:  JSON.dump(update),
+        input: JSON.dump(update),
         'CONTENT_TYPE' => 'application/json',
       )
     end
@@ -24,7 +26,8 @@ RSpec.describe Telegram::Bot::Middleware do
     end
 
     it 'calls dispatch on controller' do
-      expect(controller).to receive(:dispatch).with(bot, update)
+      expect(controller).to receive(:dispatch).
+        with(bot, update, instance_of(ActionDispatch::Request))
       subject
     end
 

spec/telegram/bot/routes_helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/routes_helper'
 
 RSpec.describe Telegram::Bot::RoutesHelper do
@@ -41,57 +43,61 @@ RSpec.describe Telegram::Bot::RoutesHelper do
   end
 
   describe '#telegram_webhook' do
-    subject { mapper.telegram_webhook(*input) }
+    subject { ->(*args, **kwargs) { mapper.telegram_webhook(*args, **kwargs) } }
     let(:mapper) { double(:mapper).tap { |x| x.extend described_class } }
-    let(:bots) { {default: bot, other: other_bot} }
     let(:controller) { double(:controller, name: :controller) }
-    let(:other_controller) { double(:other_controller, name: :other_controller) }
     before { allow(Telegram).to receive(:bots) { bots } }
 
-    def assert_routes(bot, controller, route_name, options) # rubocop:disable AbcSize
-      expected_path = options.delete(:path) || "telegram/#{bot.token}"
-      expect(mapper).to receive(:post) do |path, params|
-        expect(path).to eq expected_path
-        middleware = params[:to]
+    def assert_route(bot, controller, path: nil, **expected_options) # rubocop:disable Metrics/AbcSize
+      path ||= "telegram/#{described_class.token_hash(bot.token)}"
+      expect(mapper).to receive(:post) do |actual_path, actual_options|
+        expect(actual_path).to eq(path)
+        middleware = actual_options[:to]
         expect(middleware.controller).to eq(controller)
         expect(middleware.bot.token).to eq(bot.token)
         expect(middleware.bot.username).to eq(bot.username)
-        expect(params[:as]).to eq route_name
-        expect(params).to include(options) if options
+        expect(actual_options).to include(expected_options)
       end
-      subject
+      yield
     end
 
-    context 'when called with controller' do
-      let(:input) { [controller, option: :val] }
-
-      it 'creates routes for default bot and this controller' do
-        assert_routes bot, controller, 'default_telegram_webhook', option: :val
+    it 'creates routes for default bot' do
+      assert_route(bot, controller, as: 'default_telegram_webhook') do
+        subject[controller]
       end
 
-      context 'and bot does not have configured token' do
-        let(:bot) { create_bot(nil) }
-        it 'creates routes for default bot and this controller' do
-          assert_routes bot, controller, 'default_telegram_webhook', option: :val
-        end
+      other_controller = double(:other_controller, name: :other_controller)
+      assert_route(bot, other_controller, as: 'custom_route') do
+        subject[other_controller, as: 'custom_route']
       end
+    end
 
-      context 'and bot has colon in token' do
-        let(:bot) { create_bot('some:token') }
-        it 'replaces colon with underscore' do
-          assert_routes bot, controller, 'default_telegram_webhook',
-            option: :val,
-            path: 'telegram/some_token'
+    it 'passes extra options' do
+      assert_route(bot, controller, as: 'default_telegram_webhook', option: :val, other: 2) do
+        subject[controller, option: :val, other: 2]
+      end
+    end
+
+    it 'uses :path param to override default path' do
+      assert_route(bot, controller, as: 'default_telegram_webhook', path: 'custom/path') do
+        subject[controller, path: 'custom/path']
+      end
+    end
+
+    context 'when bot does not have configured token' do
+      let(:bot) { create_bot(nil) }
+      it 'creates route anyway' do
+        assert_route(bot, controller, as: 'default_telegram_webhook', path: 'telegram/') do
+          subject[controller]
         end
       end
     end
 
     context 'when called with controller and smth castable to bot' do
-      let(:input) { [controller, 'custom_token', option: :val] }
-
       it 'creates routes for every created bot and controller' do
-        assert_routes create_bot('custom_token'), controller, 'telegram_webhook',
-          option: :val
+        assert_route(create_bot('custom_token'), controller, as: 'telegram_webhook') do
+          subject[controller, 'custom_token']
+        end
       end
     end
   end

spec/telegram/bot/rspec/callback_query_helpers_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/poller'
 
 RSpec.describe 'Integration spec helpers', telegram_bot: :poller do

spec/telegram/bot/rspec/client_matchers_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::RSpec::ClientMatchers do
   let(:bot) { Telegram::Bot::ClientStub.new('TestBot') }
   let(:other_bot) { Telegram::Bot::ClientStub.new('OtherTestBot') }
@@ -31,6 +33,9 @@ RSpec.describe Telegram::Bot::RSpec::ClientMatchers do
         args = {text: 'test', parseMode: :Markdown}
         block = ->(*) { bot.send_message(args) }
         expect(&block).to make_telegram_request(bot, :sendMessage).with(args)
+        expect do
+          expect(&block).to make_telegram_request(bot, :sendMessage).with(args.merge(extra: 1))
+        end.to raise_error RSpec::Expectations::ExpectationNotMetError
         expect(&block).to_not make_telegram_request(bot, :sendMessage).with(args.except(:text))
         expect { 3.times(&block) }.to make_telegram_request(bot, :sendMessage).
           with(args).exactly(3).times

spec/telegram/bot/rspec/integration/poller_spec.rb

@@ -1,5 +1,16 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/poller'
 
 RSpec.describe 'Poller integration spec', telegram_bot: :poller do
   include_examples 'shared integration examples'
+
+  describe '#dispatch' do
+    it 'doesn`t provide webhook_request' do
+      expect(controller_class).to receive(:dispatch).
+        with(bot, hash_including('message')).
+        and_call_original
+      dispatch_message :test
+    end
+  end
 end

spec/telegram/bot/rspec/integration/rack_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/rack'
 
 RSpec.describe 'Rack integration spec', telegram_bot: :rack do
@@ -17,4 +19,13 @@ RSpec.describe 'Rack integration spec', telegram_bot: :rack do
       ActionDispatch::ParamsParser.new(app)
     end
   end
+
+  describe '#dispatch' do
+    it 'provides webhook_request' do
+      expect(controller_class).to receive(:dispatch).
+        with(bot, hash_including('message'), instance_of(ActionDispatch::Request)).
+        and_call_original
+      dispatch_message :test
+    end
+  end
 end

spec/telegram/bot/rspec/integration/rails_spec.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 # Tested in spec/integration

spec/telegram/bot/rspec/message_helpers_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/poller'
 
 RSpec.describe 'Integration: message helpers', telegram_bot: :poller do
@@ -108,7 +110,7 @@ RSpec.describe 'Integration: message helpers', telegram_bot: :poller do
     end
 
     context 'with options' do
-      let(:args) { ['asd', 'qwe', option: 1] }
+      let(:args) { ['asd', 'qwe', {option: 1}] }
       it { should respond_with_message "Start: #{args[0...-1].inspect}, option: 1" }
     end
   end

spec/telegram/bot/updates_controller/callback_query_context_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::UpdatesController::CallbackQueryContext do
   include_context 'telegram/bot/updates_controller'
   let(:controller_class) do
@@ -6,7 +8,8 @@ RSpec.describe Telegram::Bot::UpdatesController::CallbackQueryContext do
       include described_class
 
       attr_accessor :filter_done
-      before_action only: :ctx2_callback_query do
+
+      before_action only: :ctx_2_callback_query do
         self.filter_done = true
       end
 
@@ -14,12 +17,12 @@ RSpec.describe Telegram::Bot::UpdatesController::CallbackQueryContext do
         [:no_context, data]
       end
 
-      def ctx1_callback_query(data)
-        [:ctx1, data]
+      def ctx_1_callback_query(data)
+        [:ctx_1, data]
       end
 
-      def ctx2_callback_query(data)
-        [:ctx2, data]
+      def ctx_2_callback_query(data)
+        [:ctx_2, data]
       end
     end
   end
@@ -40,19 +43,19 @@ RSpec.describe Telegram::Bot::UpdatesController::CallbackQueryContext do
       let(:data) { "#{ctx}:#{text}" }
 
       context 'and valid' do
-        let(:ctx) { 'ctx1' }
-        its(:call) { should eq [:ctx1, text] }
+        let(:ctx) { 'ctx_1' }
+        its(:call) { should eq [:ctx_1, text] }
         it { should_not change(controller, :filter_done) }
 
         context 'and context has callback' do
-          let(:ctx) { 'ctx2' }
-          its(:call) { should eq [:ctx2, text] }
+          let(:ctx) { 'ctx_2' }
+          its(:call) { should eq [:ctx_2, text] }
           it { should change(controller, :filter_done) }
         end
 
         context 'and data has multiple colons' do
           let(:text) { super().tr(' ', ':') }
-          its(:call) { should eq [:ctx1, text] }
+          its(:call) { should eq [:ctx_1, text] }
         end
       end
 

spec/telegram/bot/updates_controller/commands_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::UpdatesController::Commands do
   describe '#action_for_command' do
     subject { ->(*args) { object.action_for_command(*args) } }
@@ -88,11 +90,11 @@ RSpec.describe Telegram::Bot::UpdatesController::Commands do
         context 'with command' do
           let(:text) { "/test#{"@#{mention}" if mention} arg 1 2" }
           let(:mention) {}
-          it { should eq [['test!', type: :command, command: 'test'], %w[arg 1 2]] }
+          it { should eq [['test!', {type: :command, command: 'test'}], %w[arg 1 2]] }
 
           context 'with mention' do
             let(:mention) { bot.username }
-            it { should eq [['test!', type: :command, command: 'test'], %w[arg 1 2]] }
+            it { should eq [['test!', {type: :command, command: 'test'}], %w[arg 1 2]] }
           end
 
           context 'with mention for other bot' do

spec/telegram/bot/updates_controller/instrumentation_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::UpdatesController::Instrumentation do
   include_context 'telegram/bot/updates_controller'
 

spec/telegram/bot/updates_controller/message_context_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::UpdatesController::MessageContext do
   include_context 'telegram/bot/updates_controller'
   let(:controller_class) do
@@ -6,11 +8,13 @@ RSpec.describe Telegram::Bot::UpdatesController::MessageContext do
       include described_class
 
       attr_accessor :filter_done
+
       before_action only: :context_with_filter do
         self.filter_done = true
       end
 
       attr_reader :callbacks_runs
+
       before_action { @callbacks_runs = (@callbacks_runs || 0) + 1 }
 
       def message(*args)

spec/telegram/bot/updates_controller/reply_helpers_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::UpdatesController do
   include_context 'telegram/bot/updates_controller'
   let(:params) { {arg: 1, 'other_arg' => 2} }
@@ -38,7 +40,7 @@ RSpec.describe Telegram::Bot::UpdatesController do
     end
 
     context 'when update is not set' do
-      let(:controller_args) { [bot, chat: deep_stringify(chat)] }
+      let(:controller_args) { [bot, {chat: deep_stringify(chat)}] }
       it 'sets chat_id' do
         expect(bot).to receive("send_#{respond_type}").
           with(params.merge(chat_id: chat[:id])) { result }

spec/telegram/bot/updates_controller/rescue_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::UpdatesController::Rescue do
   include_context 'telegram/bot/updates_controller'
 

spec/telegram/bot/updates_controller/session_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::UpdatesController::Session do
   include_context 'telegram/bot/updates_controller'
   let(:controller_class) do

spec/telegram/bot/updates_controller/testing_spec.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require 'action_dispatch'
+
 RSpec.describe Telegram::Bot::UpdatesController::Testing do
   include_context 'telegram/bot/updates_controller'
   let(:controller_class) do
@@ -24,4 +28,27 @@ RSpec.describe Telegram::Bot::UpdatesController::Testing do
       it { should_not change { controller.send(:session)[:key] }.from 'sval' }
     end
   end
+
+  describe '#dispatch' do
+    it 'doesn`t provide webhook_request' do
+      dispatch
+      expect(controller.webhook_request).to eq nil
+    end
+
+    context 'when webhook_request is set' do
+      let(:webhook_request) { ActionDispatch::Request.new({}) }
+      it 'passes it to controller' do
+        dispatch
+        expect(controller.webhook_request).to eq webhook_request
+      end
+    end
+
+    context 'when webhook_request is given' do
+      it 'passes it to controller' do
+        webhook_request = ActionDispatch::Request.new({})
+        dispatch(update, bot, webhook_request)
+        expect(controller.webhook_request).to eq webhook_request
+      end
+    end
+  end
 end

spec/telegram/bot/updates_controller/translation_spec.rb

@@ -1,5 +1,28 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::UpdatesController::Translation do
+  def self.stub_translations(translations)
+    around do |ex|
+      backend = I18n.backend
+      I18n.backend = I18n::Backend::Simple.new
+      begin
+        I18n.backend.store_translations 'en', telegram: {webhooks: translations}
+        ex.run
+      ensure
+        I18n.backend = backend
+      end
+    end
+  end
+  let(:result) { double(:result) }
+
   describe '#translate' do
+    stub_translations(
+      start: {
+        hello: 'Hello from start!',
+        hi: 'Hi %{name} from start', # rubocop:disable Style/FormatStringToken
+      },
+    )
+
     let(:controller) do
       double(
         controller_path: 'telegram/webhooks',
@@ -10,12 +33,28 @@ RSpec.describe Telegram::Bot::UpdatesController::Translation do
     it 'uses action_name without ! for lazy translations' do
       expect(I18n).to receive(:translate).with('telegram.webhooks.start.hello',
         default: [:'telegram.webhooks.hello'],
-      )
-      controller.t('.hello')
+      ) { result }
+      expect(controller.t('.hello')).to eq(result)
+
+      expect(I18n).to receive(:translate).with('telegram.webhooks.start.hi',
+        default: [:'telegram.webhooks.hi'],
+        name: 'Dude',
+      ) { result }
+      expect(controller.t('.hi', name: 'Dude')).to eq(result)
+    end
+
+    it 'translates' do
+      expect(controller.t('.hello')).to eq('Hello from start!')
+      expect(controller.t('.hi', name: 'Dude')).to eq('Hi Dude from start')
     end
   end
 
   describe described_class::ClassMethods do
+    stub_translations(
+      hello: 'Hello!',
+      hi: 'Hi %{name}', # rubocop:disable Style/FormatStringToken
+    )
+
     describe '#translate' do
       let(:controller_class) do
         double(controller_path: 'telegram/webhooks').
@@ -23,8 +62,20 @@ RSpec.describe Telegram::Bot::UpdatesController::Translation do
       end
 
       it 'uses controller_path for lazy translations' do
-        expect(I18n).to receive(:translate).with('telegram.webhooks.hello', {})
-        controller_class.t('.hello')
+        expect(I18n).to receive(:translate) do |*args, **kwargs|
+          # not using .with to support ruby 2.x and 3.x
+          expect([*args, kwargs]).to eq(['telegram.webhooks.hello', {}])
+          result
+        end
+        expect(controller_class.t('.hello')).to eq(result)
+
+        expect(I18n).to receive(:translate).with('telegram.webhooks.hi', name: 'Dude') { result }
+        expect(controller_class.t('.hi', name: 'Dude')).to eq(result)
+      end
+
+      it 'translates' do
+        expect(controller_class.t('.hello')).to eq('Hello!')
+        expect(controller_class.t('.hi', name: 'Dude')).to eq('Hi Dude')
       end
     end
   end

spec/telegram/bot/updates_controller/typed_update_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::UpdatesController::TypedUpdate do
   include_context 'telegram/bot/updates_controller'
   let(:controller_class) do
@@ -9,14 +11,30 @@ RSpec.describe Telegram::Bot::UpdatesController::TypedUpdate do
 
   context 'when `update` is a virtus model' do
     subject { controller }
-    unique_types = Telegram::Bot::UpdatesController::PAYLOAD_TYPES - %w[
+    unique_types = (Telegram::Bot::UpdatesController::PAYLOAD_TYPES - %w[
       edited_message
       channel_post
       edited_channel_post
-    ]
-    unique_types.each do |type|
+      my_chat_member
+      chat_member
+      chat_join_request
+
+      # TODO: remove when added to telegram-bot-types
+      business_connection
+      business_message
+      edited_business_message
+      deleted_business_messages
+      message_reaction
+      message_reaction_count
+      chat_boost
+      removed_chat_boost
+    ]).
+      map { |x| [x, Telegram::Bot::Types.const_get(x.camelize)] }.to_h.
+      merge(
+        'chat_member' => Telegram::Bot::Types::ChatMemberUpdated
+      )
+    unique_types.each do |type, type_class|
       context "with #{type}" do
-        type_class = Telegram::Bot::Types.const_get(type.camelize)
         let(:payload_type) { type }
         let(:payload) do
           {}.tap do |result|

spec/telegram/bot/updates_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::UpdatesController do
   include_context 'telegram/bot/updates_controller'
 
@@ -5,7 +7,7 @@ RSpec.describe Telegram::Bot::UpdatesController do
     subject { controller.action_for_payload }
 
     def stub_payload(*fields)
-      Hash[fields.map { |x| [x, double(x)] }]
+      fields.map { |x| [x, double(x)] }.to_h
     end
 
     context 'when payload is inline_query' do
@@ -26,6 +28,12 @@ RSpec.describe Telegram::Bot::UpdatesController do
       it { should eq [payload_type, payload.values_at(:data)] }
     end
 
+    context 'when payload is poll_answer' do
+      let(:payload_type) { 'poll_answer' }
+      let(:payload) { stub_payload(:poll_id, :user, :option_ids) }
+      it { should eq [payload_type, payload.values_at(:poll_id, :option_ids)] }
+    end
+
     context 'when payload is not supported' do
       let(:payload_type) { '_unsupported_' }
       it { should eq [:unsupported_payload_type, []] }
@@ -39,6 +47,8 @@ RSpec.describe Telegram::Bot::UpdatesController do
       inline_query
       chosen_inline_result
       callback_query
+      poll_answer
+      chat_join_request
     ]
     (described_class::PAYLOAD_TYPES - custom_payload_types).each do |type|
       context "when payload is #{type}" do
@@ -82,7 +92,7 @@ RSpec.describe Telegram::Bot::UpdatesController do
 
   describe '#process' do
     subject { -> { controller.process(:action, *args) } }
-    let(:args) { %i[arg1 arg2] }
+    let(:args) { %i[arg_1 arg_2] }
     let(:controller_class) do
       Class.new(described_class) do
         attr_reader :acted, :hooked
@@ -190,7 +200,7 @@ RSpec.describe Telegram::Bot::UpdatesController do
     end
 
     context 'when options hash is given' do
-      let(:controller_args) { [bot, from: from, chat: chat] }
+      let(:controller_args) { [bot, {from: from, chat: chat}] }
       with_reinitialize do
         its(:bot) { should eq bot }
         its(:update) { should eq nil }

spec/telegram/bot/updates_poller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot::UpdatesPoller do
   let(:instance) { described_class.new(bot, controller) }
   let(:bot) { Telegram::Bot::Client.new('token') }

spec/telegram/bot_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Telegram::Bot do
   it 'has a version number' do
     expect(described_class::VERSION).not_to be nil

telegram-bot.gemspec

@@ -1,4 +1,6 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'telegram/bot/version'
 
@@ -12,20 +14,21 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/telegram-bot-rb/telegram-bot'
   spec.license       = 'MIT'
 
+  spec.metadata      = {
+    'rubygems_mfa_required' => 'true',
+  }
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.post_install_message = 'Breaking changes in v0.14! ' \
-    'See upgrade guide at https://github.com/telegram-bot-rb/telegram-bot/wiki/Upgrading-to-0.14'
+  spec.required_ruby_version = '>= 2.4'
 
-  spec.required_ruby_version = '~> 2.0'
-
-  spec.add_dependency 'actionpack', '>= 4.0', '< 6.0'
-  spec.add_dependency 'activesupport', '>= 4.0', '< 6.0'
+  spec.add_dependency 'actionpack', '>= 4.0', '< 7.2'
+  spec.add_dependency 'activesupport', '>= 4.0', '< 7.2'
   spec.add_dependency 'httpclient', '~> 2.7'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '> 1.16'
+  spec.add_development_dependency 'rake', '~> 13.0'
 end