Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
- gemfiles/rails_51.gemfile
include:
# ruby 3.x
- ruby: '3.2'
gemfile: gemfiles/rails_81.gemfile
- ruby: '3.2'
gemfile: gemfiles/rails_80.gemfile
- ruby: '3.2'
Expand Down
5 changes: 5 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# frozen_string_literal: true

appraise 'rails-81' do
gem 'actionpack', '~> 8.1.0'
gem 'railties', '~> 8.1.0'
end

appraise 'rails-80' do
gem 'actionpack', '~> 8.0.0'
gem 'railties', '~> 8.0.0'
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Unreleased

- Rails 8.1 support

# 0.16.7

- Update to Bot API 8.2
Expand Down
21 changes: 21 additions & 0 deletions gemfiles/rails_81.gemfile
Original file line number Diff line number Diff line change
@@ -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: "../"
2 changes: 1 addition & 1 deletion lib/telegram/bot/routes_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def telegram_webhook(controller, bot = :default, path: nil, **options)
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
Expand Down
6 changes: 5 additions & 1 deletion lib/telegram/bot/updates_controller/instrumentation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ module Instrumentation
extend ActiveSupport::Concern

included do
config_accessor :logger
if respond_to?(:config_accessor, true)
config_accessor :logger
else
include AbstractController::Logger
end
end

class << self
Expand Down
4 changes: 2 additions & 2 deletions telegram-bot.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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', '< 8.2'
spec.add_dependency 'activesupport', '>= 4.0', '< 8.2'
spec.add_dependency 'httpclient', '~> 2.7'

spec.add_development_dependency 'bundler', '> 1.16'
Expand Down