telegram-bot 0.16.1 → 0.16.3

data/lib/telegram/bot/rspec/client_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module RSpec
@@ -61,14 +63,14 @@ module Telegram
 
           attr_reader :performed_requests, :description
 
-          def initialize(bot, action, description: nil)
+          def initialize(bot, action, description: nil) # rubocop:disable Lint/MissingSuper
             @bot = bot
             @action = action
             @description = description || "make #{action} telegram request"
             exactly(1)
           end
 
-          def matches?(proc) # rubocop:disable AbcSize
+          def matches?(proc) # rubocop:disable Metrics/AbcSize
             raise ArgumentError, 'matcher only supports block expectations' unless proc.is_a?(Proc)
             original_requests_count = bot.requests[action].count
             proc.call
@@ -115,15 +117,15 @@ module Telegram
             :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
+            msg = "make #{expectation_type.to_s.tr('_', ' ')} #{expected_number} " \
+              "#{bot.inspect}.#{action} requests,"
+            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
+            msg
           end
         end
 

data/lib/telegram/bot/rspec/integration/poller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/shared'
 
 RSpec.shared_context 'telegram/bot/integration/poller' do

data/lib/telegram/bot/rspec/integration/rack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/shared'
 require 'rack/test'
 

data/lib/telegram/bot/rspec/integration/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/shared'
 
 RSpec.shared_context 'telegram/bot/integration/rails', type: :request do

data/lib/telegram/bot/rspec/integration/shared.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/json'
 require 'telegram/bot'
 require 'telegram/bot/rspec/message_helpers'
@@ -10,5 +12,5 @@ RSpec.shared_context 'telegram/bot/integration/shared' do
 
   let(:bot) { Telegram.bot }
   let(:clear_session?) { described_class.respond_to?(:session_store) }
-  before { described_class.session_store.try!(:clear) if clear_session? }
+  before { described_class.session_store&.clear if clear_session? }
 end

data/lib/telegram/bot/rspec/message_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Shared helpers for testing message updates.
 RSpec.shared_context 'telegram/bot/message_helpers' do
   let(:default_message_options) { {from: from, chat: chat} }

data/lib/telegram/bot/rspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module RSpec

data/lib/telegram/bot/tasks.rb

@@ -7,7 +7,7 @@ module Telegram
 
       def set_webhook
         routes = Rails.application.routes.url_helpers
-        cert_file = ENV['CERT']
+        cert_file = ENV.fetch('CERT', nil)
         cert = File.open(cert_file) if cert_file
         each_bot do |key, bot|
           route_name = RoutesHelper.route_name_for_bot(bot)
@@ -16,7 +16,7 @@ module Telegram
           bot.set_webhook(
             url: url,
             certificate: cert,
-            ip_address: ENV['IP_ADDRESS'],
+            ip_address: ENV.fetch('IP_ADDRESS', nil),
             drop_pending_updates: drop_pending_updates,
           )
         end
@@ -50,13 +50,13 @@ module Telegram
       end
 
       def each_bot(&block)
-        id = ENV['BOT'].try!(:to_sym)
+        id = ENV['BOT']&.to_sym
         bots = id ? {id => Client.by_id(id)} : Telegram.bots
         bots.each { |key, bot| bot.async(false) { block[key, bot] } }
       end
 
       def drop_pending_updates
-        ENV['DROP_PENDING_UPDATES'].try!(:downcase) == 'true'
+        ENV['DROP_PENDING_UPDATES']&.downcase == 'true'
       end
     end
   end

data/lib/telegram/bot/updates_controller/callback_query_context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController

data/lib/telegram/bot/updates_controller/commands.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
       #  Support for parsing commands
       module Commands
-        CMD_REGEX = %r{\A/([a-z\d_]{,31})(@(\S+))?(\s|$)}i
+        CMD_REGEX = %r{\A/([a-z\d_]{,31})(@(\S+))?(\s|$)}i.freeze
 
         class << self
           # Fetches command from text message. All subsequent words are returned
@@ -34,7 +36,7 @@ module Telegram
         def action_for_message
           cmd, args = Commands.command_from_text(payload['text'], bot_username)
           return unless cmd
-          [[action_for_command(cmd), type: :command, command: cmd], args]
+          [[action_for_command(cmd), {type: :command, command: cmd}], args]
         end
 
         alias_method :action_for_channel_post, :action_for_message

data/lib/telegram/bot/updates_controller/instrumentation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
@@ -23,8 +25,8 @@ module Telegram
         def process_action(*args)
           raw_payload = {
             controller: self.class.name,
-            action:     action_name,
-            update:     update,
+            action: action_name,
+            update: update,
           }
           Instrumentation.instrument(:start_processing, raw_payload.dup)
           Instrumentation.instrument(:process_action, raw_payload) do |payload|
@@ -61,14 +63,14 @@ module Telegram
         #   end
         #
         # :api: plugin
-        def cleanup_view_runtime #:nodoc:
+        def cleanup_view_runtime # :nodoc:
           yield
         end
 
         # Every time after an action is processed, this method is invoked
         # with the payload, so you can add more information.
         # :api: plugin
-        def append_info_to_payload(_payload) #:nodoc:
+        def append_info_to_payload(_payload) # :nodoc:
         end
 
         module ClassMethods
@@ -76,7 +78,7 @@ module Telegram
           # controller process action. This method should return an array
           # with the messages to be added.
           # :api: plugin
-          def log_process_action(_payload) #:nodoc:
+          def log_process_action(_payload) # :nodoc:
             []
           end
         end

data/lib/telegram/bot/updates_controller/log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/log_subscriber'
 
 module Telegram
@@ -8,7 +10,7 @@ module Telegram
           info do
             payload = event.payload
             "Processing by #{payload[:controller]}##{payload[:action]}\n" \
-            "  Update: #{payload[:update].to_json}"
+              "  Update: #{payload[:update].to_json}"
           end
         end
 
@@ -17,7 +19,7 @@ module Telegram
             payload   = event.payload
             additions = UpdatesController.log_process_action(payload)
             message = "Completed in #{event.duration.round}ms"
-            message << " (#{additions.join(' | ')})" if additions.present?
+            message += " (#{additions.join(' | ')})" if additions.present?
             message
           end
         end

data/lib/telegram/bot/updates_controller/message_context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
@@ -48,12 +50,12 @@ module Telegram
         # it has higher priority than contextual action.
         def action_for_message
           val = message_context_session.delete(:context)
-          context = val && val.to_s
-          super || context && begin
-            args = payload['text'].try!(:split) || []
+          context = val&.to_s
+          super || (context && begin
+            args = payload['text']&.split || []
             action = action_for_message_context(context)
-            [[action, type: :message_context, context: context], args]
-          end
+            [[action, {type: :message_context, context: context}], args]
+          end)
         end
 
         # Save context for the next request.

data/lib/telegram/bot/updates_controller/reply_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
@@ -59,9 +61,9 @@ module Telegram
         # Edit message from callback query.
         def edit_message(type, params = {})
           params =
-            if message_id = payload['inline_message_id'] # rubocop:disable AssignmentInCondition
+            if message_id = payload['inline_message_id'] # rubocop:disable Lint/AssignmentInCondition
               params.merge(inline_message_id: message_id)
-            elsif message = payload['message'] # rubocop:disable AssignmentInCondition
+            elsif message = payload['message'] # rubocop:disable Lint/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`'

data/lib/telegram/bot/updates_controller/rescue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/rescuable'
 
 module Telegram
@@ -11,7 +13,7 @@ module Telegram
 
         def process_action(*)
           super
-        rescue Exception => exception # rubocop:disable RescueException
+        rescue Exception => exception # rubocop:disable Lint/RescueException
           rescue_with_handler(exception) || raise
         end
       end

data/lib/telegram/bot/updates_controller/rspec_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/updates_controller/testing'
 require 'telegram/bot/rspec/message_helpers'
 require 'telegram/bot/rspec/callback_query_helpers'

data/lib/telegram/bot/updates_controller/session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/session/abstract/id'
 require 'active_support/cache'
 
@@ -27,7 +29,8 @@ module Telegram
         protected
 
         def session
-          @_session ||= self.class.build_session(session_key)
+          @_session ||= # rubocop:disable Naming/MemoizedInstanceVariableName
+            self.class.build_session(session_key)
         end
 
         def session_key
@@ -41,7 +44,7 @@ module Telegram
         class SessionHash < Rack::Session::Abstract::SessionHash
           attr_reader :id
 
-          def initialize(store, id)
+          def initialize(store, id) # rubocop:disable Lint/MissingSuper
             @store = store
             @id = id
           end
@@ -65,13 +68,13 @@ module Telegram
 
           def commit
             return unless loaded?
-            data = to_hash.delete_if { |_, v| v.nil? }
+            data = to_hash.compact
             @store.write(id, data)
           end
         end
 
         class NullSessionHash < Session::SessionHash
-          def initialize
+          def initialize # rubocop:disable Lint/MissingSuper
             @data = {}
             @loaded = true
             @exists = true

data/lib/telegram/bot/updates_controller/testing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController
@@ -16,7 +18,7 @@ module Telegram
         # everything will be rewriten with #initialize.
         #
         # With `full` set to `true` it'll clear all cached instance variables.
-        def recycle!(full = false)
+        def recycle!(full = false) # rubocop:disable Style/OptionalBooleanParameter
           return unless full
           (instance_variables - IVARS_TO_KEEP).each do |ivar|
             remove_instance_variable(ivar)
@@ -27,7 +29,8 @@ module Telegram
 
         # Stubs session.
         def session
-          @_session ||= Session::NullSessionHash.new
+          @_session ||= # rubocop:disable Naming/MemoizedInstanceVariableName
+            Session::NullSessionHash.new
         end
       end
     end

data/lib/telegram/bot/updates_controller/translation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController

data/lib/telegram/bot/updates_controller/typed_update.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class UpdatesController

data/lib/telegram/bot/updates_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'abstract_controller'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/callbacks'
@@ -47,7 +49,7 @@ module Telegram
     #     ControllerClass.new(bot, from: telegram_user, chat: telegram_chat).
     #       process(:help, *args)
     #
-    class UpdatesController < AbstractController::Base # rubocop:disable ClassLength
+    class UpdatesController < AbstractController::Base # rubocop:disable Metrics/ClassLength
       abstract!
 
       %w[
@@ -69,12 +71,12 @@ module Telegram
       include AbstractController::Callbacks
       # Redefine callbacks with default terminator.
       if ActiveSupport::VERSION::MAJOR >= 5
-        define_callbacks  :process_action,
-                          skip_after_callbacks_if_terminated: true
+        define_callbacks :process_action,
+          skip_after_callbacks_if_terminated: true
       else
-        define_callbacks  :process_action,
-                          terminator: ->(_, result) { result == false },
-                          skip_after_callbacks_if_terminated: true
+        define_callbacks :process_action,
+          terminator: ->(_, result) { result == false },
+          skip_after_callbacks_if_terminated: true
       end
 
       include Commands
@@ -87,11 +89,17 @@ module Telegram
 
       extend Session::ConfigMethods
 
-      PAYLOAD_TYPES = %w[
+      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
@@ -102,7 +110,10 @@ module Telegram
         my_chat_member
         chat_member
         chat_join_request
-      ].freeze
+        chat_boost
+        removed_chat_boost
+        pre_checkout_query
+      ].freeze)
 
       class << self
         # Initialize controller and process update.
@@ -111,9 +122,28 @@ module Telegram
         end
 
         def payload_from_update(update)
-          update && PAYLOAD_TYPES.find do |type|
-            item = update[type]
-            return [item, type] if item
+          case update
+          when nil then nil
+          when Hash
+            # faster lookup for the case when telegram-bot-types is not used
+            update.find do |type, item|
+              return [item, type] if PAYLOAD_TYPES.include?(type)
+            end
+          else
+            payload_from_typed_update(update)
+          end
+        end
+
+        private
+
+        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
           end
         end
       end
@@ -126,14 +156,14 @@ module Telegram
       # that update is nil.
       # ActionDispatch::Request object is passed in `webhook_request` when bot running
       # in webhook mode.
-      def initialize(bot = nil, update = nil, webhook_request = nil)
+      def initialize(bot = nil, update = nil, webhook_request = nil) # rubocop:disable Lint/MissingSuper
         if update.is_a?(Hash) && (update.key?(:from) || update.key?(:chat))
           options = update
           update = nil
         end
         @_bot = bot
         @_update = update
-        @_chat, @_from = options && options.values_at(:chat, :from)
+        @_chat, @_from = options&.values_at(:chat, :from)
         @_payload, @_payload_type = self.class.payload_from_update(update)
         @_webhook_request = webhook_request
       end
@@ -142,13 +172,13 @@ module Telegram
       # when there is no such field in payload.
       #
       # Can be overriden with `chat` option for #initialize.
-      def chat
-        @_chat ||=
+      def chat # rubocop:disable Metrics/PerceivedComplexity
+        @_chat ||= # rubocop:disable Naming/MemoizedInstanceVariableName
           if payload
             if payload.is_a?(Hash)
-              payload['chat'] || payload['message'] && payload['message']['chat']
+              payload['chat'] || (payload['message'] && payload['message']['chat'])
             else
-              payload.try(:chat) || payload.try(:message).try!(:chat)
+              payload.try(:chat) || payload.try(:message)&.chat
             end
           end
       end
@@ -156,7 +186,8 @@ module Telegram
       # Accessor to `'from'` field of payload. Can be overriden with `from` option
       # for #initialize.
       def from
-        @_from ||= payload.is_a?(Hash) ? payload['from'] : payload.try(:from)
+        @_from ||= # rubocop:disable Naming/MemoizedInstanceVariableName
+          payload.is_a?(Hash) ? payload['from'] : payload.try(:from)
       end
 
       # Processes current update.
@@ -221,7 +252,7 @@ module Telegram
       # Silently ignore unsupported messages to not fail when user crafts
       # an update with usupported command, callback query context, etc.
       def action_missing(action, *_args)
-        logger.debug { "The action '#{action}' is not defined in #{self.class.name}" } if logger
+        logger&.debug { "The action '#{action}' is not defined in #{self.class.name}" }
         nil
       end
 

data/lib/telegram/bot/updates_poller.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     # Supposed to be used in development environments only.
     class UpdatesPoller
       class << self
-        @@instances = {} # rubocop:disable ClassVars
+        @@instances = {} # rubocop:disable Style/ClassVars
 
         def instances
           @@instances
@@ -36,7 +38,7 @@ module Telegram
       end
 
       def log(&block)
-        logger.info(&block) if logger
+        logger&.info(&block)
       end
 
       def start
@@ -56,7 +58,7 @@ module Telegram
       def run
         while running
           updates = fetch_updates
-          process_updates(updates) if updates && updates.any?
+          process_updates(updates) if updates&.any?
         end
       end
 
@@ -82,8 +84,8 @@ module Telegram
             process_update(update)
           end
         end
-      rescue StandardError => e
-        logger.error { ([e.message] + e.backtrace).join("\n") } if logger
+      rescue StandardError => exception
+        logger&.error { ([exception.message] + exception.backtrace).join("\n") }
       end
 
       # Override this method to setup custom error collector.
@@ -102,10 +104,8 @@ module Telegram
       end
 
       if defined?(Rails.application) && Rails.application.respond_to?(:reloader)
-        def reloading_code
-          Rails.application.reloader.wrap do
-            yield
-          end
+        def reloading_code(&block)
+          Rails.application.reloader.wrap(&block)
         end
       else
         def reloading_code

data/lib/telegram/bot/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
-    VERSION = '0.16.1'.freeze
+    VERSION = '0.16.3'
 
     def self.gem_version
       Gem::Version.new VERSION

data/lib/telegram/bot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/config_methods'
 
 module Telegram
@@ -12,15 +14,6 @@ module Telegram
     # Raised for valid telegram response with 404 status code.
     class NotFound < Error; end
 
-    module_function
-
-    def deprecation_0_16
-      @deprecation ||= begin
-        require 'active_support/deprecation'
-        ActiveSupport::Deprecation.new('0.16', 'Telegram::Bot')
-      end
-    end
-
     autoload :Async,              'telegram/bot/async'
     autoload :Client,             'telegram/bot/client'
     autoload :ClientStub,         'telegram/bot/client_stub'
@@ -30,6 +23,7 @@ module Telegram
     autoload :Tasks,              'telegram/bot/tasks'
     autoload :UpdatesController,  'telegram/bot/updates_controller'
     autoload :UpdatesPoller,      'telegram/bot/updates_poller'
+    autoload :VERSION,            'telegram/bot/version'
   end
 end
 

data/telegram-bot.gemspec

@@ -1,4 +1,6 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'telegram/bot/version'
 
@@ -12,6 +14,10 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/telegram-bot-rb/telegram-bot'
   spec.license       = 'MIT'
 
+  spec.metadata      = {
+    'rubygems_mfa_required' => 'true',
+  }
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.3
 platform: ruby
 authors:
 - Max Melentiev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-30 00:00:00.000000000 Z
+date: 2024-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -163,7 +163,8 @@ files:
 homepage: https://github.com/telegram-bot-rb/telegram-bot
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: