telegram-bot-ruby 0.23.0 → 1.0.0.pre

data/lib/telegram/bot/types/successful_payment.rb

@@ -4,13 +4,13 @@ module Telegram
   module Bot
     module Types
       class SuccessfulPayment < Base
-        attribute :currency, String
-        attribute :total_amount, Integer
-        attribute :invoice_payload, String
-        attribute :shipping_option_id, String
-        attribute :order_info, OrderInfo
-        attribute :telegram_payment_charge_id, String
-        attribute :provider_payment_charge_id, String
+        attribute :currency, Types::String
+        attribute :total_amount, Types::Integer
+        attribute :invoice_payload, Types::String
+        attribute? :shipping_option_id, Types::String
+        attribute? :order_info, OrderInfo
+        attribute :telegram_payment_charge_id, Types::String
+        attribute :provider_payment_charge_id, Types::String
       end
     end
   end

data/lib/telegram/bot/types/update.rb

@@ -4,21 +4,21 @@ module Telegram
   module Bot
     module Types
       class Update < Base
-        attribute :update_id, Integer
-        attribute :message, Message
-        attribute :edited_message, Message
-        attribute :channel_post, Message
-        attribute :edited_channel_post, Message
-        attribute :inline_query, InlineQuery
-        attribute :chosen_inline_result, ChosenInlineResult
-        attribute :callback_query, CallbackQuery
-        attribute :shipping_query, ShippingQuery
-        attribute :pre_checkout_query, PreCheckoutQuery
-        attribute :poll, Poll
-        attribute :poll_answer, PollAnswer
-        attribute :my_chat_member, ChatMemberUpdated
-        attribute :chat_member, ChatMemberUpdated
-        attribute :chat_join_request, ChatJoinRequest
+        attribute :update_id, Types::Integer
+        attribute? :message, Message
+        attribute? :edited_message, Message
+        attribute? :channel_post, Message
+        attribute? :edited_channel_post, Message
+        attribute? :inline_query, InlineQuery
+        attribute? :chosen_inline_result, ChosenInlineResult
+        attribute? :callback_query, CallbackQuery
+        attribute? :shipping_query, ShippingQuery
+        attribute? :pre_checkout_query, PreCheckoutQuery
+        attribute? :poll, Poll
+        attribute? :poll_answer, PollAnswer
+        attribute? :my_chat_member, ChatMemberUpdated
+        attribute? :chat_member, ChatMemberUpdated
+        attribute? :chat_join_request, ChatJoinRequest
 
         def current_message
           @current_message ||=

data/lib/telegram/bot/types/user.rb

@@ -4,17 +4,17 @@ module Telegram
   module Bot
     module Types
       class User < Base
-        attribute :id, Integer
-        attribute :is_bot, Boolean
-        attribute :first_name, String
-        attribute :last_name, String
-        attribute :username, String
-        attribute :language_code, String
-        attribute :is_premium, Boolean
-        attribute :added_to_attachment_menu, Boolean
-        attribute :can_join_groups, Boolean
-        attribute :can_read_all_group_messages, Boolean
-        attribute :supports_inline_queries, Boolean
+        attribute :id, Types::Integer
+        attribute :is_bot, Types::Bool
+        attribute :first_name, Types::String
+        attribute? :last_name, Types::String
+        attribute? :username, Types::String
+        attribute? :language_code, Types::String
+        attribute? :is_premium, Types::Bool
+        attribute? :added_to_attachment_menu, Types::Bool
+        attribute? :can_join_groups, Types::Bool
+        attribute? :can_read_all_group_messages, Types::Bool
+        attribute? :supports_inline_queries, Types::Bool
       end
     end
   end

data/lib/telegram/bot/types/user_profile_photos.rb

@@ -4,8 +4,8 @@ module Telegram
   module Bot
     module Types
       class UserProfilePhotos < Base
-        attribute :total_count, Integer
-        attribute :photos, Array[Array[PhotoSize]]
+        attribute :total_count, Types::Integer
+        attribute :photos, Types::Array.of(Types::Array.of(PhotoSize))
       end
     end
   end

data/lib/telegram/bot/types/venue.rb

@@ -5,12 +5,12 @@ module Telegram
     module Types
       class Venue < Base
         attribute :location, Location
-        attribute :title, String
-        attribute :address, String
-        attribute :foursquare_id, String
-        attribute :foursquare_type, String
-        attribute :google_place_id, String
-        attribute :google_place_type, String
+        attribute :title, Types::String
+        attribute :address, Types::String
+        attribute? :foursquare_id, Types::String
+        attribute? :foursquare_type, Types::String
+        attribute? :google_place_id, Types::String
+        attribute? :google_place_type, Types::String
       end
     end
   end

data/lib/telegram/bot/types/video.rb

@@ -4,15 +4,15 @@ module Telegram
   module Bot
     module Types
       class Video < Base
-        attribute :file_id, String
-        attribute :file_unique_id, String
-        attribute :width, Integer
-        attribute :height, Integer
-        attribute :duration, Integer
-        attribute :thumb, PhotoSize
-        attribute :file_name, String
-        attribute :mime_type, String
-        attribute :file_size, Integer
+        attribute :file_id, Types::String
+        attribute :file_unique_id, Types::String
+        attribute :width, Types::Integer
+        attribute :height, Types::Integer
+        attribute :duration, Types::Integer
+        attribute? :thumb, PhotoSize
+        attribute? :file_name, Types::String
+        attribute? :mime_type, Types::String
+        attribute? :file_size, Types::Integer
       end
     end
   end

data/lib/telegram/bot/types/video_chat_ended.rb

@@ -4,7 +4,7 @@ module Telegram
   module Bot
     module Types
       class VideoChatEnded < Base
-        attribute :duration, Integer
+        attribute :duration, Types::Integer
       end
     end
   end

data/lib/telegram/bot/types/video_chat_participants_invited.rb

@@ -4,7 +4,7 @@ module Telegram
   module Bot
     module Types
       class VideoChatParticipantsInvited < Base
-        attribute :users, Array[User]
+        attribute :users, Types::Array.of(User)
       end
     end
   end

data/lib/telegram/bot/types/video_chat_scheduled.rb

@@ -4,7 +4,7 @@ module Telegram
   module Bot
     module Types
       class VideoChatScheduled < Base
-        attribute :start_date, Integer
+        attribute :start_date, Types::Integer
       end
     end
   end

data/lib/telegram/bot/types/video_note.rb

@@ -4,12 +4,12 @@ module Telegram
   module Bot
     module Types
       class VideoNote < Base
-        attribute :file_id, String
-        attribute :file_unique_id, String
-        attribute :length, Integer
-        attribute :duration, Integer
-        attribute :thumb, PhotoSize
-        attribute :file_size, Integer
+        attribute :file_id, Types::String
+        attribute :file_unique_id, Types::String
+        attribute :length, Types::Integer
+        attribute :duration, Types::Integer
+        attribute? :thumb, PhotoSize
+        attribute? :file_size, Types::Integer
       end
     end
   end

data/lib/telegram/bot/types/voice.rb

@@ -4,11 +4,11 @@ module Telegram
   module Bot
     module Types
       class Voice < Base
-        attribute :file_id, String
-        attribute :file_unique_id, String
-        attribute :duration, Integer
-        attribute :mime_type, String
-        attribute :file_size, Integer
+        attribute :file_id, Types::String
+        attribute :file_unique_id, Types::String
+        attribute :duration, Types::Integer
+        attribute? :mime_type, Types::String
+        attribute? :file_size, Types::Integer
       end
     end
   end

data/lib/telegram/bot/types/web_app_data.rb

@@ -4,8 +4,8 @@ module Telegram
   module Bot
     module Types
       class WebAppData < Base
-        attribute :data, String
-        attribute :button_text, String
+        attribute :data, Types::String
+        attribute :button_text, Types::String
       end
     end
   end

data/lib/telegram/bot/types/web_app_info.rb

@@ -4,7 +4,7 @@ module Telegram
   module Bot
     module Types
       class WebAppInfo < Base
-        attribute :url, String
+        attribute :url, Types::String
       end
     end
   end

data/lib/telegram/bot/types/webhook_info.rb

@@ -4,15 +4,15 @@ module Telegram
   module Bot
     module Types
       class WebhookInfo < Base
-        attribute :url, String
-        attribute :has_custom_certificate, Boolean
-        attribute :pending_update_count, Integer
-        attribute :ip_address, String
-        attribute :last_error_date, Integer
-        attribute :last_error_message, String
-        attribute :last_synchronization_error_date, Integer
-        attribute :max_connections, Integer
-        attribute :allowed_updates, Array[String]
+        attribute :url, Types::String
+        attribute :has_custom_certificate, Types::Bool
+        attribute :pending_update_count, Types::Integer
+        attribute? :ip_address, Types::String
+        attribute? :last_error_date, Types::Integer
+        attribute? :last_error_message, Types::String
+        attribute? :last_synchronization_error_date, Types::Integer
+        attribute? :max_connections, Types::Integer
+        attribute? :allowed_updates, Types::Array.of(String)
       end
     end
   end

data/lib/telegram/bot/types.rb

@@ -1,126 +1,9 @@
 # frozen_string_literal: true
 
-require 'telegram/bot/types/compactable'
-require 'telegram/bot/types/pattern_matching'
-require 'telegram/bot/types/base'
-require 'telegram/bot/types/file'
-require 'telegram/bot/types/user'
-require 'telegram/bot/types/photo_size'
-require 'telegram/bot/types/audio'
-require 'telegram/bot/types/document'
-require 'telegram/bot/types/mask_position'
-require 'telegram/bot/types/sticker'
-require 'telegram/bot/types/sticker_set'
-require 'telegram/bot/types/video'
-require 'telegram/bot/types/voice'
-require 'telegram/bot/types/video_note'
-require 'telegram/bot/types/contact'
-require 'telegram/bot/types/dice'
-require 'telegram/bot/types/location'
-require 'telegram/bot/types/chat_photo'
-require 'telegram/bot/types/chat_permissions'
-require 'telegram/bot/types/chat_location'
-require 'telegram/bot/types/chat'
-require 'telegram/bot/types/message_entity'
-require 'telegram/bot/types/venue'
-require 'telegram/bot/types/animation'
-require 'telegram/bot/types/game'
-require 'telegram/bot/types/callback_game'
-require 'telegram/bot/types/game_high_score'
-require 'telegram/bot/types/invoice'
-require 'telegram/bot/types/shipping_address'
-require 'telegram/bot/types/order_info'
-require 'telegram/bot/types/successful_payment'
-require 'telegram/bot/types/poll_option'
-require 'telegram/bot/types/poll_answer'
-require 'telegram/bot/types/poll'
-require 'telegram/bot/types/passport_file'
-require 'telegram/bot/types/encrypted_passport_element'
-require 'telegram/bot/types/encrypted_credentials'
-require 'telegram/bot/types/passport_data'
-require 'telegram/bot/types/passport_element_error_data_field'
-require 'telegram/bot/types/passport_element_error_front_side'
-require 'telegram/bot/types/passport_element_error_reverse_side'
-require 'telegram/bot/types/passport_element_error_selfie'
-require 'telegram/bot/types/passport_element_error_file'
-require 'telegram/bot/types/passport_element_error_files'
-require 'telegram/bot/types/passport_element_error_translation_file'
-require 'telegram/bot/types/passport_element_error_translation_files'
-require 'telegram/bot/types/passport_element_error_unspecified'
-require 'telegram/bot/types/labeled_price'
-require 'telegram/bot/types/input_message_content'
-require 'telegram/bot/types/input_contact_message_content'
-require 'telegram/bot/types/input_invoice_message_content'
-require 'telegram/bot/types/input_location_message_content'
-require 'telegram/bot/types/input_text_message_content'
-require 'telegram/bot/types/input_venue_message_content'
-require 'telegram/bot/types/login_url'
-require 'telegram/bot/types/web_app_info'
-require 'telegram/bot/types/inline_keyboard_button'
-require 'telegram/bot/types/inline_keyboard_markup'
-require 'telegram/bot/types/inline_query'
-require 'telegram/bot/types/inline_query_result_article'
-require 'telegram/bot/types/inline_query_result_audio'
-require 'telegram/bot/types/inline_query_result_cached_audio'
-require 'telegram/bot/types/inline_query_result_cached_document'
-require 'telegram/bot/types/inline_query_result_cached_gif'
-require 'telegram/bot/types/inline_query_result_cached_mpeg4_gif'
-require 'telegram/bot/types/inline_query_result_cached_photo'
-require 'telegram/bot/types/inline_query_result_cached_sticker'
-require 'telegram/bot/types/inline_query_result_cached_video'
-require 'telegram/bot/types/inline_query_result_cached_voice'
-require 'telegram/bot/types/inline_query_result_contact'
-require 'telegram/bot/types/inline_query_result_game'
-require 'telegram/bot/types/inline_query_result_document'
-require 'telegram/bot/types/inline_query_result_gif'
-require 'telegram/bot/types/inline_query_result_location'
-require 'telegram/bot/types/inline_query_result_mpeg4_gif'
-require 'telegram/bot/types/inline_query_result_photo'
-require 'telegram/bot/types/inline_query_result_venue'
-require 'telegram/bot/types/inline_query_result_video'
-require 'telegram/bot/types/inline_query_result_voice'
-require 'telegram/bot/types/chosen_inline_result'
-require 'telegram/bot/types/proximity_alert_triggered'
-require 'telegram/bot/types/video_chat_scheduled'
-require 'telegram/bot/types/video_chat_started'
-require 'telegram/bot/types/video_chat_ended'
-require 'telegram/bot/types/video_chat_participants_invited'
-require 'telegram/bot/types/message_auto_delete_timer_changed'
-require 'telegram/bot/types/web_app_data'
-require 'telegram/bot/types/message'
-require 'telegram/bot/types/callback_query'
-require 'telegram/bot/types/shipping_query'
-require 'telegram/bot/types/pre_checkout_query'
-require 'telegram/bot/types/keyboard_button_poll_type'
-require 'telegram/bot/types/keyboard_button'
-require 'telegram/bot/types/reply_keyboard_markup'
-require 'telegram/bot/types/reply_keyboard_remove'
-require 'telegram/bot/types/force_reply'
-require 'telegram/bot/types/shipping_option'
-require 'telegram/bot/types/chat_invite_link'
-require 'telegram/bot/types/chat_member'
-require 'telegram/bot/types/chat_member_updated'
-require 'telegram/bot/types/chat_join_request'
-require 'telegram/bot/types/update'
-require 'telegram/bot/types/user_profile_photos'
-require 'telegram/bot/types/input_media_photo'
-require 'telegram/bot/types/input_media_video'
-require 'telegram/bot/types/input_media_animation'
-require 'telegram/bot/types/input_media_audio'
-require 'telegram/bot/types/input_media_document'
-require 'telegram/bot/types/webhook_info'
-require 'telegram/bot/types/bot_command'
-require 'telegram/bot/types/bot_command_scope_all_chat_administrators'
-require 'telegram/bot/types/bot_command_scope_all_group_chats'
-require 'telegram/bot/types/bot_command_scope_all_private_chats'
-require 'telegram/bot/types/bot_command_scope_chat_administrators'
-require 'telegram/bot/types/bot_command_scope_chat_member'
-require 'telegram/bot/types/bot_command_scope_chat'
-require 'telegram/bot/types/bot_command_scope_default'
-require 'telegram/bot/types/sent_web_app_message'
-require 'telegram/bot/types/menu_button_commands'
-require 'telegram/bot/types/menu_button_web_app'
-require 'telegram/bot/types/menu_button_default'
-require 'telegram/bot/types/chat_administrator_rights'
-
-Virtus.finalize
+module Telegram
+  module Bot
+    module Types
+      include Dry.Types()
+    end
+  end
+end

data/lib/telegram/bot/version.rb

@@ -2,6 +2,6 @@
 
 module Telegram
   module Bot
-    VERSION = '0.23.0'
+    VERSION = '1.0.0.pre'
   end
 end

data/lib/telegram/bot.rb

@@ -1,18 +1,11 @@
 # frozen_string_literal: true
 
-require 'virtus'
 require 'logger'
 require 'json'
 require 'faraday'
 require 'faraday/multipart'
-
-require 'telegram/bot/types'
-require 'telegram/bot/exceptions'
-require 'telegram/bot/api'
-require 'telegram/bot/null_logger'
-require 'telegram/bot/client'
-require 'telegram/bot/version'
-require 'telegram/bot/configuration'
+require 'zeitwerk'
+require 'dry-struct'
 
 module Telegram
   module Bot
@@ -29,3 +22,8 @@ module Telegram
     end
   end
 end
+
+loader = Zeitwerk::Loader.new
+loader.inflector = Zeitwerk::GemInflector.new(__FILE__)
+loader.push_dir("#{__dir__}/bot", namespace: Telegram::Bot)
+loader.setup

data/telegram-bot-ruby.gemspec

@@ -22,11 +22,13 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.7'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.add_dependency 'dry-inflector'
+  spec.add_dependency 'dry-struct', '~> 1.6'
   spec.add_dependency 'faraday', '~> 2.0'
   spec.add_dependency 'faraday-multipart', '~> 1.0'
-  spec.add_dependency 'virtus', '~> 2.0'
+  spec.add_dependency 'zeitwerk', '~> 2.6'
 
+  spec.add_development_dependency 'dotenv', '~> 2.8'
+  spec.add_development_dependency 'nokogiri', '~> 1.13'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.4'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 1.0.0.pre
 platform: ruby
 authors:
 - Alexander Tipugin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-inflector
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.sample"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
@@ -173,7 +202,6 @@ files:
 - lib/telegram/bot/api.rb
 - lib/telegram/bot/client.rb
 - lib/telegram/bot/configuration.rb
-- lib/telegram/bot/exceptions.rb
 - lib/telegram/bot/exceptions/base.rb
 - lib/telegram/bot/exceptions/response_error.rb
 - lib/telegram/bot/null_logger.rb
@@ -197,6 +225,12 @@ files:
 - lib/telegram/bot/types/chat_join_request.rb
 - lib/telegram/bot/types/chat_location.rb
 - lib/telegram/bot/types/chat_member.rb
+- lib/telegram/bot/types/chat_member_administrator.rb
+- lib/telegram/bot/types/chat_member_banned.rb
+- lib/telegram/bot/types/chat_member_left.rb
+- lib/telegram/bot/types/chat_member_member.rb
+- lib/telegram/bot/types/chat_member_owner.rb
+- lib/telegram/bot/types/chat_member_restricted.rb
 - lib/telegram/bot/types/chat_member_updated.rb
 - lib/telegram/bot/types/chat_permissions.rb
 - lib/telegram/bot/types/chat_photo.rb
@@ -209,6 +243,10 @@ files:
 - lib/telegram/bot/types/encrypted_passport_element.rb
 - lib/telegram/bot/types/file.rb
 - lib/telegram/bot/types/force_reply.rb
+- lib/telegram/bot/types/forum_topic.rb
+- lib/telegram/bot/types/forum_topic_closed.rb
+- lib/telegram/bot/types/forum_topic_created.rb
+- lib/telegram/bot/types/forum_topic_reopened.rb
 - lib/telegram/bot/types/game.rb
 - lib/telegram/bot/types/game_high_score.rb
 - lib/telegram/bot/types/inline_keyboard_button.rb
@@ -317,9 +355,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key:

data/lib/telegram/bot/exceptions.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require 'telegram/bot/exceptions/base'
-require 'telegram/bot/exceptions/response_error'