telegramAPI 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c9908f71396de288dbd195d642ee99591ed9dc1
-  data.tar.gz: 01d4febf435e5f35c3cc6e3dd454d66a35c329fd
+  metadata.gz: 84b02e4ec0791515fde7440bd0d17ffe2c7af1ad
+  data.tar.gz: 9c160edd39a5818bc5530de9eaf5b10900b19e3d
 SHA512:
-  metadata.gz: 2b593ea37a4c1f09036faf33181f3e253883d279ee857412bf2c4919a69a03aaf73e97672c87126dfd634a4a5efde749ca503036fd4325c350d17a3b49af103b
-  data.tar.gz: f70dd720c3b901c1ffdc00eb59b64aa091b3f733d9003d3d0526e193db773b83e718b1d25ba910a15f00bbe6de9582737a2951fcb519932d4a137fed2669edd3
+  metadata.gz: d15ef602f46f4a0f8f34010b3241d5a5d46f6be3f22af085e7bb3f4fd0d3ff73526f2fbac8d2fd7fc04addc2cd04a5bcd673f2f2fc2980b355cd1fadd4372838
+  data.tar.gz: c75acdef5092862dac5016f2ea7dbd4b92a14891d6fd611bb4336482bf26cf7dd2df15058de36c8cc9115353382123e288889d8a23a599cad810efdb7b6daa2d

data/README.md

@@ -1,13 +1,13 @@
 # TelegramAPI
 
 [![Gem Version](https://badge.fury.io/rb/telegramAPI.svg)](https://badge.fury.io/rb/telegramAPI)
+[![Dependency Status](https://gemnasium.com/bennesp/telegramAPI.svg)](https://gemnasium.com/bennesp/telegramAPI)
+[![Code Climate](https://codeclimate.com/github/bennesp/telegramAPI/badges/gpa.svg)](https://codeclimate.com/github/bennesp/telegramAPI)
 
 This is a simple and lightweight Ruby API for Telegram Bots.
 
 With this tiny library you can create awesome Telegram Bot!
 
-Version: 1.0.10
-
 ## Installation
 
 ```

data/lib/telegramAPI.rb

@@ -39,6 +39,10 @@ class TelegramAPI
     JSON.parse(open(@@core+@token+"/"+api+params_s).read)
   end
 
+  def post api, name, path, to, options={}
+    Message.new JSON.parse(RestClient.post(@@core+@token+api, {name=>File.new(path,'rb'), :chat_id=>to.to_s}.merge(parse_hash(options))).body)["result"]
+  end
+
   # Provide information about the bot itself
   # @return [User] Information about the bot
   def getMe
@@ -83,28 +87,37 @@ 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(parse_hash(options))).body)["result"]
+    self.post "/sendPhoto", :photo, path, to, options
+  end
+
+  # Send a photo through an ID
+  # @param to (see #sendMessage)
+  # @param id [String] The id of the photo to send
+  # @param options (see #sendMessage)
+  # @return (see #sendMessage)
+  def sendPhotoFromId to, id, options={}
+    Message.new self.query "sendPhoto", {"chat_id"=>to, "photo"=>id}.merge(parse_hash(options))["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(parse_hash(options))).body)["result"]
+    self.post "/sendAudio", :audio, path, to, options
   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(parse_hash(options))).body)["result"]
+    self.post "/sendDocument", :document, path, to, options
   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(parse_hash(options))).body)["result"]
+    self.post "/sendSticker", :sticker, path, to, options
   end
 
   # Send a Sticker through its ID
@@ -120,7 +133,7 @@ class TelegramAPI
   # @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(parse_hash(options))).body)["result"]
+    self.post "/sendVideo", :video, path, to, options
   end
   
   # Send a location
@@ -148,5 +161,5 @@ class TelegramAPI
     UserProfilePhotos.new self.query("getUserProfilePhotos", {"user_id"=>id}.merge(parse_hash(options)))["result"]
   end
 
-  protected :query, :parse_hash
+  protected :query, :parse_hash, :post
 end

data/lib/telegramObjects.rb

@@ -182,10 +182,6 @@ class ReplyKeyboardMarkup
     @one_time_keyboard = json["one_time_keyboard"]
     @selective = json["selective"]
   end
-
-  def to_json
-    "{\"keyboard\":" + @keyboard.to_json  + ", \"resize_keyboard\":" + (!@resize_keyboard ? "false" : "true") + ", \"one_time_keyboard\":" + (!@one_time_keyboard ? "false" : "true") + ", \"selective\":" + (!@selective ? "false" : "true") + "}"
-  end
 end
 
 class ReplyKeyboardHide
@@ -195,10 +191,6 @@ class ReplyKeyboardHide
     @hide_keyboard = json["hide_keyboard"]
     @selective = json["selective"]
   end
-
-  def to_json
-    "{\"hide_keyboard\":true, \"selective\":"+(!@selective ? "false" : "true")+"}"
-  end
 end
 
 class ForceReply
@@ -208,8 +200,4 @@ class ForceReply
     @force_reply = json["force_reply"]
     @selective = json["selective"]
   end
-
-  def to_json
-    "{\"force_reply\":true, \"selective\":"+(!@selective ? "false" : "true")+"}"
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegramAPI
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Benedetto Nespoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -59,9 +59,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Telegram API for Bots
 test_files: []
-has_rdoc: