smess 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7417e77e181e70dc6198ad7c2c7fb82616798785a9134fae691967a03e7734
-  data.tar.gz: 382ac7cef4d2cd4e4d4ca52bd9eb0d8d34acef4b4a0dd9da590fef8fceb9cf10
+  metadata.gz: 1b7ccf079bc9a513d980641f39babe9327b83c78f7b3b7f37f020ed70fa3269c
+  data.tar.gz: 19f6f5004e99ef36661e4d30e609ed1f36170345083fcef2138b32cc6b45f2bb
 SHA512:
-  metadata.gz: 5e2899a348d8090368337f2df34bf0b027f723a110a9af024f952d07d51fd59267bfd35b7758585301e51eff46d01b41fc8b04418c07daf19f1ff61d700a9662
-  data.tar.gz: fbb2a7d9b07ed6fbd787e442ed97cb4e70e2ac514fcc1f3609f9c772ade17ddbccff55911695679993f26ddacf5e0d19c871ca11bd954bfb1ff9ee0d44f6522d
+  metadata.gz: 7100610edcc788f08b130eec803fc63fd0623df604783a07a5d2a53507bfbe297963b9a1e31dac73a76497ae2ed3579d52e3a1230891d8f6736745bf2a048d5e
+  data.tar.gz: 4af6c646dd401f4c2bd76b2f94781945e746877ff0ee4815e68a4c48b5ecd0bfa5cfb38b7e793ecd3626bcbc9e1848964037db46e6979b8ac47fd470d2d98cc4

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    smess (2.2.1)
+    smess (3.0.0)
       activesupport (>= 5.2.6, < 7.0.0)
       clickatell (~> 0)
       httpi (~> 3.0)
-      twilio-ruby (~> 5.26)
+      twilio-ruby (~> 6.2)
 
 GEM
   remote: https://rubygems.org/
@@ -57,9 +57,9 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    twilio-ruby (5.73.4)
+    twilio-ruby (6.2.0)
       faraday (>= 0.9, < 3.0)
-      jwt (>= 1.5, <= 2.5)
+      jwt (>= 1.5, < 3.0)
       nokogiri (>= 1.6, < 2.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)

data/example_config.rb

@@ -41,10 +41,12 @@ Smess.configure do |config|
     country_codes: ["1", "971"],
     type: :twilio,
     config: {
-      sid:          ENV["SMESS_TWILIO_SID"],
-      auth_token:   ENV["SMESS_TWILIO_AUTH_TOKEN"],
-      from:         ENV["SMESS_TWILIO_FROM"],
-      callback_url: ENV["SMESS_TWILIO_CALLBACK_URL"]
+      sid:            ENV["SMESS_TWILIO_SID"],
+      # auth_token:     ENV["SMESS_TWILIO_AUTH_TOKEN"],
+      api_key:        ENV["SMESS_TWILIO_API_KEY_SID"],
+      api_secret:     ENV["SMESS_TWILIO_API_KEY_SECRET"],
+      from:           ENV["SMESS_TWILIO_FROM"],
+      callback_url:   ENV["SMESS_TWILIO_CALLBACK_URL"]
     }
   })
 

data/lib/smess/outputs/twilio.rb

@@ -9,11 +9,14 @@ module Smess
       @results = []
     end
 
-    attr_accessor :sid, :auth_token, :from, :messaging_service_sid, :callback_url, :verify_service_sid
+    attr_accessor :sid, :auth_token, :api_key, :api_secret, :from, :messaging_service_sid, :callback_url, :verify_service_sid
 
     def validate_config
       @sid = config.fetch(:sid)
-      @auth_token = config.fetch(:auth_token)
+      @auth_token = config.fetch(:auth_token, nil)
+      @api_key = config.fetch(:api_key, nil)
+      @api_secret = config.fetch(:api_secret, nil)
+      raise "missing API credentials" unless auth_token.present? || (api_key.present? && api_secret.present?)
       @from = config.fetch(:from, nil)
       @messaging_service_sid = config.fetch(:messaging_service_sid, nil)
       @callback_url = config.fetch(:callback_url)
@@ -120,7 +123,7 @@ module Smess
     end
 
     def client
-      @client ||= ::Twilio::REST::Client.new(sid, auth_token)
+      @client ||= auth_token.present? ? ::Twilio::REST::Client.new(sid, auth_token) : ::Twilio::REST::Client.new(api_key, api_secret, sid)
     end
 
     def normal_result(response)

data/lib/smess/version.rb

@@ -1,3 +1,3 @@
 module Smess
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

data/smess.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'dotenv'
   s.add_dependency 'httpi', '~> 3.0'
   s.add_dependency 'clickatell', '~> 0'
-  s.add_dependency 'twilio-ruby', '~> 5.26'
+  s.add_dependency 'twilio-ruby', '~> 6.2'
   s.add_dependency 'activesupport', '>= 5.2.6', '< 7.0.0'
 
   s.files = Dir["{lib}/**/*", "[A-Z]*", "init.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smess
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Martin Westin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.26'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.26'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement