smess 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 939361e7af3aaff1ede9e6f14ffc19eeba98cf70d48f91da5234115e9672ccb9
-  data.tar.gz: 8ddc196e5cc1c5230f633e69c38cb4e099a1fb0efe093cd6dbfe965e6c3ea9dc
+  metadata.gz: 0f7417e77e181e70dc6198ad7c2c7fb82616798785a9134fae691967a03e7734
+  data.tar.gz: 382ac7cef4d2cd4e4d4ca52bd9eb0d8d34acef4b4a0dd9da590fef8fceb9cf10
 SHA512:
-  metadata.gz: d5f031c724a2966ae661a35a768d5980c7de9122ccdac97f012fda80b93c779b13799b6a167097f99c6cda4cd851776f550bf2c533a3ed9e260a75d14f9922e5
-  data.tar.gz: e6dca30228c547204c99cf6439e5b8ba280cbe52102de347de023868c2cb880bc94941a95b261919c70b532bd501991a552a8c4cc82d88d4d340ea877e25e972
+  metadata.gz: 5e2899a348d8090368337f2df34bf0b027f723a110a9af024f952d07d51fd59267bfd35b7758585301e51eff46d01b41fc8b04418c07daf19f1ff61d700a9662
+  data.tar.gz: fbb2a7d9b07ed6fbd787e442ed97cb4e70e2ac514fcc1f3609f9c772ade17ddbccff55911695679993f26ddacf5e0d19c871ca11bd954bfb1ff9ee0d44f6522d

data/README.md

@@ -7,14 +7,11 @@ This is a messy SMS messenger supporting every aggregator I have gotten my hands
 
 In 2008 I started working on SMS and MMS messaging applications. Within the first 2 months it was apparent that I needed an abstraction that could route messages to different aggregators (messaging providers) to support different countries. No one API supports the entire word in any useful way.
 
-This is that abstraction finally cleaned up (a little) enabling it to be public. Everyone from mBlox to  Clickatell. The following 7 aggregators are supported.
+This is that abstraction finally cleaned up (a little) enabling it to be public. Everyone from Twilio to Clickatell. The following aggregators are supported.
 
 * Auto - will automatically select the best option for each country. Most often using Global Mouth.
 * Clickatell - http://www.clickatell.com
 * Global Mouth - http://www.globalmouth.com
-* Iconectiv - http://www.iconectiv.com
-* IPX - http://www.ipx.com (who knows what'll happen to them)
-* mBlox - http://www.mblox.com
 * SMS Global - https://www.smsglobal.com
 * Twilio - http://www.twilio.com
 
@@ -25,13 +22,13 @@ There is also a _test_ aggregator that you should set evrything to use when runn
 
 * You want to send SMS messages from Ruby code.
 * You want one API to call regardless of which aggregator you switch to.
-* You may even want to do it to people in multiple countries using the "best" aggregator for each.
+* You may even want message people in multiple countries using the "best" aggregator for each.
 
 ## Why?
 
 It may be old and crappy but it has served many millions of SMS messages in production across all continents of the globe. Being in production it has some nice touches that may serve you well.
 
-There is automatic fallback delivery in places where it really makes a difference. Delivery reliability, particularly in the US, is appalling and being able to reduce non-deliveries by more than half is a big deal when sending transactional messages.
+There is automatic fallback delivery in places where it really makes a difference. Delivery reliability is not always good and being able to reduce non-deliveries by more than half is a big deal when sending transactional messages.
 
 The aggregator outputs are a very simple plugin system so you can subclass, modify and write your own. The protocol is just one method accepting a single argument.
 
@@ -119,7 +116,7 @@ There are also convenience methods patched onto String to normalize phone number
 "\r\n +(070-123)\n45 67\n".msisdn(46)
 #=> 46701234567
 ```
-US numbers cannot be banged into shape as much as most international numbers can. This is due to area codes not conforming to leading 0 as most other countries do. Tt is actually not terribly simple to see the difference between the US area code 850 and the North Korean country code 850. :)
+US numbers cannot be banged into shape as much as most international numbers can. This is due to area codes not conforming to leading 0 as most other countries do. It is actually not terribly simple to see the difference between the US area code 850 and the North Korean country code 850. :)
 
 More usage is pretty clear from the specs.
 
@@ -129,7 +126,7 @@ Being Swedish, disclaimers are required.
 
 * Much of the code is old and crappy. It started in 2008 in PHP, ported to Ruby in 2010.
 * There are OK specs for the simple stuff. No specs for the more error-prone API calls. There are live tests that can be run to verify end-to-end messaging, though.
-* Does not handle the other part of messaging... accepting and processing Delivery Reports. (I have the code... it is just not extracted yet.)
+* Does not handle the other part of messaging... accepting and processing Delivery Reports. 
 
 
 

data/example_config.rb

@@ -36,25 +36,9 @@ Smess.configure do |config|
     }
   })
 
-  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"],
+    country_codes: ["1", "971"],
     type: :twilio,
     config: {
       sid:          ENV["SMESS_TWILIO_SID"],

data/lib/smess/output.rb

@@ -11,14 +11,22 @@ module Smess
 
     # 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")
+      raise NoMethodError.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")
+      raise NoMethodError.new("You must define deliver in your Smess output class")
     end
 
+    # entry point to the verification process.
+    def verify(using: 'none')
+      raise NoMethodError.new("Verify API is not supported by this Smess output")
+    end
+    def check(code)
+      raise NoMethodError.new("Verify API is not supported by this Smess output")
+    end
+    
     def send_feedback(_message_sid)
       nil
     end

data/lib/smess/outputs/http_base.rb

@@ -42,9 +42,6 @@ module Smess
     def http_request(method, request)
       response = HTTPI.send(method, request)
       normal_result(response)
-    rescue => e
-      logger.warn response
-      result_for_error(e)
     end
 
     def result_for_error(e)

data/lib/smess/outputs/smsglobal.rb

@@ -37,9 +37,9 @@ module Smess
     end
 
     def normal_result(response)
-      first_response = response.body.split(/\r\n/).first.split(";")
-      response_code = first_response.first.split(':').last.to_i
-      message_id = first_response.last.split('SMSGlobalMsgID:').last
+      first_response = response.body.split(/\r\n/).first.split(";") rescue nil
+      response_code = first_response.first.split(':').last.to_i rescue response.code.to_s
+      message_id = first_response.last.split('SMSGlobalMsgID:').last rescue ""
       # Successful response
       {
         message_id: message_id,
@@ -51,4 +51,4 @@ module Smess
     end
 
   end
-end
+end

data/lib/smess/outputs/twilio.rb

@@ -9,7 +9,7 @@ module Smess
       @results = []
     end
 
-    attr_accessor :sid, :auth_token, :from, :messaging_service_sid, :callback_url
+    attr_accessor :sid, :auth_token, :from, :messaging_service_sid, :callback_url, :verify_service_sid
 
     def validate_config
       @sid = config.fetch(:sid)
@@ -17,6 +17,7 @@ module Smess
       @from = config.fetch(:from, nil)
       @messaging_service_sid = config.fetch(:messaging_service_sid, nil)
       @callback_url = config.fetch(:callback_url)
+      @verify_service_sid = config.fetch(:verify_service_sid, nil)
     end
 
     def send_feedback(message_sid)
@@ -27,6 +28,51 @@ module Smess
       send_one_sms sms.message
     end
 
+    def verify(using: 'sms')
+      response = client.verify.v2
+        .services(verify_service_sid)
+        .verifications
+        .create(to: to, channel: using)
+      {
+        'sid' => response.sid,
+        'service_sid' => response.service_sid,
+        'account_sid' => response.account_sid,
+        'to' => response.to,
+        'channel' => response.channel,
+        'status' => response.status,
+        'valid' => response.valid,
+        'lookup' => response.lookup,
+        'amount' => response.amount,
+        'payee' => response.payee,
+        'send_code_attempts' => response.send_code_attempts,
+        'date_created' => response.date_created,
+        'date_updated' => response.date_updated,
+        'sna' => response.sna,
+        'url' => response.url
+      }  
+    end
+
+    def check(code)
+      response = client.verify.v2
+        .services(verify_service_sid)
+        .verification_checks
+        .create(to: to, code: code)
+      {
+        'sid' => response.sid,
+        'service_sid' => response.service_sid,
+        'account_sid' => response.account_sid,
+        'to' => response.to,
+        'channel' => response.channel,
+        'status' => response.status,
+        'valid' => response.valid,
+        'amount' => response.amount,
+        'payee' => response.payee,
+        'date_created' => response.date_created,
+        'date_updated' => response.date_updated,
+        'sna_attempts_error_codes' => response.sna_attempts_error_codes,
+      }
+    end
+
     private
 
     attr_accessor :results
@@ -62,7 +108,7 @@ module Smess
         opts.merge!(sender)
         response = create_client_message(opts)
         result = normal_result(response)
-      rescue => e
+      rescue Twilio::REST::RestError => e
         puts "got exception #{e.inspect}"
         result = result_for_error(e)
       end

data/lib/smess/sms.rb

@@ -17,6 +17,18 @@ module Smess
       self.results = {sent_with: output}.merge(out.deliver)
     end
 
+    def verify(using: 'sms')
+      out = Smess.named_output_instance(output)
+      out.sms = self
+      self.results = {sent_with: output}.merge(out.verify(using: using))
+    end
+
+    def check(code)
+      out = Smess.named_output_instance(output)
+      out.sms = self
+      self.results = {sent_with: output}.merge(out.check(code))
+    end
+
     def delivered?
       results[:response_code] == "0"
     end

data/lib/smess/version.rb

@@ -1,3 +1,3 @@
 module Smess
-  VERSION = '2.3.0'
+  VERSION = '3.0.0'
 end

data/lib/smess.rb

@@ -2,8 +2,6 @@
 smess_path = File.expand_path('.', File.dirname(__FILE__))
 $:.unshift(smess_path) if File.directory?(smess_path) && !$:.include?(smess_path)
 
-require 'mail'
-require 'savon'
 require 'active_support'
 require 'active_support/core_ext'
 
@@ -14,17 +12,13 @@ require 'smess/utils'
 require 'smess/sms'
 require 'smess/outputs/http_base'
 require 'smess/outputs/auto'
-require 'smess/outputs/ipx'
-require 'smess/outputs/ipxus'
 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/twilio_whatsapp'
-require 'smess/outputs/iconectiv'
 require 'smess/outputs/test'
 
 require 'string_ext'
@@ -60,7 +54,7 @@ module Smess
       @nothing = false
       @default_output = nil
       @default_sender_id = "Smess"
-      @output_types = %i{auto card_board_fish clickatell global_mouth link_mobility iconectiv mblox smsglobal twilio twilio_whatsapp}
+      @output_types = %i{auto card_board_fish clickatell global_mouth link_mobility smsglobal twilio twilio_whatsapp}
       @configured_outputs = {}
       @output_by_country_code = {}
 

data/smess.gemspec

@@ -17,9 +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 'mail', '~> 2.7'
-  s.add_dependency 'savon', '1.2.0'
-  s.add_dependency 'httpi', '~> 1.1'
+  s.add_dependency 'httpi', '~> 3.0'
   s.add_dependency 'clickatell', '~> 0'
   s.add_dependency 'twilio-ruby', '~> 5.26'
   s.add_dependency 'activesupport', '>= 5.2.6', '< 7.0.0'

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: smess
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Martin Westin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2023-06-15 00:00:00.000000000 Z
@@ -52,48 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mail
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: savon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: httpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: clickatell
   requirement: !ruby/object:Gem::Requirement
@@ -161,11 +133,7 @@ files:
 - lib/smess/outputs/clickatell.rb
 - lib/smess/outputs/global_mouth.rb
 - lib/smess/outputs/http_base.rb
-- 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
 - lib/smess/outputs/twilio.rb
@@ -179,7 +147,7 @@ homepage: https://github.com/eimermusic/smess
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: A messy SMS messenger supporting every aggregator I have gotten my hands
   on

data/lib/smess/outputs/iconectiv.rb

@@ -1,13 +0,0 @@
-module Smess
-  class Iconectiv < Ipxus
-
-    private
-
-    # 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)
-      adapt_for_t_mobile_us msisdn
-    end
-
-  end
-end

data/lib/smess/outputs/ipx.rb

@@ -1,221 +0,0 @@
-module Smess
-  class Ipx < Output
-    include Smess::Logging
-
-    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 = {
-        name: username,
-        pass: password
-      }
-    end
-
-    def deliver
-      set_originator(sms.originator)
-      perform_operator_adaptation(sms.to)
-
-      parts.each_with_index do |part, i|
-        populate_soap_body(part, i)
-        results << send_one_sms
-
-        # halt and use fallback on error...
-        if last_result_was_error
-          logger.info "IPX_ERROR: #{results.last}"
-          return fallback_to_twilio || results.first
-        end
-      end
-
-      # we don't actually return the status for any of additional messages which is cheating
-      results.first
-    end
-
-    private
-
-    attr_reader :sms
-    attr_accessor :results
-
-    def soap_body
-      @soap_body ||= {
-        "correlationId" => Time.now.strftime('%Y%m%d%H%M%S') + sms.to,
-        "originatingAddress" => shortcode,
-        "originatorTON" => "0",
-        "destinationAddress" => sms.to,
-        "userData" => "",
-        "userDataHeader" => "#NULL#",
-        "DCS" => "-1",
-        "PID" => "-1",
-        "relativeValidityTime" => "-1",
-        "deliveryTime" => "#NULL#",
-        "statusReportFlags" => "1", # 1
-        "accountName" => account_name,
-        "tariffClass" => "USD0", # needs to be extracted and variable per country
-        "VAT" => "-1",
-        "referenceId" => "#NULL#",
-        "serviceName" =>  service_name,
-        "serviceCategory" => "#NULL#",
-        "serviceMetaData" => "#NULL#",
-        "campaignName" => "#NULL#",
-        "username" => username,
-        "password" => password
-      }
-    end
-
-
-    def soap_client
-      Savon.configure do |config|
-        config.log_level = :info
-        config.raise_errors = false
-      end
-
-      endpoint = @endpoint
-      mm7ns = wsdl_namespace
-      credentials = @credentials
-
-      client = Savon::Client.new do |wsdl, http|
-        wsdl.endpoint = endpoint
-        wsdl.namespace = mm7ns
-
-        http.open_timeout = 15
-        http.read_timeout = 60 # Won't set read timeout to 10 minutes!! (IPX are crazy)
-        http.auth.basic  credentials[:name], credentials[:pass] unless credentials.nil?
-      end
-      client
-    end
-
-    # Delivery reliability, particularly in the US, is appalling
-    # and being able to reduce non-deliveries by more than half
-    # is a big deal when sending transactional messages.
-    def fallback_to_twilio
-      sms.output = :twilio
-      sms.deliver
-    end
-
-    def get_response_hash_from(response)
-      response.to_hash[:submit_rsp]
-    end
-
-    def get_message_id_from hash
-      hash[:message_id] rescue ''
-    end
-
-    def set_originator(originator)
-      soap_body["originatingAddress"] = originator
-      soap_body["originatorTON"] = (originator.length == 5 && originator.to_i.to_s == originator) ? "0" : "1"
-    end
-
-    def xmlns
-      "http://www.ipx.com/api/services/smsapi52/types"
-    end
-
-    def wsdl_namespace
-      "http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-6-MM7-1-2"
-    end
-
-    def parts
-      @parts ||= split_parts
-    end
-
-    def split_parts
-      Smess.split_sms(sms.message.strip_nongsm_chars).reject {|s| s.empty? }
-    end
-
-    # {050003}{ff}{02}{01} {concat-command}{id to link all parts}{total num parts}{num of current part}
-    def concatenation_udh(num, total)
-      "050003#{ref_id}#{total.to_s(16).rjust(2,'0')}#{(num).to_s(16).rjust(2,'0')}"
-    end
-
-    def ref_id
-      @ref_id ||= Random.new.rand(255).to_s(16).rjust(2,"0")
-    end
-
-    def populate_soap_body(part, i)
-      # if we have several parts, send them as concatenated sms using UDH codes
-      soap_body["userDataHeader"] = concatenation_udh(i+1, parts.length) if parts.length > 1
-      soap_body["userData"] = part
-      soap_body["correlationId"] = Time.now.strftime('%Y%m%d%H%M%S') + sms.to + (i+1).to_s
-    end
-
-    def send_one_sms
-      client = soap_client
-      soap_body_var = soap_body
-      begin
-        response = client.request "SendRequest", "xmlns" => xmlns do
-          soap.body = soap_body_var
-        end
-        result = parse_sms_response(response)
-      rescue => e
-        result = result_for_error(e)
-        # LOG error here?
-      end
-      result
-    end
-
-    def last_result_was_error
-      results.last.fetch(:response_code, '').to_s != "0"
-    end
-
-    def parse_sms_response(response)
-      if response.http_error? || response.soap_fault?
-        e = Struct.new(:code, :message).new("-1", response.http_error || response.soap_fault.to_hash)
-        result = result_for_error(e)
-      else
-        result = normal_result(response)
-      end
-      result
-    end
-
-    def result_for_error(e)
-      {
-        response_code: '-1',
-        response: {
-          temporaryError: 'true',
-          responseCode: '-1',
-          responseText: e.message
-        },
-        data: result_data
-      }
-    end
-
-    def normal_result(response)
-      hash = response.to_hash[:send_response]
-      message_id = ""
-      message_id = hash[:message_id] if hash.has_key? :message_id
-      response_code = hash[:response_code]
-
-      {
-        message_id: message_id,
-        response_code: response_code,
-        response: hash,
-        destination_address: sms.to,
-        data: result_data
-      }
-    end
-
-    def result_data
-      data = soap_body.dup
-      data.delete "password"
-      data["userData"] = sms.message.strip_nongsm_chars
-      data
-    end
-
-
-    # Called before final message assembly
-    # used to look up the operator and make changes to the SOAP data for some carriers
-    def perform_operator_adaptation(msisdn)
-    end
-
-
-
-  end
-end

data/lib/smess/outputs/ipxus.rb

@@ -1,69 +0,0 @@
-module Smess
-  class Ipxus < Ipx
-
-  private
-
-    def set_originator(originator)
-      # Cannot set custom originator in the US
-    end
-
-    # Called before final message assembly
-    # used to look up the operator and make changes to the MM7 for Verizon and T-mobile
-    def perform_operator_adaptation(msisdn)
-      operator_data = lookup_operator msisdn
-      unless operator_data[:operator].nil?
-        method_name = "adapt_for_#{operator_data[:operator].smess_to_underscore.gsub(" ","_")}"
-        send(method_name, msisdn) if respond_to?(:"#{method_name}", true)
-      end
-    end
-
-    def lookup_operator(msisdn)
-      orig_endpoint = @endpoint
-      orig_credentials = @credentials
-      @endpoint = "http://europe.ipx.com/api/services/ConsumerLookupApi09"
-      @credentials = nil
-      client = soap_client
-      client.wsdl.namespace = "http://www.ipx.com/api/services/consumerlookupapi09/types"
-      body = {
-        "correlationId" => Time.now.strftime('%Y%m%d%H%M%S') + msisdn,
-        "consumerId" => msisdn,
-        "campaignName" => "#NULL#",
-        "username" => username,
-        "password" => password
-      }
-
-      begin
-        response = client.request "ResolveOperatorRequest", "xmlns"=>"http://www.ipx.com/api/services/consumerlookupapi09/types" do
-          soap.body = body
-        end
-        result = parse_operator_response(response)
-      rescue => e
-        result = result_for_error(e)
-      ensure
-        @endpoint = orig_endpoint
-        @credentials = orig_credentials
-      end
-      result
-    end
-
-    def parse_operator_response(response)
-      if response.http_error? || response.soap_fault?
-        e = Struct.new(:code, :message).new("-1", response.http_error || response.soap_fault.to_hash)
-        result = result_for_error(e)
-      else
-        result = response.to_hash[:resolve_operator_response]
-      end
-      result
-    end
-
-
-    def adapt_for_verizon(msisdn)
-      soap_body["serviceMetaData"] = service_meta_data_verizon
-    end
-
-    def adapt_for_t_mobile_us(msisdn)
-      soap_body["serviceMetaData"] = service_meta_data_t_mobile_us
-    end
-
-  end
-end

data/lib/smess/outputs/mblox.rb

@@ -1,179 +0,0 @@
-require 'uri'
-require 'httpi'
-
-module Smess
-  class Mblox < Output
-    include Smess::Logging
-
-    def initialize(config)
-      super
-      @results = []
-    end
-
-    def deliver
-      xml_params = {
-        subscriber_number: sms.to,
-        message: ""
-      }
-
-      parts.each_with_index do |part, i|
-        xml_params[:message] = part
-        xml_params[:udh]  = concatenation_udh(i+1, parts.length) if parts.length > 1
-        results << send_one_sms(xml_params)
-      end
-
-      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
-
-      xml_hash = {
-        notification_request: {
-          notification_header: {
-            partner_name: username,
-            partner_password: password
-          },
-          notification_list: {
-            notification: {
-              message: xml_params[:message],
-              profile: profile_id,
-              udh: xml_params.fetch(:udh,""),
-              sender_i_d: from,
-              # expire_date: "",
-              # operator: "",
-              # tariff: "",
-              subscriber: {
-                subscriber_number: xml_params[:subscriber_number],
-                session_id: ""
-              },
-              # tags: '<Tag Name=”Number”>56</Tag><Tag Name=”City”>Paris</Tag>',
-              # service_desc: "",
-              # content_type: "",
-              service_id: sid,
-              attributes!: { sender_i_d: { "Type" => "Shortcode" } }
-            },
-            attributes!: { notification: { "SequenceNumber" => "1", "MessageType" => "SMS" } } # FlashSMS
-          },
-          attributes!: { notification_list: { "BatchID" => @message_id } }
-        },
-        attributes!: {  notification_request: { "Version" => "3.5" } }
-      }
-      xml_hash[:notification_request][:notification_list][:notification].delete :udh unless xml_params.key? :udh
-      xml_hash
-    end
-
-    private
-
-    attr_reader :sms
-    attr_accessor :results
-
-    def from
-      shortcode
-    end
-
-    def parts
-      @parts ||= split_parts
-    end
-
-    def split_parts
-      Smess.split_sms(sms.message.strip_nongsm_chars).reject {|s| s.empty? }
-    end
-
-    def send_one_sms(xml_params)
-      request.url = 'https://xml4.us.mblox.com:443/send'
-      request.headers["Content-Type"] = "application/x-www-form-urlencoded"
-      request.body = http_body(xml_params)
-
-      begin
-        HTTPI.log_level = :debug
-        response = HTTPI.post request
-        result = normal_result(response)
-      rescue => e
-        logger.warn response
-        # connection problem or some error
-        result = result_for_error(e)
-      end
-      result
-    end
-
-    def http_body(xml_params)
-      xml = xml_data_for(xml_params)
-      "XMLDATA="+URI::encode( xml.encode("ISO-8859-1") )
-    end
-
-    def xml_data_for(xml_params)
-      Gyoku.convert_symbols_to :camelcase
-      '<?xml version="1.0"?>'+
-      Gyoku.xml( hash_data_for(xml_params) )
-    end
-
-    def concatenation_udh(num, total)
-      "050003#{ref_id}#{total.to_s(16).rjust(2,'0')}#{(num).to_s(16).rjust(2,'0')}".scan(/../).join(':').prepend(':')
-    end
-
-    def ref_id
-      @ref_id ||= Random.new.rand(255).to_s(16).rjust(2,"0")
-    end
-
-    def normal_result(response)
-      response_data = Nori.parse(response.body)
-      response_code = response_code_for response_data
-      # Successful response
-      result = {
-        message_id: @message_id,
-        response_code: response_code,
-        response: response_data,
-        destination_address: sms.to,
-        data: result_data
-      }
-    end
-
-    def response_code_for(response_data)
-      request_result_code = response_data[:notification_request_result][:notification_result_header][:request_result_code] rescue "-1"
-      return "request:#{request_result_code}" unless request_result_code == "0"
-
-      notification_result_code = response_data[:notification_request_result][:notification_result_list][:notification_result][:notification_result_code] rescue "-1"
-      return "notification:#{notification_result_code}" unless notification_result_code == "0"
-
-      subscriber_result_code = response_data[:notification_request_result][:notification_result_list][:notification_result][:subscriber_result][:subscriber_result_code] rescue "-1"
-      (subscriber_result_code == "0") ? subscriber_result_code : "subscriber:#{subscriber_result_code}"
-    end
-
-    def request
-      @request ||= HTTPI::Request.new
-    end
-
-    def result_for_error(e)
-      {
-        response_code: '-1',
-        response: {
-          temporaryError: 'true',
-          responseCode: '-1',
-          responseText: e.message
-        },
-        data: result_data
-      }
-    end
-
-    def result_data
-      {
-        to: sms.to,
-        text: sms.message.strip_nongsm_chars,
-        from: from
-      }
-    end
-
-  end
-end