viberroo 0.0.7 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffd5dd8c29342acd993ed001e8957b006e7e74e82ee7f64f887b9fe7dd4cb42c
-  data.tar.gz: f1febbae3bf056dd257c726f794f1124efc3f20ac41014dbddb95ade90408d54
+  metadata.gz: 664a309e7aaa7c6aef70d20e94145949bb6c4ff6753f15910440bae46b2549a4
+  data.tar.gz: 33a67d36213f503ba8bfc425dfbd1f69bc824fb7d2a01ad4d5e5e535727fe710
 SHA512:
-  metadata.gz: 1e9ffcebd82b968bb287484553170dbce430b036c9580fedec698540ab63738bb1c5b187d46765c5f5e96ab1b39151efaffcdb4625050157c9d429f1085944ab
-  data.tar.gz: cc2ca4deb311c1cce8b294f4fdcb3be3c4e67b2ce3a7818ca2afb6b9847764d51a8c7df6c3b5c3c6915a31712f884cd44a5326488c8c1faeef2d03f2a3b757da
+  metadata.gz: 134a5e4b9ed4d2b8fdd057874c8c4238803245173542b936582604c8ec1dfd5bff3251ff694d1a7dc75272129dd9b1ef2e558d517939aac2c2bd2b3a8eb86770
+  data.tar.gz: bebeab8ecf509af9b3d26a5e708fd22c03783ea887a7d95bca1c258ccab9fdb1dfa43766569e9423f93d7731e383436b88aa771363eeb4c5c45d5583ca2be410

data/lib/viberroo.rb

@@ -4,8 +4,17 @@ require 'viberroo/message'
 require 'viberroo/bot'
 require 'viberroo/input'
 require 'viberroo/response'
+require 'viberroo/callback'
 require 'viberroo/bot'
 
 module Viberroo
-  API_URL = 'https://chatapi.viber.com/pa'.freeze
+  module URL
+    API               = 'https://chatapi.viber.com/pa'.freeze
+    WEBHOOK           = "#{API}/set_webhook".freeze
+    MESSAGE           = "#{API}/send_message".freeze
+    BROADCAST_MESSAGE = "#{API}/broadcast_message".freeze
+    GET_ACCOUNT_INFO  = "#{API}/get_account_info".freeze
+    GET_USER_DETAILS  = "#{API}/get_user_details".freeze
+    GET_ONLINE        = "#{API}/get_online".freeze
+  end
 end

data/lib/viberroo/bot.rb

@@ -1,16 +1,91 @@
+require 'byebug'
 module Viberroo
   class Bot
-    include Message
-
-    def initialize(token:, response: {})
-      @webhook_url = "#{API_URL}/set_webhook"
-      @message_url = "#{API_URL}/send_message"
+    def initialize(token:, callback: {}, response: {})
       @headers = { 'X-Viber-Auth-Token': token, 'Content-Type': 'application/json' }
       @response = response
+      @callback = callback
+    end
+
+    def set_webhook(url:, event_types: nil, send_name: nil, send_photo: nil)
+      request(URL::WEBHOOK, url: url, event_types: event_types,
+              send_name: send_name,
+              send_photo: send_photo)
+    end
+
+    def set_webhook!(url:, event_types: nil, send_name: nil, send_photo: nil)
+      parse set_webhook(url: url, event_types: event_types,
+                        send_name: send_name,
+                        send_photo: send_photo)
+    end
+
+    def remove_webhook
+      request(URL::WEBHOOK, url: '')
+    end
+
+    def remove_webhook!
+      parse remove_webhook
+    end
+
+    def send(message:, keyboard: {})
+      if @callback.is_a?(Callback)
+        receiver = @callback.user_id
+      elsif @response.is_a?(RecursiveOpenStruct)
+        receiver = @response.user_id
+      end
+
+      request(URL::MESSAGE,
+              { receiver: receiver }.merge(message).merge(keyboard))
+    end
+
+    def send!(message:, keyboard: {})
+      parse self.send(message: message, keyboard: keyboard)
+    end
+
+    def broadcast(message:, to:)
+      request(URL::BROADCAST_MESSAGE, message.merge(broadcast_list: to))
+    end
+
+    def broadcast!(message:, to:)
+      parse broadcast(message: message, to: to)
+    end
+
+    def get_account_info
+      request(URL::GET_ACCOUNT_INFO)
+    end
+
+    def get_account_info!
+      parse get_account_info
+    end
+
+    def get_user_details(id:)
+      request(URL::GET_USER_DETAILS, id: id)
+    end
+
+    def get_user_details!(id:)
+      parse get_user_details(id: id)
+    end
+
+    def get_online(ids:)
+      request(URL::GET_ONLINE, ids: ids)
+    end
+
+    def get_online!(ids:)
+      parse get_online(ids: ids)
+    end
+
+    private
+
+    def request(url, params = {})
+      Faraday.post(url, compact(params).to_json, @headers)
+    end
+
+    def parse(request)
+      JSON.parse(request.body)
     end
 
-    def set_webhook(params)
-      Faraday.post(@webhook_url, params.to_json, @headers)
+    def compact(params)
+      params.delete_if { |_, v| v.nil? }
     end
   end
 end

data/lib/viberroo/input.rb

@@ -1,33 +1,31 @@
 module Viberroo
-  module Input
-    class Button
-      def self.reply(params = {})
-        { ActionType: 'reply' }.merge(params)
-      end
+  class Input
+    def self.keyboard(params)
+      { keyboard: { Type: 'keyboard' }.merge(params) }
+    end
 
-      def self.url(params = {})
-        { ActionType: 'open-url' }.merge(params)
-      end
+    def self.reply_button(params)
+      { ActionType: 'reply' }.merge(params)
+    end
 
-      def self.location_picker(params = {})
-        { ActionType: 'location-picker',
-          min_api_version: 3
-        }.merge(params)
-      end
+    def self.url_button(params)
+      { ActionType: 'open-url' }.merge(params)
+    end
 
-      def self.share_phone(params = {})
-        { ActionType: 'share-phone',
-          min_api_version: 3
-        }.merge(params)
-      end
+    def self.location_picker_button(params)
+      { ActionType: 'location-picker',
+        min_api_version: 3
+      }.merge(params)
+    end
 
-      def self.none(params = {})
-        { ActionType: 'none' }.merge(params)
-      end
+    def self.share_phone_button(params)
+      { ActionType: 'share-phone',
+        min_api_version: 3
+      }.merge(params)
     end
 
-    def keyboard(params = {})
-      { Type: 'keyboard' }.merge(params)
+    def self.none_button(params = {})
+      { ActionType: 'none' }.merge(params)
     end
   end
 end

data/lib/viberroo/message.rb

@@ -1,65 +1,39 @@
 module Viberroo
-  module Message
-    # TODO: add list of params that is mandatory for particular message type,
-    # throw exceptions and log errors if not found
-
-    # required params = text
-    def send_message(params = {})
-      dispatch({ type: :text }.merge(params))
-    end
-
-    def send_rich_media(params = {})
-      dispatch({ type: :rich_media, min_api_version: 2 }.merge(params))
+  class Message
+    def self.plain(params)
+      { type: :text }.merge(params)
     end
 
-    # required params = location.lat, location.lon
-    def send_location(params = {})
-      dispatch({ type: :location, min_api_version: 3 }.merge(params))
+    def self.rich(params)
+      { type: :rich_media, min_api_version: 2 }.merge(params)
     end
 
-    # required params = text, media
-    def send_picture(params = {})
-      dispatch({ type: :picture }.merge(params))
+    def self.location(params)
+      { type: :location }.merge(params)
     end
 
-    # required params = text, media
-    def send_video(params = {})
-      dispatch({ type: :video }.merge(params))
+    def self.picture(params = {})
+      { type: :picture, text: '' }.merge(params)
     end
 
-    # required params = media, size, file_name
-    def send_file(params = {})
-      dispatch({ type: :file }.merge(params))
+    def self.video(params = {})
+      { type: :video }.merge(params)
     end
 
-    # required params = contact, contact.name, contact.phone_number
-    def send_contact(params = {})
-      dispatch({ type: :contact }.merge(params))
+    def self.file(params = {})
+      { type: :file }.merge(params)
     end
 
-    # required params = media
-    def send_url(params = {})
-      dispatch({ type: :url }.merge(params))
+    def self.contact(params = {})
+      { type: :contact }.merge(params)
     end
 
-    # required params = sticker_id
-    # https://viber.github.io/docs/tools/sticker-ids/
-    def send_sticker(params = {})
-      dispatch({ type: :sticker }.merge(params))
-    end
-
-    private
-
-    def dispatch(params)
-      Faraday.post(
-        @message_url,
-        normalize({ receiver: @response.user_id }.merge(params)),
-        @headers
-      )
+    def self.url(params = {})
+      { type: :url }.merge(params)
     end
 
-    def normalize(params)
-      params.delete_if { |_, v| v.nil? }.to_json
+    def self.sticker(params = {})
+      { type: :sticker }.merge(params)
     end
   end
 end

data/lib/viberroo/response.rb

@@ -4,6 +4,7 @@ module Viberroo
   class Response
     class << self
       def init(params)
+        warn 'WARNING: Response.init is deprecated and will be gone in next minor release. Use Callback.new as a replacement.'
         @@os = RecursiveOpenStruct.new params.to_h
         @@os.user_id = user_id
         @@os
@@ -19,6 +20,8 @@ module Viberroo
           @@os.user_id
         when 'message'
           @@os.sender.id
+        else
+          @@os.dig(:user, :id)
         end
       end
     end

data/lib/viberroo/version.rb

@@ -1,3 +1,3 @@
 module Viberroo
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: viberroo
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.2
 platform: ruby
 authors:
 - Viktor Habchak
@@ -69,8 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Thin Viber REST API wrapper for Ruby.
+summary: Viber bot for Ruby.
 test_files: []