telegram-bot-ruby 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b39d62dd4efff4ab96664e0cc4a0ce3eee6631ea8b96c3b90be993f8bae6d34
-  data.tar.gz: e7afcb7986690e5e512faa9caec4abe13f85e21252e86f13af48968ae990bca0
+  metadata.gz: 6227a7eff23e7037a7e07e021a4f2925681c952a449b99a38cd5c23b3f331c5c
+  data.tar.gz: a1bc35c582ff1ba5fe4627613e6c71454be8c11877a5a1fdca7ca300a1a1fead
 SHA512:
-  metadata.gz: 527a11835b057bc29fdbeecd22350b86b1f3bfdd9bc3c328e11b5fe275fd47847c946bc4bf7b3f804f25b9f9dee8a693c54bb3d6ebf8d64a1a009995b59d03e9
-  data.tar.gz: 839b7b1c0c03c4109ebcdc6f777af0f90013393f35407b113c6805d7740bc9326dc2e4236b465f76387db38656832aa615178bcc96b5c13a0fdb1ebbbedbc356
+  metadata.gz: 39ff75cc41a8fcfa5558a28cedb8e9f3b4be72e40fca71a4f8a9a1493bcd67850c6598e84882b2db7edee2c46202b72756d1612f477909fc1097211d7a95f1da
+  data.tar.gz: fb29319e282a3b851689503657f1877511555b10be4135bc9c99ad192093c3ea7f96e352a32bb2cb50bedc5dd206944f2604d135b15a9375a678186c244c385b

data/.rubocop.yml

@@ -10,6 +10,7 @@ Metrics/BlockLength:
     - describe
 
 Metrics/LineLength:
+  Max: 120
   Exclude:
     - telegram-bot-ruby.gemspec
     - examples/*.rb

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.16.0
+
+- Replace `inflecto` with `dry-inflector`
+- Update `virtus` up to 2.0
+
 ## 0.15.0
 
 - Implement [Bot API 5.1](https://core.telegram.org/bots/api#march-9-2021)

data/lib/telegram/bot.rb

@@ -1,5 +1,4 @@
 require 'virtus'
-require 'inflecto'
 require 'logger'
 require 'json'
 require 'faraday'

data/lib/telegram/bot/api.rb

@@ -1,6 +1,6 @@
 module Telegram
   module Bot
-    class Api # rubocop:disable ClassLength
+    class Api
       ENDPOINTS = %w[
         getUpdates setWebhook deleteWebhook getWebhookInfo getMe sendMessage
         forwardMessage sendPhoto sendAudio sendDocument sendVideo sendVoice
@@ -22,34 +22,6 @@ module Telegram
         setStickerSetThumb logOut close copyMessage createChatInviteLink
         editChatInviteLink revokeChatInviteLink
       ].freeze
-      REPLY_MARKUP_TYPES = [
-        Telegram::Bot::Types::ReplyKeyboardMarkup,
-        Telegram::Bot::Types::ReplyKeyboardRemove,
-        Telegram::Bot::Types::ForceReply,
-        Telegram::Bot::Types::InlineKeyboardMarkup
-      ].freeze
-      INLINE_QUERY_RESULT_TYPES = [
-        Telegram::Bot::Types::InlineQueryResultArticle,
-        Telegram::Bot::Types::InlineQueryResultPhoto,
-        Telegram::Bot::Types::InlineQueryResultGif,
-        Telegram::Bot::Types::InlineQueryResultMpeg4Gif,
-        Telegram::Bot::Types::InlineQueryResultVideo,
-        Telegram::Bot::Types::InlineQueryResultAudio,
-        Telegram::Bot::Types::InlineQueryResultVoice,
-        Telegram::Bot::Types::InlineQueryResultDocument,
-        Telegram::Bot::Types::InlineQueryResultLocation,
-        Telegram::Bot::Types::InlineQueryResultVenue,
-        Telegram::Bot::Types::InlineQueryResultContact,
-        Telegram::Bot::Types::InlineQueryResultGame,
-        Telegram::Bot::Types::InlineQueryResultCachedPhoto,
-        Telegram::Bot::Types::InlineQueryResultCachedGif,
-        Telegram::Bot::Types::InlineQueryResultCachedMpeg4Gif,
-        Telegram::Bot::Types::InlineQueryResultCachedSticker,
-        Telegram::Bot::Types::InlineQueryResultCachedDocument,
-        Telegram::Bot::Types::InlineQueryResultCachedVideo,
-        Telegram::Bot::Types::InlineQueryResultCachedVoice,
-        Telegram::Bot::Types::InlineQueryResultCachedAudio
-      ].freeze
 
       attr_reader :token, :url
 
@@ -92,19 +64,15 @@ module Telegram
       end
 
       def sanitize_value(value)
-        jsonify_inline_query_results(jsonify_reply_markup(value))
+        jsonify_value(value)
       end
 
-      def jsonify_reply_markup(value)
-        return value unless REPLY_MARKUP_TYPES.any? { |type| value.is_a?(type) }
-        value.to_compact_hash.to_json
+      def jsonify_value(value)
+        jsonify_value?(value) ? value.to_json : value
       end
 
-      def jsonify_inline_query_results(value)
-        return value unless
-          value.is_a?(Array) &&
-          value.all? { |i| INLINE_QUERY_RESULT_TYPES.any? { |t| i.is_a?(t) } }
-        value.map { |i| i.to_compact_hash.select { |_, v| v } }.to_json
+      def jsonify_value?(value)
+        value.respond_to?(:to_compact_hash) || value.is_a?(Array)
       end
 
       def camelize(method_name)

data/lib/telegram/bot/types.rb

@@ -1,4 +1,5 @@
 require 'telegram/bot/types/compactable'
+require 'telegram/bot/types/pattern_matching'
 require 'telegram/bot/types/base'
 require 'telegram/bot/types/user'
 require 'telegram/bot/types/photo_size'

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

@@ -4,6 +4,7 @@ module Telegram
       class Base
         include Virtus.model
         include Compactable
+        include PatternMatching
       end
     end
   end

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

@@ -4,6 +4,7 @@ module Telegram
       class Chat
         include Virtus.model(finalize: false)
         include Compactable
+        include PatternMatching
 
         attribute :id, Integer
         attribute :type, String

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

@@ -5,7 +5,7 @@ module Telegram
         def to_compact_hash
           Hash[attributes.dup.delete_if { |_, v| v.nil? }.map do |key, value|
             value =
-              if value.class.ancestors.include?(Telegram::Bot::Types::Base)
+              if value.respond_to?(:to_compact_hash)
                 value.to_compact_hash
               else
                 value
@@ -14,6 +14,10 @@ module Telegram
             [key, value]
           end]
         end
+
+        def to_json(*args)
+          to_compact_hash.select { |_, v| v }.to_json(*args)
+        end
       end
     end
   end

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

@@ -0,0 +1,11 @@
+module Telegram
+  module Bot
+    module Types
+      module PatternMatching
+        def deconstruct_keys(_keys)
+          attributes
+        end
+      end
+    end
+  end
+end

data/lib/telegram/bot/version.rb

@@ -1,5 +1,5 @@
 module Telegram
   module Bot
-    VERSION = '0.15.0'.freeze
+    VERSION = '0.16.0'.freeze
   end
 end

data/telegram-bot-ruby.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'faraday'
-  spec.add_dependency 'virtus'
-  spec.add_dependency 'inflecto'
+  spec.add_dependency 'virtus', '~> 2.0'
+  spec.add_dependency 'dry-inflector'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'pry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Alexander Tipugin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -28,18 +28,18 @@ dependencies:
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: inflecto
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -228,6 +228,7 @@ files:
 - lib/telegram/bot/types/passport_element_error_translation_files.rb
 - lib/telegram/bot/types/passport_element_error_unspecified.rb
 - lib/telegram/bot/types/passport_file.rb
+- lib/telegram/bot/types/pattern_matching.rb
 - lib/telegram/bot/types/photo_size.rb
 - lib/telegram/bot/types/poll.rb
 - lib/telegram/bot/types/poll_answer.rb
@@ -273,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Ruby wrapper for Telegram's Bot API