telegram-bot-ruby 0.5.0.beta1 → 0.5.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 789950417db18c87aeeaf3ada4788131e8d1e5a0
-  data.tar.gz: 8240d4073e39f8d7400df0682689e1aec49839d5
+  metadata.gz: 21c521862fb67cf5de03a54c65f4b459350ad9d2
+  data.tar.gz: fd0095bc8c4815329289f92af0fbf3ec292ea830
 SHA512:
-  metadata.gz: 8c5819e6e65f453afc80df9354b21783912e3f1f76a15b4bd0fc2ceefe9b1a2472e8c04b661a4175a32e3d2adadf149ae061dd00c2ed5386e27621cf430cf424
-  data.tar.gz: 28170029b9b8b8066e693f30687fa8eb3a3168d73a92ef35a18fcc5bf149ceee8358d767a0a4603899a1c3cac560ff9bf3519c6489cf9dd80ed04f7ef517dba5
+  metadata.gz: 55b5682ccc05202ff57ff36d12f4d762c5083253a1b074e1b330294a7fe0918e5929c7e2aed7f902e66c45ffe7cfd092915cf66071d7fe56d016c5033eae4b15
+  data.tar.gz: 7c2468fbe973b32ceb7f144f3c886122dc35ff79950c86b95477b7f3f8cafb0bb094cd757e819aa37e73c41b1e630f29c0c1f3baabf8cf2026b2c68dac3f8022

data/README.md

@@ -77,6 +77,43 @@ bot.listen do |message|
 end
 ```
 
+Furthermore, you can ask user to share location or phone number using `KeyboardButton`:
+
+```ruby
+bot.listen do |message|
+    kb = [
+      Telegram::Bot::Types::KeyboardButton.new(text: 'Give me your phone number', request_contact: true),
+      Telegram::Bot::Types::KeyboardButton.new(text: 'Show me your location', request_location: true)
+    ]
+    markup = Telegram::Bot::Types::ReplyKeyboardMarkup.new(keyboard: kb)
+    bot.api.send_message(chat_id: message.chat.id, text: 'Hey!', reply_markup: markup)
+  end
+```
+
+## Inline keyboards
+
+[Bot API 2.0](https://core.telegram.org/bots/2-0-intro) brought us new inline keyboards. Example:
+
+```ruby
+bot.listen do |message|
+  case message
+  when Telegram::Bot::Types::CallbackQuery
+    # Here you can handle your callbacks from inline buttons
+    if message.data == 'touch'
+      bot.api.send_message(chat_id: message.from.id, text: "Don't touch me!")
+    end
+  when Telegram::Bot::Types::Message
+    kb = [
+      Telegram::Bot::Types::InlineKeyboardButton.new(text: 'Go to Google', url: 'https://google.com'),
+      Telegram::Bot::Types::InlineKeyboardButton.new(text: 'Touch me', callback_data: 'touch'),
+      Telegram::Bot::Types::InlineKeyboardButton.new(text: 'Switch to inline', switch_inline_query: 'some text')
+    ]
+    markup = Telegram::Bot::Types::InlineKeyboardMarkup.new(inline_keyboard: kb)
+    bot.api.send_message(chat_id: message.chat.id, text: 'Make a choice', reply_markup: markup)
+  end
+end
+```
+
 ## Inline bots
 
 If you are going to create [inline bot](https://core.telegram.org/bots/inline), check the example below:
@@ -155,6 +192,18 @@ end
 - Telegram's user id (required)
 - hash of additional properties (optional)
 
+## Connection adapters
+
+Since version `0.5.0` we rely on [faraday](https://github.com/lostisland/faraday) under the hood. You can use any of supported adapters (for example, `net/http/persistent`):
+
+```ruby
+require 'net/http/persistent'
+
+Telegram::Bot.configure do |config|
+  config.adapter = :net_http_persistent
+end
+```
+
 ## 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

@@ -81,12 +81,12 @@ module Telegram
 
       def jsonify_reply_markup(value)
         return value unless REPLY_MARKUP_TYPES.include?(value.class)
-        value.to_h.to_json
+        value.to_compact_hash.to_json
       end
 
       def jsonify_inline_query_results(value)
         return value unless value.is_a?(Array) && value.all? { |i| INLINE_QUERY_RESULT_TYPES.include?(i.class) }
-        value.map { |i| i.to_h.select { |_, v| v } }.to_json
+        value.map { |i| i.to_compact_hash.select { |_, v| v } }.to_json
       end
 
       def camelize(method_name)

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

@@ -4,7 +4,7 @@ module Telegram
       class Base
         include Virtus.model
 
-        def compact_attributes
+        def to_compact_hash
           attributes.dup.delete_if { |_, v| v.nil? }
         end
       end

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

@@ -6,10 +6,6 @@ module Telegram
         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

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

@@ -4,9 +4,13 @@ module Telegram
       class InlineKeyboardMarkup < Base
         attribute :inline_keyboard, Array[Array[InlineKeyboardButton]]
 
-        def to_h
+        def to_compact_hash
           hsh = super
-          hsh[:inline_keyboard].map! { |a| a.map(&:to_h) }
+          hsh[:inline_keyboard].map! do |arr|
+            arr.map do |item|
+              item.is_a?(InlineKeyboardButton) ? item.to_compact_hash : item
+            end
+          end
 
           hsh
         end

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

@@ -5,10 +5,6 @@ module Telegram
         attribute :text, String
         attribute :request_contact, Boolean
         attribute :request_location, Boolean
-
-        def to_h
-          super.delete_if { |_, v| v.nil? }
-        end
       end
     end
   end

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

@@ -7,9 +7,13 @@ module Telegram
         attribute :one_time_keyboard, Boolean, default: false
         attribute :selective, Boolean, default: false
 
-        def to_h
+        def to_compact_hash
           hsh = super
-          hsh[:keyboard].map! { |a| a.map(&:to_h) }
+          hsh[:keyboard].map! do |arr|
+            arr.map do |item|
+              item.is_a?(KeyboardButton) ? item.to_compact_hash : item
+            end
+          end
 
           hsh
         end

data/lib/telegram/bot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta1
+  version: 0.5.0.beta2
 platform: ruby
 authors:
 - Alexander Tipugin