stealth-twilio 0.10.0 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd0a1632b69f594f142ba3e96e9aeb23264c228568fbd05f2fe2fc8dcd63c84b
-  data.tar.gz: 6649cc6183d02e8779531017b7b75fafa379b536d23803ab52827009b1e1aa0f
+  metadata.gz: a333f36afd40400ce4b58e79eaa443c6720eb36f1602117b7a1522ff759ee0dd
+  data.tar.gz: 7073c50991bfad7b01f2b34db11775ee6467a2e972c666c54d5c610098ab73b7
 SHA512:
-  metadata.gz: 0f4b9160892af2a14844b6188dd30ccaca85937883f90cbab7364d51a483f66efe0868b59cac04062ec064080f490585bfcc742d33f5e0ce78e6e684c3915b10
-  data.tar.gz: 8f1c1784e6475319212d33d06e11c64b79263cf300acd1c0502f50cce37e1ab94e84a7bff965ea560677d6b314fcdbd08bfcd67ab82a3f93c3098da95f945e1f
+  metadata.gz: a334abb9b111e210f3e490b1c46e6a10c34b6c9493045c2ff6eaf75f30d7d1dfdc7bcf0e75b6ec60cf68e68d7ae20fff7be1280aad6990a33b5d3e7b4e3b656f
+  data.tar.gz: 7ce2a6e9e5a88054da0ce77a805f66784eb49efbd5f133c4eff28e416e5075df250be094724aa1af72e629d655e4101a44ef2788eb4409621652003c13ed9944

data/Gemfile

@@ -1,2 +1,5 @@
 source 'https://rubygems.org'
+
+gem 'stealth', '>= 2.0.0.beta'
+
 gemspec

data/Gemfile.lock

@@ -1,121 +1,86 @@
 PATH
   remote: .
   specs:
-    stealth-twilio (0.9.5)
-      stealth (< 2.0)
+    stealth-twilio (1.3.3)
+      stealth (>= 2.0.0.beta)
       twilio-ruby (~> 5.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
-      arel (>= 9.0)
-    activesupport (5.2.1)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    connection_pool (2.2.2)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    erubi (1.7.1)
-    faraday (0.15.3)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    concurrent-ruby (1.1.7)
+    connection_pool (2.2.3)
+    diff-lcs (1.4.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    i18n (1.1.1)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jwt (2.1.0)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (0.9.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
-    mustermann (1.0.3)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    puma (3.12.0)
-    rack (2.0.6)
-    rack-protection (2.0.4)
+    jwt (2.2.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    puma (4.3.6)
+      nio4r (~> 2.0)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.1)
-      actionpack (= 5.2.1)
-      activesupport (= 5.2.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (12.3.1)
-    redis (4.0.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    redis (4.2.2)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    sidekiq (5.2.2)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    sinatra (2.0.4)
-      mustermann (~> 1.0)
+    ruby2_keywords (0.0.2)
+    sidekiq (6.1.2)
+      connection_pool (>= 2.2.2)
       rack (~> 2.0)
-      rack-protection (= 2.0.4)
+      redis (>= 4.2.0)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    stealth (1.0.4)
-      activerecord (~> 5.2)
-      activesupport (~> 5.2)
+    stealth (2.0.0.beta1)
+      activesupport (~> 6.0)
       multi_json (~> 1.12)
-      puma (~> 3.10)
-      railties (~> 5.2)
-      sidekiq (~> 5.0)
+      puma (>= 4.2, < 5.0)
+      sidekiq (~> 6.0)
       sinatra (~> 2.0)
-      thor (~> 0.20)
-    thor (0.20.0)
+      thor (~> 1.0)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tilt (2.0.8)
-    twilio-ruby (5.15.2)
-      faraday (~> 0.9)
+    tilt (2.0.10)
+    twilio-ruby (5.40.2)
+      faraday (>= 0.9, < 2.0)
       jwt (>= 1.5, <= 2.5)
       nokogiri (>= 1.6, < 2.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -124,7 +89,8 @@ DEPENDENCIES
   rack-test (~> 1.1)
   rspec (~> 3.6)
   rspec_junit_formatter (~> 0.3)
+  stealth (>= 2.0.0.beta)
   stealth-twilio!
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

data/VERSION

@@ -1 +1 @@
-0.10.0
+1.3.3

data/lib/stealth/services/twilio/client.rb

@@ -10,7 +10,6 @@ require 'stealth/services/twilio/setup'
 module Stealth
   module Services
     module Twilio
-
       class Client < Stealth::Services::BaseClient
 
         attr_reader :twilio_client, :reply
@@ -18,20 +17,52 @@ module Stealth
         def initialize(reply:)
           @reply = reply
           account_sid = Stealth.config.twilio.account_sid
+          api_key = Stealth.config.twilio.api_key
           auth_token = Stealth.config.twilio.auth_token
-          @twilio_client = ::Twilio::REST::Client.new(account_sid, auth_token)
+
+          if api_key.present?
+            @twilio_client = ::Twilio::REST::Client.new(
+              api_key, auth_token, account_sid
+            )
+          else
+            @twilio_client = ::Twilio::REST::Client.new(account_sid, auth_token)
+          end
         end
 
         def transmit
           # Don't transmit anything for delays
           return true if reply.blank?
 
-          response = twilio_client.messages.create(reply)
-          Stealth::Logger.l(topic: "twilio", message: "Transmitting. Response: #{response.status}: #{response.error_message}")
+          begin
+            response = twilio_client.messages.create(reply)
+          rescue ::Twilio::REST::RestError => e
+            case e.message
+            when /21610/ # Attempt to send to unsubscribed recipient
+              raise Stealth::Errors::UserOptOut
+            when /21612/ # 'To' phone number is not currently reachable via SMS
+              raise Stealth::Errors::UserOptOut
+            when /21614/ # 'To' number is not a valid mobile number
+              raise Stealth::Errors::UserOptOut
+            when /30004/ # Message blocked
+              raise Stealth::Errors::UserOptOut
+            when /21211/ # Invalid 'To' Phone Number
+              raise Stealth::Errors::InvalidSessionID
+            when /30003/ # Unreachable destination handset
+              raise Stealth::Errors::InvalidSessionID
+            when /30005/ # Unknown destination handset
+              raise Stealth::Errors::InvalidSessionID
+            else
+              raise
+            end
+          end
+
+          Stealth::Logger.l(
+            topic: "twilio",
+            message: "Transmitting. Response: #{response.status}: #{response.error_message}"
+          )
         end
 
       end
-
     end
   end
 end

data/lib/stealth/services/twilio/message_handler.rb

@@ -4,9 +4,7 @@
 module Stealth
   module Services
     module Twilio
-
       class MessageHandler < Stealth::Services::BaseMessageHandler
-
         attr_reader :service_message, :params, :headers
 
         def initialize(params:, headers:)
@@ -15,7 +13,11 @@ module Stealth
         end
 
         def coordinate
-          Stealth::Services::HandleMessageJob.perform_async('twilio', params, {})
+          Stealth::Services::HandleMessageJob.perform_async(
+            'twilio',
+            params,
+            headers
+          )
 
           # Relay our acceptance
           [204, 'No Content']
@@ -24,23 +26,17 @@ module Stealth
         def process
           @service_message = ServiceMessage.new(service: 'twilio')
           service_message.sender_id = params['From']
+          service_message.target_id = params['To']
           service_message.message = params['Body']
 
           # Check for media attachments
-          attachment_count = 0
-          begin
-            attachment_count = Integer(params['NumMedia'])
-          rescue ArgumentError
-
-          end
+          attachment_count = params['NumMedia'].to_i
 
-          if attachment_count > 0
-            for i in (0..attachment_count) do
-              service_message.attachments << {
-                type: params["MediaContentType#{i}"],
-                url: params["MediaUrl#{i}"]
-              }
-            end
+          attachment_count.times do |i|
+            service_message.attachments << {
+              type: params["MediaContentType#{i}"],
+              url: params["MediaUrl#{i}"]
+            }
           end
 
           service_message

data/lib/stealth/services/twilio/reply_handler.rb

@@ -4,9 +4,10 @@
 module Stealth
   module Services
     module Twilio
-
       class ReplyHandler < Stealth::Services::BaseReplyHandler
 
+        ALPHA_ORDINALS = ('A'..'Z').to_a.freeze
+
         attr_reader :recipient_id, :reply
 
         def initialize(recipient_id: nil, reply: nil)
@@ -17,7 +18,35 @@ module Stealth
         def text
           check_text_length
 
-          format_response({ body: reply['text'] })
+          translated_reply = reply['text']
+
+          suggestions = generate_suggestions(suggestions: reply['suggestions'])
+          buttons = generate_buttons(buttons: reply['buttons'])
+
+          if suggestions.present?
+            translated_reply = [
+              translated_reply,
+              'Reply with:'
+            ].join("\n\n")
+
+            suggestions.each_with_index do |suggestion, i|
+              translated_reply = [
+                translated_reply,
+                "\"#{ALPHA_ORDINALS[i]}\" for #{suggestion}"
+              ].join("\n")
+            end
+          end
+
+          if buttons.present?
+            buttons.each do |button|
+              translated_reply = [
+                translated_reply,
+                button
+              ].join("\n\n")
+            end
+          end
+
+          format_response({ body: translated_reply })
         end
 
         def image
@@ -52,17 +81,46 @@ module Stealth
 
           def check_text_length
             if reply['text'].present? && reply['text'].size > 1600
-              raise(ArgumentError, "Text messages must be 1600 characters or less.")
+              raise(ArgumentError, 'Text messages must be 1600 characters or less.')
             end
           end
 
           def format_response(response)
-            sender_info = { from: Stealth.config.twilio.from_phone, to: recipient_id }
+            sender_info = {
+              from: Stealth.config.twilio.from_phone,
+              to: recipient_id
+            }
             response.merge(sender_info)
           end
 
-      end
+          def generate_suggestions(suggestions:)
+            return if suggestions.blank?
+
+            mf = suggestions.collect do |suggestion|
+              suggestion['text']
+            end.compact
+          end
+
+          def generate_buttons(buttons:)
+            return if buttons.blank?
+
+            sms_buttons = buttons.map do |button|
+              case button['type']
+              when 'url'
+                "#{button['text']}: #{button['url']}"
+              when 'payload'
+                "To #{button['text'].downcase}: Text #{button['payload'].upcase}"
+              when 'call'
+                "#{button['text']}: #{button['phone_number']}"
+              else # Don't raise for unsupported buttons
+                next
+              end
+            end.compact
+
+            sms_buttons
+          end
 
+      end
     end
   end
 end

data/lib/stealth/services/twilio/setup.rb

@@ -11,7 +11,10 @@ module Stealth
 
         class << self
           def trigger
-            Stealth::Logger.l(topic: "twilio", message: "There is no setup needed!")
+            Stealth::Logger.l(
+              topic: "twilio",
+              message: "There is no setup needed!"
+            )
           end
         end
 

data/stealth-twilio.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.author = 'Mauricio Gomes'
   s.email = 'mauricio@edge14.com'
 
-  s.add_dependency 'stealth', '< 2.0'
+  s.add_dependency 'stealth', '>= 2.0.0.beta'
   s.add_dependency 'twilio-ruby', '~> 5.5'
 
   s.add_development_dependency 'rspec', '~> 3.6'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: stealth-twilio
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.3.3
 platform: ruby
 authors:
 - Mauricio Gomes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stealth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0.beta
 - !ruby/object:Gem::Dependency
   name: twilio-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,6 @@ files:
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
-- LICENSE
 - README.md
 - VERSION
 - lib/stealth-twilio.rb
@@ -107,7 +106,7 @@ homepage: https://github.com/hellostealth/stealth-twilio
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,9 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Stealth Twilio SMS driver
 test_files:

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2017 Mauricio Gomes, Black Ops Bureau
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.