smess 3.1.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df5b5ce7458d753d8a71be1dc990c6440090e211a7d56aef2fe260d78280246
-  data.tar.gz: 5bdef78831d44bb6ca1cd7d39e6812f1f4e4fa257624f5845ac83cdb3fee1593
+  metadata.gz: 0e97ae77460f2165f6b5c3f709c9d474aad3c3c219d19130f9f19cac85184947
+  data.tar.gz: ed64fdfc02094631c1ae3c4f203b15cb052b1b3814294f99e4c22ed60edaf99b
 SHA512:
-  metadata.gz: e6742ad77e0833de159f9d455ce3c5789365e902fe016f9e260b8f50017ffaf37322c7b5b00e67b6e010d66aa291525a35389932a7a666899c5e9625630e0947
-  data.tar.gz: d74fecb642dfa7c6f43230dd3d7871c16e86640c4e3e4bbdfe8a68ba92dade52aacbc07cd4e0ef0720fa2ba9594e2e4d753899b73d956f9a5cab02bf0b76ccbd
+  metadata.gz: baef20801eb0958f6875e72fcd95e132f1a97921aade208b151454398391f5a8caed475381ed7f5708d5198559667fbe5a4c774b01d4f8b4ebc0b117a004f3ba
+  data.tar.gz: 0c96995a74d926f30f514d428033bcd74ccd3316e6fbfe66ea84f64b99cabca8e5114ea1e0c7628b944d93071ff98c1ae5707f91265d753129ee180589aa4387

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smess (3.1.1)
+    smess (3.2.0)
       activesupport (>= 5.2.6, < 8.0.0)
       clickatell (~> 0)
       httpi (~> 3.0)

data/lib/smess/outputs/twilio.rb

@@ -80,24 +80,25 @@ module Smess
 
     attr_accessor :results
 
-    def parts
-      @parts ||= split_parts
-    end
-
-    def split_parts
-      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}
+      {from: from}
+    end
+
+    def dynamic_callback_url
+      return callback_url if callback_url.nil? || callback_url.empty? || sms.callback_params.to_h.empty?
+
+      uri = URI(callback_url)
+      query = URI.encode_www_form(sms.callback_params.to_h)
+      if uri.query.nil?
+        uri.query = query
       else
-        {from: from}
+        uri.query << "&"+query
       end
+      uri.to_s
     end
 
     def send_one_sms(message)
@@ -105,10 +106,15 @@ module Smess
         opts = {
           to: to,
           body: message,
-          status_callback: callback_url,
+          status_callback: dynamic_callback_url,
           provide_feedback: true
         }
+        if message.is_a? Hash
+          opts.merge!(message)
+          opts.delete :body
+        end  
         opts.merge!(sender)
+        opts.merge!({messaging_service_sid: messaging_service_sid}) if messaging_service_sid.present?
         response = create_client_message(opts)
         result = normal_result(response)
       rescue ::Twilio::REST::RestError => e

data/lib/smess/outputs/twilio_whatsapp.rb

@@ -10,7 +10,11 @@ module Smess
     end
 
     def sender
-      {from: "whatsapp:+#{from}"}
+      if from.present?
+        {from: "whatsapp:+#{from}"}
+      else
+        super
+      end
     end
 
   end

data/lib/smess/sms.rb

@@ -1,7 +1,7 @@
 module Smess
   class Sms
 
-    attr_accessor :to, :message, :originator, :output, :results
+    attr_accessor :to, :message, :originator, :output, :results, :callback_params
 
     def initialize(*args)
       opts = args.first || {}
@@ -9,6 +9,7 @@ module Smess
       @message = opts.fetch(:message, "")
       @originator = opts.fetch(:originator, nil)
       @output = opts.fetch(:output, :auto).to_sym
+      @callback_params = opts.fetch(:callback_params, nil)
     end
 
     def deliver

data/lib/smess/version.rb

@@ -1,3 +1,3 @@
 module Smess
-  VERSION = '3.1.2'
+  VERSION = '3.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smess
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Martin Westin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-04 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A messy SMS messenger supporting every aggregator I have gotten my hands