v0.7.1

.gitignore

@@ -6,5 +6,4 @@
 /doc/
 /pkg/
 /spec/reports/
-/log/
 /tmp/

.rubocop.yml

@@ -15,7 +15,6 @@ Style/DotPosition: {EnforcedStyle: trailing}
 Style/FirstParameterIndentation: {EnforcedStyle: consistent}
 Style/IfUnlessModifier: {Enabled: false}
 Style/ModuleFunction: {Enabled: false}
-Style/MultilineMethodCallIndentation: {EnforcedStyle: indented}
 Style/MultilineOperationIndentation: {EnforcedStyle: indented}
 Style/NestedParenthesizedCalls: {Enabled: false}
 Style/PredicateName: {Enabled: false}

.travis.yml

@@ -2,9 +2,5 @@ language: ruby
 cache: bundler
 rvm:
   - 2.2.3
-env:
-  - RAILS=4
-  - RAILS=5
-  - RAILS=5_1
 notifications:
   email: false

CHANGELOG.md

@@ -1,72 +1,4 @@
-# Unreleased
-
-# 0.12.0
-
-- New API methods and payload types (up to Bot API 3.2).
-- Fix rails 5.1.x support.
-- RSpec context for callback_query updates.
-- `edit_message` helper.
-- ClientStub saves and returns token. Fixes testing multiple bots.
-- Raise descriptive error when accessing not-configured bot.
-
-# 0.11.3
-
-- Release dependencies for Rails 5.1.
-
-# 0.11.2
-
-- Rails 5.1 deep symbolized secrets support.
-
-# 0.11.1
-
-- Fixed poller for typed response.
-
-# 0.11.0
-
-- Remove Bot::StaleChat in favor of Bot::Forbidden, as Telegram adds more
-  and more new descriptions.
-  Please open an issue if you face a problem.
-
-# 0.10.2
-
-- Support `(edited_)channel_post` updates.
-- New methods from 2.3, 2.3.1 API updates.
-
-# 0.10.0
-
-- Integration helpers for RSpec.
-- Fix for ruby 2.2.0 bug by @bob-frost.
-
-# 0.9.0
-
-- Async API requests.
-- One more description for StaleChat error.
-- edit_message_* methods.
-- API methods from 2016-10-03 update
-- Fix typo in module name: CallbackQueyContext -> CallbackQueryContext.
-- Take `chat` from `message` for callback queries
-- RSpec matchers.
-
-# 0.8.0
-
-- Fixed `#reply_with`, now it sets `reply_to_message_id` as it's supposed to.
-  Added `#respond_with` which works the same way, but doesn't set `reply_to_message_id`.
-  Please, replace all occurrences of `reply_with` to `respond_with` to
-  keep it working the old way.
-- Fixes for Rails 5:
-  - Controller callbacks
-  - Middleware
-  - Setup travis builds
-
-# 0.7.4
-
-- Rails 5 support by @dreyks (#4).
-
-# 0.7.3
-
--  Fixed issues with poller in production (#3)
-
-# 0.7.2
+# 0.7.1
 
 - Bot API 2.1
 - Fixed possible crashes when payload type is not supported.

Gemfile

@@ -2,30 +2,14 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  case ENV['RAILS']
-  when '5_1'
-    gem 'railties', '5.1.0'
-    gem 'actionpack', '5.1.0'
-  when '5'
-    gem 'railties', '5.0.2'
-    gem 'actionpack', '5.0.2'
-  when '4'
-    gem 'railties', '~> 4.2'
-    gem 'actionpack', '~> 4.2'
-  else
-    gem 'railties'
-    gem 'actionpack'
-  end
-
   gem 'sdoc', '~> 0.4.1'
   gem 'pry', '~> 0.10.1'
   gem 'pry-byebug', '~> 3.2.0'
 
-  gem 'telegram-bot-types', '~> 0.3.0'
+  gem 'telegram-bot-types', '~> 0.2.0'
 
-  gem 'rspec', '~> 3.5.0'
+  gem 'rspec', '~> 3.3.0'
   gem 'rspec-its', '~> 1.1.0'
-  gem 'rspec-rails', '~> 3.5.0'
 
   gem 'rubocop', '~> 0.37.0'
 

README.md

@@ -5,8 +5,7 @@
 [![Build Status](https://travis-ci.org/telegram-bot-rb/telegram-bot.svg)](https://travis-ci.org/telegram-bot-rb/telegram-bot)
 
 Tools for developing bot for Telegram. Best used with Rails, but can be be used in
-[standalone app](https://github.com/telegram-bot-rb/telegram-bot/wiki/Non-rails-application).
-Supposed to be used in webhook-mode in production, and poller-mode
+standalone app. Supposed to be used in webhook-mode in production, and poller-mode
 in development, but you can use poller in production if you want.
 
 Package contains:
@@ -17,18 +16,11 @@ Package contains:
 - Middleware and routes helpers for production env.
 - Poller with automatic source-reloader for development env.
 - Rake tasks to update webhook urls.
-- __[Async mode](#async-mode)__ for Telegram and/or Botan API.
-  Let the queue adapter handle network errors!
 
 Here is sample [telegram_bot_app](https://github.com/telegram-bot-rb/telegram_bot_app)
 with session, keyboards and inline queries.
 Run it on your local machine in 1 minute!
 
-And here is [app teamplate](https://github.com/telegram-bot-rb/rails_template)
-to generate clean app in seconds.
-
-Examples and cookbook in [wiki](https://github.com/telegram-bot-rb/telegram-bot/wiki).
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -45,12 +37,6 @@ Or install it yourself as:
 
     $ gem install telegram-bot
 
-Require if necessary:
-
-```ruby
-require 'telegram/bot'
-```
-
 ## Usage
 
 ### Configuration
@@ -108,7 +94,7 @@ bot.get_me.class # => Telegram::Bot::Types::User
 ```
 
 Any API request error will raise `Telegram::Bot::Error` with description in its message.
-Special `Telegram::Bot::Forbidden` is raised when bot can't post messages to the chat anymore.
+Special `Telegram::Bot::StaleChat` is raised when bot can't post messages to the chat anymore.
 
 ### Controller
 
@@ -144,12 +130,10 @@ class Telegram::WebhookController < Telegram::Bot::UpdatesController
     # do_smth_with(data)
 
     # There are `chat` & `from` shortcut methods.
-    # For callback queries `chat` if 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')
+    # There is `reply_with` helper to set basic fields
+    # like `reply_to_message` & `chat_id`.
+    reply_with :message, text: response
   end
 
   private
@@ -168,20 +152,6 @@ class Telegram::WebhookController < Telegram::Bot::UpdatesController
 end
 ```
 
-#### Reply helpers
-
-There are helpers to respond for basic actions. They just set chat/message/query
-identifiers from update. See `ReplyHelpers` method for more information.
-Here are this methods signatures:
-
-```ruby
-def respond_with(type, params); end
-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
-```
-
 #### Optional typecasting
 
 You can enable typecasting of `update` with `telegram-bot-types` by including
@@ -218,7 +188,7 @@ class Telegram::WebhookController < Telegram::Bot::UpdatesController
   end
 
   def read
-    respond_with :message, text: session[:text]
+    reply_with :message, text: session[:text]
   end
 
   private
@@ -244,23 +214,23 @@ class Telegram::WebhookController < Telegram::Bot::UpdatesController
   def rename(*)
     # set context for the next message
     save_context :rename
-    respond_with :message, text: 'What name do you like?'
+    reply_with :message, text: 'What name do you like?'
   end
 
   # register context handlers to handle this context
   context_handler :rename do |*words|
     update_name words[0]
-    respond_with :message, text: 'Renamed!'
+    reply_with :message, text: 'Renamed!'
   end
 
   # You can do it in other way:
   def rename(name = nil, *)
     if name
       update_name name
-      respond_with :message, text: 'Renamed!'
+      reply_with :message, text: 'Renamed!'
     else
       save_context :rename
-      respond_with :message, text: 'What name do you like?'
+      reply_with :message, text: 'What name do you like?'
     end
   end
 
@@ -273,7 +243,7 @@ class Telegram::WebhookController < Telegram::Bot::UpdatesController
 end
 ```
 
-You can use `CallbackQueryContext` in the similar way to split `#callback_query` into
+You can use `CallbackQueyContext` in the similar way to split `#callback_query` into
 several specific methods. It doesn't require session support, and takes context from
 data. If data has a prefix with colon like this `my_ctx:smth...` it'll call
 `my_ctx_callback_query('smth...')` when there is such action method. Otherwise
@@ -348,64 +318,18 @@ To stub all possible clients use `Telegram::Bot::ClientStub.stub_all!` before
 initializing clients. Most likely you'll want something like this:
 
 ```ruby
-# environments/test.rb
-# Make sure to run it before defining routes or storing bot to some place in app!
-Telegram.reset_bots
-Telegram::Bot::ClientStub.stub_all!
-
-# rails_helper.rb
 RSpec.configure do |config|
   # ...
+  Telegram.reset_bots
+  Telegram::Bot::ClientStub.stub_all!
   config.after { Telegram.bot.reset }
-  # or for multiple bots:
-  config.after { Telegram.bots.each_value(&:reset) }
   # ...
 end
 ```
 
-There are integration and controller contexts for RSpec and some built-in matchers:
-
-```ruby
-# spec/requests/telegram_webhooks_spec.rb
-require 'telegram/bot/rspec/integration'
-
-RSpec.describe TelegramWebhooksController, :telegram_bot do
-  # for old rspec add:
-  # include_context 'telegram/bot/integration'
-
-  describe '#start' do
-    subject { -> { dispatch_command :start } }
-    it { should respond_with_message 'Hi there!' }
-  end
-
-  # There is context for callback queries with related matchers.
-  describe '#hey_callback_query', :callback_query do
-    let(:data) { "hey:#{name}" }
-    let(:name) { 'Joe' }
-    it { should answer_callback_query('Hey Joe') }
-    it { should edit_current_message :text, text: 'Done' }
-end
-
-# For controller specs use
-require 'telegram/bot/updates_controller/rspec_helpers'
-RSpec.describe TelegramWebhooksController, type: :telegram_bot_controller do
-  # for old rspec add:
-  # include_context 'telegram/bot/updates_controller'
-end
-
-# Matchers are available for custom specs:
-include Telegram::Bot::RSpec::ClientMatchers
-
-expect(&process_update).to send_telegram_message(bot, /msg regexp/, some: :option)
-expect(&process_update).
-  to make_telegram_request(bot, :sendMessage, hash_including(text: 'msg text'))
-```
-
-Place integration tests inside `spec/requests`
-when using RSpec's `infer_spec_type_from_file_location!`,
-or just add `type: :request` to `describe`.
-
-See sample app for more examples.
+There are also some helpers for controller tests.
+Check out `telegram/bot/updates_controller/rspec_helpers` and
+`telegram/bot/updates_controller/testing`.
 
 ### Deploying
 
@@ -427,11 +351,11 @@ or just add `botan` key in `secrets.yml`:
 Access to Botan client with `bot.botan`.
 Use `bot.botan.track(event, uid, payload)` to track events.
 
-There are some helpers for controllers in `Telegram::Bot::Botan::ControllerHelpers`:
+There are some helpers for controllers in `Telegram::Bot::UpdatesController::Botan`:
 
 ```ruby
 class Telegram::WebhookController < Telegram::Bot::UpdatesController
-  include Telegram::Bot::Botan::ControllerHelpers
+  include Telegram::Bot::UpdatesController::Botan
 
   # This will track with event: action_name & data: payload
   before_action :botan_track_action
@@ -448,37 +372,6 @@ end
 
 There is no stubbing for botan clients, so don't set botan token in tests.
 
-### Async mode
-
-There is built in support for async requests using ActiveJob. Without Rails
-you can implement your own worker class to handle such requests. This allows:
-
-- Process updates very fast, without waiting for telegram and botan responses.
-- Handle and retry network and other errors with queue adapter.
-- ???
-
-Instead of performing request instantly client serializes it, pushes to queue,
-and immediately return control back. The job is then fetched with a worker
-and real API request is performed. And this all is absolutely transparent for the app.
-
-To enable this mode add `async: true` to bot's and botan's config.
-For more information and custom configuration check out
-[docs](http://www.rubydoc.info/github/telegram-bot-rb/telegram-bot/master/Telegram/Bot/Async) or
-[source](https://github.com/telegram-bot-rb/telegram-bot/blob/master/lib/telegram/bot/async.rb).
-
-If you want async mode, but don't want to setup queue, know that Rails 5 are shipped
-with Async adapter by default, and there is
-[Sucker Punch](https://github.com/brandonhilkert/sucker_punch) for Rails 4.
-
-Be aware of some limitations:
-
-- Client will not return API response.
-- Sending files is not available in async mode [now],
-  because them can not be serialized.
-
-To disable async mode for the block of code use `bot.async(false) { bot.send_photo }`.
-Yes, it's threadsafe too.
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies.
@@ -490,16 +383,6 @@ To release a new version, update the version number in `version.rb`,
 and then run `bundle exec rake release`, which will create a git tag for the version,
 push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-### Different Rails versions
-
-To setup development for specific major Rails version use:
-
-```
-RAILS=5 bundle install
-# or
-RAILS=5 bundle update
-```
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/telegram-bot-rb/telegram-bot.

lib/tasks/telegram-bot.rake

@@ -1,14 +1,9 @@
 namespace :telegram do
   namespace :bot do
-    desc 'Run poller. It broadcasts Rails.logger to STDOUT in dev like `rails s` do. ' \
-      'Use LOG_TO_STDOUT to enable/disable broadcasting.'
-    task :poller 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
-      end
+    desc 'Run poller'
+    task poller: :environment do
+      console = ActiveSupport::Logger.new(STDERR)
+      Rails.logger.extend ActiveSupport::Logger.broadcast console
       Telegram::Bot::UpdatesPoller.start(ENV['BOT'].try!(:to_sym) || :default)
     end
 

lib/telegram/bot.rb

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

lib/telegram/bot/async.rb

@@ -1,162 +0,0 @@
-module Telegram
-  module Bot
-    # Telegram & Botan clients can perform requests in async way with
-    # any job adapter (ActiveJob by default). Using Rails you don't need any
-    # additional configuration. However you may want to enable async requests
-    # by default with `async: true` in `secrets.yml`. Botan client doesn't inherit
-    # async setting from client and must be configured separately.
-    #
-    #   telegram:
-    #     bots:
-    #       chat_async:
-    #         token: secret
-    #         async: true # enable async mode for client
-    #         botan: botan_token # in this way botan will not be async
-    #         botan: # in this way - it's in async mode
-    #           token: botan_token
-    #           async: true
-    #
-    # Without Rails To start using async requests
-    # initialize client with `id` kwarg and make sure the client is
-    # 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.
-    # Async behavior is controlled with `#async=` writer
-    # and can be enabled/disabled for the block with `#async`:
-    #
-    #   client = Telegram::Bot::Client.new(**config, async: true)
-    #   client.send_message(message)
-    #   client.async(false) { client.send_message(other_one) }
-    #
-    # `#async=` sets global value for all threads,
-    # 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
-    # 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.
-    module Async
-      # Used to track missing key in a hash in local variable.
-      MISSING_VALUE = Object.new.freeze
-
-      module Job
-        class << self
-          def included(base)
-            base.singleton_class.send :attr_accessor, :client_class
-          end
-        end
-
-        def perform(client_id, *args)
-          client = self.class.client_class.wrap(client_id.to_sym)
-          client.async(false) { client.request(*args) }
-        end
-      end
-
-      module ClassMethods
-        def default_async_job
-          @default_async_job ||= begin
-            begin
-              ApplicationJob
-            rescue NameError
-              raise 'Define ApplicationJob class or setup #async= with custom job class'
-            end
-            klass = Class.new(ApplicationJob) { include Job }
-            klass.client_class = self
-            const_set(:AsyncJob, klass)
-          end
-        end
-
-        # This is used in specs.
-        def default_async_job=(val)
-          @default_async_job = val
-          remove_const(:AsyncJob) if const_defined?(:AsyncJob, false)
-        end
-
-        # Prepares argments for async job. ActiveJob doesn't support
-        # Symbol in argumens. Also we can encode json bodies only once here,
-        # so it would not be unnecessarily serialized-deserialized.
-        #
-        # This is stub method, which returns input. Every client class
-        # must prepare args itself.
-        def prepare_async_args(*args)
-          args
-        end
-
-        # Returns default_async_job if `true` is given,
-        # treats String as a constant name, or bypasses any other values.
-        def prepare_async_val(val)
-          case val
-          when true then default_async_job
-          when String then Object.const_get(val)
-          else val
-          end
-        end
-      end
-
-      class << self
-        def prepended(base)
-          base.extend(ClassMethods)
-        end
-
-        # Transforms symbols to strings in hash values.
-        def prepare_hash(hash)
-          return hash unless hash.is_a?(Hash)
-          hash = hash.dup
-          hash.each { |key, val| hash[key] = val.to_s if val.is_a?(Symbol) }
-        end
-
-        # Thread-local hash to store async config for every client.
-        def thread_store
-          Thread.current[:telegram_bot_async] ||= {}
-        end
-      end
-
-      attr_reader :id
-
-      def initialize(*, id: nil, async: nil, **options)
-        @id = id
-        self.async = async
-        super
-      end
-
-      # Sets default async value for all threads.
-      # Uses `self.class.prepare_async_val` to prepare value.
-      def async=(val)
-        @async = self.class.prepare_async_val(val)
-      end
-
-      # Sets async value in a thread-safe way for the block.
-      # Uses `self.class.prepare_async_val` to prepare value.
-      #
-      # If no block is given returns previously set value or the global one,
-      # set by #async=.
-      def async(val = true)
-        thread_key = object_id
-        thread_store = Async.thread_store
-        return thread_store.fetch(thread_key) { @async } unless block_given?
-        begin
-          old_val = thread_store.fetch(thread_key) { MISSING_VALUE }
-          thread_store[thread_key] = self.class.prepare_async_val(val)
-          yield
-        ensure
-          if MISSING_VALUE == old_val
-            thread_store.delete(thread_key)
-          else
-            thread_store[thread_key] = old_val
-          end
-        end
-      end
-
-      # Uses job if #async is set.
-      def request(*args)
-        job_class = async
-        return super unless job_class
-        raise 'Can not enqueue job without client id' unless id
-        job_class.perform_later(id.to_s, *self.class.prepare_async_args(*args))
-      end
-    end
-  end
-end

lib/telegram/bot/botan.rb

@@ -3,37 +3,24 @@ module Telegram
     class Botan
       TRACK_URI = 'https://api.botan.io/track'.freeze
 
-      autoload :ClientHelpers, 'telegram/bot/botan/client_helpers'
-      autoload :ControllerHelpers, 'telegram/bot/botan/controller_helpers'
       class Error < Bot::Error; end
 
-      extend Initializers
-      prepend Async
       include DebugClient
 
-      class << self
-        def by_id(id)
-          Telegram.botans[id]
-        end
-
-        def prepare_async_args(method, uri, query = {}, body = nil)
-          [method.to_s, uri.to_s, Async.prepare_hash(query), body]
-        end
-      end
-
       attr_reader :client, :token
 
-      def initialize(token = nil, **options)
+      def initialize(token)
         @client = HTTPClient.new
-        @token = token || options[:token]
+        @token = token
       end
 
       def track(event, uid, payload = {})
-        request(:post, TRACK_URI, {name: event, uid: uid}, payload.to_json)
-      end
-
-      def request(method, uri, query = {}, body = nil)
-        res = http_request(method, uri, query.merge(token: token), body)
+        res = http_request(
+          :post,
+          TRACK_URI,
+          {token: token, name: event, uid: uid},
+          payload.to_json,
+        )
         status = res.status
         return JSON.parse(res.body) if 300 > status
         result = JSON.parse(res.body) rescue nil # rubocop:disable RescueModifier
@@ -44,10 +31,6 @@ module Telegram
       def http_request(method, uri, query, body)
         client.request(method, uri, query, body)
       end
-
-      def inspect
-        "#<#{self.class.name}##{object_id}(#{@id})>"
-      end
     end
   end
 end

lib/telegram/bot/botan/client_helpers.rb

@@ -1,15 +0,0 @@
-module Telegram
-  module Bot
-    class Botan
-      # Helpers for botan.io metrics.
-      module ClientHelpers
-        attr_reader :botan
-
-        def initialize(*, botan: nil, **options)
-          super
-          @botan = Botan.wrap(botan, id: id) if botan
-        end
-      end
-    end
-  end
-end

lib/telegram/bot/client.rb

@@ -2,21 +2,31 @@ require 'json'
 require 'httpclient'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/keys'
+require 'telegram/bot/debug_client'
 
 module Telegram
   module Bot
-    class Client # rubocop:disable ClassLength
+    class Client
       URL_TEMPLATE = 'https://api.telegram.org/bot%s/'.freeze
 
       autoload :TypedResponse, 'telegram/bot/client/typed_response'
-      extend Initializers
-      prepend Async
-      prepend Botan::ClientHelpers
       include DebugClient
 
       class << self
-        def by_id(id)
-          Telegram.bots[id]
+        # Accepts different options to initialize bot.
+        def wrap(input)
+          case input
+          when self then input
+          when Array then input.map(&method(__callee__))
+          when Hash then
+            input = input.stringify_keys
+            new input['token'], input['username'], botan: input['botan']
+          when Symbol
+            Telegram.bots[input] or
+              raise "Bot #{input} not configured, check Telegram.bots_config."
+          else
+            new(input)
+          end
         end
 
         # Prepend TypedResponse module.
@@ -31,60 +41,41 @@ module Telegram
             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))]
-        end
       end
 
-      attr_reader :client, :token, :username, :base_uri
+      attr_reader :client, :token, :username, :base_uri, :botan
 
-      def initialize(token = nil, username = nil, **options)
+      def initialize(token, username = nil, botan: nil)
         @client = HTTPClient.new
-        @token = token || options[:token]
-        @username = username || options[:username]
-        @base_uri = format URL_TEMPLATE, self.token
+        @token = token
+        @username = username
+        @base_uri = format URL_TEMPLATE, token
+        @botan = Botan.new(botan) if botan
       end
 
-      def request(action, body = {})
+      def request(action, body = {}) # rubocop:disable PerceivedComplexity
         res = http_request("#{base_uri}#{action}", self.class.prepare_body(body))
         status = res.status
         return JSON.parse(res.body) if 300 > status
         result = JSON.parse(res.body) rescue nil # rubocop:disable RescueModifier
-        err_msg = result && result['description'] || '-'
+        err_msg = "#{res.reason}: #{result && result['description'] || '-'}"
         if result
-          # This errors are raised only for valid responses from Telegram
-          case status
-          when 403 then raise Forbidden, err_msg
-          when 404 then raise NotFound, err_msg
-          end
+          # NotFound is raised only for valid responses from Telegram
+          raise NotFound, err_msg if 404 == status
+          raise StaleChat, err_msg if StaleChat.match_response?(result)
         end
-        raise Error, "#{res.reason}: #{err_msg}"
+        raise Error, err_msg
       end
 
-      # Splited to the sections similar to API docs.
       %w(
-        deleteWebhook
-        getUpdates
-        getWebhookInfo
-        setWebhook
-
         answerCallbackQuery
-        deleteChatPhoto
-        exportChatInviteLink
+        answerInlineQuery
         forwardMessage
-        getChat
-        getChatAdministrators
-        getChatMember
-        getChatMembersCount
         getFile
         getMe
+        getUpdates
         getUserProfilePhotos
         kickChatMember
-        leaveChat
-        pinChatMessage
-        promoteChatMember
-        restrictChatMember
         sendAudio
         sendChatAction
         sendContact
@@ -92,38 +83,12 @@ module Telegram
         sendLocation
         sendMessage
         sendPhoto
+        sendSticker
         sendVenue
         sendVideo
-        sendVideoNote
         sendVoice
-        setChatDescription
-        setChatPhoto
-        setChatTitle
+        setWebhook
         unbanChatMember
-        unpinChatMessage
-
-        deleteMessage
-        editMessageCaption
-        editMessageReplyMarkup
-        editMessageText
-
-        sendSticker
-        getStickerSet
-        uploadStickerFile
-        createNewStickerSet
-        addStickerToSet
-        setStickerPositionInSet
-        deleteStickerFromSet
-
-        answerInlineQuery
-
-        sendInvoice
-        answerShippingQuery
-        answerPreCheckoutQuery
-
-        getGameHighScores
-        sendGame
-        setGameScore
       ).each do |method|
         define_method(method.underscore) { |*args| request(method, *args) }
       end

lib/telegram/bot/client_stub.rb

@@ -9,7 +9,7 @@ module Telegram
           if self == ClientStub || !ClientStub.stub_all?
             super
           else
-            ClientStub.new(*args)
+            ClientStub.new(args[1])
           end
         end
       end
@@ -34,9 +34,8 @@ module Telegram
         end
       end
 
-      def initialize(token = nil, username = nil, **options)
-        @token = token || options[:token]
-        @username = username || options[:username] || token
+      def initialize(username = nil)
+        @username = username
         reset
       end
 
@@ -44,7 +43,7 @@ module Telegram
         @requests = Hash.new { |h, k| h[k] = [] }
       end
 
-      def request(action, body = {})
+      def request(action, body)
         requests[action.to_sym] << body
       end
     end

lib/telegram/bot/config_methods.rb

@@ -1,6 +1,5 @@
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/transform_values'
-require 'active_support/core_ext/hash/indifferent_access'
 
 module Telegram
   module Bot
@@ -15,35 +14,19 @@ module Telegram
       # It just tells routes helpers whether to add routed bots to
       # Bot::UpdatesPoller, so their config will be available by bot key in
       # Bot::UpdatesPoller.start.
-      #
-      # It's enabled by default in Rails dev environment and `rake telegram:bot:poller`
-      # task. Use `BOT_POLLER_MODE=true` envvar to set it manually.
       def bot_poller_mode?
         return @bot_poller_mode if defined?(@bot_poller_mode)
-        @bot_poller_mode = ENV.fetch('BOT_POLLER_MODE') do
-          Rails.env.development? if defined?(Rails.env)
-        end
+        Rails.env.development? if defined?(Rails)
       end
 
       # Hash of bots made with bots_config.
       def bots
-        @bots ||= bots_config.each_with_object({}) do |(id, config), h|
-          h[id] = Client.wrap(config, id: id)
-        end
+        @bots ||= bots_config.transform_values(&Client.method(:wrap))
       end
 
       # Default bot.
       def bot
-        @bot ||= bots.fetch(:default) do
-          raise 'Default bot is not configured.' \
-            ' Add :default to bots_config' \
-            ' or use telegram.bot/telegram.bots.default section in secrets.yml.'
-        end
-      end
-
-      # Hash of botan clients made from #bots.
-      def botans
-        @botans ||= bots.transform_values(&:botan)
+        @bot ||= bots[:default]
       end
 
       # Returns config for .bots method. By default uses `telegram['bots']` section
@@ -51,17 +34,12 @@ module Telegram
       #
       # Can be overwritten with .bots_config=
       def bots_config
-        @bots_config ||=
-          if defined?(Rails.application)
-            secrets = Rails.application.secrets.
-              fetch(:telegram, {}).with_indifferent_access
-            secrets.fetch(:bots, {}).symbolize_keys.tap do |config|
-              default = secrets[:bot]
-              config[:default] = default if default
-            end
-          else
-            {}
-          end
+        return @bots_config if @bots_config
+        telegram_config = Rails.application.secrets[:telegram]
+        (telegram_config['bots'] || {}).symbolize_keys.tap do |config|
+          default = telegram_config['bot']
+          config[:default] = default if default
+        end
       end
 
       # Resets all cached bots and their configs.
@@ -69,7 +47,6 @@ module Telegram
         @bots = nil
         @bot = nil
         @bots_config = nil
-        @botans = nil
       end
     end
   end

lib/telegram/bot/initializers.rb

@@ -1,19 +0,0 @@
-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,8 +1,6 @@
 require 'active_support/concern'
-require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/json'
 require 'action_dispatch/http/mime_type'
-require 'action_dispatch/http/request'
+require 'action_dispatch/middleware/params_parser'
 
 module Telegram
   module Bot
@@ -15,8 +13,7 @@ module Telegram
       end
 
       def call(env)
-        request = ActionDispatch::Request.new(env)
-        update = request.request_parameters
+        update = env['action_dispatch.request.request_parameters']
         controller.dispatch(bot, update)
         [200, {}, ['']]
       end

lib/telegram/bot/routes_helper.rb

@@ -20,7 +20,7 @@ module Telegram
         # Replaces colon with underscore so rails don't treat it as
         # route parameter.
         def escape_token(token)
-          token && token.tr(':', '_')
+          token.tr(':', '_')
         end
       end
 

lib/telegram/bot/rspec.rb

@@ -1,7 +0,0 @@
-module Telegram
-  module Bot
-    module RSpec
-      autoload :ClientMatchers, 'telegram/bot/rspec/client_matchers'
-    end
-  end
-end

lib/telegram/bot/rspec/client_matchers.rb

@@ -1,151 +0,0 @@
-module Telegram
-  module Bot
-    module RSpec
-      # Proxy that uses RSpec::Mocks::ArgListMatcher when it's available.
-      # Otherwise just performs `#==` match.
-      #
-      # Also allows to check argumets with custom block.
-      class ArgListMatcher
-        attr_reader :expected, :expected_proc
-
-        def initialize(*args, &block)
-          @expected_proc = block if block_given?
-          @expected =
-            if mocks_matcher?
-              ::RSpec::Mocks::ArgumentListMatcher.new(*args)
-            else
-              args
-            end
-        end
-
-        def args_match?(*actual)
-          if expected_proc
-            expected_proc[*actual]
-            true
-          elsif mocks_matcher?
-            expected.args_match?(*actual)
-          else
-            expected == actual
-          end
-        end
-
-        def args
-          mocks_matcher? ? expected.args : expected
-        end
-
-        def mocks_matcher?
-          defined?(::RSpec::Mocks::ArgumentListMatcher)
-        end
-
-        def to_s
-          if mocks_matcher?
-            expected.expected_args.inspect
-          elsif expected_proc
-            '(proc matcher)'
-          else
-            expected.inspect
-          end
-        end
-      end
-
-      # Matchers to test requests to Telegram API.
-      #
-      # Complex matchers requires `rspec-mocks` to be installed.
-      module ClientMatchers
-        class MakeTelegramRequest < ::RSpec::Matchers::BuiltIn::BaseMatcher
-          EXPECTATION_TYPES = {
-            exactly: :==,
-            at_most: :>=,
-            at_least: :<=,
-          }.freeze
-
-          attr_reader :performed_requests, :description
-
-          def initialize(bot, action, description: nil)
-            @bot = bot
-            @action = action
-            @description = description || "make #{action} telegram request"
-            exactly(1)
-          end
-
-          def matches?(proc) # rubocop:disable AbcSize
-            raise ArgumentError, 'matcher only supports block expectations' unless proc.is_a?(Proc)
-            original_requests_count = bot.requests[action].count
-            proc.call
-            @performed_requests = bot.requests[action].drop(original_requests_count)
-            @matching_requests_count = performed_requests.count do |request|
-              !arg_list_matcher || arg_list_matcher.args_match?(request)
-            end
-            expectation_method = EXPECTATION_TYPES[expectation_type]
-            expected_number.public_send(expectation_method, matching_requests_count)
-          end
-
-          def with(*args, &block)
-            @arg_list_matcher = ArgListMatcher.new(*args, &block)
-            self
-          end
-
-          EXPECTATION_TYPES.each_key do |type|
-            define_method type do |count|
-              @expectation_type = type
-              @expected_number = Integer(count)
-              self
-            end
-          end
-
-          def times
-            self
-          end
-
-          def failure_message
-            "expected to #{base_message}"
-          end
-
-          def failure_message_when_negated
-            "expected not to #{base_message}"
-          end
-
-          def supports_block_expectations?
-            true
-          end
-
-          private
-
-          attr_reader :bot, :action, :expectation_type, :expected_number,
-            :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
-            end
-          end
-        end
-
-        # Check that bot performed request to telegram API:
-        #
-        #   expect { dispatch_message('Hi!') }.
-        #     to make_telegram_request(bot, :sendMessage).
-        #     with(text: 'Hello!', chat_id: chat_id)
-        def make_telegram_request(bot, action)
-          MakeTelegramRequest.new(bot, action)
-        end
-
-        # Helper for asserting message is sent. Note that options are checked
-        # with `hash_including`. For strict checks use #make_telegram_request.
-        def send_telegram_message(bot, text = nil, options = {})
-          description = "send telegram message #{text.inspect}"
-          text = a_string_matching(text) if text.is_a?(Regexp)
-          options = options.merge(text: text) if text
-          MakeTelegramRequest.new(bot, :sendMessage, description: description).
-            with(hash_including(options))
-        end
-      end
-    end
-  end
-end

lib/telegram/bot/rspec/integration.rb

@@ -1,83 +0,0 @@
-RSpec.shared_context 'telegram/bot/integration' do
-  let(:bot) { Telegram.bot }
-  let(:from_id) { 123 }
-  let(:chat_id) { 456 }
-  let(:default_message_options) { {from: {id: from_id}, chat: {id: chat_id}} }
-  let(:controller_path) do
-    route_name = Telegram::Bot::RoutesHelper.route_name_for_bot(bot)
-    Rails.application.routes.url_helpers.public_send("#{route_name}_path")
-  end
-  let(:request_headers) do
-    {
-      'ACCEPT' => 'application/json',
-      'Content-Type' => 'application/json',
-    }
-  end
-  let(:clear_session?) { described_class.respond_to?(:session_store) }
-  before { described_class.session_store.try!(:clear) if clear_session? }
-
-  include Telegram::Bot::RSpec::ClientMatchers
-
-  def dispatch(update)
-    if ActionPack::VERSION::MAJOR >= 5
-      post(controller_path, params: update.to_json, headers: request_headers)
-    else
-      post(controller_path, update.to_json, request_headers)
-    end
-  end
-
-  def dispatch_message(text, options = {})
-    dispatch message: default_message_options.merge(options).merge(text: text)
-  end
-
-  def dispatch_command(*args)
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    dispatch_message("/#{args.join ' '}", options)
-  end
-
-  # Matcher to check response. Make sure to define `let(:chat_id)`.
-  def respond_with_message(expected = Regexp.new(''))
-    raise 'Define chat_id to use respond_with_message' unless defined?(chat_id)
-    send_telegram_message(bot, expected, chat_id: chat_id)
-  end
-end
-
-RSpec.shared_context 'telegram/bot/callback_query', callback_query: true do
-  include_context 'telegram/bot/integration'
-
-  subject { -> { dispatch callback_query: payload } }
-  let(:payload) { {id: 11, from: from, message: message, data: data} }
-  let(:message) { {message_id: 22, chat: chat, text: 'message text'} }
-
-  # Matcher to check that origin message got edited.
-  def edit_current_message(type, options = {})
-    description = 'edit current message'
-    options = options.merge(
-      message_id: message[:message_id],
-      chat_id: chat_id,
-    )
-    Telegram::Bot::RSpec::ClientMatchers::MakeTelegramRequest.new(
-      bot, :"editMessage#{type.to_s.camelize}", description: description
-    ).with(hash_including(options))
-  end
-
-  # Matcher to check that callback query is answered.
-  def answer_callback_query(text = Regexp.new(''), options = {})
-    description = "answer callback query with #{text.inspect}"
-    text = a_string_matching(text) if text.is_a?(Regexp)
-    options = options.merge(
-      callback_query_id: payload[:id],
-      text: text,
-    )
-    Telegram::Bot::RSpec::ClientMatchers::MakeTelegramRequest.new(
-      bot, :answerCallbackQuery, description: description
-    ).with(hash_including(options))
-  end
-end
-
-RSpec.configure do |config|
-  if config.respond_to?(:include_context)
-    config.include_context 'telegram/bot/integration', :telegram_bot
-    config.include_context 'telegram/bot/callback_query', :telegram_bot, :callback_query
-  end
-end

lib/telegram/bot/updates_controller.rb

@@ -21,7 +21,7 @@ module Telegram
     #     end
     #
     #     def help(*)
-    #       respond_with :message, text:
+    #       reply_with :message, text:
     #     end
     #
     # To process plain text messages (without commands) or other updates just
@@ -29,7 +29,7 @@ module Telegram
     # as an argument.
     #
     #     def message(message)
-    #       respond_with :message, text: "Echo: #{message['text']}"
+    #       reply_with :message, text: "Echo: #{message['text']}"
     #     end
     #
     #     def inline_query(query)
@@ -57,12 +57,13 @@ module Telegram
       require 'telegram/bot/updates_controller/log_subscriber'
       require 'telegram/bot/updates_controller/instrumentation'
       require 'telegram/bot/updates_controller/reply_helpers'
-      autoload :CallbackQueryContext, 'telegram/bot/updates_controller/callback_query_context'
+      autoload :CallbackQueyContext, 'telegram/bot/updates_controller/callback_query_context'
       autoload :MessageContext, 'telegram/bot/updates_controller/message_context'
+      autoload :Botan, 'telegram/bot/updates_controller/botan'
 
       include AbstractController::Callbacks
       # Redefine callbacks with default terminator.
-      if ActiveSupport::VERSION::MAJOR >= 5
+      if ActiveSupport.gem_version >= Gem::Version.new('5')
         define_callbacks  :process_action,
                           skip_after_callbacks_if_terminated: true
       else
@@ -80,14 +81,10 @@ module Telegram
 
       PAYLOAD_TYPES = %w(
         message
-        edited_message
-        channel_post
-        edited_channel_post
         inline_query
         chosen_inline_result
         callback_query
-        shipping_query
-        pre_checkout_query
+        edited_message
       ).freeze
       CMD_REGEX = %r{\A/([a-z\d_]{,31})(@(\S+))?(\s|$)}i
       CONFLICT_CMD_REGEX = Regexp.new("^(#{PAYLOAD_TYPES.join('|')}|\\d)")
@@ -144,12 +141,10 @@ module Telegram
         @_payload, @_payload_type = payload_data
       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.
+      # Accessor to `'chat'` field of payload. Can be overriden with `chat` option
+      # for #initialize.
       def chat
-        @_chat ||= payload.try! { |x| x['chat'] || x['message'] && x['message']['chat'] }
+        @_chat ||= payload && payload['chat']
       end
 
       # Accessor to `'from'` field of payload. Can be overriden with `from` option
@@ -171,27 +166,25 @@ module Telegram
       # Returns array `[is_command?, action, args]`.
       def action_for_payload
         if payload_type
-          send("action_for_#{payload_type}") || action_for_default_payload
+          send("action_for_#{payload_type}") || [false, payload_type, [payload]]
         else
           [false, :unsupported_payload_type, []]
         end
       end
 
-      def action_for_default_payload
-        [false, payload_type, [payload]]
-      end
-
       # If payload is a message with command, then returned action is an
       # action for this command.
       # Separate method, so it can be easily overriden (ex. MessageContext).
-      #
-      # This is not used for edited messages/posts. It process them as basic updates.
       def action_for_message
         cmd, args = self.class.command_from_text(payload['text'], bot_username)
         cmd &&= self.class.action_for_command(cmd)
         [true, cmd, args] if cmd
       end
-      alias_method :action_for_channel_post, :action_for_message
+
+      # It doesn't extract commands from edited messages. Just process
+      # them as usual ones.
+      def action_for_edited_message
+      end
 
       def action_for_inline_query
         [false, payload_type, [payload['query'], payload['offset']]]
@@ -210,11 +203,6 @@ module Telegram
       def action_missing(*)
       end
 
-      PAYLOAD_TYPES.each do |type|
-        method = :"action_for_#{type}"
-        alias_method method, :action_for_default_payload unless instance_methods.include?(method)
-      end
-
       ActiveSupport.run_load_hooks('telegram.bot.updates_controller', self)
     end
   end

lib/telegram/bot/updates_controller/botan.rb

@@ -1,8 +1,8 @@
 module Telegram
   module Bot
-    class Botan
+    class UpdatesController
       # Helpers for botan.io metrics.
-      module ControllerHelpers
+      module Botan
         class MissingFrom < Error; end
 
         protected

lib/telegram/bot/updates_controller/callback_query_context.rb

@@ -3,7 +3,7 @@ module Telegram
     class UpdatesController
       # Use separate actions for different callback queries.
       # It doesn't require session support. Simply add `%{context}:` prefix to data.
-      module CallbackQueryContext
+      module CallbackQueyContext
         protected
 
         # Uses #context_from_callback_query as context name.
@@ -15,6 +15,7 @@ module Telegram
         # because `data` param is controlled by client.
         def action_for_callback_query
           context, new_data = context_from_callback_query
+          # binding.pry
           if context
             action_name = "#{context}_callback_query"
             [false, action_name, [new_data]] if action_method?(action_name)

lib/telegram/bot/updates_controller/instrumentation.rb

@@ -6,7 +6,7 @@ module Telegram
       module Instrumentation
         class << self
           def prepended(base)
-            base.send :config_accessor, :logger
+            base.config_accessor :logger
             base.extend ClassMethods
           end
 
@@ -35,13 +35,13 @@ module Telegram
           end
         end
 
-        def respond_with(type, *)
-          Instrumentation.instrument(:respond_with, type: type) { super }
+        def reply_with(type, *)
+          Instrumentation.instrument(:reply_with, type: type) { super }
         end
 
         %i(answer_callback_query answer_inline_query).each do |type|
           define_method(type) do |*args|
-            Instrumentation.instrument(:respond_with, type: type) { super(*args) }
+            Instrumentation.instrument(:reply_with, type: type) { super(*args) }
           end
         end
 

lib/telegram/bot/updates_controller/log_subscriber.rb

@@ -22,8 +22,8 @@ module Telegram
           end
         end
 
-        def respond_with(event)
-          info { "Responded with #{event.payload[:type]}" }
+        def reply_with(event)
+          info { "Replied with #{event.payload[:type]}" }
         end
 
         def halted_callback(event)

lib/telegram/bot/updates_controller/reply_helpers.rb

@@ -2,23 +2,21 @@ module Telegram
   module Bot
     class UpdatesController
       module ReplyHelpers
-        # Helper to call bot's `send_#{type}` method with already set `chat_id`:
+        # Helper to call bot's `send_#{type}` method with already set `chat_id` and
+        # `reply_to_message_id`:
         #
-        #     respond_with :message, text: 'Hello!'
-        #     respond_with :message, text: '__Hello!__', parse_mode: :Markdown
-        #     respond_with :photo, photo: File.open(photo_to_send), caption: "It's incredible!"
-        def respond_with(type, params)
-          chat = self.chat
-          chat_id = chat && chat['id'] or raise 'Can not respond_with when chat is not present'
-          bot.public_send("send_#{type}", params.merge(chat_id: chat_id))
-        end
-
-        # Same as respond_with but also sets `reply_to_message_id`.
+        #     reply_with :message, text: 'Hello!'
+        #     reply_with :message, text: '__Hello!__', parse_mode: :Markdown
+        #     reply_with :photo, photo: File.open(photo_to_send), caption: "It's incredible!"
         def reply_with(type, params)
+          method = "send_#{type}"
+          chat = self.chat
           payload = self.payload
-          message_id = payload && payload['message_id']
-          params = params.merge(reply_to_message_id: message_id) if message_id
-          respond_with(type, params)
+          params = params.merge(
+            chat_id: (chat && chat['id'] or raise 'Can not reply_with when chat is not present'),
+            reply_to_message: payload && payload['message_id'],
+          )
+          bot.public_send(method, params)
         end
 
         # Same as reply_with, but for inline queries.
@@ -38,19 +36,6 @@ module Telegram
           )
           bot.answer_callback_query(params)
         end
-
-        # Edit message from callback query.
-        def edit_message(type, params = {})
-          params =
-            if message_id = payload['inline_message_id'] # rubocop:disable AssignmentInCondition
-              params.merge(inline_message_id: message_id)
-            elsif message = payload['message'] # rubocop:disable 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`'
-            end
-          bot.public_send("edit_message_#{type}", params)
-        end
       end
     end
   end

lib/telegram/bot/updates_controller/rspec_helpers.rb

@@ -13,18 +13,13 @@ RSpec.shared_context 'telegram/bot/updates_controller' do
   let(:bot) { Telegram::Bot::ClientStub.new(bot_name) }
   let(:bot_name) { 'bot' }
   let(:session) { controller.send(:session) }
-  let(:from_id) { 123 }
-  let(:chat_id) { 456 }
-  let(:default_message_options) { {from: {id: from_id}, chat: {id: chat_id}} }
-
-  include Telegram::Bot::RSpec::ClientMatchers
 
   def dispatch(bot = self.bot, update = self.update)
     controller.dispatch_again(bot, update)
   end
 
   def dispatch_message(text, options = {})
-    update = build_update :message, default_message_options.merge(options).merge(text: text)
+    update = build_update :message, options.merge(text: text)
     dispatch bot, update
   end
 
@@ -39,15 +34,4 @@ RSpec.shared_context 'telegram/bot/updates_controller' do
     else input
     end
   end
-
-  # Matcher to check response. Make sure to define `let(:chat_id)`.
-  def respond_with_message(expected)
-    send_telegram_message(bot, expected, chat_id: chat_id)
-  end
-end
-
-RSpec.configure do |config|
-  if config.respond_to?(:include_context)
-    config.include_context 'telegram/bot/updates_controller', type: :telegram_bot_controller
-  end
 end

lib/telegram/bot/updates_poller.rb

@@ -27,12 +27,12 @@ module Telegram
       attr_reader :bot, :controller, :timeout, :offset, :logger, :running, :reload
 
       def initialize(bot, controller, **options)
-        @logger = options.fetch(:logger) { defined?(Rails.logger) && Rails.logger }
+        @logger = options.fetch(:logger) { defined?(Rails) && Rails.logger }
         @bot = bot
         @controller = controller
         @timeout = options.fetch(:timeout) { DEFAULT_TIMEOUT }
         @offset = options[:offset]
-        @reload = options.fetch(:reload) { defined?(Rails.env) && Rails.env.development? }
+        @reload = options.fetch(:reload) { defined?(Rails) && Rails.env.development? }
       end
 
       def log(&block)
@@ -64,40 +64,24 @@ module Telegram
       end
 
       def fetch_updates
-        response = bot.async(false) { bot.get_updates(offset: offset, timeout: timeout) }
-        updates = response.is_a?(Array) ? response : response['result']
-        return unless updates && updates.any?
+        response = bot.get_updates(offset: offset, timeout: timeout)
+        return unless response['ok'] && response['result'].any?
         reload! do
-          updates.each do |update|
+          response['result'].each do |update|
             @offset = update['update_id'] + 1
             yield update
           end
         end
-      rescue Timeout::Error
-        log { 'Fetch timeout' }
+      rescue Timeout::Error # rubocop:disable HandleExceptions
       end
 
       def reload!
         return yield unless reload
-        reloading_code do
-          if controller.is_a?(Class) && controller.name
-            @controller = Object.const_get(controller.name)
-          end
-          yield
-        end
-      end
-
-      if defined?(Rails.application) && Rails.application.respond_to?(:reloader)
-        def reloading_code
-          Rails.application.reloader.wrap do
-            yield
-          end
-        end
-      else
-        def reloading_code
-          ActionDispatch::Reloader.prepare!
-          yield.tap { ActionDispatch::Reloader.cleanup! }
+        ActionDispatch::Reloader.prepare!
+        if controller.is_a?(Class) && controller.name
+          @controller = Object.const_get(controller.name)
         end
+        yield.tap { ActionDispatch::Reloader.cleanup! }
       end
     end
   end

lib/telegram/bot/version.rb

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

spec/integration/requests/default_bot_spec.rb

@@ -1,8 +0,0 @@
-require 'integration_helper'
-
-RSpec.describe DefaultBotController, :telegram_bot, type: :request do
-  describe '#start' do
-    subject { -> { dispatch_command :start } }
-    it { should respond_with_message 'from default' }
-  end
-end

spec/integration/requests/named_bot_spec.rb

@@ -1,9 +0,0 @@
-require 'integration_helper'
-
-RSpec.describe NamedBotController, :telegram_bot, type: :request do
-  let(:bot) { Telegram.bots[:named] }
-  describe '#start' do
-    subject { -> { dispatch_command :start } }
-    it { should respond_with_message 'from named' }
-  end
-end

spec/integration/requests/other_bot_spec.rb

@@ -1,9 +0,0 @@
-require 'integration_helper'
-
-RSpec.describe OtherBotController, :telegram_bot, type: :request do
-  let(:bot) { Telegram.bots[:other] }
-  describe '#start' do
-    subject { -> { dispatch_command :start } }
-    it { should respond_with_message 'from other' }
-  end
-end

spec/integration_helper.rb

@@ -1,62 +0,0 @@
-require 'telegram/bot/rspec/integration'
-require 'action_controller'
-require 'action_dispatch'
-require 'action_dispatch/testing/integration'
-
-require 'rails'
-require 'rspec/rails/adapters'
-require 'rspec/rails/fixture_support'
-require 'rspec/rails/example/rails_example_group'
-require 'rspec/rails/example/request_example_group'
-
-ENV['RAILS_ENV'] = 'test'
-class TestApplication < Rails::Application
-  config.eager_load = false
-  config.log_level = :debug
-  secrets[:secret_key_base] = 'test'
-  secrets[:telegram] = {
-    bot: 'default_token',
-    bots: {
-      other: {token: 'other_token'},
-      named: {token: 'named_token', username: 'TestBot'},
-    },
-  }
-end
-Rails.application.initialize!
-
-# # Controllers
-%w(default other named).each do |bot_name|
-  controller = Class.new(Telegram::Bot::UpdatesController) do
-    define_method :start do |*|
-      respond_with :message, text: "from #{bot_name}"
-    end
-  end
-  Object.const_set("#{bot_name}_bot_controller".camelize, controller)
-end
-
-RSpec.configure do |config|
-  config.include RSpec::Rails::RequestExampleGroup, type: :request
-
-  config.around type: :request do |ex|
-    begin
-      Telegram.reset_bots
-      Telegram::Bot::ClientStub.stub_all!
-      ex.run
-    ensure
-      Telegram.reset_bots
-      Telegram::Bot::ClientStub.stub_all!(false)
-    end
-  end
-
-  config.before type: :request do
-    # Redefine routes before every example, so it does not depent on order.
-    Rails.application.routes.draw do
-      require 'telegram/bot/routes_helper'
-      extend Telegram::Bot::RoutesHelper
-
-      telegram_webhooks default: DefaultBotController,
-                        other: OtherBotController,
-                        named: NamedBotController
-    end
-  end
-end

spec/spec_helper.rb

@@ -16,9 +16,6 @@ $LOAD_PATH.unshift GEM_ROOT.join('lib')
 require 'telegram/bot'
 require 'telegram/bot/updates_controller/rspec_helpers'
 require 'telegram/bot/types'
-require 'active_support/core_ext/object/json'
-
-Dir[GEM_ROOT.join('spec/support/**/*.rb')].each { |f| require f }
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

spec/support/examples/async.rb

@@ -1,143 +0,0 @@
-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 }
-  let!(:application_job_class) do
-    klass = Class.new do
-      def self.perform_later(*)
-      end
-    end
-    klass.tap { |x| stub_const('ApplicationJob', x) }
-  end
-  after { described_class.default_async_job = nil }
-
-  describe '#async' do
-    subject { ->(*args, &block) { instance.async(*args, &block) } }
-    its(:call) { should eq described_class.default_async_job }
-
-    context 'when async is disabled' do
-      let(:async) { false }
-      its(:call) { should eq false }
-    end
-
-    context 'when using with block' do
-      it 'sets value inside block' do
-        expect do
-          expect do
-            subject.call(false) do
-              expect do
-                subject.call(nil) { expect(subject[]).to eq nil }
-              end.to_not change(&subject).from false
-              raise 'TestError'
-            end
-          end.to raise_error(/TestError/)
-        end.to_not change(instance, :async).from(described_class.default_async_job)
-      end
-    end
-
-    context 'in multi-threaded environment' do
-      it 'changes only in current thread' do
-        thread = nil
-        expect do
-          thread = Thread.new do
-            expect do
-              subject.call(false) do
-                expect(subject[]).to eq false
-              end
-            end.to_not change(instance, :async).from(described_class.default_async_job)
-            sleep 0.2
-          end
-        end.to_not change(instance, :async).from(described_class.default_async_job)
-        thread.join
-      end
-
-      it 'uses default value after block' do
-        thread = Thread.new do
-          subject.call(false) {}
-          expect { sleep 0.2 }.to change(instance, :async).
-            from(described_class.default_async_job).to(nil)
-        end
-        sleep 0.1
-        instance.async = nil
-        thread.join
-      end
-    end
-  end
-
-  describe '#async=' do
-    subject { ->(val = new_val) { instance.async = val } }
-    let(:async) {}
-
-    context 'when true is given' do
-      let(:new_val) { true }
-      it { should change(instance, :async).to described_class.default_async_job }
-    end
-
-    context 'when false is given' do
-      let(:new_val) { false }
-      it { should change(instance, :async).to false }
-    end
-
-    context 'when string is given' do
-      let(:new_val) { 'Telegram::Bot::Client' }
-      it { should change(instance, :async).to Object.const_get(new_val) }
-    end
-
-    context 'in multi-threaded environment' do
-      subject { ->(val = new_val) { Thread.new { instance.async = val }.join } }
-      let(:new_val) { true }
-      it { should change(instance, :async).to described_class.default_async_job }
-    end
-  end
-
-  describe '.default_async_job' do
-    subject { described_class.default_async_job }
-    its(:superclass) { should eq application_job_class }
-    it { should include Telegram::Bot::Async::Job }
-    its(:client_class) { should eq described_class }
-
-    context 'when ApplicationJob is not defined' do
-      let(:application_job_class) {}
-      it { expect { subject }.to raise_error(/Define ApplicationJob/) }
-    end
-  end
-
-  describe '#request' do
-    subject { ->(*args) { instance.request(*(args.empty? ? self.args : args)) } }
-    let(:args, &request_args)
-    let(:result) { double(:result) }
-
-    shared_examples 'enqueues job' do
-      it 'enqueues job' do
-        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
-      end
-    end
-
-    include_examples 'enqueues job'
-
-    context 'with custom job class' do
-      let(:async) { double(:job_class) }
-      include_examples 'enqueues job'
-    end
-
-    context 'when id is not set' do
-      let(:id) {}
-      it { should raise_error(/Can not enqueue/) }
-    end
-
-    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'
-      end
-    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/telegram/bot/async_spec.rb

@@ -1,28 +0,0 @@
-RSpec.describe Telegram::Bot::Async::Job do
-  let(:job_class) do
-    described_class = self.described_class
-    client_class = self.client_class
-    Class.new do
-      include described_class
-      self.client_class = client_class
-    end
-  end
-  let(:client_class) { Telegram::Bot::Client }
-  let(:instance) { job_class.new }
-
-  describe '#perform' do
-    subject { instance.perform(id, *args) }
-    let(:id) { 'bot_id' }
-    let(:args) { [double(:action), {body: :content}] }
-    let(:client) { Telegram::Bot::Client.new(async: custom_job_class) }
-    let(:custom_job_class) { Class.new }
-    let(:result) { double(status: 200, body: '{"test":"ok"}') }
-
-    it 'finds client and performs request' do
-      expect(client_class).to receive(:wrap).with(id.to_sym) { client }
-      expect(client).to receive(:request).with(*args).and_call_original
-      expect(client).to receive(:http_request) { result }
-      should eq 'test' => 'ok'
-    end
-  end
-end

spec/telegram/bot/botan/client_helpers_spec.rb

@@ -1,33 +0,0 @@
-RSpec.describe Telegram::Bot::Client do
-  let(:instance) { described_class.new(*client_args) }
-  let(:token) { 'token' }
-  let(:botan_token) { double(:botan_token) }
-  let(:client_id) { 'client_id' }
-  let(:client_args) { [token] }
-
-  describe '#botan' do
-    subject { instance.botan }
-    it { should eq nil }
-
-    context 'when botan token is set' do
-      let(:client_args) { [token, id: client_id, async: Class.new, botan: botan_token] }
-      it { should be_instance_of Telegram::Bot::Botan }
-      its(:token) { should eq botan_token }
-      its(:id) { should eq client_id }
-
-      it 'doesnt inherit async from client' do
-        expect(instance.async).to be
-        expect(subject.async).to_not be
-      end
-    end
-
-    context 'when botan is configured with hash' do
-      let(:client_args) { [token, id: client_id, async: Class.new, botan: botan_config] }
-      let(:botan_config) { {token: botan_token, async: Class.new} }
-      it { should be_instance_of Telegram::Bot::Botan }
-      its(:token) { should eq botan_token }
-      its(:id) { should eq client_id }
-      its(:async) { should eq botan_config[:async] }
-    end
-  end
-end

spec/telegram/bot/botan_spec.rb

@@ -1,27 +0,0 @@
-RSpec.describe Telegram::Bot::Botan do
-  let(:instance) { described_class.new 'token' }
-  let(:token) { 'token' }
-
-  include_examples 'initializers', :botans
-  it_behaves_like 'async', request_args: -> { [double(:method), double(:url)] }
-
-  describe '.new' do
-    subject { described_class.new(*args) }
-
-    context 'when usual args are given' do
-      let(:args) { ['secret'] }
-      its(:token) { should eq args[0] }
-    end
-
-    context 'when options are given' do
-      let(:args) { [token: 'secret'] }
-      its(:token) { should eq args[0][:token] }
-    end
-  end
-
-  describe '.prepare_async_args' do
-    subject { described_class.prepare_async_args(*input) }
-    let(:input) { [:post, :uri, {a: 1, b: :sym, 'd' => 'str'}, 'body'] }
-    it { should eq ['post', 'uri', {a: 1, b: 'sym', 'd' => 'str'}, 'body'] }
-  end
-end

spec/telegram/bot/client_spec.rb

@@ -3,8 +3,71 @@ RSpec.describe Telegram::Bot::Client do
   let(:token) { 'token' }
   let(:botan_token) { double(:botan_token) }
 
-  include_examples 'initializers'
-  it_behaves_like 'async', request_args: -> { [double(:action), {body: :content}] }
+  describe '.wrap' do
+    subject { described_class.wrap(input) }
+    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
+    end
+
+    context 'when input is a hash' do
+      let(:input) { {token: token, username: username, ignore: :ignore} }
+
+      it 'extracts token & username' do
+        expect(described_class).to receive(:new).
+          with(token, username, botan: nil) { result }
+        should eq result
+      end
+
+      context 'when `botan` is given' do
+        let(:input) { super().merge(botan: botan_token) }
+
+        it 'passes it to initializer' do
+          expect(described_class).to receive(:new).
+            with(token, username, botan: botan_token) { 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) { :bot_1 }
+      before { allow(Telegram).to receive(:bots) { {bot_1: instance} } }
+      it { should eq Telegram.bots[:bot_1] }
+
+      context 'and there is no such bot' do
+        let(:input) { :invalid }
+        it { expect { subject }.to raise_error(/not configured/) }
+      end
+    end
+
+    context 'when input is an array' do
+      let!(:input) { ['other_token', instance, token: token, username: username] }
+      let(:result_2) { double(:result_2) }
+
+      it 'calls wrap for every element' do
+        expect(described_class).to receive(:new).with('other_token') { result }
+        expect(described_class).to receive(:new).with(token, username, botan: nil) { result_2 }
+        should eq [result, instance, result_2]
+      end
+    end
+  end
 
   describe '.prepare_body' do
     subject { described_class.prepare_body(input) }
@@ -25,72 +88,14 @@ RSpec.describe Telegram::Bot::Client do
     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'] }
-  end
+  describe '#botan' do
+    subject { instance.botan }
+    it { should eq nil }
 
-  describe '.new' do
-    subject { described_class.new(*args) }
-
-    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] }
-    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] }
-    end
-  end
-
-  describe '#request' do
-    subject { -> { instance.request(action, request_body) } }
-    let(:action) { :some_action }
-    let(:url) { "#{format described_class::URL_TEMPLATE, token}#{action}" }
-    let(:request_body) { double(:body) }
-    let(:prepared_body) { double(:prepared_body) }
-    let(:response) { HTTP::Message.new_response(body).tap { |x| x.status = status } }
-
-    let(:status) { 200 }
-    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(instance).to receive(:http_request).with(url, prepared_body) { response }
-    end
-    around { |ex| Telegram::Bot::ClientStub.stub_all!(false) { ex.run } }
-
-    shared_examples 'invalid body' do |error = Telegram::Bot::Error|
-      context 'when body is not json' do
-        let(:body) { '{' }
-        it { should raise_error error }
-      end
-    end
-
-    its(:call) { should eq body_json }
-    include_examples 'invalid body', JSON::ParserError
-
-    context 'when status is 403' do
-      let(:status) { 403 }
-      it { should raise_error Telegram::Bot::Forbidden, body_json['description'] }
-      include_examples 'invalid body'
-    end
-
-    context 'when status is 404' do
-      let(:status) { 404 }
-      it { should raise_error Telegram::Bot::NotFound, body_json['description'] }
-      include_examples 'invalid body'
-    end
-
-    context 'when status is other' do
-      let(:status) { 500 }
-      it { should raise_error Telegram::Bot::Error, /#{body_json['description']}/ }
+    context 'when botan token is set' do
+      let(:instance) { described_class.new token, botan: botan_token }
+      it { should be_instance_of Telegram::Bot::Botan }
+      its(:token) { should eq botan_token }
     end
   end
 end

spec/telegram/bot/client_stub_spec.rb

@@ -1,7 +1,7 @@
 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) { Telegram::Bot::Client.wrap(['token', token: 'token2']) }
 
     shared_examples 'constructors' do |expected_class|
       it 'makes Client.new return ClientStub' do
@@ -9,7 +9,7 @@ RSpec.describe Telegram::Bot::ClientStub do
         expect(client.username).to eq 'bot_name'
       end
 
-      it 'makes Client.wrap return ClientStub' do
+      it 'makes Client.wrap raturn ClientStub' do
         expect(clients).to contain_exactly instance_of(expected_class),
           instance_of(expected_class)
       end
@@ -35,25 +35,4 @@ RSpec.describe Telegram::Bot::ClientStub do
       include_examples 'constructors', Telegram::Bot::Client
     end
   end
-
-  describe '#new' do
-    subject { described_class.new(*args) }
-
-    context 'when only username is given' do
-      let(:args) { 'superbot' }
-      its(:username) { should eq args }
-    end
-
-    context 'when username and token are given' do
-      let(:args) { %w(token superbot) }
-      its(:token) { should eq args[0] }
-      its(:username) { should eq args[1] }
-    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] }
-    end
-  end
 end

spec/telegram/bot/config_methods_spec.rb

@@ -1,106 +0,0 @@
-RSpec.describe Telegram::Bot::ConfigMethods do
-  let(:registry) do
-    Object.new.tap do |x|
-      x.extend described_class
-      x.bots_config = config
-    end
-  end
-  let(:config) do
-    {
-      default: 'default_token',
-      chat: {
-        token: 'chat_token',
-        username: 'Chat',
-        botan: 'chat_botan_token',
-      },
-      other_chat: {
-        'token' => 'other_chat_token',
-        'username' => 'OtherChat',
-        'botan' => 'other_chat_botan_token',
-      },
-    }
-  end
-
-  describe '#bot' do
-    subject { -> { registry.bot } }
-    its(:call) { should eq registry.bots[:default] }
-
-    context 'when bot is not configured' do
-      let(:config) { super().except(:default) }
-      it { should raise_error(/bot is not configured/) }
-    end
-  end
-
-  describe '#bots' do
-    context 'configured by token' do
-      subject { registry.bots[:default] }
-      its(:id) { should eq :default }
-      its(:token) { should eq config[:default] }
-    end
-
-    context 'configured by hash' do
-      subject { registry.bots[:chat] }
-      its(:id) { should eq :chat }
-      its(:token) { should eq config[:chat][:token] }
-      its(:username) { should eq config[:chat][:username] }
-      its('botan.token') { should eq config[:chat][:botan] }
-    end
-
-    context 'configured by hash with stringified keys' do
-      subject { registry.bots[:other_chat] }
-      its(:id) { should eq :other_chat }
-      its(:token) { should eq config[:other_chat]['token'] }
-      its(:username) { should eq config[:other_chat]['username'] }
-      its('botan.token') { should eq config[:other_chat]['botan'] }
-    end
-  end
-
-  describe '#botans' do
-    subject { registry.botans }
-    it do
-      should eq(
-        default: nil,
-        chat: registry.bots[:chat].botan,
-        other_chat: registry.bots[:other_chat].botan,
-      )
-    end
-  end
-
-  describe '#bots_config' do
-    subject { registry.bots_config }
-    it { should eq config }
-
-    context 'when not configured' do
-      let(:registry) { Object.new.tap { |x| x.extend described_class } }
-      before { hide_const('Rails') }
-      it { should eq({}) }
-
-      context 'in rails environment' do
-        before { stub_const('Rails', double(application: double(secrets: secrets))) }
-        let(:secrets) { {} }
-        it { should eq({}) }
-
-        context 'when there is telegram section in secrets' do
-          let(:secrets) { {telegram: config.stringify_keys} }
-          let(:config) do
-            {
-              bot: double(:bot_config),
-              bots: {
-                chat: double(:chat_config),
-                other_chat: double(:other_chat_config),
-              },
-            }
-          end
-          it { should include default: config[:bot] }
-          it { should include config[:bots] }
-
-          context 'on rails >5.1 (deep symbolized keys)' do
-            let(:secrets) { {telegram: config.deep_symbolize_keys} }
-            it { should include default: config[:bot] }
-            it { should include config[:bots] }
-          end
-        end
-      end
-    end
-  end
-end

spec/telegram/bot/middleware_spec.rb

@@ -1,5 +1,3 @@
-require 'rack/mock'
-
 RSpec.describe Telegram::Bot::Middleware do
   let(:instance) { described_class.new bot, controller }
   let(:bot) { double(:bot) }
@@ -8,25 +6,10 @@ RSpec.describe Telegram::Bot::Middleware do
   describe '#call' do
     subject { instance.call(env) }
     let(:env) { {'action_dispatch.request.request_parameters' => json_body} }
-    let(:update) { {'message' => {'id' => 1}} }
-    let(:env) do
-      Rack::MockRequest.env_for('/',
-        method: :post,
-        input:  JSON.dump(update),
-        'CONTENT_TYPE' => 'application/json',
-      )
-    end
-
-    require 'action_pack/version'
-    if ActionPack::VERSION::MAJOR < 5
-      # Before Rails 5, params are parsed in middleware.
-      # In Rails 5, they are parsed in Request#request_parameters.
-      require 'action_dispatch/middleware/params_parser'
-      let(:instance) { ActionDispatch::ParamsParser.new(super()) }
-    end
+    let(:json_body) { double(:json_body) }
 
     it 'calls dispatch on controller' do
-      expect(controller).to receive(:dispatch).with(bot, update)
+      expect(controller).to receive(:dispatch).with(bot, json_body)
       subject
     end
 

spec/telegram/bot/routes_helper_spec.rb

@@ -50,9 +50,8 @@ RSpec.describe Telegram::Bot::RoutesHelper do
 
     def assert_routes(*expected) # rubocop:disable AbcSize
       expected.each do |(bot, controller, route_name, options)|
-        expected_path = options.delete(:path) || "telegram/#{bot.token}"
         expect(mapper).to receive(:post) do |path, params|
-          expect(path).to eq expected_path
+          expect(path).to eq "telegram/#{bot.token}"
           middleware = params[:to]
           expect(middleware.controller).to eq(controller)
           expect(middleware.bot.token).to eq(bot.token)
@@ -71,27 +70,6 @@ RSpec.describe Telegram::Bot::RoutesHelper do
         assert_routes [bot, controller, 'default_telegram_webhook', option: :val],
                       [other_bot, controller, 'other_telegram_webhook', option: :val]
       end
-
-      context 'and bot does not have configured token' do
-        let(:bot) { create_bot(nil) }
-        it 'creates routes for every bot and this controller' do
-          assert_routes [bot, controller, 'default_telegram_webhook', option: :val],
-                        [other_bot, controller, 'other_telegram_webhook', option: :val]
-        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',
-          ], [other_bot, controller, 'other_telegram_webhook', option: :val]
-        end
-      end
     end
 
     context 'when called with hash' do

spec/telegram/bot/rspec/client_matchers_spec.rb

@@ -1,87 +0,0 @@
-RSpec.describe Telegram::Bot::RSpec::ClientMatchers do
-  let(:bot) { Telegram::Bot::ClientStub.new('TestBot') }
-  let(:other_bot) { Telegram::Bot::ClientStub.new('OtherTestBot') }
-
-  include described_class
-
-  describe '#make_telegram_request' do
-    context 'without args' do
-      it 'works for matching' do
-        block = ->(*) { bot.send_message(text: 'test') }
-        expect(&block).to make_telegram_request(bot, :sendMessage)
-        expect { 3.times(&block) }.to make_telegram_request(bot, :sendMessage).exactly(3).times
-        expect { 3.times(&block) }.to make_telegram_request(bot, :sendMessage).at_least(2).times
-        expect { 3.times(&block) }.to make_telegram_request(bot, :sendMessage).at_most(4).times
-      end
-
-      it 'works for not-matching' do
-        block = ->(*) { bot.get_me }
-        expect {}.to_not make_telegram_request(bot, :getMe)
-        expect { other_bot.get_me }.to_not make_telegram_request(bot, :getMe)
-        expect { 3.times(&block) }.to_not make_telegram_request(bot, :getMe)
-        expect { 3.times(&block) }.to_not make_telegram_request(bot, :getMe).exactly(2).times
-        expect { 3.times(&block) }.to_not make_telegram_request(bot, :getMe).exactly(4).times
-        expect { 3.times(&block) }.to_not make_telegram_request(bot, :getMe).at_least(4).times
-        expect { 3.times(&block) }.to_not make_telegram_request(bot, :getMe).at_most(2).times
-      end
-    end
-
-    context 'with args' do
-      it 'works for exact matching' do
-        args = {text: 'test', parseMode: :Markdown}
-        block = ->(*) { bot.send_message(args) }
-        expect(&block).to make_telegram_request(bot, :sendMessage).with(args)
-        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
-      end
-
-      it 'works for block matchers' do
-        args = {text: 'test', parseMode: :Markdown}
-        block = ->(*) { bot.send_message(args) }
-        expect(&block).to make_telegram_request(bot, :sendMessage).
-          with { |actual| expect(actual).to eq(args) }
-        # It ignores block's result! Custom expectations must be used inside block.
-        expect(&block).to make_telegram_request(bot, :sendMessage).
-          with { |actual| actual == {} }
-        expect do
-          expect(&block).to_not make_telegram_request(bot, :sendMessage).
-            with { |actual| expect(actual).to eq({}) }
-        end.to raise_error RSpec::Expectations::ExpectationNotMetError
-        n = -1
-        expect { 3.times { |i| bot.send_message text: i } }.
-          to make_telegram_request(bot, :sendMessage).exactly(3).times.
-            with { |actual| expect(actual).to eq(text: n += 1) }
-      end
-
-      it 'works for RSpec::Mocks matchers' do
-        args = {text: 'test', parseMode: :Markdown}
-        block = ->(*) { bot.send_message(args) }
-        expect(&block).to make_telegram_request(bot, :sendMessage).with(hash_including(args))
-        expect(&block).to make_telegram_request(bot, :sendMessage).with(
-          text: a_string_matching(/est$/),
-          parseMode: :Markdown,
-        )
-      end
-    end
-  end
-
-  describe '#send_telegram_message' do
-    let(:args) { {text: 'test', parseMode: :Markdown} }
-    let(:block) { ->(*) { bot.send_message(args) } }
-
-    it 'works for matching' do
-      expect(&block).to send_telegram_message(bot, 'test')
-      expect(&block).to send_telegram_message(bot, /^tes/)
-      expect(&block).to send_telegram_message(bot, 'test', parseMode: :Markdown)
-      expect(&block).to send_telegram_message(bot, a_string_including('es'))
-    end
-
-    it 'works for not-matching' do
-      expect(&block).to_not send_telegram_message(bot, 'test!')
-      expect(&block).to_not send_telegram_message(bot, /tes$/)
-      expect(&block).to_not send_telegram_message(bot, 'test', parseMode: :HTML)
-      expect(&block).to_not send_telegram_message(bot, a_string_including('smth'))
-    end
-  end
-end

spec/telegram/bot/rspec/integration_spec.rb

@@ -1,71 +0,0 @@
-require 'telegram/bot/rspec/integration'
-require 'action_controller'
-require 'action_dispatch'
-require 'action_dispatch/testing/integration'
-
-RSpec.describe 'Integrations helper', :telegram_bot do
-  include ActionDispatch::Integration::Runner
-  def reset_template_assertion; end
-
-  let(:app) do
-    app = Telegram::Bot::Middleware.new(bot, controller)
-    if ActionPack::VERSION::MAJOR >= 5
-      app
-    else
-      require 'action_dispatch/middleware/params_parser'
-      ActionDispatch::ParamsParser.new(app)
-    end
-  end
-  let(:bot) { Telegram::Bot::ClientStub.new('token') }
-  let(:controller_path) { '/' }
-  let(:controller) do
-    Class.new(Telegram::Bot::UpdatesController) do
-      def start(*args)
-        respond_with :message, text: "Start: #{args.inspect}, option: #{payload[:option]}"
-      end
-    end
-  end
-
-  describe '#default_message_options' do
-    subject { default_message_options }
-    it { should eq from: {id: from_id}, chat: {id: chat_id} }
-  end
-
-  describe '#dispatch' do
-    subject { -> { dispatch message: {text: '/start', **default_message_options} } }
-    it { should respond_with_message 'Start: [], option: ' }
-  end
-
-  describe '#dispatch_message' do
-    subject { -> { dispatch_message "/start #{args.join ' '}", options } }
-    let(:args) { %w(asd qwe) }
-    let(:options) { {} }
-    it { should respond_with_message "Start: #{args.inspect}, option: " }
-
-    context 'with options' do
-      let(:options) { {option: 1} }
-      it { should respond_with_message "Start: #{args.inspect}, option: 1" }
-
-      context 'and chat_id is not set' do
-        let(:options) { super().merge(chat: nil) }
-        it { should raise_error(/chat is not present/) }
-      end
-    end
-  end
-
-  describe '#dispatch_command' do
-    subject { -> { dispatch_command :start, *args } }
-    let(:args) { [] }
-    it { should respond_with_message "Start: #{args.inspect}, option: " }
-
-    context 'with args' do
-      let(:args) { %w(asd qwe) }
-      it { should respond_with_message "Start: #{args.inspect}, option: " }
-    end
-
-    context 'with options' do
-      let(:args) { ['asd', 'qwe', option: 1] }
-      it { should respond_with_message "Start: #{args[0...-1].inspect}, option: 1" }
-    end
-  end
-end

spec/telegram/bot/updates_controller/botan_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Telegram::Bot::Botan::ControllerHelpers do
+RSpec.describe Telegram::Bot::UpdatesController::Botan do
   include_context 'telegram/bot/updates_controller'
   let(:controller_class) do
     described_class = self.described_class

spec/telegram/bot/updates_controller/callback_query_context_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Telegram::Bot::UpdatesController::CallbackQueryContext do
+RSpec.describe Telegram::Bot::UpdatesController::CallbackQueyContext do
   include_context 'telegram/bot/updates_controller'
   let(:controller_class) do
     described_class = self.described_class

spec/telegram/bot/updates_controller/reply_helpers_spec.rb

@@ -1,76 +1,35 @@
 RSpec.describe Telegram::Bot::UpdatesController do
   include_context 'telegram/bot/updates_controller'
-  let(:params) { {arg: 1, 'other_arg' => 2} }
-  let(:respond_type) { :photo }
-  let(:result) { double(:result) }
-  let(:payload_type) { :message }
-  let(:payload) { {message_id: double(:message_id)} }
-  let(:chat) { {'id' => double(:chat_id)} }
-
-  shared_examples 'missing chat' do
-    context 'when chat is missing' do
-      let(:payload_type) { :some_type }
-      it { expect { subject }.to raise_error(/chat/) }
-    end
-  end
-
-  describe '#respond_with' do
-    subject { controller.respond_with respond_type, params }
-    include_examples 'missing chat'
-
-    it 'sets chat_id & reply_to_message_id' do
-      expect(controller).to receive(:chat) { chat }
-      expect(bot).to receive("send_#{respond_type}").
-        with(params.merge(chat_id: chat['id'])) { result }
-      should eq result
-    end
-  end
 
   describe '#reply_with' do
-    subject { controller.reply_with respond_type, params }
-    include_examples 'missing chat'
+    subject { controller.reply_with type, params }
+    let(:params) { {arg: 1, 'other_arg' => 2} }
+    let(:type) { :photo }
+    let(:result) { double(:result) }
+    let(:payload_type) { :message }
+    let(:payload) { {message_id: double(:message_id)} }
+    let(:chat) { {'id' => double(:chat_id)} }
 
-    it 'sets chat_id & reply_to_message_id' do
+    it 'sets chat_id & reply_to_message' do
       expect(controller).to receive(:chat) { chat }
-      expect(bot).to receive("send_#{respond_type}").with(params.merge(
+      expect(bot).to receive("send_#{type}").with(params.merge(
         chat_id: chat['id'],
-        reply_to_message_id: payload[:message_id],
+        reply_to_message: payload[:message_id],
       )) { result }
       should eq result
     end
 
+    context 'when chat is missing' do
+      let(:payload_type) { :some_type }
+      it { expect { subject }.to raise_error(/chat/) }
+    end
+
     context 'when update is not set' do
       let(:update) { {chat: chat} }
-      it 'sets chat_id' do
-        expect(bot).to receive("send_#{respond_type}").
-          with(params.merge(chat_id: chat['id'])) { result }
-        should eq result
-      end
-    end
-  end
-
-  describe '#edit_message' do
-    subject { controller.edit_message(type, params) }
-    let(:type) { :reply_markup }
-
-    it { expect { subject }.to raise_error(/Can not edit message without/) }
-
-    context 'when inline_message_id is present' do
-      let(:payload) { {inline_message_id: double(:message_id)} }
-      it 'sets inline_message_id' do
-        expect(bot).to receive("edit_message_#{type}").with(params.merge(
-          inline_message_id: payload[:inline_message_id],
-        )) { result }
-        should eq result
-      end
-    end
-
-    context 'when message is present' do
-      let(:payload) { {message: super().merge(chat: chat)} }
-      it 'sets chat_id & message_id' do
-        expect(bot).to receive("edit_message_#{type}").with(params.merge(
-          message_id: payload[:message][:message_id],
-          chat_id: payload[:message][:chat]['id'],
+      it 'sets chat_id & reply_to_message' do
+        expect(bot).to receive("send_#{type}").with(params.merge(
+          chat_id: chat['id'],
+          reply_to_message: nil,
         )) { result }
         should eq result
       end

spec/telegram/bot/updates_controller_spec.rb

@@ -102,59 +102,41 @@ RSpec.describe Telegram::Bot::UpdatesController do
       it { should eq [false, payload_type, payload.values_at(:data)] }
     end
 
+    context 'when payload is edited_message' do
+      let(:payload_type) { 'edited_message' }
+      it { should eq [false, payload_type, [payload]] }
+    end
+
     context 'when payload is not supported' do
       let(:payload_type) { '_unsupported_' }
       it { should eq [false, :unsupported_payload_type, []] }
     end
 
-    %w(message channel_post).each do |type|
-      context "when payload is edited_#{type}" do
-        let(:payload_type) { "edited_#{type}" }
-        it { should eq [false, payload_type, [payload]] }
-      end
+    context 'when payload is message' do
+      let(:payload_type) { 'message' }
+      let(:payload) { {'text' => text} }
+      let(:text) { 'test' }
 
-      context 'when payload is message' do
-        let(:payload_type) { type }
-        let(:payload) { {'text' => text} }
-        let(:text) { 'test' }
+      it { should eq [false, payload_type, [payload]] }
 
-        it { should eq [false, payload_type, [payload]] }
+      context 'with command' do
+        let(:text) { "/test#{"@#{mention}" if mention} arg 1 2" }
+        let(:mention) {}
+        it { should eq [true, 'test', %w(arg 1 2)] }
 
-        context 'with command' do
-          let(:text) { "/test#{"@#{mention}" if mention} arg 1 2" }
-          let(:mention) {}
+        context 'with mention' do
+          let(:mention) { bot.username }
           it { should eq [true, 'test', %w(arg 1 2)] }
-
-          context 'with mention' do
-            let(:mention) { bot.username }
-            it { should eq [true, 'test', %w(arg 1 2)] }
-          end
-
-          context 'with mention for other bot' do
-            let(:mention) { other_bot_name }
-            it { should eq [false, payload_type, [payload]] }
-          end
         end
 
-        context 'without text' do
-          let(:payload) { {'audio' => {'file_id' => 123}} }
-          it { should eq [false, payload_type, [payload]] }
+        context 'with mention for other bot' do
+          let(:mention) { other_bot_name }
+          it { should eq [false, 'message', [payload]] }
         end
       end
-    end
 
-    custom_payload_types = %w(
-      message
-      edited_message
-      channel_post
-      edited_channel_post
-      inline_query
-      chosen_inline_result
-      callback_query
-    )
-    (described_class::PAYLOAD_TYPES - custom_payload_types).each do |type|
-      context "when payload is #{type}" do
-        let(:payload_type) { type }
+      context 'without text' do
+        let(:payload) { {'audio' => {'file_id' => 123}} }
         it { should eq [false, payload_type, [payload]] }
       end
     end
@@ -243,12 +225,12 @@ RSpec.describe Telegram::Bot::UpdatesController do
       it { should change(controller, :acted).to true }
       its(:call) { should eq [nil, nil, args] }
 
-      context 'when callback halts chain' do
+      context 'when callback returns false' do
         before do
           controller_class.prepend(Module.new do
             def hook
               super
-              ActiveSupport::VERSION::MAJOR >= 5 ? throw(:abort) : false
+              false
             end
           end)
         end
@@ -311,49 +293,4 @@ RSpec.describe Telegram::Bot::UpdatesController do
       end
     end
   end
-
-  describe '#chat' do
-    subject { controller.chat }
-    let(:payload_type) { :message }
-    let(:payload) { {chat: 'test_value'} }
-    it { should eq payload[:chat] }
-
-    context 'when payload is not set' do
-      let(:payload) {}
-      it { should eq nil }
-    end
-
-    context 'when payload has no such field' do
-      let(:payload) { {smth: 'other'} }
-      it { should eq nil }
-
-      context 'but has `message`' do
-        let(:payload) { {message: message} }
-        let(:message) { {text: 'Hello bot!'} }
-        it { should eq nil }
-
-        context 'with `chat` set' do
-          let(:message) { super().merge(chat: 'test value') }
-          it { should eq message[:chat] }
-        end
-      end
-    end
-  end
-
-  describe '#from' do
-    subject { controller.from }
-    let(:payload_type) { :message }
-    let(:payload) { {from: 'test_value'} }
-    it { should eq payload[:from] }
-
-    context 'when payload is not set' do
-      let(:payload) {}
-      it { should eq nil }
-    end
-
-    context 'when payload has no such field' do
-      let(:payload) { {smth: 'other'} }
-      it { should eq nil }
-    end
-  end
 end

spec/telegram/bot/updates_poller_spec.rb

@@ -1,39 +1,9 @@
 RSpec.describe Telegram::Bot::UpdatesPoller do
-  let(:instance) { described_class.new(bot, controller) }
-  let(:bot) { Telegram::Bot::Client.new('token') }
-  let(:controller) { double(:controller) }
-
   describe '#initialize' do
-    subject { instance }
+    subject { described_class.new bot, controller }
+    let(:bot) { double }
+    let(:controller) { double }
+
     it { should be }
   end
-
-  describe '#fetch_updates' do
-    subject { -> { instance.fetch_updates(&block) } }
-    let(:block) { ->(x) { expect(x).to eq expected_results.shift } }
-    let(:results) { [{update_id: 12}, {update_id: 34}] }
-    let(:expected_results) { results.as_json }
-    let(:request_result) { {ok: true, result: results}.as_json }
-    before do
-      allow(bot).to receive(:get_updates) do
-        expect(bot.async).to be_falsy
-        request_result
-      end
-    end
-
-    it { should change(instance, :offset).to(results.last[:update_id] + 1) }
-    it { should change { expected_results }.to([]) }
-
-    context 'with typed response' do
-      let(:request_result) { results.as_json.map { |x| Telegram::Bot::Types::Update.new(x) } }
-      let(:expected_results) { request_result.dup }
-      it { should change(instance, :offset).to(results.last[:update_id] + 1) }
-      it { should change { expected_results }.to([]) }
-    end
-
-    context 'when bot is in async mode' do
-      let(:bot) { Telegram::Bot::Client.new('token', async: Class.new) }
-      it { should change { expected_results }.to([]) }
-    end
-  end
 end

spec/telegram/bot_spec.rb

@@ -2,4 +2,22 @@ RSpec.describe Telegram::Bot do
   it 'has a version number' do
     expect(described_class::VERSION).not_to be nil
   end
+
+  describe described_class::StaleChat do
+    describe '.match_response?' do
+      subject { ->(val) { described_class.match_response?(val) } }
+
+      it 'returns true for specific errors' do
+        expect(subject.call({})).to eq false
+        expect(subject.call('description' => 'test')).to eq false
+        expect(subject.call('description' => 'Error: bot was kicked from')).to eq true
+        expect(subject.call(
+          'description' => "Forbidden: can't write to private chat with deleted user"
+        )).to eq true
+        expect(subject.call(
+          'description' => 'Bad request: group chat is deactivated'
+        )).to eq true
+      end
+    end
+  end
 end

telegram-bot.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_dependency 'activesupport', '>= 4.0', '< 5.2'
-  spec.add_dependency 'actionpack', '>= 4.0', '< 5.2'
+  spec.add_dependency 'activesupport', '~> 4.0'
+  spec.add_dependency 'actionpack', '~> 4.0'
   spec.add_dependency 'httpclient', '~> 2.7'
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'