smess 3.2.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31b776d978966568783beada85d1b844069716f83b09486635de30efe86654e1
-  data.tar.gz: 656698bb66974499367712120428b0b89ab0db577f62b04990bad42c77397a4f
+  metadata.gz: 8213c67258f3d5ff0221556f4d745752f0ef33777ef29bff1fea71b0af54c7e0
+  data.tar.gz: 1c4ec4caeb328ccc57942125705332b99cca87c813892f895b544e90d273b758
 SHA512:
-  metadata.gz: b8ff3128d4344de5a848922d980ac1687948b1f0fcdc16dfb8d3bf95d9b562636eadd1f935c489eeae7a4fb75eaf6190d045a87545b79d31921788d2e30f44ff
-  data.tar.gz: c5223cadc7a05f5aaa838af64b313f6d8e896ba1db6b8209b6b7263e2659955587a58d9a8e6c990e4c52ccc472981d6ac7b539bba2a4d59362c0e695f8d6e7af
+  metadata.gz: 7b3abdb19eafa71a10110712becef5ea91cfec88cec9aaadaee7ba397eed7a8b121a65aef4ba8d03a58f47525695135f3a1b021ef4709b3879c94e42168091bc
+  data.tar.gz: fde5083a9ac6f4128c409e56b77f08b9f074ae1d6c011cf75160697b5dbffbbe4f97af255f9387218445c00b05956f170c3fcf167ef3c1c9c1ade8eabd50561e

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    smess (3.1.2)
+    smess (3.3.1)
       activesupport (>= 5.2.6, < 8.0.0)
       clickatell (~> 0)
-      httpi (~> 3.0)
+      httpi (~> 4.0, >= 4)
       twilio-ruby (~> 6.2)
 
 GEM
@@ -15,6 +15,7 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
+    base64 (0.2.0)
     clickatell (0.8.2)
     concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
@@ -24,13 +25,18 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    httpi (3.0.1)
-      rack
+    httpi (4.0.4)
+      base64
+      mutex_m
+      nkf
+      rack (>= 2.0, < 4)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jwt (2.7.1)
     mini_portile2 (2.8.4)
     minitest (5.19.0)
+    mutex_m (0.3.0)
+    nkf (0.2.0)
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)

data/lib/smess/outputs/twilio.rb

@@ -80,24 +80,12 @@ 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}
-      else
-        {from: from}
-      end
+      {from: from}
     end
 
     def dynamic_callback_url
@@ -121,7 +109,12 @@ module Smess
           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/version.rb

@@ -1,3 +1,3 @@
 module Smess
-  VERSION = '3.2.0'
+  VERSION = '3.3.1'
 end

data/smess.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '>= 2.4.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'dotenv'
-  s.add_dependency 'httpi', '~> 3.0'
+  s.add_dependency 'httpi', '>=4', '~> 4.0'
   s.add_dependency 'clickatell', '~> 0'
   s.add_dependency 'twilio-ruby', '~> 6.2'
   s.add_dependency 'activesupport', '>= 5.2.6', '< 8.0.0'
@@ -25,4 +25,4 @@ Gem::Specification.new do |s|
   s.files = Dir["{lib}/**/*", "[A-Z]*", "init.rb"]
   s.required_ruby_version = ">= 2.0.0"
   s.required_rubygems_version = ">= 1.3.7"
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smess
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Martin Westin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,16 +56,22 @@ dependencies:
   name: httpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: clickatell
   requirement: !ruby/object:Gem::Requirement