viberroo 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664a309e7aaa7c6aef70d20e94145949bb6c4ff6753f15910440bae46b2549a4
-  data.tar.gz: 33a67d36213f503ba8bfc425dfbd1f69bc824fb7d2a01ad4d5e5e535727fe710
+  metadata.gz: 6e99b6a05f07fc41a2ae9952fe3d5088b34f55ce541f5624c9257713e29ec0c4
+  data.tar.gz: 432960ff25d67e609e5357b76a4b63c33115aef892016b964847ee6fa980be5c
 SHA512:
-  metadata.gz: 134a5e4b9ed4d2b8fdd057874c8c4238803245173542b936582604c8ec1dfd5bff3251ff694d1a7dc75272129dd9b1ef2e558d517939aac2c2bd2b3a8eb86770
-  data.tar.gz: bebeab8ecf509af9b3d26a5e708fd22c03783ea887a7d95bca1c258ccab9fdb1dfa43766569e9423f93d7731e383436b88aa771363eeb4c5c45d5583ca2be410
+  metadata.gz: 4f800f461911f603c1a95ca30cfbe5ec0b33b9c1c02df3e681c462a2c1307fd7014074bd95f9478f2ee44c6c061a13c6ecba6533eee35c8d5d074c612425c076
+  data.tar.gz: 78ea9bf73786aa9d36b1c43606b7df8363575237813f4e954bb980a7e3d188602f6db088eab3d05c1a48f3708d2588e2d110d55a42fae18f348efbcaca55649c

data/lib/viberroo.rb

@@ -3,7 +3,6 @@ require 'faraday'
 require 'viberroo/message'
 require 'viberroo/bot'
 require 'viberroo/input'
-require 'viberroo/response'
 require 'viberroo/callback'
 require 'viberroo/bot'
 

data/lib/viberroo/bot.rb

@@ -1,9 +1,7 @@
-require 'byebug'
 module Viberroo
   class Bot
-    def initialize(token:, callback: {}, response: {})
+    def initialize(token:, callback: nil)
       @headers = { 'X-Viber-Auth-Token': token, 'Content-Type': 'application/json' }
-      @response = response
       @callback = callback
     end
 
@@ -28,14 +26,8 @@ module Viberroo
     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))
+              { receiver: @callback&.user_id }.merge(message).merge(keyboard))
     end
 
     def send!(message:, keyboard: {})

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: viberroo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Viktor Habchak
@@ -46,9 +46,9 @@ extra_rdoc_files: []
 files:
 - lib/viberroo.rb
 - lib/viberroo/bot.rb
+- lib/viberroo/callback.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,9 +60,9 @@ 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:
   - - ">="

data/lib/viberroo/response.rb

@@ -1,29 +0,0 @@
-require 'recursive-open-struct'
-
-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
-      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