smess 1.0.10 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e70f8c594626335089b201e79e00ccbd6c84e8f5
-  data.tar.gz: 6dcbf7c05b656e00dca3b443df7b3e1a35217fbb
+  metadata.gz: e1da1bd648e95236f325b5c70c5bc274ab92944b
+  data.tar.gz: 16069db6c4ce54709459b595cda9dee7d0e49341
 SHA512:
-  metadata.gz: 9566ff2e2f6f391d62a2c1d28aeb084c323c89eac4f8038d29d709a598f7e0ee2007afde184a50a5f60c8af2de8b23ee6b055f4755b720b811e977a599f5f770
-  data.tar.gz: f2b84cd3d206cf6ba1b21792ba9fa6d31416ab63810e5e23a416f205a0431ee5684aec3c680ae084c0e2c19ab00b7b01a603e4d5a32d81d7fe554df4ad01fc6e
+  metadata.gz: ce971172a2b5b55238d41ea7c2be8281b1e9b5e247caf30b8257f275e769724042627339b5eb5fa269598f9033af5f39bd9cfd17aca4617c96ab12431c8686f1
+  data.tar.gz: 8a5a83d00200e89236edbba2d62475f2d43049d96749adc3beda74d17864bccfd6b2d2d7bdd3d0d302bd6a8149b05a65a5276ddfb4d508065ebcb9c0e4c20778

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smess (1.0.9)
+    smess (2.0)
       activesupport (>= 3.0)
       clickatell
       httpi
@@ -10,9 +10,9 @@ PATH
       twilio-ruby
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activesupport (4.2.1)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -30,18 +30,18 @@ GEM
     httpi (1.1.1)
       rack
     i18n (0.7.0)
-    json (1.8.2)
-    jwt (1.5.0)
+    json (1.8.3)
+    jwt (1.5.2)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.5)
-    mini_portile (0.6.2)
-    minitest (5.6.1)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    minitest (5.8.3)
     multi_json (1.8.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
     nori (1.1.5)
-    rack (1.6.1)
+    rack (1.6.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -63,7 +63,7 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     thread_safe (0.3.5)
-    twilio-ruby (4.1.0)
+    twilio-ruby (4.9.0)
       builder (>= 2.1.2)
       jwt (~> 1.0)
       multi_json (>= 1.3.0)
@@ -81,3 +81,6 @@ DEPENDENCIES
   rspec (>= 2.4.0)
   simplecov
   smess!
+
+BUNDLED WITH
+   1.10.3

data/README.md

@@ -48,7 +48,7 @@ module Smess
     def deliver
       # Do work and return a hash like this one
       {
-      :response_code => '-1',
+        :response_code => '-1',
         :response  => {
           :temporaryError =>'true',
           :responseCode => '-1',
@@ -75,10 +75,29 @@ or
 gem install smess
 ```
 
-### Set a hundred ENV vars
-All credentials, and other account-sepcific settings, have been extracted into ENV vars allowing you to set these any way you like. I use Dotenv but Figaro or other env manager should work equally well. As should setting them any other way.
+### Configure the SMS providers you use
+Smess is very configurable and there is a fair amout of things to setup. Smess chooses SMS provider based on the recipient phone number and is meant to abstract away the differences betweenn providers. You have to provide the account information and "configure" each provider you actually use. THe repository contains an example_config.rb file which should be a fairly up-to date config of how I personally have providers mapped to different countries based on delivery success rates.
+
+A pretty minimal setup would look something like this:
+
+```ruby
+Smess.configure do |config|
+
+  config.default_sender_id = ENV["SMESS_SENDER_ID"]
+  config.default_output = :my_default
+  config.register_output({
+    name: :my_default,
+    country_codes: ["1", "46"],
+    type: :global_mouth,
+    config: {
+      username:  ENV["SMESS_GLOBAL_MOUTH_USER"],
+      password:  ENV["SMESS_GLOBAL_MOUTH_PASS"],
+      sender_id: ENV["SMESS_GLOBAL_MOUTH_SENDER_ID"]
+    }
+  })
+end
+```
 
-All ENV variables used by Smess are listed in the file .env. You only need to define the aggregator credentials you actually use though.
 
 ## Usage
 
@@ -87,7 +106,7 @@ sms = Smess.new(
   to: '46701234567', # phone number in normalized msisdn format
   message: 'Test SMS', # Message text
   originator: 'TestSuite', # originator, sender id. This has many names. Outside the US this can usually be set to whatever you like.
-  output: "test" # Name of the output plugin to use. Defaults to auto select.
+  output: "test" # Optional name of the output plugin to use. Defaults to auto select.
 )
 results = sms.deliver
 puts result

data/lib/smess.rb

@@ -9,7 +9,7 @@ require 'active_support/core_ext'
 
 require "smess/version"
 require 'smess/logging'
-require 'smess/country_code_registry'
+require 'smess/output'
 require 'smess/utils'
 require 'smess/sms'
 require 'smess/outputs/http_base'
@@ -18,7 +18,6 @@ require 'smess/outputs/ipx'
 require 'smess/outputs/ipxus'
 require 'smess/outputs/card_board_fish'
 require 'smess/outputs/clickatell'
-require 'smess/outputs/etisalatdemo'
 require 'smess/outputs/smsglobal'
 require 'smess/outputs/global_mouth'
 require 'smess/outputs/mblox'
@@ -26,41 +25,83 @@ require 'smess/outputs/twilio'
 require 'smess/outputs/iconectiv'
 require 'smess/outputs/test'
 
-require 'string'
+require 'string_ext'
 
 module Smess
 
-  # Move to config?
-  OUTPUTS = %w{auto card_board_fish clickatell etisalatdemo global_mouth iconectiv mblox ipxus smsglobal twilio}
-  COUNTRY_CODES = [1, 20, 212, 33, 34, 44, 46, 49, 966, 971]
-
   def self.new(*args)
     Sms.new(*args)
   end
 
+  def self.named_output_instance(name)
+    output_class_name = config.configured_outputs.fetch(name)[:type].to_s.camelize
+    conf = config.configured_outputs[name][:config]
+    "Smess::#{output_class_name}".constantize.new(conf)
+  end
+
   def self.config
-    @config ||=Config.new
+    @config ||= Config.new
+  end
+
+  def self.reset_config
+    @config = Config.new
+  end
+
+  def self.configure
+    yield(config)
   end
 
   class Config
+    attr_accessor :nothing, :default_output, :default_sender_id, :default_sender_id, :output_types, :configured_outputs, :output_by_country_code
+
     def initialize
-      @config=Hash.new
+      @nothing = false
+      @default_output = nil
+      @default_sender_id = "Smess"
+      @output_types = %i{auto card_board_fish clickatell global_mouth iconectiv mblox smsglobal twilio}
+      @configured_outputs = {test: {type: :test, config: nil}}
+      @output_by_country_code = {}
+
+      register_output({
+        name: :auto,
+        country_codes: [],
+        type: :auto,
+        config: {}
+      })
+    end
+
+    def add_country_code(cc, output=default_output)
+      raise ArgumentError.new("Invalid country code") unless cc.to_i.to_s == cc.to_s
+      raise ArgumentError.new("Unknown output specified") unless outputs.include? output.to_sym
+      output_by_country_code[cc.to_s] = output.to_sym
+      true
     end
-    def method_missing(method,*args,&block)
-      method = method.to_s.gsub(/[=]/,'')
-      if args.length>0
-        @config[method] = args.first
+
+    def register_output(options)
+      name = options.fetch(:name).to_sym
+      type = options.fetch(:type).to_sym
+      countries = options.fetch(:country_codes)
+      config = options.fetch(:config)
+
+      raise ArgumentError.new("Duplicate output name") if outputs.include? name
+      raise ArgumentError.new("Unknown output type specified") unless output_types.include? type
+
+      configured_outputs[name] = {type: type, config: config}
+      countries.each do |cc|
+        add_country_code(cc, name)
       end
-      @config[method]
     end
-  end
 
+    def outputs
+      configured_outputs.keys
+    end
+
+    def country_codes
+      output_by_country_code.keys
+    end
+
+  end
 end
 
 # httpclient does not send basic auth correctly, or at all.
 HTTPI.adapter = :net_http
-
-# Setting config defaults
-# there is probably a better way and better place
-# Unused and deprecated
-Smess.config.debug = Smess.booleanize(ENV["SMESS_DEBUG"])

data/lib/smess/output.rb

@@ -0,0 +1,23 @@
+module Smess
+  class Output
+
+    attr_accessor :sms
+    attr_reader :config
+
+    def initialize(config)
+      @config = config
+      validate_config
+    end
+
+    # should be used to make a reasonable validation that the configuration provided is good.
+    def validate_config
+      raise NotImplementedError.new("You must define validate_config in your Smess output class")
+    end
+
+    # entry point to the sms delivery process.
+    def deliver
+      raise NotImplementedError.new("You must define deliver in your Smess output class")
+    end
+
+  end
+end

data/lib/smess/outputs/auto.rb

@@ -1,30 +1,29 @@
 module Smess
-  class Auto
+  class Auto < Output
 
-    def initialize(sms)
-      @sms = sms
+    attr_accessor :output_name
+
+    def validate_config
+    end
+
+    def deliver
+      out = output_for sms.to
+      out.deliver.merge({sent_with: output_name})
     end
 
     def get_output_name_for_msisdn(msisdn)
       3.downto(0).each do |index|
-        return OUTPUT_BY_COUNTRY_CODE[msisdn[0..index]] if OUTPUT_BY_COUNTRY_CODE.key? msisdn[0..index]
+        return Smess.config.output_by_country_code[msisdn[0..index]] if Smess.config.output_by_country_code.key? msisdn[0..index]
       end
-      OUTPUT_BY_COUNTRY_CODE["0"]
+      Smess.config.default_output
     end
 
     def output_for(msisdn)
-      out_class = get_output_name_for_msisdn msisdn
-      "Smess::#{out_class.to_s.camelize}".constantize.new(sms)
+      output_name = get_output_name_for_msisdn(msisdn)
+      output = Smess.named_output_instance( output_name )
+      output.sms = sms
+      output
     end
 
-    def deliver
-      out = output_for sms.to
-      out.deliver
-    end
-
-    private
-
-    attr_reader :sms
-
   end
 end

data/lib/smess/outputs/card_board_fish.rb

@@ -6,19 +6,13 @@ module Smess
       http_get request
     end
 
-    private
-
-    def username
-      ENV["SMESS_CARD_BOARD_FISH_USER"]
-    end
-
-    def password
-      ENV["SMESS_CARD_BOARD_FISH_PASS"]
+    attr_accessor :username, :password
+    def validate_config
+      @username  = config.fetch(:username)
+      @password  = config.fetch(:password)
     end
 
-    def sender_id
-      ENV["SMESS_SENDER_ID"]
-    end
+    private
 
     def url
       "https://sms2.cardboardfish.com:9444/HTTPSMS"

data/lib/smess/outputs/clickatell.rb

@@ -23,11 +23,11 @@ end
 
 
 module Smess
-  class Clickatell
+  class Clickatell < Output
     include Smess::Logging
 
-    def initialize(sms)
-      @sms = sms
+    def initialize(config)
+      super
       ::Clickatell::API.debug_mode = true
       ::Clickatell::API.secure_mode = true
     end
@@ -47,13 +47,22 @@ module Smess
       result
     end
 
+    attr_accessor :api_id, :user, :pass, :sender_id, :sender_ids
+    def validate_config
+      @api_id     = config.fetch(:api_id)
+      @user       = config.fetch(:user)
+      @pass       = config.fetch(:pass)
+      @sender_id  = config.fetch(:sender_id)
+      @sender_ids = config.fetch(:sender_ids)
+    end
+
     private
 
     attr_reader :sms
 
     def from
       return nil if sender_not_supported
-      ENV["SMESS_CLICKATELL_SENDER_IDS"].split(",").include?(sms.originator) ? sms.originator : ENV["SMESS_CLICKATELL_SENDER_ID"]
+      sender_ids.split(",").include?(sms.originator) ? sms.originator : sender_id
     end
 
     def messages
@@ -74,11 +83,7 @@ module Smess
     end
 
     def api
-      @api ||= ::Clickatell::API.authenticate(
-        ENV["SMESS_CLICKATELL_API_ID"],
-        ENV["SMESS_CLICKATELL_USER"],
-        ENV["SMESS_CLICKATELL_PASS"]
-      )
+      @api ||= ::Clickatell::API.authenticate(api_id, user, pass)
     end
 
     def normal_result(response)

data/lib/smess/outputs/global_mouth.rb

@@ -10,18 +10,17 @@ module Smess
       http_get request
     end
 
-    private
-
-    def username
-      ENV["SMESS_GLOBAL_MOUTH_USER"].dup # paranoid safeguard
+    attr_accessor :username, :password, :sender_id
+    def validate_config
+      @username  = config.fetch(:username)
+      @password  = config.fetch(:password)
+      @sender_id = config.fetch(:sender_id)
     end
 
-    def password
-      ENV["SMESS_GLOBAL_MOUTH_PASS"]
-    end
+    private
 
-    def sender_id
-      ENV["SMESS_GLOBAL_MOUTH_SENDER_ID"]
+    def username
+      @username.dup # paranoid safeguard
     end
 
     def url

data/lib/smess/outputs/http_base.rb

@@ -2,22 +2,23 @@ require 'uri'
 require 'httpi'
 
 module Smess
-  class HttpBase
+  class HttpBase < Output
     include Smess::Logging
 
-    def initialize(sms)
-      @sms = sms
+    def initialize(config)
+      super
       HTTPI.log_level = :debug
     end
 
-    private
-
-    attr_reader :sms
 
     def sender_id
-      ENV["SMESS_SENDER_ID"]
+      @sender_id || Smess.config.default_sender_id
     end
 
+    private
+
+    attr_reader :sms
+
     def from
       sms.originator || sender_id
     end

data/lib/smess/outputs/iconectiv.rb

@@ -3,10 +3,6 @@ module Smess
 
     private
 
-    def account_key_prefix
-      "ICONECTIV"
-    end
-
     # iConectiv asserts that this is all that is still reqquired and that it wont break other carriers.
     # test of major carriers confirm this too... let's see how the small ones do.
     def perform_operator_adaptation(msisdn)

data/lib/smess/outputs/ipx.rb

@@ -1,9 +1,18 @@
 module Smess
-  class Ipx
+  class Ipx < Output
     include Smess::Logging
 
-    def initialize(sms)
-      @sms = sms
+    attr_accessor :sms_url, :username, :password, :shortcode, :account_name, :service_name, :service_meta_data_verizon, :service_meta_data_t_mobile_us
+    def validate_config
+      @sms_url                       = config.fetch(:sms_url)
+      @username                      = config.fetch(:username)
+      @password                      = config.fetch(:password)
+      @shortcode                     = config.fetch(:shortcode)
+      @account_name                  = config.fetch(:account_name)
+      @service_name                  = config.fetch(:service_name)
+      @service_meta_data_verizon     = config.fetch(:service_meta_data_verizon, "")
+      @service_meta_data_t_mobile_us = config.fetch(:service_meta_data_t_mobile_us, "")
+
       @results = []
       @endpoint = sms_url
       @credentials = {
@@ -36,46 +45,6 @@ module Smess
     attr_reader :sms
     attr_accessor :results
 
-    def account_key_prefix
-      "IPX"
-    end
-
-    def account_key_for(key_part)
-      "SMESS_#{account_key_prefix}_#{key_part}"
-    end
-
-    def sms_url
-      ENV[ account_key_for("URL") ]
-    end
-
-    def shortcode
-      ENV[ account_key_for("SHORTCODE") ]
-    end
-
-    def username
-      ENV[ account_key_for("USER") ]
-    end
-
-    def password
-      ENV[ account_key_for("PASS") ]
-    end
-
-    def account_name
-      ENV[ account_key_for("ACCOUNT_NAME") ]
-    end
-
-    def service_name
-      ENV["SMESS_SERVICE_NAME"]
-    end
-
-    def service_meta_data_t_mobile_us
-      ENV[ account_key_for("SERVICE_META_DATA_T_MOBILE_US") ]
-    end
-
-    def service_meta_data_verizon
-      ENV[ account_key_for("SERVICE_META_DATA_VERIZON") ]
-    end
-
     def soap_body
       @soap_body ||= {
         "correlationId" => Time.now.strftime('%Y%m%d%H%M%S') + sms.to,

data/lib/smess/outputs/mblox.rb

@@ -2,11 +2,11 @@ require 'uri'
 require 'httpi'
 
 module Smess
-  class Mblox
+  class Mblox < Output
     include Smess::Logging
 
-    def initialize(sms)
-      @sms = sms
+    def initialize(config)
+      super
       @results = []
     end
 
@@ -25,6 +25,16 @@ module Smess
       results.first
     end
 
+    attr_accessor :username, :password, :shortcode, :profile_id, :sid
+    def validate_config
+      @username   = config.fetch(:username)
+      @password   = config.fetch(:password)
+      @shortcode  = config.fetch(:shortcode)
+      @profile_id = config.fetch(:profile_id)
+      @sid        = config.fetch(:sid)
+    end
+
+
     def hash_data_for(xml_params)
       rand = (SecureRandom.random_number*100000000).to_i
       @message_id = rand
@@ -32,13 +42,13 @@ module Smess
       xml_hash = {
         notification_request: {
           notification_header: {
-            partner_name: ENV["SMESS_MBLOX_SURE_ROUTE_USER"],
-            partner_password: ENV["SMESS_MBLOX_SURE_ROUTE_PASS"]
+            partner_name: username,
+            partner_password: password
           },
           notification_list: {
             notification: {
               message: xml_params[:message],
-              profile: ENV["SMESS_MBLOX_SURE_ROUTE_PROFILE_ID"],
+              profile: profile_id,
               udh: xml_params.fetch(:udh,""),
               sender_i_d: from,
               # expire_date: "",
@@ -51,7 +61,7 @@ module Smess
               # tags: '<Tag Name=”Number”>56</Tag><Tag Name=”City”>Paris</Tag>',
               # service_desc: "",
               # content_type: "",
-              service_id: ENV["SMESS_MBLOX_SURE_ROUTE_SID"],
+              service_id: sid,
               attributes!: { sender_i_d: { "Type" => "Shortcode" } }
             },
             attributes!: { notification: { "SequenceNumber" => "1", "MessageType" => "SMS" } } # FlashSMS
@@ -70,7 +80,7 @@ module Smess
     attr_accessor :results
 
     def from
-      ENV["SMESS_MBLOX_SURE_ROUTE_SHORTCODE"]
+      shortcode
     end
 
     def parts

data/lib/smess/outputs/smsglobal.rb

@@ -11,18 +11,15 @@ module Smess
       http_post request
     end
 
-    private
-
-    def username
-      ENV["SMESS_SMSGLOBAL_USER"]
-    end
-    def password
-      ENV["SMESS_SMSGLOBAL_PASS"]
-    end
-    def sender_id
-      ENV["SMESS_SMSGLOBAL_SENDER_ID"]
+    attr_accessor :username, :password, :sender_id
+    def validate_config
+      @username = config.fetch(:username)
+      @password = config.fetch(:password)
+      @sender_id = config.fetch(:sender_id, Smess.config.default_sender_id)
     end
 
+    private
+
     def url
       "https://www.smsglobal.com/http-api.php"
     end

data/lib/smess/outputs/test.rb

@@ -1,5 +1,5 @@
 module Smess
-  class Test
+  class Test < Output
 
     @@instance = nil
     @delivery_result = {
@@ -11,10 +11,9 @@ module Smess
       }
     }
     class << self; attr_accessor :delivery_result end
-    attr_reader :sms
 
-    def initialize(sms)
-      @sms = sms
+    def initialize(config)
+      super
       @@instance = self
     end
 
@@ -22,6 +21,9 @@ module Smess
       @@instance
     end
 
+    def validate_config
+    end
+
     def deliver
       self.class.delivery_result
     end

data/lib/smess/outputs/twilio.rb

@@ -1,32 +1,31 @@
 require 'twilio-ruby'
 
 module Smess
-  class Twilio
+  class Twilio < Output
     include Smess::Logging
 
-    def initialize(sms)
-      @sms = sms
+    def initialize(config)
+      super
       @results = []
     end
 
-    def deliver
-      parts.each do |part|
-        results << send_one_sms(part)
-      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)
+      @from = config.fetch(:from, nil)
+      @messaging_service_sid = config.fetch(:messaging_service_sid, nil)
+      @callback_url = config.fetch(:callback_url)
+    end
 
-      # we don't actually return the status for any of additional messages which is cheating
-      results.first
+    def deliver
+      send_one_sms sms.message.strip_nongsm_chars
     end
 
     private
 
-    attr_reader :sms
     attr_accessor :results
 
-    def from
-      ENV["SMESS_TWILIO_FROM"]
-    end
-
     def parts
       @parts ||= split_parts
     end
@@ -37,12 +36,17 @@ module Smess
 
     def send_one_sms(message)
       begin
-        response = create_client_message({
-          from: from,
+        opts = {
           to: "+#{sms.to}",
           body: message,
-          status_callback: ENV["SMESS_TWILIO_CALLBACK_URL"]
-        })
+          status_callback: callback_url
+        }
+        if messaging_service_sid.present?
+          opts[:messaging_service_sid] =  messaging_service_sid
+        else
+          opts[:from] =  from
+        end
+        response = create_client_message(opts)
         result = normal_result(response)
       rescue => e
         result = result_for_error(e)
@@ -55,7 +59,7 @@ module Smess
     end
 
     def client
-      @client ||= ::Twilio::REST::Client.new(ENV["SMESS_TWILIO_SID"], ENV["SMESS_TWILIO_AUTH_TOKEN"])
+      @client ||= ::Twilio::REST::Client.new(sid, auth_token)
     end
 
     def normal_result(response)

data/lib/smess/sms.rb

@@ -8,13 +8,13 @@ module Smess
       @to = opts.fetch(:to, nil)
       @message = opts.fetch(:message, "")
       @originator = opts.fetch(:originator, nil)
-      @output = opts.fetch(:output, "auto")
+      @output = opts.fetch(:output, :auto).to_sym
     end
 
     def deliver
-      out_class = output
-      out = "Smess::#{out_class.to_s.camelize}".constantize.new(self)
-      results = out.deliver
+      out = Smess.named_output_instance(output)
+      out.sms = self
+      self.results = {sent_with: output}.merge(out.deliver)
     end
 
     def delivered?

data/lib/smess/version.rb

@@ -1,3 +1,3 @@
 module Smess
-  VERSION = '1.0.10'
+  VERSION = '2.0'
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: smess
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: '2.0'
 platform: ruby
 authors:
 - Martin Westin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   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
@@ -84,56 +84,56 @@ dependencies:
   name: httpi
   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: 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 description: A mess of SMS messaging
@@ -142,12 +142,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/smess/country_code_registry.rb
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- lib/smess.rb
 - lib/smess/logging.rb
+- lib/smess/output.rb
 - lib/smess/outputs/auto.rb
 - lib/smess/outputs/card_board_fish.rb
 - lib/smess/outputs/clickatell.rb
-- lib/smess/outputs/etisalatdemo.rb
 - lib/smess/outputs/global_mouth.rb
 - lib/smess/outputs/http_base.rb
 - lib/smess/outputs/iconectiv.rb
@@ -160,12 +164,7 @@ files:
 - lib/smess/sms.rb
 - lib/smess/utils.rb
 - lib/smess/version.rb
-- lib/smess.rb
-- lib/string.rb
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.md
+- lib/string_ext.rb
 homepage: https://github.com/eimermusic/smess
 licenses:
 - MIT
@@ -176,17 +175,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A messy SMS messenger supporting every aggregator I have gotten my hands

data/lib/smess/country_code_registry.rb

@@ -1,36 +0,0 @@
-module Smess
-  OUTPUT_BY_COUNTRY_CODE = {
-    "0"   => :global_mouth,     # default for any undefined code
-    "1"   => :iconectiv,        # USA
-    "1242"=> :global_mouth,     # Bahamas
-    "1246"=> :global_mouth,     # Barbados
-    "1264"=> :global_mouth,     # Anguilla
-    "1268"=> :global_mouth,     # Antigua and Barbuda
-    "1284"=> :global_mouth,     # British Virgin Islands
-    "1345"=> :global_mouth,     # Cayman Islands
-    "1441"=> :clickatell,       # Bermuda
-    "1473"=> :global_mouth,     # Grenada
-    "1649"=> :global_mouth,     # Turks and Caicos Islands
-    "1664"=> :global_mouth,     # Montserrat
-    "1670"=> :global_mouth,     # Northern Mariana Islands
-    "1671"=> :global_mouth,     # Guam
-    "1684"=> :global_mouth,     # American Samoa
-    "1758"=> :global_mouth,     # Saint Lucia
-    "1767"=> :global_mouth,     # Dominica
-    "1784"=> :global_mouth,     # Saint Vincent and the Grenadines
-    "1787"=> :global_mouth,     # Puerto Rico
-    "1809"=> :global_mouth,     # Dominican Republic
-    "1868"=> :global_mouth,     # Trinidad and Tobago
-    "1869"=> :global_mouth,     # Saint Kitts and Nevis
-    "1876"=> :global_mouth,     # Jamaica
-    "20"  => :global_mouth,     # Egypt
-    "212" => :card_board_fish,  # Morocco
-    "33"  => :global_mouth,     # France
-    "34"  => :global_mouth,     # Spain
-    "44"  => :global_mouth,     # Great Britain
-    "46"  => :global_mouth,     # Sweden
-    "49"  => :global_mouth,     # Germany
-    "966" => :global_mouth,     # Saudi Arabia
-    "971" => :etisalatdemo      # United Arab Emirates
-  }
-end

data/lib/smess/outputs/etisalatdemo.rb

@@ -1,62 +0,0 @@
-module Smess
-  class Etisalatdemo
-    include Smess::Logging
-
-    attr_reader :sms
-
-    def initialize(sms)
-      @sms = sms
-      @smtp_settings = {
-        address:              "exmail.emirates.net.ae",
-        port:                 25,
-        domain:               'eim.ae',
-        user_name:            ENV["SMESS_ETISALATDEMO_USER"],
-        password:             ENV["SMESS_ETISALATDEMO_PASS"],
-        authentication:       'plain',
-        enable_starttls_auto: false
-      }
-    end
-
-    def deliver
-      local_from_var = from_address
-      local_sms = sms
-      mail = Mail.new do
-        from      local_from_var
-        to        "+#{local_sms.to}@email2sms.ae"
-        subject   "Smess Message"
-        body      local_sms.message.strip_nongsm_chars
-      end
-
-      mail.delivery_method :smtp, @smtp_settings
-
-      begin
-        mail.deliver
-      rescue => e
-        result = {
-          response_code: "-1",
-          response: {text: "Email2sms: Delivery Error: #{e.inspect}"},
-          data: {
-            to: sms.to,
-            text: sms.message.strip_nongsm_chars,
-            from: from_address
-          }
-        }
-      else
-        result = {
-          response_code: "0",
-          response: {text: "Email2sms: Delivery Successful"},
-          data: {
-            to: sms.to,
-            text: sms.message.strip_nongsm_chars,
-            from: from_address
-          }
-        }
-      end
-    end
-
-    def from_address
-      "#{@smtp_settings[:user_name]}@#{@smtp_settings[:domain]}"
-    end
-
-  end
-end