telegram-bot-ruby 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42f3aaa643f89d7ac2534a93a9867567706c3412
-  data.tar.gz: c1e130a68c7e98375a0c536ebe8a62f16bdc5990
+  metadata.gz: 1d52d14ef44cbb3583be07ce94d6a497c5fcdbe9
+  data.tar.gz: a9e8eb1afb4a9ed07ff4a645f68f54f4978505d2
 SHA512:
-  metadata.gz: 6a030e8417d75db739206e74cafae2502d0cfe97b5dd584ec9880d391fea050a0dd4e9102374fdba347d8a1c6ac88772bbf517857740132562f620e8cfa4cce2
-  data.tar.gz: 5a226a421b69610e6d691ea0aeeb91a7c455ddf0ff82f70d518625b18c12ff4f7730953bc6bfd448bd40ca740ddd85183af67e7699de8a4d3abcead5d800bf87
+  metadata.gz: 9f79b2bf808f6b88e2003a8eb628a88dc45d093aae9e67b05a8659de96f71d48b9f37418c09bb0eb9b0b6d20507cf0f183bedd8329a476af1e030dcd965d1b62
+  data.tar.gz: 50db3e10ebadbd7daa4cb0f877e9453a191a1b1a5bebf8b530f16971917dea7bffa32819eb22dd67bf26899cc5a237e7e364e1b84cca34f42a7e5808c4bfa4cd

data/README.md

@@ -2,6 +2,9 @@
 
 Ruby wrapper for [Telegram's Bot API](https://core.telegram.org/bots/api).
 
+[![Gem Version](https://badge.fury.io/rb/telegram-bot-ruby.svg)](http://badge.fury.io/rb/telegram-bot-ruby)
+[![Code Climate](https://codeclimate.com/github/atipugin/telegram-bot-ruby/badges/gpa.svg)](https://codeclimate.com/github/atipugin/telegram-bot-ruby)
+
 ## Installation
 
 Add following line to your Gemfile:
@@ -34,8 +37,10 @@ token = 'YOUR_TELEGRAM_BOT_API_TOKEN'
 Telegram::Bot::Client.run(token) do |bot|
   bot.listen do |message|
     case message.text
-    when /^hello/
+    when /^\/start$/
       bot.api.sendMessage(chat_id: message.chat.id, text: "Hello, #{message.from.username}")
+    when /^\/stop$/
+      bot.api.sendMessage(chat_id: message.chat.id, text: "Bye, #{message.from.username}")
     end
   end
 end
@@ -45,6 +50,28 @@ Note that `bot.api` object implements [Telegram Bot API methods](https://core.te
 
 Same thing about `message` object - it implements [Message](https://core.telegram.org/bots/api#message) spec, so you always know what to expect from it.
 
+## Custom keyboards
+
+You can use your own [custom keyboards](https://core.telegram.org/bots#keyboards). Here is an example:
+
+```ruby
+bot.listen do |message|
+  case message.text
+  when /^\/start$/
+    question = 'London is a capital of which country?'
+    # See more: https://core.telegram.org/bots/api#replykeyboardmarkup
+    answers =
+      Telegram::Bot::Types::ReplyKeyboardMarkup
+      .new(keyboard: [%w(A B), %w(C D)], one_time_keyboard: true)
+    bot.api.sendMessage(chat_id: message.chat.id, text: question, reply_markup: answers)
+  when /^\/stop$/
+    # See more: https://core.telegram.org/bots/api#replykeyboardhide
+    kb = Telegram::Bot::Types::ReplyKeyboardHide.new(hide_keyboard: true)
+    bot.api.sendMessage(chat_id: message.chat.id, text: 'Sorry to see you go :(', reply_markup: kb)
+  end
+end
+```
+
 ## Contributing
 
 1. Fork it

data/lib/telegram/bot.rb

@@ -2,7 +2,7 @@ require 'httparty'
 require 'persistent_httparty'
 require 'virtus'
 
-require 'telegram/bot/api'
 require 'telegram/bot/types'
+require 'telegram/bot/api'
 require 'telegram/bot/client'
 require 'telegram/bot/version'

data/lib/telegram/bot/api.rb

@@ -8,6 +8,11 @@ module Telegram
         sendSticker sendVideo sendLocation sendChatAction getUserProfilePhotos
         getUpdates setWebhook
       ).freeze
+      REPLY_MARKUP_TYPES = [
+        Telegram::Bot::Types::ReplyKeyboardMarkup,
+        Telegram::Bot::Types::ReplyKeyboardHide,
+        Telegram::Bot::Types::ForceReply
+      ].freeze
 
       attr_reader :token
 
@@ -22,8 +27,27 @@ module Telegram
         ENDPOINTS.include?(method_name.to_s) ? call(method_name, *args) : super
       end
 
-      def call(endpoint, params = {})
-        self.class.get("/bot#{token}/#{endpoint}", query: params).to_h
+      def call(endpoint, raw_params = {})
+        params = build_params(raw_params)
+        response = self.class.get("/bot#{token}/#{endpoint}", query: params)
+        response.code == 200 ? response.to_h : {}
+      end
+
+      private
+
+      def build_params(h)
+        h.each_with_object({}) do |(key, value), params|
+          params[key] = sanitize_value(value)
+        end
+      end
+
+      def sanitize_value(value)
+        jsonify_reply_markup(value)
+      end
+
+      def jsonify_reply_markup(value)
+        return value unless REPLY_MARKUP_TYPES.include?(value.class)
+        value.to_h.to_json
       end
     end
   end

data/lib/telegram/bot/types.rb

@@ -10,3 +10,6 @@ require 'telegram/bot/types/contact'
 require 'telegram/bot/types/location'
 require 'telegram/bot/types/message'
 require 'telegram/bot/types/update'
+require 'telegram/bot/types/reply_keyboard_markup'
+require 'telegram/bot/types/reply_keyboard_hide'
+require 'telegram/bot/types/force_reply'

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

@@ -0,0 +1,10 @@
+module Telegram
+  module Bot
+    module Types
+      class ForceReply < Base
+        attribute :force_reply, Boolean
+        attribute :selective, Boolean, default: false
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Telegram
+  module Bot
+    module Types
+      class ReplyKeyboardHide < Base
+        attribute :hide_keyboard, Boolean
+        attribute :selective, Boolean, default: false
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Telegram
+  module Bot
+    module Types
+      class ReplyKeyboardMarkup < Base
+        attribute :keyboard, Array[Array[String]]
+        attribute :resize_keyboard, Boolean, default: false
+        attribute :one_time_keyboard, Boolean, default: false
+        attribute :selective, Boolean, default: false
+      end
+    end
+  end
+end

data/lib/telegram/bot/version.rb

@@ -1,5 +1,5 @@
 module Telegram
   module Bot
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alexander Tipugin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -131,10 +131,13 @@ files:
 - lib/telegram/bot/types/base.rb
 - lib/telegram/bot/types/contact.rb
 - lib/telegram/bot/types/document.rb
+- lib/telegram/bot/types/force_reply.rb
 - lib/telegram/bot/types/group_chat.rb
 - lib/telegram/bot/types/location.rb
 - lib/telegram/bot/types/message.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