test: add rails 8.1 appraisal matrix and require logger

Logger functionality in ActionController implemented using
AbstractController::Logger class. Following change fixes incompatibility
with Rails 8.1.

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
         include:
           # ruby 3.x
           - ruby: '3.2'
-            gemfile: gemfiles/rails_80.gemfile
+            gemfile: gemfiles/rails_81.gemfile
           - ruby: '3.2'
             gemfile: gemfiles/rails_72.gemfile
           - ruby: '3.2'

Appraisals

@@ -5,6 +5,11 @@ appraise 'rails-80' do
   gem 'railties', '~> 8.0.0'
 end
 
+appraise 'rails-81' do
+  gem 'actionpack', '~> 8.1.0'
+  gem 'railties', '~> 8.1.0'
+end
+
 appraise 'rails-72' do
   gem 'actionpack', '~> 7.2.0'
   gem 'railties', '~> 7.2.0'

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Unreleased
 
+# 0.16.7
+
+- Update to Bot API 8.2
+
+# 0.16.6
+
+- Fix poller rake task for Rails 8.0
+
 # 0.16.5
 
 - Rails 8.0 support

bin/fetch-telegram-methods

@@ -41,3 +41,23 @@ puts result_txt
 API_METHODS_FILE = File.expand_path('../lib/telegram/bot/client/api_methods.txt', __dir__).freeze
 File.write(API_METHODS_FILE, result_txt)
 puts '', "Updated #{API_METHODS_FILE}"
+
+puts '', 'Payload types:'
+update_tbody = doc.css('tbody').
+  find { |tbody| tbody.css('td').any? { |td| td.text == 'update_id' } }
+payload_types = update_tbody.css('td:first-child').map(&:text).reject { |x| x == 'update_id' }
+
+result = ['# Generated with bin/fetch-telegram-methods']
+result << "# #{api_version[1]}" if api_version
+result << payload_types.join("\n")
+result << ''
+result_txt = result.join("\n")
+
+puts result_txt
+
+PAYLOAD_TYPES_FILE = File.expand_path(
+  '../lib/telegram/bot/updates_controller/payload_types.txt',
+  __dir__,
+).freeze
+File.write(PAYLOAD_TYPES_FILE, result_txt)
+puts '', "Updated #{PAYLOAD_TYPES_FILE}"

gemfiles/rails_81.gemfile

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

lib/tasks/telegram-bot.rake

@@ -15,6 +15,9 @@ namespace :telegram do
           Rails.logger.extend ActiveSupport::Logger.broadcast console
         end
       end
+      # Routes are not loaded by default in Rails >= 8.0.
+      # Load them explicitly to identify a controller for a bot.
+      Rails.application.try(:reload_routes_unless_loaded)
       Telegram::Bot::UpdatesPoller.start(ENV['BOT']&.to_sym || :default)
     end
 

lib/telegram/bot/client/api_methods.txt

@@ -1,5 +1,5 @@
 # Generated with bin/fetch-telegram-methods
-# Bot API 8.0
+# Bot API 8.2
 
 getUpdates
 setWebhook
@@ -121,6 +121,10 @@ setCustomEmojiStickerSetThumbnail
 deleteStickerSet
 getAvailableGifts
 sendGift
+verifyUser
+verifyChat
+removeUserVerification
+removeChatVerification
 
 answerInlineQuery
 answerWebAppQuery

lib/telegram/bot/routes_helper.rb

@@ -47,7 +47,7 @@ module Telegram
           as: RoutesHelper.route_name_for_bot(bot),
           format: false,
         }.merge!(options)
-        post(path || "telegram/#{bot.token && RoutesHelper.token_hash(bot.token)}", params)
+        post(path || "telegram/#{bot.token && RoutesHelper.token_hash(bot.token)}", **params)
         UpdatesPoller.add(bot, controller) if Telegram.bot_poller_mode?
       end
     end

lib/telegram/bot/updates_controller.rb

@@ -89,31 +89,13 @@ module Telegram
 
       extend Session::ConfigMethods
 
-      PAYLOAD_TYPES = Set.new(%w[
-        message
-        edited_message
-        channel_post
-        edited_channel_post
-        business_connection
-        business_message
-        edited_business_message
-        deleted_business_messages
-        message_reaction
-        message_reaction_count
-        inline_query
-        chosen_inline_result
-        callback_query
-        shipping_query
-        pre_checkout_query
-        purchased_paid_media
-        poll
-        poll_answer
-        my_chat_member
-        chat_member
-        chat_join_request
-        chat_boost
-        removed_chat_boost
-      ].freeze)
+      PAYLOAD_TYPES_FILE = File.expand_path('updates_controller/payload_types.txt', __dir__)
+      PAYLOAD_TYPES = File.read(PAYLOAD_TYPES_FILE).
+        lines.
+        map(&:strip).
+        reject { |x| x.empty? || x.start_with?('#') }.
+        to_set.
+        freeze
 
       class << self
         # Initialize controller and process update.

lib/telegram/bot/updates_controller/instrumentation.rb

@@ -8,9 +8,7 @@ module Telegram
       module Instrumentation
         extend ActiveSupport::Concern
 
-        included do
-          config_accessor :logger
-        end
+        include AbstractController::Logger
 
         class << self
           def instrument(action, *args, &block)

lib/telegram/bot/updates_controller/payload_types.txt

@@ -0,0 +1,25 @@
+# Generated with bin/fetch-telegram-methods
+# Bot API 8.2
+message
+edited_message
+channel_post
+edited_channel_post
+business_connection
+business_message
+edited_business_message
+deleted_business_messages
+message_reaction
+message_reaction_count
+inline_query
+chosen_inline_result
+callback_query
+shipping_query
+pre_checkout_query
+purchased_paid_media
+poll
+poll_answer
+my_chat_member
+chat_member
+chat_join_request
+chat_boost
+removed_chat_boost

lib/telegram/bot/version.rb

@@ -2,7 +2,7 @@
 
 module Telegram
   module Bot
-    VERSION = '0.16.5'
+    VERSION = '0.16.7'
 
     def self.gem_version
       Gem::Version.new VERSION

spec/spec_helper.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'logger'
 require 'pathname'
 require 'debug'
 require 'rspec/its'

telegram-bot.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.4'
 
-  spec.add_dependency 'actionpack', '>= 4.0', '< 8.1'
-  spec.add_dependency 'activesupport', '>= 4.0', '< 8.1'
+  spec.add_dependency 'actionpack', '>= 4.0'
+  spec.add_dependency 'activesupport', '>= 4.0'
   spec.add_dependency 'httpclient', '~> 2.7'
 
   spec.add_development_dependency 'bundler', '> 1.16'