telegrammer 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01192345cd31357f67504923fbd3cb1933e99b4e
-  data.tar.gz: a06447a0d0bde6d7d0f9cf03a09e0b51faba93a4
+  metadata.gz: fdc5d677c010ce352e77dff0485af04688cd6937
+  data.tar.gz: ecaaf9602bf7bc7912e1fd0665d088f0773e8b61
 SHA512:
-  metadata.gz: d8d582a1eb2c96034917e98133a7b8eae71ef67dc6e63582fdaefbd5500cf9b1637fd097760f5b2907b0b0a566f11484decad6f9e801d7710dd5929ac607445a
-  data.tar.gz: d3e478e64f1bca7af8eae29785abcb9fe04df2dd8f482e6f1e03e11a20b0b3c74663d63e87f378939a033cc0c3bc50a0155219e1fc1ff3b21d618c67ae53b475
+  metadata.gz: 6bc3a0bb233f5fc8c1255cae7a3087442f5ec4fa930da8b8840163f3c9e73582d741bd8c0f403b114f7a954cfa658a356be75adffaff805ca5e980b15df58bb8
+  data.tar.gz: 6af421ebee380d692566e26cac7857de19b8be19911022f8ac6c68315e98829fbe25823f2c7d0b6b8d8a9d47cd9785eff2ed5818ed01bd938003ad9f3c0e863b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.2.0
+======
+
+* Simplified internals for send operations to reuse as much as possible.
+
 v0.1.0
 ======
 

data/lib/telegrammer/bot.rb

@@ -109,21 +109,12 @@ module Telegrammer
     #
     # @return [Telegrammer::DataTypes::Message] Message object sent to the user or group chat
     def send_message(params)
-      params_validation = {
-        chat_id: { required: true, class: [Fixnum] },
+      extra_params_validation = {
         text: { required: true, class: [String] },
-        disable_web_page_preview: { required: false, class: [TrueClass, FalseClass] },
-        reply_to_message_id: { required: false, class: [Fixnum] },
-        reply_markup: { required: false, class: [
-          Telegrammer::DataTypes::ReplyKeyboardMarkup,
-          Telegrammer::DataTypes::ReplyKeyboardHide,
-          Telegrammer::DataTypes::ForceReply,
-        ]}
+        disable_web_page_preview: { required: false, class: [TrueClass, FalseClass] }
       }
 
-      response = api_request("sendMessage", params, params_validation)
-
-      Telegrammer::DataTypes::Message.new(response.result)
+      send_something(:message, params, extra_params_validation)
     end
 
     # Forward message to a user or group chat.
@@ -178,21 +169,12 @@ module Telegrammer
     # @see #send_document
     # @return [Telegrammer::DataTypes::Message] Message object sent to the user or group chat
     def send_photo(params)
-      params_validation = {
-        chat_id: { required: true, class: [Fixnum] },
-        photo: { required: true, class: [File, String] },
-        caption: { required: false, class: [String] },
-        reply_to_message_id: { required: false, class: [String] },
-        reply_markup: { required: false, class: [
-          Telegrammer::DataTypes::ReplyKeyboardMarkup,
-          Telegrammer::DataTypes::ReplyKeyboardHide,
-          Telegrammer::DataTypes::ForceReply,
-        ]}
+      extra_params_validation = {
+        photo: { required: false, class: [File, String] },
+        caption: { required: false, class: [String] }
       }
 
-      response = api_request("sendPhoto", params, params_validation)
-
-      Telegrammer::DataTypes::Message.new(response.result)
+      send_something(:photo, params, extra_params_validation)
     end
 
     # Sends audio file to a user or group chat.
@@ -216,20 +198,11 @@ module Telegrammer
     # @see #send_document
     # @return [Telegrammer::DataTypes::Message] Message object sent to the user or group chat
     def send_audio(params)
-      params_validation = {
-        chat_id: { required: true, class: [Fixnum] },
-        audio: { required: true, class: [File, String] },
-        reply_to_message_id: { required: false, class: [String] },
-        reply_markup: { required: false, class: [
-          Telegrammer::DataTypes::ReplyKeyboardMarkup,
-          Telegrammer::DataTypes::ReplyKeyboardHide,
-          Telegrammer::DataTypes::ForceReply,
-        ]}
+      extra_params_validation = {
+        audio: { required: false, class: [File, String] }
       }
 
-      response = api_request("sendAudio", params, params_validation)
-
-      Telegrammer::DataTypes::Message.new(response.result)
+      send_something(:audio, params, extra_params_validation)
     end
 
     # Sends a document to a user or group chat.
@@ -250,20 +223,11 @@ module Telegrammer
     #
     # @return [Telegrammer::DataTypes::Message] Message object sent to the user or group chat
     def send_document(params)
-      params_validation = {
-        chat_id: { required: true, class: [Fixnum] },
-        document: { required: false, class: [File, String] },
-        reply_to_message_id: { required: false, class: [String] },
-        reply_markup: { required: false, class: [
-          Telegrammer::DataTypes::ReplyKeyboardMarkup,
-          Telegrammer::DataTypes::ReplyKeyboardHide,
-          Telegrammer::DataTypes::ForceReply,
-        ]}
+      extra_params_validation = {
+        document: { required: false, class: [File, String] }
       }
 
-      response = api_request("sendDocument", params, params_validation)
-
-      Telegrammer::DataTypes::Message.new(response.result)
+      send_something(:document, params, extra_params_validation)
     end
 
     # Send WebP images as stickers.
@@ -285,20 +249,11 @@ module Telegrammer
     # @see #send_document
     # @return [Telegrammer::DataTypes::Message] Message object sent to the user or group chat
     def send_sticker(params)
-      params_validation = {
-        chat_id: { required: true, class: [Fixnum] },
-        sticker: { required: true, class: [File, String] },
-        reply_to_message_id: { required: false, class: [String] },
-        reply_markup: { required: false, class: [
-          Telegrammer::DataTypes::ReplyKeyboardMarkup,
-          Telegrammer::DataTypes::ReplyKeyboardHide,
-          Telegrammer::DataTypes::ForceReply,
-        ]}
+      extra_params_validation = {
+        sticker: { required: true, class: [File, String] }
       }
 
-      response = api_request("sendSticker", params, params_validation)
-
-      Telegrammer::DataTypes::Message.new(response.result)
+      send_something(:sticker, params, extra_params_validation)
     end
 
     # Sends a video file to a user or group chat.
@@ -322,20 +277,11 @@ module Telegrammer
     # @see #send_document
     # @return [Telegrammer::DataTypes::Message] Message object sent to the user or group chat
     def send_video(params)
-      params_validation = {
-        chat_id: { required: true, class: [Fixnum] },
-        video: { required: true, class: [File, String] },
-        reply_to_message_id: { required: false, class: [String] },
-        reply_markup: { required: false, class: [
-          Telegrammer::DataTypes::ReplyKeyboardMarkup,
-          Telegrammer::DataTypes::ReplyKeyboardHide,
-          Telegrammer::DataTypes::ForceReply,
-        ]}
+      extra_params_validation = {
+        video: { required: true, class: [File, String] }
       }
 
-      response = api_request("sendVideo", params, params_validation)
-
-      Telegrammer::DataTypes::Message.new(response.result)
+      send_something(:video, params, extra_params_validation)
     end
 
     # Sends point on the map to a user or group chat.
@@ -356,21 +302,12 @@ module Telegrammer
     #
     # @return [Telegrammer::DataTypes::Message] Message object sent to the user or group chat
     def send_location(params)
-      params_validation = {
-        chat_id: { required: true, class: [Fixnum] },
+      extra_params_validation = {
         latitude: { required: true, class: [Float] },
-        longitude: { required: true, class: [Float] },
-        reply_to_message_id: { required: false, class: [String] },
-        reply_markup: { required: false, class: [
-          Telegrammer::DataTypes::ReplyKeyboardMarkup,
-          Telegrammer::DataTypes::ReplyKeyboardHide,
-          Telegrammer::DataTypes::ForceReply,
-        ]}
+        longitude: { required: true, class: [Float] }
       }
 
-      response = api_request("sendLocation", params, params_validation)
-
-      Telegrammer::DataTypes::Message.new(response.result)
+      send_something(:location, params, extra_params_validation)
     end
 
     # Sends a status action to a user or group chat.
@@ -470,5 +407,21 @@ module Telegrammer
 
       ApiResponse.new(response)
     end
+
+    def send_something(object_kind, params, extra_params_validation = {})
+      params_validation = {
+        chat_id: { required: true, class: [Fixnum] },
+        reply_to_message_id: { required: false, class: [String] },
+        reply_markup: { required: false, class: [
+          Telegrammer::DataTypes::ReplyKeyboardMarkup,
+          Telegrammer::DataTypes::ReplyKeyboardHide,
+          Telegrammer::DataTypes::ForceReply,
+        ]}
+      }
+
+      response = api_request("send#{object_kind.to_s.capitalize}", params, extra_params_validation.merge(params_validation))
+
+      Telegrammer::DataTypes::Message.new(response.result)
+    end
   end
 end

data/lib/telegrammer/version.rb

@@ -1,3 +1,3 @@
 module Telegrammer
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegrammer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Luis Mayoral
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus