telegram-bot-ruby 2.7.0 → 2.8.1

data/rakelib/builders/type_builder.rb

@@ -8,10 +8,11 @@ module Builders
 
     attr_reader :name, :attributes, :templates_dir
 
-    def initialize(name, attributes, templates_dir:)
+    def initialize(name, attributes, templates_dir:, dependencies:)
       @name = name
       @attributes = deep_dup(attributes)
       @templates_dir = templates_dir
+      @dependencies = dependencies
     end
 
     def build
@@ -37,10 +38,17 @@ module Builders
     end
 
     def build_empty_type
-      attrs = attributes[:type].join(" |\n        ")
+      attrs = attributes[:type].map { |member| empty_type_member(member.to_s) }
+                               .join(" |\n        ")
       render_template('empty_type.erb', name: name, attributes: attrs)
     end
 
+    def empty_type_member(member)
+      return "Types::Array.of(#{add_module_types(member.delete_prefix('array:'))})" if member.start_with?('array:')
+
+      add_module_types(member)
+    end
+
     def build_full_type
       process_attributes!
       render_template('type.erb', name: name, attributes: attributes)
@@ -81,7 +89,8 @@ module Builders
       if properties[:items].is_a?(String)
         attributes[attr_name][:type] += ".of(#{add_module_types(properties[:items])})"
       elsif properties[:items] && properties[:items][:type] == 'array'
-        attributes[attr_name][:type] += ".of(Types::Array.of(#{properties[:items][:items]}))"
+        item_type = add_module_types(properties[:items][:items])
+        attributes[attr_name][:type] += ".of(Types::Array.of(#{item_type}))"
       end
     end
 
@@ -108,6 +117,7 @@ module Builders
 
     def add_module_types(type)
       return 'Types::Float' if type == 'number'
+      return "Types.deferred(:#{type})" if @dependencies.deferred?(owner: name, target: type)
 
       DRY_TYPES.include?(type) ? "Types::#{type.capitalize}" : type
     end

data/rakelib/builders/type_dependencies.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'set'
+
+module Builders
+  # Decides which generated type references must be wrapped in Types.deferred:
+  # referencing a union that can reach back to the referencing type would
+  # evaluate the union constant mid-definition and fail to load.
+  class TypeDependencies
+    EMPTY = [].freeze
+
+    def initialize(types)
+      @known_types = types.keys.to_set(&:to_s)
+      @dependencies = types.to_h { |name, definition| [name.to_s, references_in(definition)] }
+      unions = types.select { |_, definition| definition[:type].is_a?(Array) }.keys
+      @reachable_from_union = unions.to_h { |name| [name.to_s, reachable_from(name.to_s)] }
+    end
+
+    def deferred?(owner:, target:)
+      @reachable_from_union[target.to_s]&.include?(owner.to_s) || false
+    end
+
+    private
+
+    def references_in(value)
+      case value
+      when Hash
+        value.values.flat_map { |item| references_in(item) }
+      when Array
+        value.flat_map { |item| references_in(item) }
+      when String
+        @known_types.include?(value) ? [value] : EMPTY
+      else
+        EMPTY
+      end
+    end
+
+    def reachable_from(node, visited = Set.new)
+      return visited unless visited.add?(node)
+
+      @dependencies.fetch(node, EMPTY).each { |dependency| reachable_from(dependency, visited) }
+      visited
+    end
+  end
+end

data/rakelib/parsers/types_parser.rb

@@ -51,17 +51,23 @@ module Parsers
       name
     end
 
-    def parse_type(header, _type_name)
+    def parse_type(header, type_name)
       # Check if this is a union type (list of types without a table)
+      description = first_description_paragraph(header)
       next_sibling = find_next_significant_sibling(header)
 
       if union_type?(next_sibling)
-        parse_union_type(next_sibling)
+        parse_union_type(next_sibling, description, type_name)
       else
         parse_table_type(header)
       end
     end
 
+    def first_description_paragraph(header)
+      sibling = header.next_element
+      sibling if sibling&.name == 'p'
+    end
+
     def find_next_significant_sibling(header)
       sibling = header.next_element
       # Skip description paragraphs
@@ -73,9 +79,13 @@ module Parsers
       element&.name == 'ul'
     end
 
-    def parse_union_type(ul_element)
-      types = ul_element.css('li a').map { |a| a.text.strip }
-      { 'type' => types }
+    def parse_union_type(ul_element, description, type_name)
+      types = []
+      desc_text = description&.text.to_s
+      types << 'string' if desc_text.match?(/String for plain text/i)
+      types << "array:#{type_name}" if desc_text.match?(/an Array of #{type_name}/i)
+      types.concat(ul_element.css('li a').map { |a| a.text.strip })
+      { 'type' => types.uniq }
     end
 
     def parse_table_type(header)

data/rakelib/rebuild.rake

@@ -2,16 +2,19 @@
 
 require 'json'
 require_relative 'builders/type_builder'
+require_relative 'builders/type_dependencies'
 require_relative 'builders/endpoints_builder'
 
 namespace :rebuild do
   desc 'Rebuild types from type_attributes.json'
   task :types do
     types = JSON.parse(File.read("#{__dir__}/../data/types.json"), symbolize_names: true)
+    dependencies = Builders::TypeDependencies.new(types)
     templates_dir = "#{__dir__}/templates"
 
     types.each_pair do |name, attributes|
-      builder = Builders::TypeBuilder.new(name.to_s, attributes, templates_dir: templates_dir)
+      builder = Builders::TypeBuilder.new(name.to_s, attributes,
+                                          templates_dir: templates_dir, dependencies: dependencies)
       output_path = "#{__dir__}/../lib/telegram/bot/types/#{Builders::TypeBuilder.underscore(name)}.rb"
 
       File.write(output_path, builder.build)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot-ruby
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Alexander Tipugin
@@ -111,6 +111,7 @@ files:
 - lib/telegram/bot/types/background_type_wallpaper.rb
 - lib/telegram/bot/types/base.rb
 - lib/telegram/bot/types/birthdate.rb
+- lib/telegram/bot/types/bot_access_settings.rb
 - lib/telegram/bot/types/bot_command.rb
 - lib/telegram/bot/types/bot_command_scope.rb
 - lib/telegram/bot/types/bot_command_scope_all_chat_administrators.rb
@@ -123,6 +124,7 @@ files:
 - lib/telegram/bot/types/bot_description.rb
 - lib/telegram/bot/types/bot_name.rb
 - lib/telegram/bot/types/bot_short_description.rb
+- lib/telegram/bot/types/bot_subscription_updated.rb
 - lib/telegram/bot/types/business_bot_rights.rb
 - lib/telegram/bot/types/business_connection.rb
 - lib/telegram/bot/types/business_intro.rb
@@ -165,6 +167,9 @@ files:
 - lib/telegram/bot/types/checklist_tasks_added.rb
 - lib/telegram/bot/types/checklist_tasks_done.rb
 - lib/telegram/bot/types/chosen_inline_result.rb
+- lib/telegram/bot/types/community.rb
+- lib/telegram/bot/types/community_chat_added.rb
+- lib/telegram/bot/types/community_chat_removed.rb
 - lib/telegram/bot/types/compactable.rb
 - lib/telegram/bot/types/contact.rb
 - lib/telegram/bot/types/copy_text_button.rb
@@ -231,16 +236,51 @@ files:
 - lib/telegram/bot/types/input_media_animation.rb
 - lib/telegram/bot/types/input_media_audio.rb
 - lib/telegram/bot/types/input_media_document.rb
+- lib/telegram/bot/types/input_media_link.rb
+- lib/telegram/bot/types/input_media_live_photo.rb
+- lib/telegram/bot/types/input_media_location.rb
 - lib/telegram/bot/types/input_media_photo.rb
+- lib/telegram/bot/types/input_media_sticker.rb
+- lib/telegram/bot/types/input_media_venue.rb
 - lib/telegram/bot/types/input_media_video.rb
+- lib/telegram/bot/types/input_media_voice_note.rb
 - lib/telegram/bot/types/input_message_content.rb
 - lib/telegram/bot/types/input_paid_media.rb
+- lib/telegram/bot/types/input_paid_media_live_photo.rb
 - lib/telegram/bot/types/input_paid_media_photo.rb
 - lib/telegram/bot/types/input_paid_media_video.rb
+- lib/telegram/bot/types/input_poll_media.rb
 - lib/telegram/bot/types/input_poll_option.rb
+- lib/telegram/bot/types/input_poll_option_media.rb
 - lib/telegram/bot/types/input_profile_photo.rb
 - lib/telegram/bot/types/input_profile_photo_animated.rb
 - lib/telegram/bot/types/input_profile_photo_static.rb
+- lib/telegram/bot/types/input_rich_block.rb
+- lib/telegram/bot/types/input_rich_block_anchor.rb
+- lib/telegram/bot/types/input_rich_block_animation.rb
+- lib/telegram/bot/types/input_rich_block_audio.rb
+- lib/telegram/bot/types/input_rich_block_block_quotation.rb
+- lib/telegram/bot/types/input_rich_block_collage.rb
+- lib/telegram/bot/types/input_rich_block_details.rb
+- lib/telegram/bot/types/input_rich_block_divider.rb
+- lib/telegram/bot/types/input_rich_block_footer.rb
+- lib/telegram/bot/types/input_rich_block_list.rb
+- lib/telegram/bot/types/input_rich_block_list_item.rb
+- lib/telegram/bot/types/input_rich_block_map.rb
+- lib/telegram/bot/types/input_rich_block_mathematical_expression.rb
+- lib/telegram/bot/types/input_rich_block_paragraph.rb
+- lib/telegram/bot/types/input_rich_block_photo.rb
+- lib/telegram/bot/types/input_rich_block_preformatted.rb
+- lib/telegram/bot/types/input_rich_block_pull_quotation.rb
+- lib/telegram/bot/types/input_rich_block_section_heading.rb
+- lib/telegram/bot/types/input_rich_block_slideshow.rb
+- lib/telegram/bot/types/input_rich_block_table.rb
+- lib/telegram/bot/types/input_rich_block_thinking.rb
+- lib/telegram/bot/types/input_rich_block_video.rb
+- lib/telegram/bot/types/input_rich_block_voice_note.rb
+- lib/telegram/bot/types/input_rich_message.rb
+- lib/telegram/bot/types/input_rich_message_content.rb
+- lib/telegram/bot/types/input_rich_message_media.rb
 - lib/telegram/bot/types/input_sticker.rb
 - lib/telegram/bot/types/input_story_content.rb
 - lib/telegram/bot/types/input_story_content_photo.rb
@@ -254,7 +294,9 @@ files:
 - lib/telegram/bot/types/keyboard_button_request_managed_bot.rb
 - lib/telegram/bot/types/keyboard_button_request_users.rb
 - lib/telegram/bot/types/labeled_price.rb
+- lib/telegram/bot/types/link.rb
 - lib/telegram/bot/types/link_preview_options.rb
+- lib/telegram/bot/types/live_photo.rb
 - lib/telegram/bot/types/location.rb
 - lib/telegram/bot/types/location_address.rb
 - lib/telegram/bot/types/login_url.rb
@@ -284,6 +326,7 @@ files:
 - lib/telegram/bot/types/owned_gifts.rb
 - lib/telegram/bot/types/paid_media.rb
 - lib/telegram/bot/types/paid_media_info.rb
+- lib/telegram/bot/types/paid_media_live_photo.rb
 - lib/telegram/bot/types/paid_media_photo.rb
 - lib/telegram/bot/types/paid_media_preview.rb
 - lib/telegram/bot/types/paid_media_purchased.rb
@@ -305,6 +348,7 @@ files:
 - lib/telegram/bot/types/photo_size.rb
 - lib/telegram/bot/types/poll.rb
 - lib/telegram/bot/types/poll_answer.rb
+- lib/telegram/bot/types/poll_media.rb
 - lib/telegram/bot/types/poll_option.rb
 - lib/telegram/bot/types/poll_option_added.rb
 - lib/telegram/bot/types/poll_option_deleted.rb
@@ -326,6 +370,59 @@ files:
 - lib/telegram/bot/types/revenue_withdrawal_state_failed.rb
 - lib/telegram/bot/types/revenue_withdrawal_state_pending.rb
 - lib/telegram/bot/types/revenue_withdrawal_state_succeeded.rb
+- lib/telegram/bot/types/rich_block.rb
+- lib/telegram/bot/types/rich_block_anchor.rb
+- lib/telegram/bot/types/rich_block_animation.rb
+- lib/telegram/bot/types/rich_block_audio.rb
+- lib/telegram/bot/types/rich_block_block_quotation.rb
+- lib/telegram/bot/types/rich_block_caption.rb
+- lib/telegram/bot/types/rich_block_collage.rb
+- lib/telegram/bot/types/rich_block_details.rb
+- lib/telegram/bot/types/rich_block_divider.rb
+- lib/telegram/bot/types/rich_block_footer.rb
+- lib/telegram/bot/types/rich_block_list.rb
+- lib/telegram/bot/types/rich_block_list_item.rb
+- lib/telegram/bot/types/rich_block_map.rb
+- lib/telegram/bot/types/rich_block_mathematical_expression.rb
+- lib/telegram/bot/types/rich_block_paragraph.rb
+- lib/telegram/bot/types/rich_block_photo.rb
+- lib/telegram/bot/types/rich_block_preformatted.rb
+- lib/telegram/bot/types/rich_block_pull_quotation.rb
+- lib/telegram/bot/types/rich_block_section_heading.rb
+- lib/telegram/bot/types/rich_block_slideshow.rb
+- lib/telegram/bot/types/rich_block_table.rb
+- lib/telegram/bot/types/rich_block_table_cell.rb
+- lib/telegram/bot/types/rich_block_thinking.rb
+- lib/telegram/bot/types/rich_block_video.rb
+- lib/telegram/bot/types/rich_block_voice_note.rb
+- lib/telegram/bot/types/rich_message.rb
+- lib/telegram/bot/types/rich_text.rb
+- lib/telegram/bot/types/rich_text_anchor.rb
+- lib/telegram/bot/types/rich_text_anchor_link.rb
+- lib/telegram/bot/types/rich_text_bank_card_number.rb
+- lib/telegram/bot/types/rich_text_bold.rb
+- lib/telegram/bot/types/rich_text_bot_command.rb
+- lib/telegram/bot/types/rich_text_cashtag.rb
+- lib/telegram/bot/types/rich_text_code.rb
+- lib/telegram/bot/types/rich_text_custom_emoji.rb
+- lib/telegram/bot/types/rich_text_date_time.rb
+- lib/telegram/bot/types/rich_text_email_address.rb
+- lib/telegram/bot/types/rich_text_hashtag.rb
+- lib/telegram/bot/types/rich_text_italic.rb
+- lib/telegram/bot/types/rich_text_marked.rb
+- lib/telegram/bot/types/rich_text_mathematical_expression.rb
+- lib/telegram/bot/types/rich_text_mention.rb
+- lib/telegram/bot/types/rich_text_phone_number.rb
+- lib/telegram/bot/types/rich_text_reference.rb
+- lib/telegram/bot/types/rich_text_reference_link.rb
+- lib/telegram/bot/types/rich_text_spoiler.rb
+- lib/telegram/bot/types/rich_text_strikethrough.rb
+- lib/telegram/bot/types/rich_text_subscript.rb
+- lib/telegram/bot/types/rich_text_superscript.rb
+- lib/telegram/bot/types/rich_text_text_mention.rb
+- lib/telegram/bot/types/rich_text_underline.rb
+- lib/telegram/bot/types/rich_text_url.rb
+- lib/telegram/bot/types/sent_guest_message.rb
 - lib/telegram/bot/types/sent_web_app_message.rb
 - lib/telegram/bot/types/shared_user.rb
 - lib/telegram/bot/types/shipping_address.rb
@@ -395,6 +492,7 @@ files:
 - mise.toml
 - rakelib/builders/endpoints_builder.rb
 - rakelib/builders/type_builder.rb
+- rakelib/builders/type_dependencies.rb
 - rakelib/parse.rake
 - rakelib/parsers/methods_parser.rb
 - rakelib/parsers/types_parser.rb
@@ -421,7 +519,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Ruby wrapper for Telegram's Bot API
 test_files: []