Use same logger configuration for all rails versions

.github/workflows/ci.yml

@@ -17,13 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby:
-          - '2.7'
-        gemfile:
-          - gemfiles/rails_61.gemfile
-          - gemfiles/rails_60.gemfile
-          - gemfiles/rails_52.gemfile
-          - gemfiles/rails_51.gemfile
         include:
           # ruby 3.x
           - ruby: '3.2'
@@ -34,10 +27,9 @@ jobs:
             gemfile: gemfiles/rails_72.gemfile
           - ruby: '3.2'
             gemfile: gemfiles/rails_71.gemfile
-          - ruby: '3.0'
-            gemfile: gemfiles/rails_61.gemfile
-          - ruby: '3.0'
-            gemfile: gemfiles/rails_60.gemfile
+          # ruby 2.x
+          - ruby: '2.7'
+            gemfile: gemfiles/rails_71.gemfile
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
     steps:

.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rails
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7
   NewCops: enable
   SuggestExtensions: false
   Exclude:

Appraisals

@@ -24,23 +24,3 @@ appraise 'rails-70' do
   gem 'actionpack', '~> 7.0.0'
   gem 'railties', '~> 7.0.0'
 end
-
-appraise 'rails-61' do
-  gem 'actionpack', '~> 6.1.0'
-  gem 'railties', '~> 6.1.0'
-end
-
-appraise 'rails-60' do
-  gem 'actionpack', '~> 6.0.0'
-  gem 'railties', '~> 6.0.0'
-end
-
-appraise 'rails-52' do
-  gem 'actionpack', '~> 5.2.0'
-  gem 'railties', '~> 5.2.0'
-end
-
-appraise 'rails-51' do
-  gem 'actionpack', '~> 5.1.0'
-  gem 'railties', '~> 5.1.0'
-end

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Unreleased
 
 - Rails 8.1 support
+- Drop support for rails < 7.0 and ruby < 2.7
 
 # 0.16.7
 

lib/telegram/bot/rspec/client_matchers.rb

@@ -82,8 +82,8 @@ def matches?(proc) # rubocop:disable Metrics/AbcSize
             expected_number.public_send(expectation_method, matching_requests_count)
           end
 
-          def with(*args, &block)
-            @arg_list_matcher = ArgListMatcher.new(*args, &block)
+          def with(...)
+            @arg_list_matcher = ArgListMatcher.new(...)
             self
           end
 

lib/telegram/bot/updates_controller.rb

@@ -120,12 +120,10 @@ def payload_from_update(update)
 
         def payload_from_typed_update(update)
           PAYLOAD_TYPES.find do |type|
-            begin
-              item = update[type]
-              return [item, type] if item
-            rescue Exception # rubocop:disable Lint/RescueException
-              # dry-rb raises exception if field is not defined in schema
-            end
+            item = update[type]
+            return [item, type] if item
+          rescue Exception # rubocop:disable Lint/RescueException
+            # dry-rb raises exception if field is not defined in schema
           end
         end
       end

lib/telegram/bot/updates_controller/instrumentation.rb

@@ -8,13 +8,7 @@ class UpdatesController
       module Instrumentation
         extend ActiveSupport::Concern
 
-        included do
-          if respond_to?(:config_accessor, true)
-            config_accessor :logger
-          else
-            include AbstractController::Logger
-          end
-        end
+        include AbstractController::Logger
 
         class << self
           def instrument(action, *args, &block)
@@ -34,11 +28,9 @@ def process_action(*args)
           }
           Instrumentation.instrument(:start_processing, raw_payload.dup)
           Instrumentation.instrument(:process_action, raw_payload) do |payload|
-            begin
-              super
-            ensure
-              append_info_to_payload(payload)
-            end
+            super
+          ensure
+            append_info_to_payload(payload)
           end
         end
 

lib/telegram/bot/updates_controller/rspec_helpers.rb

@@ -33,7 +33,7 @@ def dispatch(update = self.update, bot = self.bot, webhook_request = self.webhoo
   def deep_stringify(input)
     case input
     when Array then input.map(&method(__callee__))
-    when Hash then input.map { |k, v| [k.to_s, deep_stringify(v)] }.to_h
+    when Hash then input.to_h { |k, v| [k.to_s, deep_stringify(v)] }
     else input
     end
   end

spec/integration_helper.rb

@@ -66,14 +66,12 @@ class TestApplication < Rails::Application
   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
+    Telegram.reset_bots
+    Telegram::Bot::ClientStub.stub_all!
+    ex.run
+  ensure
+    Telegram.reset_bots
+    Telegram::Bot::ClientStub.stub_all!(false)
   end
 
   config.before type: :request do

spec/telegram/bot/updates_controller/typed_update_spec.rb

@@ -31,7 +31,7 @@
       purchased_paid_media
       pre_checkout_query
     ]).
-      map { |x| [x, Telegram::Bot::Types.const_get(x.camelize)] }.to_h.
+      to_h { |x| [x, Telegram::Bot::Types.const_get(x.camelize)] }.
       merge(
         'chat_member' => Telegram::Bot::Types::ChatMemberUpdated
       )

spec/telegram/bot/updates_controller_spec.rb

@@ -7,7 +7,7 @@
     subject { controller.action_for_payload }
 
     def stub_payload(*fields)
-      fields.map { |x| [x, double(x)] }.to_h
+      fields.to_h { |x| [x, double(x)] }
     end
 
     context 'when payload is inline_query' do

telegram-bot.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_dependency 'actionpack', '>= 4.0', '< 8.2'
-  spec.add_dependency 'activesupport', '>= 4.0', '< 8.2'
+  spec.add_dependency 'actionpack', '>= 7.0', '< 8.2'
+  spec.add_dependency 'activesupport', '>= 7.0', '< 8.2'
   spec.add_dependency 'httpclient', '~> 2.7'
 
   spec.add_development_dependency 'bundler', '> 1.16'