ya_telegram_bot 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61a5de13ed8de99426a7bfa61de2546284469107
-  data.tar.gz: e9fab4795d112701d2c5af7fca256b0b7a96ce4c
+  metadata.gz: c607a290b4ddc0b1aa0e6655266736dfc049db55
+  data.tar.gz: d5de93cfa149d2e35f0f46053117335fdc3d6efd
 SHA512:
-  metadata.gz: c80cb576d0254a8b2b76c56b907a9120585b32598ac41c4547673483b87da9914282454823bad44db4a51f123a344c8b4bb4ffc9681deefe80ba3dc9132e41d5
-  data.tar.gz: 869d9928d5b2e91236a3c542e33bda90705906887430290b321e14ac29573fd88e312365d9a3710c9498c82f88ef75bb775b82b1d28ea5990d7c83e5759ad553
+  metadata.gz: a72d2a026a4bbe3e6d12f4e77db06a7b249df924236c42aed30dbdd60700e86a7ff46a9cff8ae7d69c7c24aff60b8343d044cd25f907f0708b360c84bd2aeda7
+  data.tar.gz: dadfbb256be7c04a62dbb82f61710564b861a7da99ec8d2695bd3f94e29c5666ac7cf67e198e6476ae8677f4d4be5b341d52461b3abc4698cd5b8a6b5d26d40d

data/README.md

@@ -2,11 +2,10 @@
 
 **IN DEV**
 
-## What's new **0.2.0**
-
-* Class `YATelegramBot::TelegramAPI::Message`.
-* `Base#Update` generates array of `Message`. See Usage.
+## What's new **0.3.0**
 
+* Class `YATelegramBot::TelegramAPI::User`.
+* Class `YATelegramBot::TelegramAPI::Chat`.
 
 ## Usage
 
@@ -19,6 +18,8 @@ class Bot
   token YOUR_TOKEN
 end
 
+# getting LAST updates as array of YATelegramBot:TelegramAPI::Message
+# "LAST" means that #updates method every time will return fresh updates (so you will never get same updates inside your process)
 updates = Bot.updates
 updates.each do |message|
   chat_id = message['chat']['id']
@@ -30,8 +31,18 @@ updates.each do |message|
                 markdown: true
 end
 
+# reply to message
 Bot.updates.each { |message| message.reply text: 'Leave me alone!' }
 
+# YATelegramBot::TelegramAPI::User
+user = Bot.updates[0].from
+user.send_text text: '*hey hey!*',
+               markdown: true
+
+#YATelegramBot::TelegramAPI::Chat
+chat = Bot.updates[0].chat
+chat.send_text text: "Hi, #{chat.type == :private ? 'dude' : 'all'}!"
+
 ```
 
 ## Contributing

data/lib/ya_telegram_bot/base.rb

@@ -50,7 +50,7 @@ module YATelegramBot
     def send_text(params = {})
       response = send_api_request 'sendMessage',
                                   params_for_sending_text(params)
-      response['ok']
+      response['ok'] && Message.new(response['result'], self)
     end
 
     private

data/lib/ya_telegram_bot/telegram_api/chat.rb

@@ -0,0 +1,42 @@
+module YATelegramBot
+  module TelegramAPI
+    #
+    # represents Telegram Chat
+    #
+    class Chat < Hash
+      FIELDS = [:id, :type, :title, :first_name, :last_name, :username].freeze
+
+      #
+      # @param hash [Hash] hash from json.
+      # @param bot [Base] for using api methods
+      #
+      def initialize(hash, bot = nil)
+        super()
+        @bot = bot
+        FIELDS.each { |f| self[f] = hash[f.to_s] if hash[f.to_s] }
+
+        self[:type] = self[:type].to_sym
+      end
+
+      #
+      # @example chat.type
+      #
+      def method_missing(m, *args)
+        return self[m] if self[m] && args.empty?
+        super
+      end
+
+      #
+      # uses bot to send text to this user.
+      #
+      # @param params [Hash] params for Base#send_text. This method will only set :chat to self[:id]
+      #
+      def send_text(params = {})
+        fail InitWithoutBot unless @bot
+
+        params[:chat] = id
+        @bot.send_text params
+      end
+    end
+  end
+end

data/lib/ya_telegram_bot/telegram_api/message.rb

@@ -1,4 +1,6 @@
 require 'time'
+require_relative 'user'
+require_relative 'chat'
 
 module YATelegramBot
   module TelegramAPI
@@ -45,7 +47,7 @@ module YATelegramBot
       #
       # params values:
       # * :text [String]
-      # * :as_plain_message [Boolean] default: true. If it's set, method won't set :reply_to parameter
+      # * :as_plain_message [Boolean] default: true. If it's true, method won't set :reply_to parameter
       #
       # @example message.reply(text: 'Hi, *friend*!', markdown: true)
       #
@@ -68,11 +70,10 @@ module YATelegramBot
       # @return [Hash]
       #
       def hash_for_merging(hash)
-        new_hash = {}
-        new_hash[:id] = hash['message_id'].to_i
-        new_hash[:date] = Time.at hash['date'].to_i
-        new_hash[:from] = hash['from'] # TODO: class User
-        new_hash[:chat] = hash['chat'] # TODO: class Chat
+        new_hash = { id: hash['message_id'].to_i,
+                     date: Time.at(hash['date'].to_i),
+                     from: User.new(hash['from'], @bot),
+                     chat: Chat.new(hash['chat'], @bot) }
 
         type = TYPES.find { |t| hash[t.to_s] }
         new_hash[type] = hash[type.to_s] # TODO: fail if type not found

data/lib/ya_telegram_bot/telegram_api/user.rb

@@ -0,0 +1,40 @@
+module YATelegramBot
+  module TelegramAPI
+    #
+    # represents Telegram User
+    #
+    class User < Hash
+      FIELDS = [:id, :first_name, :last_name, :username].freeze
+
+      #
+      # @param hash [Hash] hash from json.
+      # @param bot [Base] for using api methods
+      #
+      def initialize(hash, bot = nil)
+        super()
+        @bot = bot
+        FIELDS.each { |f| self[f] = hash[f.to_s] if hash[f.to_s] }
+      end
+
+      #
+      # @example user.first_name
+      #
+      def method_missing(m, *args)
+        return self[m] if self[m] && args.empty?
+        super
+      end
+
+      #
+      # uses bot to send text to this user.
+      #
+      # @param params [Hash] params for Base#send_text. This method will only set :chat to self[:id]
+      #
+      def send_text(params = {})
+        fail InitWithoutBot unless @bot
+
+        params[:chat] = id
+        @bot.send_text params
+      end
+    end
+  end
+end

data/lib/ya_telegram_bot/version.rb

@@ -1,3 +1,3 @@
 module YATelegramBot
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ya_telegram_bot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitriy Non
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,9 @@ files:
 - lib/ya_telegram_bot.rb
 - lib/ya_telegram_bot/base.rb
 - lib/ya_telegram_bot/exceptions.rb
+- lib/ya_telegram_bot/telegram_api/chat.rb
 - lib/ya_telegram_bot/telegram_api/message.rb
+- lib/ya_telegram_bot/telegram_api/user.rb
 - lib/ya_telegram_bot/version.rb
 - ya_telegram_bot.gemspec
 homepage: https://github.com/Nondv/telegram_bot