telegramAPI 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5b45e79fac3640829e4e55c3c71b13333cb7814
-  data.tar.gz: 8a4e116bf7bf10b3c5806f29d8781b5dedbe4b39
+  metadata.gz: 4d0765734886b2d843ea2ec0b0526e205e87f9a7
+  data.tar.gz: 619dc5e64b3f2e18c2e9a180b6fccb2f65ff7b0a
 SHA512:
-  metadata.gz: 2d1396e0e088d2ceb852621671fddfcf0dd6caef584b600b896543e37c33f91c7fb963772db7f4702e1073d4ca6fb96318f8f0f839bd17ab594dda5c97795cd3
-  data.tar.gz: 3c2eacb52a7afbfffc85bacf306595aa62f2c94db4cc8bd182e69981709e2e452b5efb247f477fe11e73266bdd9dae2f57be3a18b2f928b7ed00210b31f13555
+  metadata.gz: 8378d99c46773a8e6f5b1916ab323d7f431240b8f4c40f075a73a311aa6ed6ae25eaff858fb025181146e04d0f584404bb419c340073e1668c5c531244139a39
+  data.tar.gz: 4f059a70260155c3e4238ad87e5a3ba4d29d79947a458c241d844990876cca97b2f876ea0523798f48498698963e813879d6597edd142afff853739fe8297577

data/README.md

@@ -4,7 +4,7 @@ This is a simple and lightweight Ruby API for Telegram Bots.
 
 With this tiny library you can create awesome Telegram Bot!
 
-Version: 1.0.4
+Version: 1.0.5
 
 ## Installation
 

data/lib/telegramAPI.rb

@@ -21,6 +21,14 @@ class TelegramAPI
     @last_update = 0
   end
 
+  def parse_hash hash
+    ret = {}
+    hash.each do |h|
+      ret[h[0]]=h[1]
+    end
+    return ret
+  end
+
   def query api, params={}
     p=[]
     params_s=""
@@ -41,7 +49,7 @@ class TelegramAPI
   # @param options [Hash<String, String>] Optional settings
   # @return [Array<Update>] List of all updates
   def getUpdates options={"timeout"=>0, "limit"=>100}
-    r=self.query "getUpdates", {"offset"=>@last_update.to_s}.merge(options)
+    r=self.query "getUpdates", {"offset"=>@last_update.to_s}.merge(parse_hash(options))
     if r['ok']!=true then return nil end
     up=ArrayOf.new(r['result'],Update).to_a
     if up[-1]!=nil then @last_update=up[-1].update_id+1 end
@@ -57,7 +65,7 @@ class TelegramAPI
     if options.has_key?"reply_markup" then
       options["reply_markup"]=options["reply_markup"].to_json
     end
-    Message.new self.query("sendMessage", {"chat_id"=>to.to_s, "text"=>URI::encode(text)}.merge(options))["result"]
+    Message.new self.query("sendMessage", {"chat_id"=>to.to_s, "text"=>URI::encode(text)}.merge(parse_hash(options)))["result"]
   end
 
   # Send a message as forwarded
@@ -75,28 +83,28 @@ class TelegramAPI
   # @param options (see #sendMessage)
   # @return (see #sendMessage)
   def sendPhoto to, path, options={}
-    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendPhoto", {:photo=>File.new(path,'rb'), :chat_id=>to.to_s}.merge(options)).body)["result"]
+    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendPhoto", {:photo=>File.new(path,'rb'), :chat_id=>to.to_s}.merge(parse_hash(options))).body)["result"]
   end
 
   # Send an audio file in Ogg OPUS format of max 50MB
   # @param (see #sendPhoto)
   # @return (see #sendPhoto)
   def sendAudio to, path, options={}
-    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendAudio", {:audio=>File.new(path, 'rb'), :chat_id=>to.to_s}.merge(options)).body)["result"]
+    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendAudio", {:audio=>File.new(path, 'rb'), :chat_id=>to.to_s}.merge(parse_hash(options))).body)["result"]
   end
 
   # Send a general document (file, image, audio)
   # @param (see #sendPhoto)
   # @return (see #sendPhoto)
   def sendDocument to, path, options={}
-    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendDocument", {:document=>File.new(path,'rb'), :chat_id=>to.to_s}.merge(options)).body)["result"]
+    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendDocument", {:document=>File.new(path,'rb'), :chat_id=>to.to_s}.merge(parse_hash(options))).body)["result"]
   end
 
   # Send a Sticker from File
   # @param (see #sendPhoto)
   # @return (see #sendSticker)
   def sendStickerFromFile to, path, options={}
-    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendStiker", {:sticker=>File.new(path,'rb'), :chat_id=>to.to_s}.merge(options)).body)["result"]
+    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendStiker", {:sticker=>File.new(path,'rb'), :chat_id=>to.to_s}.merge(parse_hash(options))).body)["result"]
   end
 
   # Send a Sticker through its ID
@@ -105,14 +113,14 @@ class TelegramAPI
   # @param options (see #sendPhoto)
   # @return (see #sendPhoto)
   def sendSticker to, id, options={}
-    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendSticker", {:sticker=>id, :chat_id=>to.to_s}.merge(options)).body)["result"]
+    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendSticker", {:sticker=>id, :chat_id=>to.to_s}.merge(parse_hash(options))).body)["result"]
   end
 
   # Send a video file in mp4 format of max 50MB
   # @param (see #sendPhoto)
   # @return (see #sendPhoto)
   def sendVideo to, path, options={}
-    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendVideo", {:video=>File.new(path,'rb'), :chat_id=>to.to_s}.merge(options)).body)["result"]
+    Message.new JSON.parse(RestClient.post(@@core+@token+"/sendVideo", {:video=>File.new(path,'rb'), :chat_id=>to.to_s}.merge(parse_hash(options))).body)["result"]
   end
   
   # Send a location
@@ -122,7 +130,7 @@ class TelegramAPI
   # @param options (see #sendPhoto)
   # @return (see #sendPhoto)
   def sendLocation to, lat, long, options={}
-    Message.new self.query("sendLocation", {"chat_id"=>to, "latitude"=>lat, "longitude"=>long}.merge(options))["result"]
+    Message.new self.query("sendLocation", {"chat_id"=>to, "latitude"=>lat, "longitude"=>long}.merge(parse_hash(options)))["result"]
   end
 
   # Send a Chat Action
@@ -137,8 +145,8 @@ class TelegramAPI
   # @param options (see #sendPhoto)
   # @return [UserProfilePhotos]
   def getUserProfilePhotos id, options={}
-    UserProfilePhotos.new self.query("getUserProfilePhotos", {"user_id"=>id}.merge(options))["result"]
+    UserProfilePhotos.new self.query("getUserProfilePhotos", {"user_id"=>id}.merge(parse_hash(options)))["result"]
   end
 
-  protected :query
+  protected :query, :parse_hash
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegramAPI
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Benedetto Nespoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client