telbe 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 815ab89f78ce78539b82a13b665694521330064655a963a96d3b7818c4d7831b
-  data.tar.gz: ffd119196e75361014e5ae52304a35626ccce170ccd4d6e9b8e0d6ca390bfbad
+  metadata.gz: c710a1a3419afc4a5068d6b2cdc3291451e7c7e62c309384c8d31021df3c6d74
+  data.tar.gz: 88e578bfccddbf24fab533e920b690945d0ac8a5c6ba5a3d34d42a846846383d
 SHA512:
-  metadata.gz: 60ee12ad31f8d363d441eb8aa74c36b4de8eeda9bbf2395f5424ad5ea154006aa94dc6b71f6cdec020afb0b3d0779eb299c98c4d50d468ed47c02bced49fd225
-  data.tar.gz: ed4df911617b94eeda88aba20c28e358f1262bfa67d1961ebca9ca39d3b0f3d40995a13d17caa4324bbf489a89976424f1f8e7066e00c7aa7fea5d84b2cfd795
+  metadata.gz: bc9b91a5a112548d353bfd80b59e546979f6b98c1d34f429637c2cbec988b1cac72f6742bf04b696985a38da9bb24d271f101cd6bb636b2de99266e3be89b414
+  data.tar.gz: 6a0e69ac415e379108b3b880fddbd80c027387345704a471a5fcc0fcad74c5d848a0f9afa5c9e2db74c810aafaddcd385f00a81f5e3cfaa3c7b41cae9085ecf2

data/lib/telbe/bot.rb

@@ -9,13 +9,16 @@ module Telbe
     end
 
     def request(action, query = {})
+      puts "### Telbe::Bot.request #{action} - #{query.to_h}"
       path = "/bot#{@token}/#{action}"
       response = @connection.post(path: path, query: query.to_h)
       if response.status == 200
+        puts "### Telbe::Bot.request --- Success"
         body = response.body
         data = JSON.parse(body)
         data["result"]
       else
+        puts "### Telbe::Bot.request --- Error"
         raise ResponseError, response.body
       end
     end
@@ -51,8 +54,42 @@ module Telbe
     include InitializeFromHash
   end
 
+  # chat_id 	Integer or String 	Yes 	Unique identifier for the target chat or username of the target channel (in the format @channelusername)
+  # text 	String 	Yes 	Text of the message to be sent
+  # parse_mode 	String 	Optional 	Send Markdown or HTML, if you want Telegram apps to show bold, italic, fixed-width text or inline URLs in your bot's message.
+  # disable_web_page_preview 	Boolean 	Optional 	Disables link previews for links in this message
+  # disable_notification 	Boolean 	Optional 	Sends the message silently. Users will receive a notification with no sound.
+  # reply_to_message_id 	Integer 	Optional 	If the message is a reply, ID of the original message
+  # reply_markup 	InlineKeyboardMarkup or ReplyKeyboardMarkup or ReplyKeyboardRemove or ForceReply 	Optional 	Additional interface options. A JSON-serialized object for an inline keyboard, custom reply keyboard, instructions to remove reply keyboard or to force a reply from the user.
   class MessageDescriptor
     include InitializeFromHash
+    def self.factory
+      new(
+        chat_id: nil,
+        text: "",
+        parse_mode: "", # Markdown or HTML
+        disable_web_page_preview: false,
+        disable_notification: false,
+        reply_to_message_id: nil,
+        reply_markup: nil
+      )
+    end
+
+    def initialize(opts)
+      raise ArgumentError, 'Invalid parse_mode' unless valid_parse_mode? opts[:parse_mode]
+      super opts
+    end
+
+    def parse_mode= (value)
+      value ||= "" # cast nil to the empty string
+      raise ArgumentError, 'Invalid parse_mode' unless valid_parse_mode? value
+      @parse_mode = value
+    end
+
+    private
+    def valid_parse_mode? (value)
+      value =~ /(^Markdown$)|(^HTML$)|(^$)/ # 0 = true
+    end
   end
 
   class ChatPhoto

data/lib/telbe/helper.rb

@@ -16,7 +16,7 @@ module Telbe
             v.collect! { |i| Telbe::const_get(k.to_s.camelize).new(i) }
           end
         end
-        instance_variable_set("@#{k}", v)
+        create_and_set_instance_variable("#{k}", v)
       end
     end
 
@@ -34,13 +34,33 @@ module Telbe
       h
     end
 
-    def method_missing(m, *args, &block)
-      case m
+    def to_json
+      self.to_h.to_json
+    end
+    
+    def method_missing(method_name, *args, &block)
+      case method_name
+      when /(.*)\=$/
+        create_and_set_instance_variable("#{$1}", args[0])
+      else
+        super(method_name, args, block)
+      end
+    end
+
+    def respond_to_missing?(method_name, *args)
+      case method_name
       when /(.*)\=$/
-        instance_variable_set("@#{$1}", args[0])
+        true # always respond to assignment methods
       else
-        instance_variable_get("@#{m}")
+        super(method_name, args)
       end
     end
+
+    private
+    def create_and_set_instance_variable(name, value)
+      instance_variable_set("@#{name}", value)
+      define_singleton_method("#{name}=") { |arg| instance_variable_set("@#{name}", arg) }
+      define_singleton_method("#{name}") { instance_variable_get("@#{name}") }
+    end
   end
 end

data/lib/telbe/keyboard.rb

@@ -1,14 +1,36 @@
 module Telbe
+  # text 	String 	Text of the button. If none of the optional fields are used, it will be sent as a message when the button is pressed
+  # request_contact 	Boolean 	Optional. If True, the user's phone number will be sent as a contact when the button is pressed. Available in private chats only
+  # request_location 	Boolean 	Optional. If True, the user's current location will be sent when the button is pressed. Available in private chats only
   class KeyboardButton
     include InitializeFromHash
+    def self.factory
+      self.new(
+        text: "",
+        request_contact: false,
+        request_location: false
+      )
+    end
   end
 
   class ReplyKeyboardRemove
     include InitializeFromHash
   end
 
+  # keyboard 	Array of Array of KeyboardButton 	Array of button rows, each represented by an Array of KeyboardButton objects
+  # resize_keyboard 	Boolean 	Optional. Requests clients to resize the keyboard vertically for optimal fit (e.g., make the keyboard smaller if there are just two rows of buttons). Defaults to false, in which case the custom keyboard is always of the same height as the app's standard keyboard.
+  # one_time_keyboard 	Boolean 	Optional. Requests clients to hide the keyboard as soon as it's been used. The keyboard will still be available, but clients will automatically display the usual letter-keyboard in the chat – the user can press a special button in the input field to see the custom keyboard again. Defaults to false.
+  # selective 	Boolean 	Optional. Use this parameter if you want to show the keyboard to specific users only. Targets: 1) users that are @mentioned in the text of the Message object; 2) if the bot's message is a reply (has reply_to_message_id), sender of the original message.
   class ReplyKeyboardMarkup
     include InitializeFromHash
+    def self.factory
+      self.new(
+        keyboard: [[]],
+        resize_keyboard: true,
+        one_time_keyboard: true,
+        selective: false
+      )
+    end
   end
 
   class InlineKeyboardMarkup

data/lib/telbe/location.rb

@@ -1,4 +1,53 @@
 module Telbe
+  class Bot
+    def send_location(send_location_descriptor)
+      Message.new(request(:sendLocation, send_location_descriptor))
+    end
+  end
+  # chat_id 	Integer or String 	Yes 	Unique identifier for the target chat or username of the target channel (in the format @channelusername)
+  # latitude 	Float number 	Yes 	Latitude of the location
+  # longitude 	Float number 	Yes 	Longitude of the location
+  # live_period 	Integer 	Optional 	Period in seconds for which the location will be updated (see Live Locations, should be between 60 and 86400.
+  # disable_notification 	Boolean 	Optional 	Sends the message silently. Users will receive a notification with no sound.
+  # reply_to_message_id 	Integer 	Optional 	If the message is a reply, ID of the original message
+  # reply_markup 	InlineKeyboardMarkup or ReplyKeyboardMarkup or ReplyKeyboardRemove or ForceReply
+  class SendLocationDescriptor
+    include InitializeFromHash
+
+    def self.factory
+      new(
+        chat_id: nil,
+        latitude: nil,
+        longitude: nil,
+        liveperiod: 60,
+        disable_notification: true,
+        reply_to_message_id: nil,
+        reply_markup: nil
+      )
+    end
+  end
+
+  # chat_id 	Integer or String 	Optional 	Required if inline_message_id is not specified. Unique identifier for the target chat or username of the target channel (in the format @channelusername)
+  # message_id 	Integer 	Optional 	Required if inline_message_id is not specified. Identifier of the message to edit
+  # inline_message_id 	String 	Optional 	Required if chat_id and message_id are not specified. Identifier of the inline message
+  # latitude 	Float number 	Yes 	Latitude of new location
+  # longitude 	Float number 	Yes 	Longitude of new location
+  # reply_markup 	InlineKeyboardMarkup 	Optional 	A JSON-serialized object for a new inline keyboard.
+  class EditMessageLiveLocationDescriptor
+    include InitializeFromHash
+
+    def self.factory
+      new(
+        chat_id: nil,
+        message_id: nil,
+        inline_message_id: nil,
+        latitude: nil,
+        longitude: nil,
+        reply_markup:nil
+      )
+    end
+  end
+  
   class Location
     include InitializeFromHash
   end

data/lib/telbe/poll.rb

@@ -1,5 +1,28 @@
 module Telbe
   class Bot
+    def send_poll(poll_descriptor)
+      Message.new(request(:sendPoll, poll_descriptor))
+    end
+  end
+
+  # chat_id 	Integer or String 	Yes 	Unique identifier for the target chat or username of the target channel (in the format @channelusername). A native poll can't be sent to a private chat.
+  # question 	String 	Yes 	Poll question, 1-255 characters
+  # options 	Array of String 	Yes 	List of answer options, 2-10 strings 1-100 characters each
+  # disable_notification 	Boolean 	Optional 	Sends the message silently. Users will receive a notification with no sound.
+  # reply_to_message_id 	Integer 	Optional 	If the message is a reply, ID of the original message
+  # reply_markup 	InlineKeyboardMarkup or ReplyKeyboardMarkup or ReplyKeyboardRemove or ForceReply 	Optional 	Additional interface options. A JSON-serialized object for an inline keyboard, custom reply keyboard, instructions to remove reply keyboard or to force a reply from the user.
+  class PollDescriptor
+    include InitializeFromHash
+    def self.factory
+      self.new(
+        chat_id: nil,
+        question: nil,
+        options: [],
+        disable_notification: false,
+        reply_to_message_id: nil,
+        reply_markup: nil
+      )
+    end
   end
 
   class PollOption

data/lib/telbe/version.rb

@@ -1,3 +1,3 @@
 module Telbe
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telbe
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Rodrigo Garcia Couto