Skip to content

Commit

Permalink
Update rails (#251)
Browse files Browse the repository at this point in the history
* Rails 8.0 support

* Update to Bot API 8.0
  • Loading branch information
printercu authored Nov 28, 2024
1 parent 225e02a commit 42b98db
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 5 deletions.
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_80.gemfile
- ruby: '3.2'
gemfile: gemfiles/rails_72.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-80' do
gem 'actionpack', '~> 8.0.0'
gem 'railties', '~> 8.0.0'
end

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

- Rails 8.0 support
- Update to Bot API 8.0

# 0.16.4

- Rails 7.2 support
Expand Down
21 changes: 21 additions & 0 deletions gemfiles/rails_80.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.0.0"
gem "railties", "~> 8.0.0"

group :development do
gem "appraisal", "~> 2.2"
gem "debug", "~> 1.9.2"
gem "sdoc", "~> 2.0.3"
gem "telegram-bot-types", "~> 0.6.3"
gem "rspec", "~> 3.12.0"
gem "rspec-its", "~> 1.3.0"
gem "rspec-rails", "~> 4.0.2"
gem "rubocop", "~> 1.59.0"
gem "rubocop-rails", "~> 2.23.1"
gem "coveralls", "~> 0.8.23", require: false
end

gemspec path: "../"
7 changes: 6 additions & 1 deletion lib/telegram/bot/client/api_methods.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated with bin/fetch-telegram-methods
# Bot API 7.9
# Bot API 8.0

getUpdates
setWebhook
Expand Down Expand Up @@ -31,6 +31,7 @@ sendDice
sendChatAction
setMessageReaction
getUserProfilePhotos
setUserEmojiStatus
getFile
banChatMember
unbanChatMember
Expand Down Expand Up @@ -118,16 +119,20 @@ setStickerSetTitle
setStickerSetThumbnail
setCustomEmojiStickerSetThumbnail
deleteStickerSet
getAvailableGifts
sendGift

answerInlineQuery
answerWebAppQuery
savePreparedInlineMessage

sendInvoice
createInvoiceLink
answerShippingQuery
answerPreCheckoutQuery
getStarTransactions
refundStarPayment
editUserStarSubscription

setPassportDataErrors

Expand Down
2 changes: 1 addition & 1 deletion lib/telegram/bot/updates_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ class UpdatesController < AbstractController::Base # rubocop:disable Metrics/Cla
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
pre_checkout_query
].freeze)

class << self
Expand Down
3 changes: 2 additions & 1 deletion spec/integration_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
class TestApplication < Rails::Application
config.eager_load = false
config.log_level = :debug
if ActionPack::VERSION::MAJOR >= 7 && ActionPack::VERSION::MINOR >= 2
if (ActionPack::VERSION::MAJOR >= 8) ||
(ActionPack::VERSION::MAJOR == 7 && ActionPack::VERSION::MINOR >= 2)
config.action_dispatch.show_exceptions = :none
else
config.action_dispatch.show_exceptions = false
Expand Down
1 change: 1 addition & 0 deletions spec/telegram/bot/updates_controller/typed_update_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
message_reaction_count
chat_boost
removed_chat_boost
purchased_paid_media
pre_checkout_query
]).
map { |x| [x, Telegram::Bot::Types.const_get(x.camelize)] }.to_h.
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', '< 7.3'
spec.add_dependency 'activesupport', '>= 4.0', '< 7.3'
spec.add_dependency 'actionpack', '>= 4.0', '< 8.1'
spec.add_dependency 'activesupport', '>= 4.0', '< 8.1'
spec.add_dependency 'httpclient', '~> 2.7'

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

0 comments on commit 42b98db

Please sign in to comment.