smess 2.0.8 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90d1e52ab3e6f1d8ae4640292cec28b848f3acedb32ec69d1b4b3a971f9d7b8e
-  data.tar.gz: 230d748d26760a0387eab912dce1e7de92a5224edf4c75e3c32ad2b01795c56e
+  metadata.gz: 4a55b648177448474907c0d1e8a1236b602c5473709d6ff71c6e1b4f669a489c
+  data.tar.gz: 9e67c5b6066fb5298afe6d04296efc6f77a258c78d9d336312c129fbf25745f7
 SHA512:
-  metadata.gz: 96e79778835ca11d3baecbbe4c3ca861a6030e1e4f0efd841ab1683803a2220cf9e8cfdefdf84c5dd8b7683bf61509bba9181456c261e180ee22b345087e365b
-  data.tar.gz: 4fda0f5f94fc7ed8b1e29c535d825f520a6ffb4af2b079a9a5b8c646d883219b8e64f175790a8b0e8eb66636a81187b07023e269d7f311dcd82751c3b850b0b4
+  metadata.gz: 17fae43d95fdee89661a81f4ac1faa2a140375fdc88c454e9c4a8fad640eece26fa67c0c5f972a47944c24a89135685cb8577cf4fa272f20162db8dee0fe65ad
+  data.tar.gz: 31cc82823c4fefe06f10cabca2ac0909ea84b89ca9c0f4ddfad8e432d3765c9812c08b14505e450b5426a090548ae518b7227a5c7084f715825d871fc6f280fb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smess (2.0.8)
+    smess (2.2.0)
       activesupport (>= 5.2.6, < 7.0.0)
       clickatell (~> 0)
       httpi (~> 1.1)
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.6)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -27,29 +27,40 @@ GEM
     diff-lcs (1.3)
     docile (1.3.2)
     dotenv (2.7.5)
-    faraday (2.3.0)
-      faraday-net_http (~> 2.0)
+    faraday (2.7.1)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.3)
+    faraday-net_http (3.0.2)
     gyoku (0.4.6)
       builder (>= 2.1.2)
     httpi (1.1.1)
       rack
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.3.0)
-    jwt (2.4.1)
-    mail (2.7.1)
+    jwt (2.5.0)
+    mail (2.8.0)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
-    nokogiri (1.13.6)
+    minitest (5.16.3)
+    net-imap (0.3.1)
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nori (1.1.5)
-    racc (1.6.0)
-    rack (2.2.3.1)
+    racc (1.6.1)
+    rack (3.0.2)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -77,16 +88,17 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    twilio-ruby (5.67.2)
+    timeout (0.3.1)
+    twilio-ruby (5.73.4)
       faraday (>= 0.9, < 3.0)
       jwt (>= 1.5, <= 2.5)
       nokogiri (>= 1.6, < 2.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     wasabi (2.5.1)
       httpi (~> 1.0)
       nokogiri (>= 1.4.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
@@ -98,4 +110,4 @@ DEPENDENCIES
   smess!
 
 BUNDLED WITH
-   1.17.3
+   2.3.25

data/lib/smess/output.rb

@@ -19,5 +19,9 @@ module Smess
       raise NotImplementedError.new("You must define deliver in your Smess output class")
     end
 
+    def send_feedback(_message_sid)
+      nil
+    end
+
   end
 end

data/lib/smess/outputs/auto.rb

@@ -11,6 +11,11 @@ module Smess
       out.deliver.merge({sent_with: output_name})
     end
 
+    def send_feedback(message_sid)
+      out = output_for sms.to
+      out.send_feedback(message_sid)
+    end
+
     def get_output_name_for_msisdn(msisdn)
       3.downto(0).each do |index|
         return Smess.config.output_by_country_code[msisdn[0..index]] if Smess.config.output_by_country_code.key? msisdn[0..index]

data/lib/smess/outputs/twilio.rb

@@ -10,6 +10,7 @@ module Smess
     end
 
     attr_accessor :sid, :auth_token, :from, :messaging_service_sid, :callback_url
+
     def validate_config
       @sid = config.fetch(:sid)
       @auth_token = config.fetch(:auth_token)
@@ -18,6 +19,10 @@ module Smess
       @callback_url = config.fetch(:callback_url)
     end
 
+    def send_feedback(message_sid)
+      client.messages(message_sid).feedback.create(outcome: "confirmed")
+    end
+
     def deliver
       send_one_sms sms.message
     end
@@ -31,22 +36,30 @@ module Smess
     end
 
     def split_parts
-      Smess.separate_sms(sms.message).reject {|s| s.empty? }
+      Smess.separate_sms(sms.message).reject { |s| s.empty? }
+    end
+
+    def to
+      "+#{sms.to}"
+    end
+
+    def sender
+      if messaging_service_sid.present?
+        {messaging_service_sid: messaging_service_sid}
+      else
+        {from: from}
+      end
     end
 
     def send_one_sms(message)
       begin
         opts = {
-          to: "+#{sms.to}",
+          to: to,
           body: message,
           status_callback: callback_url,
           provide_feedback: true
         }
-        if messaging_service_sid.present?
-          opts[:messaging_service_sid] =  messaging_service_sid
-        else
-          opts[:from] =  from
-        end
+        opts.merge!(sender)
         response = create_client_message(opts)
         result = normal_result(response)
       rescue => e

data/lib/smess/outputs/twilio_whatsapp.rb

@@ -0,0 +1,17 @@
+require 'twilio-ruby'
+
+module Smess
+  class TwilioWhatsapp < Twilio
+
+    private
+
+    def to
+      "whatsapp:+#{sms.to}"
+    end
+
+    def sender
+      {from: "whatsapp:+#{from}"}
+    end
+
+  end
+end

data/lib/smess/sms.rb

@@ -21,5 +21,12 @@ module Smess
       results[:response_code] == "0"
     end
 
+    def send_feedback(to, message_sid)
+      out = Smess.named_output_instance(output)
+      @to = to
+      out.sms = self
+      out.send_feedback(message_sid)
+    end
+
   end
 end

data/lib/smess/version.rb

@@ -1,3 +1,3 @@
 module Smess
-  VERSION = '2.0.8'
+  VERSION = '2.2.0'
 end

data/lib/smess.rb

@@ -23,6 +23,7 @@ require 'smess/outputs/global_mouth'
 require 'smess/outputs/link_mobility'
 require 'smess/outputs/mblox'
 require 'smess/outputs/twilio'
+require 'smess/outputs/twilio_whatsapp'
 require 'smess/outputs/iconectiv'
 require 'smess/outputs/test'
 
@@ -59,7 +60,7 @@ module Smess
       @nothing = false
       @default_output = nil
       @default_sender_id = "Smess"
-      @output_types = %i{auto card_board_fish clickatell global_mouth link_mobility iconectiv mblox smsglobal twilio}
+      @output_types = %i{auto card_board_fish clickatell global_mouth link_mobility iconectiv mblox smsglobal twilio twilio_whatsapp}
       @configured_outputs = {}
       @output_by_country_code = {}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smess
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.2.0
 platform: ruby
 authors:
 - Martin Westin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2022-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -169,6 +169,7 @@ files:
 - lib/smess/outputs/smsglobal.rb
 - lib/smess/outputs/test.rb
 - lib/smess/outputs/twilio.rb
+- lib/smess/outputs/twilio_whatsapp.rb
 - lib/smess/sms.rb
 - lib/smess/utils.rb
 - lib/smess/version.rb
@@ -193,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A messy SMS messenger supporting every aggregator I have gotten my hands