smess 2.0.5 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f232022239ca55009627ad67ee16bd5f5e493885
-  data.tar.gz: 73d9a6886dbbf049aba069fc0db0bc002a571b78
+SHA256:
+  metadata.gz: 90d1e52ab3e6f1d8ae4640292cec28b848f3acedb32ec69d1b4b3a971f9d7b8e
+  data.tar.gz: 230d748d26760a0387eab912dce1e7de92a5224edf4c75e3c32ad2b01795c56e
 SHA512:
-  metadata.gz: 5569c0d2cd1d35342209a2a55f51489d181cf9d1cb854949b665c7da0f8b36081967726d05d18ddf35f6e72404c4fa636f659d9dc274fb329906ff1801e84265
-  data.tar.gz: 259e15b912d452c543ada8268aa51c2c8f6712453c89c15e73ddcddcb3dff3431ccb500fa1ae6587d4a2a2dafdba699b505085dd5df220e7c05b4366a1ee1c60
+  metadata.gz: 96e79778835ca11d3baecbbe4c3ca861a6030e1e4f0efd841ab1683803a2220cf9e8cfdefdf84c5dd8b7683bf61509bba9181456c261e180ee22b345087e365b
+  data.tar.gz: 4fda0f5f94fc7ed8b1e29c535d825f520a6ffb4af2b079a9a5b8c646d883219b8e64f175790a8b0e8eb66636a81187b07023e269d7f311dcd82751c3b850b0b4

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    smess (2.0.4)
-      activesupport (>= 3.0.0, < 7.0.0)
+    smess (2.0.8)
+      activesupport (>= 5.2.6, < 7.0.0)
       clickatell (~> 0)
       httpi (~> 1.1)
       mail (~> 2.7)
@@ -12,40 +12,44 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.1)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     akami (1.2.2)
       gyoku (>= 0.4.0)
       nokogiri
     builder (3.2.4)
     clickatell (0.8.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.3)
     docile (1.3.2)
     dotenv (2.7.5)
-    faraday (1.0.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (2.0.3)
     gyoku (0.4.6)
       builder (>= 2.1.2)
     httpi (1.1.1)
       rack
-    i18n (1.8.2)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     json (2.3.0)
-    jwt (2.2.1)
+    jwt (2.4.1)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    multipart-post (2.1.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nori (1.1.5)
-    rack (2.2.2)
+    racc (1.6.0)
+    rack (2.2.3.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -59,6 +63,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    ruby2_keywords (0.0.5)
     savon (1.2.0)
       akami (~> 1.2.0)
       builder (>= 2.1.2)
@@ -72,16 +77,16 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    thread_safe (0.3.6)
-    twilio-ruby (5.31.6)
-      faraday (~> 1.0.0)
+    twilio-ruby (5.67.2)
+      faraday (>= 0.9, < 3.0)
       jwt (>= 1.5, <= 2.5)
       nokogiri (>= 1.6, < 2.0)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     wasabi (2.5.1)
       httpi (~> 1.0)
       nokogiri (>= 1.4.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

data/example_config.rb

@@ -0,0 +1,90 @@
+most_of_the_caribbean = [
+  "1242", # Bahamas
+  "1246", # Barbados
+  "1264", # Anguilla
+  "1268", # Antigua and Barbuda
+  "1284", # British Virgin Islands
+  "1345", # Cayman Islands
+  "1473", # Grenada
+  "1649", # Turks and Caicos Islands
+  "1664", # Montserrat
+  "1670", # Northern Mariana Islands
+  "1671", # Guam
+  "1684", # American Samoa
+  "1758", # Saint Lucia
+  "1767", # Dominica
+  "1784", # Saint Vincent and the Grenadines
+  "1787", # Puerto Rico
+  "1809", # Dominican Republic
+  "1868", # Trinidad and Tobago
+  "1869", # Saint Kitts and Nevis
+  "1876"  # Jamaica
+]
+
+Smess.configure do |config|
+
+  config.default_sender_id = ENV["SMESS_SENDER_ID"]
+  config.default_output = :global_mouth
+  config.register_output({
+    name: :global_mouth,
+    country_codes: most_of_the_caribbean + ["20", "33", "34", "44", "46", "49", "594", "966"],
+    type: :global_mouth,
+    config: {
+      username:  ENV["SMESS_GLOBAL_MOUTH_USER"],
+      password:  ENV["SMESS_GLOBAL_MOUTH_PASS"],
+      sender_id: ENV["SMESS_GLOBAL_MOUTH_SENDER_ID"]
+    }
+  })
+
+  config.register_output({
+    name: :iconectiv,
+    country_codes: ["1"],
+    type: :iconectiv,
+    config: {
+      sms_url:                       ENV["SMESS_ICONECTIV_URL"],
+      username:                      ENV["SMESS_ICONECTIV_USER"],
+      password:                      ENV["SMESS_ICONECTIV_PASS"],
+      shortcode:                     ENV["SMESS_ICONECTIV_SHORTCODE"],
+      account_name:                  ENV["SMESS_ICONECTIV_ACCOUNT_NAME"],
+      service_name:                  ENV["SMESS_SERVICE_NAME"],
+      service_meta_data_verizon:     ENV["SMESS_ICONECTIV_SERVICE_META_DATA_VERIZON"],
+      service_meta_data_t_mobile_us: ENV["SMESS_ICONECTIV_SERVICE_META_DATA_T_MOBILE_US"]
+    }
+  })
+
+  config.register_output({
+    name: :twilio,
+    country_codes: ["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"]
+    }
+  })
+
+  config.register_output({
+    name: :card_board_fish,
+    country_codes: ["212"],
+    type: :card_board_fish,
+    config: {
+      username:  ENV["SMESS_CARD_BOARD_FISH_USER"],
+      password:  ENV["SMESS_CARD_BOARD_FISH_PASS"]
+    }
+  })
+
+  config.register_output({
+    name: :clickatell,
+    country_codes: ["1441"],
+    type: :clickatell,
+    config: {
+      api_id:     ENV["SMESS_CLICKATELL_API_ID"],
+      user:       ENV["SMESS_CLICKATELL_USER"],
+      pass:       ENV["SMESS_CLICKATELL_PASS"],
+      sender_id:  ENV["SMESS_CLICKATELL_SENDER_ID"],
+      sender_ids: ENV["SMESS_CLICKATELL_SENDER_IDS"]
+    }
+  })
+
+end

data/lib/smess/outputs/link_mobility.rb

@@ -43,7 +43,7 @@ module Smess
         source: from,
         sourceTON: sourceTON,
         destination: "+#{sms.to}",
-        userData: sms.message.strip_nongsm_chars,
+        userData: sms.message,
         platformId: platform_id,
         platformPartnerId: platform_partner_id,
         dcs: "TEXT",

data/lib/smess/outputs/twilio.rb

@@ -19,7 +19,7 @@ module Smess
     end
 
     def deliver
-      send_one_sms sms.message.strip_nongsm_chars
+      send_one_sms sms.message
     end
 
     private
@@ -31,7 +31,7 @@ module Smess
     end
 
     def split_parts
-      Smess.separate_sms(sms.message.strip_nongsm_chars).reject {|s| s.empty? }
+      Smess.separate_sms(sms.message).reject {|s| s.empty? }
     end
 
     def send_one_sms(message)
@@ -39,7 +39,8 @@ module Smess
         opts = {
           to: "+#{sms.to}",
           body: message,
-          status_callback: callback_url
+          status_callback: callback_url,
+          provide_feedback: true
         }
         if messaging_service_sid.present?
           opts[:messaging_service_sid] =  messaging_service_sid
@@ -49,6 +50,7 @@ module Smess
         response = create_client_message(opts)
         result = normal_result(response)
       rescue => e
+        puts "got exception #{e.inspect}"
         result = result_for_error(e)
       end
       result
@@ -97,7 +99,7 @@ module Smess
     def result_data
       {
         to: sms.to,
-        text: sms.message.strip_nongsm_chars,
+        text: sms.message,
         from: from
       }
     end

data/lib/smess/version.rb

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

data/lib/string_ext.rb

@@ -62,7 +62,7 @@ class String
     end
 
     pattern = Regexp.new( "[^"+allowed+"]" )
-    self.gsub!(pattern,"")
+    self.gsub!(pattern, replacement)
   end
 
 

data/smess.gemspec

@@ -0,0 +1,30 @@
+$:.push File.expand_path("../lib", __FILE__)
+require "smess/version"
+
+Gem::Specification.new do |s|
+  s.platform = Gem::Platform::RUBY
+  s.name = "smess"
+  s.version = Smess::VERSION
+  s.date = Time.now
+  s.summary = "A messy SMS messenger supporting every aggregator I have gotten my hands on"
+  s.description = "A mess of SMS messaging"
+  s.require_paths = ["lib"]
+  s.author = "Martin Westin"
+  s.email = "martin@eimermusic.com"
+  s.homepage = "https://github.com/eimermusic/smess"
+  s.license = 'MIT'
+
+  s.add_development_dependency 'rspec', '>= 2.4.0'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'dotenv'
+  s.add_dependency 'mail', '~> 2.7'
+  s.add_dependency 'savon', '1.2.0'
+  s.add_dependency 'httpi', '~> 1.1'
+  s.add_dependency 'clickatell', '~> 0'
+  s.add_dependency 'twilio-ruby', '~> 5.26'
+  s.add_dependency 'activesupport', '>= 5.2.6', '< 7.0.0'
+
+  s.files = Dir["{lib}/**/*", "[A-Z]*", "init.rb"]
+  s.required_ruby_version = ">= 2.0.0"
+  s.required_rubygems_version = ">= 1.3.7"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smess
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.8
 platform: ruby
 authors:
 - Martin Westin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -128,20 +128,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.2.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.2.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
 description: A mess of SMS messaging
 email: martin@eimermusic.com
 executables: []
@@ -152,6 +152,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
+- example_config.rb
 - lib/smess.rb
 - lib/smess/logging.rb
 - lib/smess/output.rb
@@ -172,6 +173,7 @@ files:
 - lib/smess/utils.rb
 - lib/smess/version.rb
 - lib/string_ext.rb
+- smess.gemspec
 homepage: https://github.com/eimermusic/smess
 licenses:
 - MIT
@@ -191,8 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A messy SMS messenger supporting every aggregator I have gotten my hands