telegram-bot-ruby 0.4.2 → 0.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8650ba94f288d865b3e28b7c048b1ae1a9b9d94e
-  data.tar.gz: 19164744782cc7cdca0baef1bffe18317137a1c0
+  metadata.gz: 789950417db18c87aeeaf3ada4788131e8d1e5a0
+  data.tar.gz: 8240d4073e39f8d7400df0682689e1aec49839d5
 SHA512:
-  metadata.gz: 6b56bf52fcb734518d9d588d572945b97b13315e514adefead8210f6e69e8cc847272a279f155fbb6ecb428ea493be6d7e9d043d528335868ee6ff320186ffd3
-  data.tar.gz: 1c13c8cd9c5852dabd60557ae9e367d890b576309101bb0840bb01c6598d62c012d29d8a60d034d575f8a4a28d6dae70871db04d43236f950ec5fe44c7212af2
+  metadata.gz: 8c5819e6e65f453afc80df9354b21783912e3f1f76a15b4bd0fc2ceefe9b1a2472e8c04b661a4175a32e3d2adadf149ae061dd00c2ed5386e27621cf430cf424
+  data.tar.gz: 28170029b9b8b8066e693f30687fa8eb3a3168d73a92ef35a18fcc5bf149ceee8358d767a0a4603899a1c3cac560ff9bf3519c6489cf9dd80ed04f7ef517dba5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.0
+
+- Replace [httparty](https://github.com/jnunemaker/httparty) with [faraday](https://github.com/lostisland/faraday)
+- Implement [Bot API 2.0](https://core.telegram.org/bots/2-0-intro)
+
 ## 0.4.2
 
 - Let `Client#logger` be overwritten later (use `attr_accessor` instead of `attr_reader`)

data/README.md

@@ -110,7 +110,7 @@ Your bot can even upload files ([photos](https://core.telegram.org/bots/api#send
 bot.listen do |message|
   case message.text
   when '/photo'
-    bot.api.send_photo(chat_id: message.chat.id, photo: File.new('~/Desktop/jennifer.jpg'))
+    bot.api.send_photo(chat_id: message.chat.id, photo: Faraday::UploadIO.new('~/Desktop/jennifer.jpg', 'image/jpeg'))
   end
 end
 ```
@@ -120,7 +120,7 @@ end
 By default, bot doesn't log anything (uses `NullLoger`). You can change this behavior and provide your own logger class. See example below:
 
 ```ruby
-Telegram::Bot::Client.run(token, logger: Logger.new($stdout)) do |bot|
+Telegram::Bot::Client.run(token, logger: Logger.new($stderr)) do |bot|
   bot.logger.info('Bot has been started')
   bot.listen do |message|
     # ...
@@ -155,14 +155,6 @@ end
 - Telegram's user id (required)
 - hash of additional properties (optional)
 
-## Connection pool size
-
-Sometimes you need to do some heavy work in another thread and send response from there. In this case you have to increase your connection pool size (by default it's *1*). You can do it by setting env variable `TELEGRAM_BOT_POOL_SIZE`:
-
-```shell
-$ TELEGRAM_BOT_POOL_SIZE=4 ruby bot.rb
-```
-
 ## Boilerplates
 
 If you don't know how to setup database for your bot or how to use it with different languages here are some boilerplates which can help you to start faster:

data/lib/telegram/bot/api.rb

@@ -1,34 +1,43 @@
 module Telegram
   module Bot
     class Api
-      include HTTMultiParty
-
       ENDPOINTS = %w(
-        getMe sendMessage forwardMessage sendPhoto sendAudio sendDocument
-        sendSticker sendVideo sendVoice sendLocation sendChatAction
-        getUserProfilePhotos getUpdates setWebhook getFile answerInlineQuery
+        getUpdates setWebhook getMe sendMessage forwardMessage sendPhoto
+        sendAudio sendDocument sendSticker sendVideo sendVoice sendLocation
+        sendVenue sendContact sendChatAction getUserProfilePhotos getFile
+        kickChatMember unbanChatMember answerCallbackQuery editMessageText
+        editMessageCaption editMessageReplyMarkup answerInlineQuery
       ).freeze
       REPLY_MARKUP_TYPES = [
         Telegram::Bot::Types::ReplyKeyboardMarkup,
         Telegram::Bot::Types::ReplyKeyboardHide,
-        Telegram::Bot::Types::ForceReply
+        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::InlineQueryResultPhoto,
-        Telegram::Bot::Types::InlineQueryResultVideo
+        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::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
-      POOL_SIZE = ENV.fetch('TELEGRAM_BOT_POOL_SIZE', 1).to_i.freeze
 
       attr_reader :token
 
-      base_uri 'https://api.telegram.org'
-      persistent_connection_adapter pool_size: POOL_SIZE,
-                                    keep_alive: 30,
-                                    force_retry: true
-
       def initialize(token)
         @token = token
       end
@@ -49,12 +58,12 @@ module Telegram
 
       def call(endpoint, raw_params = {})
         params = build_params(raw_params)
-        response = self.class.post("/bot#{token}/#{endpoint}", query: params)
-        if response.code == 200
-          response.to_hash
+        response = conn.post("/bot#{token}/#{endpoint}", params)
+        if response.status == 200
+          JSON.parse(response.body)
         else
-          fail Exceptions::ResponseError.new(response),
-               'Telegram API has returned the error.'
+          raise Exceptions::ResponseError.new(response),
+                'Telegram API has returned the error.'
         end
       end
 
@@ -85,6 +94,14 @@ module Telegram
         words.drop(1).map(&:capitalize!)
         words.join
       end
+
+      def conn
+        @conn ||= Faraday.new(url: 'https://api.telegram.org') do |faraday|
+          faraday.request :multipart
+          faraday.request :url_encoded
+          faraday.adapter Telegram::Bot.configuration.adapter
+        end
+      end
     end
   end
 end

data/lib/telegram/bot/botan/api.rb

@@ -2,20 +2,24 @@ module Telegram
   module Bot
     module Botan
       class Api
-        include HTTParty
-
         attr_reader :token
 
-        base_uri 'https://api.botan.io'
-
         def initialize(token)
           @token = token
         end
 
         def track(event, uid, properties = {})
-          self.class.post('/track',
-                          query: { token: token, name: event, uid: uid },
-                          body: properties.to_json)
+          query_str = URI.encode_www_form(token: token, name: event, uid: uid)
+          conn.post("/track?#{query_str}", properties.to_json)
+        end
+
+        private
+
+        def conn
+          @conn ||= Faraday.new(url: 'https://api.botan.io') do |faraday|
+            faraday.request :url_encoded
+            faraday.adapter Telegram::Bot.configuration.adapter
+          end
         end
       end
     end

data/lib/telegram/bot/client.rb

@@ -1,9 +1,6 @@
 module Telegram
   module Bot
     class Client
-      TIMEOUT_EXCEPTIONS = [Timeout::Error]
-      TIMEOUT_EXCEPTIONS << Net::ReadTimeout if Net.const_defined?(:ReadTimeout)
-
       attr_reader :api, :offset, :timeout
       attr_accessor :logger
 
@@ -42,7 +39,7 @@ module Telegram
           log_incoming_message(message)
           yield message
         end
-      rescue *TIMEOUT_EXCEPTIONS
+      rescue Faraday::TimeoutError
         retry
       end
 
@@ -53,7 +50,10 @@ module Telegram
       end
 
       def extract_message(update)
-        update.inline_query || update.chosen_inline_result || update.message
+        update.inline_query ||
+          update.chosen_inline_result ||
+          update.callback_query ||
+          update.message
       end
 
       def log_incoming_message(message)

data/lib/telegram/bot/configuration.rb

@@ -0,0 +1,11 @@
+module Telegram
+  module Bot
+    class Configuration
+      attr_accessor :adapter
+
+      def initialize
+        @adapter = Faraday.default_adapter
+      end
+    end
+  end
+end

data/lib/telegram/bot/exceptions/response_error.rb

@@ -23,7 +23,7 @@ module Telegram
           @data ||= begin
             JSON.parse(response.body)
           rescue JSON::ParserError
-            { error_code: response.code, uri: response.request.last_uri.to_s }
+            { error_code: response.status, uri: response.request.last_uri.to_s }
           end
         end
       end

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

@@ -3,6 +3,10 @@ module Telegram
     module Types
       class Base
         include Virtus.model
+
+        def compact_attributes
+          attributes.dup.delete_if { |_, v| v.nil? }
+        end
       end
     end
   end

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

@@ -0,0 +1,13 @@
+module Telegram
+  module Bot
+    module Types
+      class CallbackQuery < Base
+        attribute :id, String
+        attribute :from, User
+        attribute :message, Message
+        attribute :inline_message_id, String
+        attribute :data, String
+      end
+    end
+  end
+end

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

@@ -4,9 +4,11 @@ module Telegram
       class ChosenInlineResult < Base
         attribute :result_id, String
         attribute :from, User
+        attribute :location, Location
+        attribute :inline_message_id, String
         attribute :query, String
 
-        alias_method :to_s, :query
+        alias to_s query
       end
     end
   end

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

@@ -0,0 +1,16 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineKeyboardButton < Base
+        attribute :text, String
+        attribute :url, String
+        attribute :callback_data, String
+        attribute :switch_inline_query, String
+
+        def to_h
+          super.delete_if { |_, v| v.nil? }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineKeyboardMarkup < Base
+        attribute :inline_keyboard, Array[Array[InlineKeyboardButton]]
+
+        def to_h
+          hsh = super
+          hsh[:inline_keyboard].map! { |a| a.map(&:to_h) }
+
+          hsh
+        end
+      end
+    end
+  end
+end

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

@@ -4,10 +4,11 @@ module Telegram
       class InlineQuery < Base
         attribute :id, String
         attribute :from, User
+        attribute :location, Location
         attribute :query, String
         attribute :offset, String
 
-        alias_method :to_s, :query
+        alias to_s query
       end
     end
   end

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

@@ -5,10 +5,8 @@ module Telegram
         attribute :type, String, default: 'article'
         attribute :id, String
         attribute :title, String
-        attribute :message_text, String
-        attribute :parse_mode, String
-        attribute :parse_mode, String
-        attribute :disable_web_page_preview, Boolean
+        attribute :input_message_content, InputMessageContent
+        attribute :reply_markup, InlineKeyboardMarkup
         attribute :url, String
         attribute :hide_url, Boolean
         attribute :description, String

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

@@ -0,0 +1,16 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultAudio < Base
+        attribute :type, String, default: 'audio'
+        attribute :id, String
+        attribute :audio_url, String
+        attribute :title, String
+        attribute :performer, String
+        attribute :audio_duration, Integer
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultCachedAudio < Base
+        attribute :type, String, default: 'audio'
+        attribute :id, String
+        attribute :audio_file_id, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultCachedDocument < Base
+        attribute :type, String, default: 'document'
+        attribute :id, String
+        attribute :title, String
+        attribute :document_file_id, String
+        attribute :description, String
+        attribute :caption, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultCachedGif < Base
+        attribute :type, String, default: 'gif'
+        attribute :id, String
+        attribute :gif_file_id, String
+        attribute :title, String
+        attribute :caption, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultCachedMpeg4Gif < Base
+        attribute :type, String, default: 'mpeg4_gif'
+        attribute :id, String
+        attribute :mpeg4_file_id, String
+        attribute :title, String
+        attribute :caption, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultCachedPhoto < Base
+        attribute :type, String, default: 'photo'
+        attribute :id, String
+        attribute :photo_file_id, String
+        attribute :title, String
+        attribute :description, String
+        attribute :caption, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultCachedSticker < Base
+        attribute :type, String, default: 'sticker'
+        attribute :id, String
+        attribute :sticker_file_id, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultCachedVideo < Base
+        attribute :type, String, default: 'video'
+        attribute :id, String
+        attribute :video_file_id, String
+        attribute :title, String
+        attribute :description, String
+        attribute :caption, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultCachedVoice < Base
+        attribute :type, String, default: 'voice'
+        attribute :id, String
+        attribute :voice_file_id, String
+        attribute :title, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultContact < Base
+        attribute :type, String, default: 'contact'
+        attribute :id, String
+        attribute :phone_number, String
+        attribute :first_name, String
+        attribute :last_name, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+        attribute :thumb_url, String
+        attribute :thumb_width, Integer
+        attribute :thumb_height, Integer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultDocument < Base
+        attribute :type, String, default: 'document'
+        attribute :id, String
+        attribute :title, String
+        attribute :caption, String
+        attribute :document_url, String
+        attribute :mime_type, String
+        attribute :description, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+        attribute :thumb_url, String
+        attribute :thumb_width, Integer
+        attribute :thumb_height, Integer
+      end
+    end
+  end
+end

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

@@ -10,9 +10,8 @@ module Telegram
         attribute :thumb_url, String
         attribute :title, String
         attribute :caption, String
-        attribute :message_text, String
-        attribute :parse_mode, String
-        attribute :disable_web_page_preview, Boolean
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
       end
     end
   end

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

@@ -0,0 +1,18 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultLocation < Base
+        attribute :type, String, default: 'location'
+        attribute :id, String
+        attribute :latitude, Float
+        attribute :longitude, Float
+        attribute :title, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+        attribute :thumb_url, String
+        attribute :thumb_width, Integer
+        attribute :thumb_height, Integer
+      end
+    end
+  end
+end

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

@@ -10,9 +10,8 @@ module Telegram
         attribute :thumb_url, String
         attribute :title, String
         attribute :caption, String
-        attribute :message_text, String
-        attribute :parse_mode, String
-        attribute :disable_web_page_preview, Boolean
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
       end
     end
   end

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

@@ -5,15 +5,14 @@ module Telegram
         attribute :type, String, default: 'photo'
         attribute :id, String
         attribute :photo_url, String
+        attribute :thumb_url, String
         attribute :photo_width, Integer
         attribute :photo_height, Integer
-        attribute :thumb_url, String
         attribute :title, String
         attribute :description, String
         attribute :caption, String
-        attribute :message_text, String
-        attribute :parse_mode, String
-        attribute :disable_web_page_preview, Boolean
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
       end
     end
   end

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

@@ -0,0 +1,20 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultVenue < Base
+        attribute :type, String, default: 'venue'
+        attribute :id, String
+        attribute :latitude, Float
+        attribute :longitude, Float
+        attribute :title, String
+        attribute :address, String
+        attribute :foursquare_id, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+        attribute :thumb_url, String
+        attribute :thumb_width, Integer
+        attribute :thumb_height, Integer
+      end
+    end
+  end
+end

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

@@ -6,15 +6,15 @@ module Telegram
         attribute :id, String
         attribute :video_url, String
         attribute :mime_type, String
-        attribute :message_text, String
-        attribute :parse_mode, String
-        attribute :disable_web_page_preview, Boolean
+        attribute :thumb_url, String
+        attribute :title, String
+        attribute :caption, String
         attribute :video_width, Integer
         attribute :video_height, Integer
         attribute :video_duration, Integer
-        attribute :thumb_url, String
-        attribute :title, String
         attribute :description, String
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
       end
     end
   end

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

@@ -0,0 +1,15 @@
+module Telegram
+  module Bot
+    module Types
+      class InlineQueryResultVoice < Base
+        attribute :type, String, default: 'voice'
+        attribute :id, String
+        attribute :voice_url, String
+        attribute :title, String
+        attribute :voice_duration, Integer
+        attribute :reply_markup, InlineKeyboardMarkup
+        attribute :input_message_content, InputMessageContent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Telegram
+  module Bot
+    module Types
+      class InputContactMessageContent < InputMessageContent
+        attribute :phone_number, String
+        attribute :first_name, String
+        attribute :last_name, String
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Telegram
+  module Bot
+    module Types
+      class InputLocationMessageContent < InputMessageContent
+        attribute :latitude, Float
+        attribute :longitude, Float
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Telegram
+  module Bot
+    module Types
+      class InputMessageContent < Base
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Telegram
+  module Bot
+    module Types
+      class InputTextMessageContent < InputMessageContent
+        attribute :message_text, String
+        attribute :parse_mode, String
+        attribute :disable_web_page_preview, Boolean
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Telegram
+  module Bot
+    module Types
+      class InputVenueMessageContent < InputMessageContent
+        attribute :latitude, Float
+        attribute :longitude, Float
+        attribute :title, String
+        attribute :address, String
+        attribute :foursquare_id, String
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Telegram
+  module Bot
+    module Types
+      class KeyboardButton < Base
+        attribute :text, String
+        attribute :request_contact, Boolean
+        attribute :request_location, Boolean
+
+        def to_h
+          super.delete_if { |_, v| v.nil? }
+        end
+      end
+    end
+  end
+end

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

@@ -5,10 +5,12 @@ module Telegram
         attribute :message_id, Integer
         attribute :from, User
         attribute :date, Integer
+        attribute :chat, Chat
         attribute :forward_from, User
         attribute :forward_date, Integer
         attribute :reply_to_message, Message
         attribute :text, String
+        attribute :entities, Array[MessageEntity]
         attribute :audio, Audio
         attribute :document, Document
         attribute :photo, Array[PhotoSize]
@@ -18,15 +20,20 @@ module Telegram
         attribute :caption, String
         attribute :contact, Contact
         attribute :location, Location
-        attribute :new_chat_participant, User
-        attribute :left_chat_participant, User
+        attribute :venue, Venue
+        attribute :new_chat_member, User
+        attribute :left_chat_member, User
         attribute :new_chat_title, String
         attribute :new_chat_photo, Array[PhotoSize]
         attribute :delete_chat_photo, Boolean
         attribute :group_chat_created, Boolean
-        attribute :chat, Chat
+        attribute :supergroup_chat_created, Boolean
+        attribute :channel_chat_created, Boolean
+        attribute :migrate_to_chat_id, Integer
+        attribute :migrate_from_chat_id, Integer
+        attribute :pinned_message, Message
 
-        alias_method :to_s, :text
+        alias to_s text
       end
     end
   end

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

@@ -0,0 +1,12 @@
+module Telegram
+  module Bot
+    module Types
+      class MessageEntity < Base
+        attribute :type, String
+        attribute :offset, Integer
+        attribute :length, Integer
+        attribute :url, String
+      end
+    end
+  end
+end

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

@@ -2,10 +2,17 @@ module Telegram
   module Bot
     module Types
       class ReplyKeyboardMarkup < Base
-        attribute :keyboard, Array[Array[String]]
+        attribute :keyboard, Array[Array[KeyboardButton]]
         attribute :resize_keyboard, Boolean, default: false
         attribute :one_time_keyboard, Boolean, default: false
         attribute :selective, Boolean, default: false
+
+        def to_h
+          hsh = super
+          hsh[:keyboard].map! { |a| a.map(&:to_h) }
+
+          hsh
+        end
       end
     end
   end

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

@@ -6,6 +6,7 @@ module Telegram
         attribute :message, Message
         attribute :inline_query, InlineQuery
         attribute :chosen_inline_result, ChosenInlineResult
+        attribute :callback_query, CallbackQuery
       end
     end
   end

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

@@ -0,0 +1,12 @@
+module Telegram
+  module Bot
+    module Types
+      class Venue < Base
+        attribute :location, Location
+        attribute :title, String
+        attribute :address, String
+        attribute :foursquare_id, String
+      end
+    end
+  end
+end

data/lib/telegram/bot/types.rb

@@ -9,15 +9,40 @@ require 'telegram/bot/types/voice'
 require 'telegram/bot/types/contact'
 require 'telegram/bot/types/location'
 require 'telegram/bot/types/chat'
+require 'telegram/bot/types/message_entity'
+require 'telegram/bot/types/venue'
 require 'telegram/bot/types/message'
+require 'telegram/bot/types/input_message_content'
+require 'telegram/bot/types/input_contact_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/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_photo'
+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_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/callback_query'
 require 'telegram/bot/types/update'
+require 'telegram/bot/types/keyboard_button'
 require 'telegram/bot/types/reply_keyboard_markup'
 require 'telegram/bot/types/reply_keyboard_hide'
 require 'telegram/bot/types/force_reply'

data/lib/telegram/bot/version.rb

@@ -1,5 +1,5 @@
 module Telegram
   module Bot
-    VERSION = '0.4.2'
+    VERSION = '0.5.0.beta1'.freeze
   end
 end

data/lib/telegram/bot.rb

@@ -1,6 +1,7 @@
-require 'httmultiparty'
-require 'persistent_httparty'
 require 'virtus'
+require 'logger'
+require 'json'
+require 'faraday'
 
 require 'telegram/bot/types'
 require 'telegram/bot/exceptions'
@@ -8,3 +9,20 @@ require 'telegram/bot/api'
 require 'telegram/bot/null_logger'
 require 'telegram/bot/client'
 require 'telegram/bot/version'
+require 'telegram/bot/configuration'
+
+module Telegram
+  module Bot
+    class << self
+      attr_writer :configuration
+    end
+
+    def self.configuration
+      @configuration ||= Configuration.new
+    end
+
+    def self.configure
+      yield(configuration)
+    end
+  end
+end

data/telegram-bot-ruby.gemspec

@@ -17,8 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httmultiparty'
-  spec.add_dependency 'persistent_httparty'
+  spec.add_dependency 'faraday'
   spec.add_dependency 'virtus'
 
   spec.add_development_dependency 'bundler', '~> 1.9'
@@ -27,5 +26,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.4'
-  spec.add_development_dependency 'nokogiri', '~> 1.6'
 end

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0.beta1
 platform: ruby
 authors:
 - Alexander Tipugin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httmultiparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: persistent_httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 description: 
 email:
 - atipugin@gmail.com
@@ -174,6 +146,7 @@ files:
 - lib/telegram/bot/botan.rb
 - lib/telegram/bot/botan/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
@@ -181,26 +154,51 @@ files:
 - lib/telegram/bot/types.rb
 - lib/telegram/bot/types/audio.rb
 - lib/telegram/bot/types/base.rb
+- lib/telegram/bot/types/callback_query.rb
 - lib/telegram/bot/types/chat.rb
 - lib/telegram/bot/types/chosen_inline_result.rb
 - lib/telegram/bot/types/contact.rb
 - lib/telegram/bot/types/document.rb
 - lib/telegram/bot/types/file.rb
 - lib/telegram/bot/types/force_reply.rb
+- lib/telegram/bot/types/inline_keyboard_button.rb
+- lib/telegram/bot/types/inline_keyboard_markup.rb
 - lib/telegram/bot/types/inline_query.rb
 - lib/telegram/bot/types/inline_query_result_article.rb
+- lib/telegram/bot/types/inline_query_result_audio.rb
+- lib/telegram/bot/types/inline_query_result_cached_audio.rb
+- lib/telegram/bot/types/inline_query_result_cached_document.rb
+- lib/telegram/bot/types/inline_query_result_cached_gif.rb
+- lib/telegram/bot/types/inline_query_result_cached_mpeg4_gif.rb
+- lib/telegram/bot/types/inline_query_result_cached_photo.rb
+- lib/telegram/bot/types/inline_query_result_cached_sticker.rb
+- lib/telegram/bot/types/inline_query_result_cached_video.rb
+- lib/telegram/bot/types/inline_query_result_cached_voice.rb
+- lib/telegram/bot/types/inline_query_result_contact.rb
+- lib/telegram/bot/types/inline_query_result_document.rb
 - lib/telegram/bot/types/inline_query_result_gif.rb
+- lib/telegram/bot/types/inline_query_result_location.rb
 - lib/telegram/bot/types/inline_query_result_mpeg4_gif.rb
 - lib/telegram/bot/types/inline_query_result_photo.rb
+- lib/telegram/bot/types/inline_query_result_venue.rb
 - lib/telegram/bot/types/inline_query_result_video.rb
+- lib/telegram/bot/types/inline_query_result_voice.rb
+- lib/telegram/bot/types/input_contact_message_content.rb
+- lib/telegram/bot/types/input_location_message_content.rb
+- lib/telegram/bot/types/input_message_content.rb
+- lib/telegram/bot/types/input_text_message_content.rb
+- lib/telegram/bot/types/input_venue_message_content.rb
+- lib/telegram/bot/types/keyboard_button.rb
 - lib/telegram/bot/types/location.rb
 - lib/telegram/bot/types/message.rb
+- lib/telegram/bot/types/message_entity.rb
 - lib/telegram/bot/types/photo_size.rb
 - lib/telegram/bot/types/reply_keyboard_hide.rb
 - lib/telegram/bot/types/reply_keyboard_markup.rb
 - lib/telegram/bot/types/sticker.rb
 - lib/telegram/bot/types/update.rb
 - lib/telegram/bot/types/user.rb
+- lib/telegram/bot/types/venue.rb
 - lib/telegram/bot/types/video.rb
 - lib/telegram/bot/types/voice.rb
 - lib/telegram/bot/version.rb
@@ -219,9 +217,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1