viberroo 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c30b02222199f1c17401145ec5684fe268cfe927466075d599c6b92740a5fd27
-  data.tar.gz: c929a33404dda4194f6d6b4cf4d05e8f9d70c8069c6ba5e56ff7ddf7b01a8249
+  metadata.gz: f382a40dcde3858d3fec54b00754e6d5fac1f8b103b4fad83cc0b8794809f584
+  data.tar.gz: 43aa2d14d95200e451dbf9c4b601555266f4651a5390475525aff951fd7a78f3
 SHA512:
-  metadata.gz: d9d732ef550ec85681e0f3b22ba408d3c531bba37c518d862dff6c8abc82c973e55e84d0dc2844cadfc5223186ef9bb0b018ced6b6ddf65c54c8cafb94922f90
-  data.tar.gz: 49cdbc99c87e1178c7e020d4ba9c755a5401fbd798d244b9bf2649eae4d5867fa353c621285b3e7f1f17886cf54095474b3c77d5b1f11d377af5bd7bedbee376
+  metadata.gz: 52ca07c022c33dbbddde9cba3ae26d1ca0daa9ee530611e6ebdf3b392caef9a3ab94aa63e2b805a33295a3311443907524abd32b81bf278a755e9509c6d8d95c
+  data.tar.gz: f799269c2b83b105167a59503bd711a27774bfdc0e2aab0bec8e1dc274fe5f3ca9bd5dbd67461d47139752318083485d56e9080bfdbd89493a289dafad2abd7d

data/lib/viberroo.rb

@@ -1,10 +1,11 @@
 require 'json'
 require 'faraday'
+require 'viberroo/configuration'
 require 'viberroo/message'
-require 'viberroo/bot'
 require 'viberroo/input'
-require 'viberroo/response'
+require 'viberroo/callback'
 require 'viberroo/bot'
+require 'logger'
 
 module Viberroo
   module URL

data/lib/viberroo/bot.rb

@@ -1,55 +1,95 @@
 module Viberroo
   class Bot
-    def initialize(token:, response: {})
-      @headers = { 'X-Viber-Auth-Token': token, 'Content-Type': 'application/json' }
-      @response = response
+    def initialize(token: nil, callback: nil)
+      Viberroo.configure
+
+      @headers = {
+        'X-Viber-Auth-Token': token || Viberroo.config.auth_token,
+        'Content-Type': 'application/json'
+      }
+      @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
-      )
+      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: {})
-      request(
-        URL::MESSAGE,
-        { receiver: @response.user_id }.merge(message).merge(keyboard)
-      )
+      request(URL::MESSAGE,
+              { receiver: @callback&.user_id }.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)
+      response = Faraday.post(url, compact(params).to_json, @headers)
+
+      Viberroo.config.logger&.info("##{caller_name} -- #{response.body}")
+
+      Viberroo.config.parse_response_body ? JSON.parse(response.body) : response
+    end
+
+    def parse(request)
+      warn 'DEPRECATION WARNING: Viberroo::Bot bang methods will be dropped on next minor release. Use Viberroo.config.parse_response_body.'
+      JSON.parse(request.body)
     end
 
     def compact(params)
       params.delete_if { |_, v| v.nil? }
     end
+
+    def caller_name
+      caller[1][/`.*'/][1..-2]
+    end
   end
 end

data/lib/viberroo/callback.rb

@@ -0,0 +1,24 @@
+require 'recursive-open-struct'
+
+module Viberroo
+  class Callback
+    attr_reader :params
+
+    def initialize(params)
+      @params = RecursiveOpenStruct.new params.to_h
+    end
+
+    def user_id
+      case @params.event
+      when 'conversation_started', 'subscribed'
+        @params.user.id
+      when 'unsubscribed', 'delivered', 'seen', 'failed'
+        @params.user_id
+      when 'message'
+        @params.sender.id
+      else
+        @params.dig(:user, :id)
+      end
+    end
+  end
+end

data/lib/viberroo/configuration.rb

@@ -0,0 +1,25 @@
+module Viberroo
+  class << self
+    attr_accessor :config
+  end
+
+  def self.configure
+    self.config ||= Configuration.new
+    yield(config) if block_given?
+  end
+
+  class Configuration
+    attr_accessor :logger, :auth_token, :parse_response_body
+
+    def initialize
+      @auth_token = nil
+
+      @logger = Logger.new(STDOUT)
+      @logger.formatter = proc do |severity, datetime, _, msg|
+        "[#{datetime}] #{severity} Viberroo::Bot #{msg}\n"
+      end
+
+      @parse_response_body = true
+    end
+  end
+end

data/lib/viberroo/version.rb

@@ -1,3 +1,3 @@
 module Viberroo
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: viberroo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Viktor Habchak
@@ -46,9 +46,10 @@ extra_rdoc_files: []
 files:
 - lib/viberroo.rb
 - lib/viberroo/bot.rb
+- lib/viberroo/callback.rb
+- lib/viberroo/configuration.rb
 - lib/viberroo/input.rb
 - lib/viberroo/message.rb
-- lib/viberroo/response.rb
 - lib/viberroo/version.rb
 homepage: https://github.com/vikdotdev/viberroo
 licenses:
@@ -60,16 +61,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Viber bot for Ruby.

data/lib/viberroo/response.rb

@@ -1,28 +0,0 @@
-require 'recursive-open-struct'
-
-module Viberroo
-  class Response
-    class << self
-      def init(params)
-        @@os = RecursiveOpenStruct.new params.to_h
-        @@os.user_id = user_id
-        @@os
-      end
-
-      private
-
-      def user_id
-        case @@os.event
-        when 'conversation_started', 'subscribed'
-          @@os.user.id
-        when 'unsubscribed', 'delivered', 'seen', 'failed'
-          @@os.user_id
-        when 'message'
-          @@os.sender.id
-        else
-          @@os.dig(:user, :id)
-        end
-      end
-    end
-  end
-end