smess 2.0.2 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e4d54c29096b700ba056311cc13c6e7a3029d13f
-  data.tar.gz: dc5e89727359445f8410c74b757761852610fbdc
+SHA256:
+  metadata.gz: 1a7753165d1cb7c418b6d7f5860452bca11b39481dafcc49b59ae20a8d0298c0
+  data.tar.gz: 3c3a95629bd39d391862375982ffd1ab2943545515deefa9c93a848d0080a9ae
 SHA512:
-  metadata.gz: f430d0806edd0400c7fed9b409e0b7f585fe9b52de5423845d10d49c430ed813fe131392b3f49c7573e1221df3c23f1c88f4929e385441b9dbbc3f50e6bf818e
-  data.tar.gz: 2ee30e6a858ae426a96cde6438ac554c4d2a51521912e93c8ce67724d5159228d46af24541132075fd1ee68cc1c36d73bc7d35c702342b61508a1c8db7050043
+  metadata.gz: 1153e820da9ae577f99575e24d82fd03b5df232dfc52d9339fc5666d0f22c954d1c2b4b61093ddebc0976238c85483a044d09497ada17a7c2b81be835d7b1baa
+  data.tar.gz: 3a3afb95ff2c60d9424bc7fa0dc1296bfd466ae59d5fa0a72681cb44b668a6d325784c7803296ef6bc2467f20753235431d458d705de7667979ca2ba426d844e

data/Gemfile.lock

@@ -1,65 +1,85 @@
 PATH
   remote: .
   specs:
-    smess (2.0.1)
-      activesupport (>= 3.0)
-      clickatell
-      httpi
-      mail
+    smess (2.0.5)
+      activesupport (>= 5.2.6, < 7.0.0)
+      clickatell (~> 0)
+      httpi (~> 1.1)
+      mail (~> 2.7)
       savon (= 1.2.0)
-      twilio-ruby
+      twilio-ruby (~> 5.26)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      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.2)
+    builder (3.2.4)
     clickatell (0.8.2)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    dotenv (2.1.1)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.3)
+    docile (1.3.2)
+    dotenv (2.7.5)
+    faraday (1.7.1)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     gyoku (0.4.6)
       builder (>= 2.1.2)
     httpi (1.1.1)
       rack
-    i18n (0.7.0)
-    json (1.8.3)
-    jwt (1.5.4)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.9.0)
-    multi_json (1.12.1)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    json (2.3.0)
+    jwt (2.2.3)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    mini_mime (1.1.1)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    multipart-post (2.1.1)
+    nokogiri (1.12.4)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
     nori (1.1.5)
-    pkg-config (1.1.7)
-    rack (1.6.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      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)
@@ -68,21 +88,21 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.1.0)
       wasabi (~> 2.5.0)
-    simplecov (0.11.2)
-      docile (~> 1.1.0)
-      json (~> 1.8)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    thread_safe (0.3.5)
-    twilio-ruby (4.11.1)
-      builder (>= 2.1.2)
-      jwt (~> 1.0)
-      multi_json (>= 1.3.0)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    simplecov-html (0.10.2)
+    twilio-ruby (5.58.2)
+      faraday (>= 0.9, < 2.0)
+      jwt (>= 1.5, <= 2.5)
+      nokogiri (>= 1.6, < 2.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     wasabi (2.5.1)
       httpi (~> 1.0)
       nokogiri (>= 1.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -94,4 +114,4 @@ DEPENDENCIES
   smess!
 
 BUNDLED WITH
-   1.11.2
+   1.17.3

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/global_mouth.rb

@@ -24,7 +24,7 @@ module Smess
     end
 
     def url
-      "https://mcm.globalmouth.com:8443/api/mcm"
+      config.fetch(:url) || "https://mcm.globalmouth.com:8443/api/mcm"
     end
 
     def params

data/lib/smess/outputs/ipx.rb

@@ -32,7 +32,7 @@ module Smess
         # halt and use fallback on error...
         if last_result_was_error
           logger.info "IPX_ERROR: #{results.last}"
-          return results.first
+          return fallback_to_twilio || results.first
         end
       end
 

data/lib/smess/outputs/link_mobility.rb

@@ -0,0 +1,73 @@
+require 'uri'
+require 'httpi'
+require 'json'
+
+module Smess
+  class LinkMobility < HttpBase
+
+    def deliver
+      request.auth.basic(username, password)
+      request.url = url
+      request.headers["Content-Type"] = "application/json"
+      request.body = body
+
+      http_post request
+    end
+
+    attr_accessor :username, :password, :platform_id, :platform_partner_id, :gate_id
+    def validate_config
+      @username  = config.fetch(:username)
+      @password  = config.fetch(:password)
+      @platform_id  = config.fetch(:platform_id)
+      @platform_partner_id  = config.fetch(:platform_partner_id)
+      @gate_id  = config.fetch(:gate_id)
+      @sender_id  = config.fetch(:sender_id, @sender_id)
+    end
+
+    private
+
+    def url
+      config.fetch(:url)
+    end
+
+    def sourceTON
+      if !from.nil? && from[0] == "+"
+        "MSISDN"
+      else
+        "ALPHANUMERIC"
+      end
+    end
+
+    def body
+      {
+        source: from,
+        sourceTON: sourceTON,
+        destination: "+#{sms.to}",
+        userData: sms.message.strip_nongsm_chars,
+        platformId: platform_id,
+        platformPartnerId: platform_partner_id,
+        dcs: "TEXT",
+        useDeliveryReport: true,
+        deliveryReportGates: [gate_id]
+      }.to_json
+    end
+
+    def normal_result(response)
+      response_json = JSON.parse(response.body)
+
+      response_code = response_json["resultCode"]
+      response_code = "0" if response_code == 1005
+
+      message_id = response_json["messageId"]
+      # Successful response
+      {
+        message_id: message_id,
+        response_code: response_code.to_s,
+        response: response_json,
+        destination_address: sms.to,
+        data: result_data
+      }
+    end
+
+  end
+end

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)
@@ -46,16 +46,19 @@ module Smess
         else
           opts[:from] =  from
         end
+        puts "about to create_client_message"
         response = create_client_message(opts)
+        puts "got response #{response.inspect}"
         result = normal_result(response)
       rescue => e
+        puts "got exception #{e.inspect}"
         result = result_for_error(e)
       end
       result
     end
 
     def create_client_message(params)
-      client.account.messages.create(params)
+      client.api.account.messages.create(params)
     end
 
     def client
@@ -69,18 +72,25 @@ module Smess
       {
         message_id: response.sid,
         response_code: response_code.to_s,
-        response: MultiJson.load(client.last_response.body),
+        response: {
+          sid: response.sid,
+          status: response.status,
+          error_code: response.error_code,
+          error_message: response.error_message
+        },
         destination_address: sms.to,
         data: result_data
       }
     end
 
     def result_for_error(e)
+      code = "-1"
+      code = e.code.to_s rescue code
       {
-        response_code: '-1',
+        response_code: code,
         response: {
           temporaryError: 'true',
-          responseCode: '-1',
+          responseCode: code,
           responseText: e.message
         },
         data: result_data
@@ -90,7 +100,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.2'
+  VERSION = '2.0.6'
 end

data/lib/smess.rb

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

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.2
+  version: 2.0.6
 platform: ruby
 authors:
 - Martin Westin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,16 +56,16 @@ dependencies:
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -84,58 +84,64 @@ dependencies:
   name: httpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: clickatell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: twilio-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.26'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 description: A mess of SMS messaging
 email: martin@eimermusic.com
 executables: []
@@ -146,6 +152,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
+- example_config.rb
 - lib/smess.rb
 - lib/smess/logging.rb
 - lib/smess/output.rb
@@ -157,6 +164,7 @@ files:
 - lib/smess/outputs/iconectiv.rb
 - lib/smess/outputs/ipx.rb
 - lib/smess/outputs/ipxus.rb
+- lib/smess/outputs/link_mobility.rb
 - lib/smess/outputs/mblox.rb
 - lib/smess/outputs/smsglobal.rb
 - lib/smess/outputs/test.rb
@@ -165,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
@@ -177,15 +186,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A messy SMS messenger supporting every aggregator I have gotten my hands