smess 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7417e77e181e70dc6198ad7c2c7fb82616798785a9134fae691967a03e7734
-  data.tar.gz: 382ac7cef4d2cd4e4d4ca52bd9eb0d8d34acef4b4a0dd9da590fef8fceb9cf10
+  metadata.gz: dc6f705611dc73a9a62fed01b38a3f3e6217045d02746686a2604bfa7f2a59e0
+  data.tar.gz: '0169994aa67408e04f3a9f63bfa33177effcaa0f1100e22cf0c96a632442f0dc'
 SHA512:
-  metadata.gz: 5e2899a348d8090368337f2df34bf0b027f723a110a9af024f952d07d51fd59267bfd35b7758585301e51eff46d01b41fc8b04418c07daf19f1ff61d700a9662
-  data.tar.gz: fbb2a7d9b07ed6fbd787e442ed97cb4e70e2ac514fcc1f3609f9c772ade17ddbccff55911695679993f26ddacf5e0d19c871ca11bd954bfb1ff9ee0d44f6522d
+  metadata.gz: 0a8104e36f45f29d7fb1297e0307f50ecb1f12522fb04d209c8950e2b84e04c4a63bced461b8baff6fe1e8d9d236403b59ef30937f087fe7df1a72075fc080e5
+  data.tar.gz: a3e0ebdb13fdbc2b7818eb2f9e03c65d09b57642fd9877f3718d9ca13ff75800da2f954eeb02d5c525273419985c87884f955dc3d71bea8850cb5cf27fb8e91d

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    smess (2.2.1)
+    smess (3.1.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)
@@ -108,7 +111,7 @@ module Smess
         opts.merge!(sender)
         response = create_client_message(opts)
         result = normal_result(response)
-      rescue Twilio::REST::RestError => e
+      rescue ::Twilio::REST::RestError => e
         puts "got exception #{e.inspect}"
         result = result_for_error(e)
       end
@@ -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.1'
 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.1
 platform: ruby
 authors:
 - Martin Westin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-08-10 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