smess 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c788fb1adca56a19e9415362cdf44e74c8064e89
-  data.tar.gz: 4778a898c0d307f1b7e45606e9942b9a81456a3e
+  metadata.gz: 0a1e283815e44722a3631efb29a2eaa38d0fa4eb
+  data.tar.gz: 1c48a4e6deb6695578794876979b2fb1d3bf928d
 SHA512:
-  metadata.gz: 64dcc2a833300d0d55a55c38329bd7c5562556a4b1189c2e587380ab4a5d94af45a0ecb98e5080ae6d5f6ff72e85ae903cca7c63a324c32833fd615c182eda43
-  data.tar.gz: 50ea00e53fda127b453cf3975dd936f9459025b1fe1f02fdfcc32566b9f81f8a0eeebbb48d89793e02496d8adb3e869e7a2761496ab47c1caf558ec9a90bc05c
+  metadata.gz: ffcaee4dd2e2e81dd04de3d50d9d3a915b84160d675fefd4fa7d127141e61a77b3f41dc662b3d5ecb95ef7bd31b968beed9965fdc1386b7f5059673e455e9d4e
+  data.tar.gz: 6dc69c352819f3e6061efae4b72b0f163cb860a760c5cba95024c030a65363d99d35792e5cb9984cdad90db47e1fe6b69ca2ead4fb039a832c76e66f1318c511

data/README.md

@@ -1,3 +1,6 @@
+[![Gem Version](https://badge.fury.io/rb/smess.png)](http://badge.fury.io/rb/smess)
+[![Code Climate](https://codeclimate.com/repos/52249703f3ea003d03072821/badges/efe9fa39e239e1515d4e/gpa.png)](https://codeclimate.com/repos/52249703f3ea003d03072821/feed)
+
 # Smess - A mess of SMS messaging
 
 This is a messy SMS messenger supporting every aggregator I have gotten my hands on.

data/lib/smess.rb

@@ -12,7 +12,6 @@ require 'smess/country_code_registry'
 require 'smess/utils'
 require 'smess/sms'
 require 'smess/outputs/auto'
-require 'smess/outputs/mm7'
 require 'smess/outputs/ipx'
 require 'smess/outputs/ipxus'
 require 'smess/outputs/clickatell'

data/lib/smess/outputs/global_mouth.rb

@@ -5,74 +5,29 @@ module Smess
   class GlobalMouth
     include Smess::Logging
 
+    def deliver_sms(sms_arg)
+      return false unless sms_arg.kind_of? Sms
+      @sms = sms_arg
 
-    def compute_hash(values = [])
-      hash = "#{username}#{values.join}"
-      auth_hash = Digest::MD5.hexdigest "#{username}:#{password}"
-      Digest::MD5.hexdigest "#{hash}#{auth_hash}"
-    end
-
-
-    def deliver_sms(sms)
-      return false unless sms.kind_of? Sms
-
-      url = "https://mcm.globalmouth.com:8443/api/mcm"
-      from = sms.originator || sender_id
-      message_id = Digest::MD5.hexdigest "#{Time.now.strftime('%Y%m%d%H%M%S')}#{sms.to}-#{SecureRandom.hex(6)}"
-
-      params = {
-        username: username,
-        msisdn: "+#{sms.to}",
-        body: sms.message.strip_nongsm_chars.encode("ISO-8859-1"),
-        originator: from,
-        ref: message_id,
-        dlr: "true"
-      }
-      params[:hash] =  compute_hash(
-        [sms.message.strip_nongsm_chars.encode("ISO-8859-1"), params[:originator], params[:msisdn]]
-      )
-      request = HTTPI::Request.new
+      generate_mac_hash
       request.url = "#{url}?#{params.to_query}"
 
       begin
         HTTPI.log_level = :debug
         response = HTTPI.get request
-
+        result = normal_result(response)
       rescue Exception => e
         logger.warn response
         # connection problem or some error
-        result = {
-          response_code: '-1',
-          response: {
-            temporaryError: 'true',
-            responseCode: e.code,
-            responseText: e.message
-          },
-          data: {
-            to: sms.to,
-            text: sms.message.strip_nongsm_chars,
-            from: from
-          }
-        }
-      else
-        response_code = response.body.split(/\n/).first
-        response_code = "0" if response_code == "200"
-        # Successful response
-        result = {
-          message_id: message_id,
-          response_code: response_code.to_s,
-          response: {body: response.body},
-          destination_address: sms.to,
-          data: {
-            to: sms.to,
-            text: sms.message.strip_nongsm_chars,
-            from: from
-          }
-        }
+        result = result_for_error(e)
       end
       result
     end
 
+    private
+
+    attr_reader :sms
+
     def username
       ENV["SMESS_GLOBAL_MOUTH_USER"].dup # paranoid safeguard
     end
@@ -83,5 +38,78 @@ module Smess
       ENV["SMESS_GLOBAL_MOUTH_SENDER_ID"]
     end
 
+    def url
+      "https://mcm.globalmouth.com:8443/api/mcm"
+    end
+
+    def from
+      sms.originator || sender_id
+    end
+
+    def message_id
+      @message_id ||= Digest::MD5.hexdigest "#{Time.now.strftime('%Y%m%d%H%M%S')}#{sms.to}-#{SecureRandom.hex(6)}"
+    end
+
+    def params
+      @params ||= {
+        username: username,
+        msisdn: "+#{sms.to}",
+        body: sms.message.strip_nongsm_chars.encode("ISO-8859-1"),
+        originator: from,
+        ref: message_id,
+        dlr: "true"
+      }
+    end
+
+    def compute_hash(values = [])
+      hash = "#{username}#{values.join}"
+      auth_hash = Digest::MD5.hexdigest "#{username}:#{password}"
+      Digest::MD5.hexdigest "#{hash}#{auth_hash}"
+    end
+
+    def generate_mac_hash
+      params[:hash] = compute_hash(
+        [sms.message.strip_nongsm_chars.encode("ISO-8859-1"), params[:originator], params[:msisdn]]
+      )
+    end
+
+    def request
+      @request ||= HTTPI::Request.new
+    end
+
+    def result_for_error(e)
+      code = e.code rescue "-1"
+      {
+        response_code: '-1',
+        response: {
+          temporaryError: 'true',
+          responseCode: e.code,
+          responseText: e.message
+        },
+        data: result_data
+      }
+    end
+
+    def normal_result(response)
+      response_code = response.body.split(/\n/).first
+      response_code = "0" if response_code == "200"
+      # Successful response
+      {
+        message_id: message_id,
+        response_code: response_code.to_s,
+        response: {body: response.body},
+        destination_address: sms.to,
+        data: result_data
+      }
+    end
+
+    def result_data
+      {
+        to: sms.to,
+        text: sms.message.strip_nongsm_chars,
+        from: from
+      }
+    end
+
   end
 end

data/lib/smess/outputs/iconectiv.rb

@@ -1,33 +1,6 @@
 module Smess
   class Iconectiv < Ipxus
 
-    def build_sms_payload
-      # SOAP data
-      @sms_options = {
-        "correlationId" => Time.now.strftime('%Y%m%d%H%M%S') + @sms.to,
-        "originatingAddress" => account[:shortcode],
-        "originatorTON" => "0",
-        "destinationAddress" => nil,
-        "userData" => "",
-        "userDataHeader" => "#NULL#",
-        "DCS" => "-1",
-        "PID" => "-1",
-        "relativeValidityTime" => "-1",
-        "deliveryTime" => "#NULL#",
-        "statusReportFlags" => "1", # 1
-        "accountName" => account[:account_name],
-        "tariffClass" => "USD0",
-        "VAT" => "-1",
-        "referenceId" => "#NULL#",
-        "serviceName" => account[:service_name],
-        "serviceCategory" => "#NULL#",
-        "serviceMetaData" => "#NULL#",
-        "campaignName" => "#NULL#",
-        "username" => account[:username],
-        "password" => account[:password]
-      }
-    end
-
     def account
       @account ||= {
         sms_url: 'http://66.70.32.42:32005/api/services2/SmsApi52?wsdl',
@@ -36,7 +9,7 @@ module Smess
         password: ENV["SMESS_ICONECTIV_PASS"],
         account_name: ENV["SMESS_ICONECTIV_ACCOUNT_NAME"],
         service_name: ENV["SMESS_SERVICE_NAME"],
-        service_meta_data_t_mobile: ENV["SMESS_ICONECTIV_SERVICE_META_DATA_T_MOBILE_US"],
+        service_meta_data_t_mobile_us: ENV["SMESS_ICONECTIV_SERVICE_META_DATA_T_MOBILE_US"],
         service_meta_data_verizon: ENV["SMESS_ICONECTIV_SERVICE_META_DATA_VERIZON"]
       }
     end

data/lib/smess/outputs/ipx.rb

@@ -4,10 +4,9 @@ module Smess
 
     def initialize
       @endpoint = account[:sms_url]
-
       @credentials = {
-        :name => account[:username],
-        :pass => account[:password]
+        name: account[:username],
+        pass: account[:password]
       }
     end
 
@@ -22,13 +21,44 @@ module Smess
       }
     end
 
-    def build_sms_payload
-      # SOAP data
-      @sms_options = {
-        "correlationId" => Time.now.strftime('%Y%m%d%H%M%S') + @sms.to,
+    def deliver_sms(sms_arg)
+      return false unless sms_arg.kind_of? Sms
+      @sms = sms_arg
+
+      set_originator(sms.originator)
+
+      perform_operator_adaptation sms.to
+
+      results = []
+      parts.each_with_index do |part, i|
+        return false if part.empty?
+        # 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
+        results << send_one_sms
+
+        # halt and use fallback on error...
+        unless results.last[:response_code].to_s == "0"
+          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
+
+    def soap_body
+      @soap_body ||= {
+        "correlationId" => Time.now.strftime('%Y%m%d%H%M%S') + sms.to,
         "originatingAddress" => account[:shortcode],
         "originatorTON" => "0",
-        "destinationAddress" => nil,
+        "destinationAddress" => sms.to,
         "userData" => "",
         "userDataHeader" => "#NULL#",
         "DCS" => "-1",
@@ -37,7 +67,7 @@ module Smess
         "deliveryTime" => "#NULL#",
         "statusReportFlags" => "1", # 1
         "accountName" => account[:account_name],
-        "tariffClass" => "USD0",
+        "tariffClass" => "USD0", # needs to be extracted and variable per country
         "VAT" => "-1",
         "referenceId" => "#NULL#",
         "serviceName" => account[:service_name],
@@ -49,63 +79,6 @@ module Smess
       }
     end
 
-    def deliver_sms(sms)
-      return false unless sms.kind_of? Sms
-
-      @sms = sms
-      build_sms_payload
-
-      set_originator sms.originator
-      @sms_options["destinationAddress"] = sms.to
-
-      perform_operator_adaptation sms.to
-
-      # validate sms contents
-      parts = Smess.split_sms(sms.message.strip_nongsm_chars)
-      return false if parts[0].empty?
-      # if we have several parts, send them as concatenated sms
-      if parts.length > 1
-        logger.info "Num Parts: #{parts.length.to_s}"
-        # create concat-sms smpp header
-        ref_id = Random.new.rand(255).to_s(16).rjust(2,"0")
-        num_parts = parts.length
-        @sms_options["userDataHeader"] = "050003#{ref_id}#{num_parts.to_s(16).rjust(2,'0')}01" # {050003}{ff}{02}{01} {concat-command}{id to link all parts}{total num parts}{num of current part}
-      end
-
-      @sms_options["userData"] = parts.shift
-
-      result = send_one_sms
-      result[:data] = @sms_options.dup
-      result[:data].delete "password"
-      result[:data]["userData"] = sms.message.strip_nongsm_chars
-
-      # fallback...
-      unless result[:response_code].to_s == "0"
-        logger.info "IPX_ERROR: #{result}"
-        return fallback_to_twilio
-      end
-
-      # send aditional parts if we have them
-      if parts.length > 0 && result[:response_code] != "-1"
-        logger.info "Sending more parts..."
-        set_originator sms.originator
-        @sms_options["destinationAddress"] = sms.to
-
-        more_results = []
-        parts.each_with_index do |part,i|
-          logger.info "Sending Part #{(i+2).to_s}"
-          @sms_options["userData"] = part
-          @sms_options["userDataHeader"] = "050003#{ref_id}#{num_parts.to_s(16).rjust(2,'0')}#{(i+2).to_s(16).rjust(2,'0')}"
-          @sms_options["correlationId"] = Time.now.strftime('%Y%m%d%H%M%S') + @sms.to + (i+1).to_s
-          more_results << send_one_sms
-          # we don't actually return the status for any of these which is cheating
-        end
-      end
-
-      result
-    end
-
-  private
 
     def soap_client
       Savon.configure do |config|
@@ -113,7 +86,6 @@ module Smess
         config.raise_errors = false
       end
 
-
       endpoint = @endpoint
       mm7ns = wsdl_namespace
       credentials = @credentials
@@ -133,8 +105,8 @@ module Smess
     # 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
+      sms.output = :twilio
+      sms.deliver
     end
 
     def get_response_hash_from(response)
@@ -146,8 +118,8 @@ module Smess
     end
 
     def set_originator(originator)
-      @sms_options["originatingAddress"] = originator
-      @sms_options["originatorTON"] = (originator.length == 5 && originator.to_i.to_s == originator) ? "0" : "1"
+      soap_body["originatingAddress"] = originator
+      soap_body["originatorTON"] = (originator.length == 5 && originator.to_i.to_s == originator) ? "0" : "1"
     end
 
     def xmlns
@@ -158,59 +130,83 @@ module Smess
       "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 send_one_sms
       client = soap_client
-      sms_options = @sms_options
+      soap_body_var = soap_body
       begin
         response = client.request "SendRequest", "xmlns" => xmlns do
-          soap.body = sms_options
+          soap.body = soap_body_var
         end
+        result = parse_sms_response(response)
       rescue Exception => e
-        result = {
-          :response_code => "-1",
-          :response  => {
-            :temporaryError =>"true",
-            :responseCode => "-1",
-            :responseText => "MM: System Communication Error. #{e.inspect}"
-          }
-        }
+        result = result_for_error(e)
         # LOG error here?
-        return result
       end
-      return parse_sms_response response
+      result
     end
 
-
     def parse_sms_response(response)
-      # logger.debug " --- "
-      # logger.debug response.to_hash
-      # logger.debug " --- "
       if response.http_error? || response.soap_fault?
-        result = {
-          :response_code => "-1",
-          :response  => {
-            :temporaryError =>"true",
-            :responseCode => "-1",
-            :responseText => response.http_error || response.soap_fault.to_hash
-          }
-        }
-        # LOG error here?
-        return result
+        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)
+      code = e.code rescue "-1"
+      {
+        response_code: '-1',
+        response: {
+          temporaryError: 'true',
+          responseCode: code,
+          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]
 
-      result = {
-        :message_id => message_id,
-        :response_code => response_code,
-        :response => hash
+      {
+        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

data/lib/smess/outputs/ipxus.rb

@@ -23,15 +23,10 @@ module Smess
     # 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)
-      if @mms && @mms.slides.empty?
-        @mm7body["mm7:ServiceCode"] << ";contentMetaData=devicediscovery=true"
-        return false
-      else
-        operator_data = lookup_operator msisdn
-        unless operator_data[:operator].nil?
-          method_name = "adapt_for_#{operator_data[:operator].to_underscore.gsub(" ","_")}"
-          send(method_name,msisdn) if respond_to?(:"#{method_name}", true)
-        end
+      operator_data = lookup_operator msisdn
+      unless operator_data[:operator].nil?
+        method_name = "adapt_for_#{operator_data[:operator].to_underscore.gsub(" ","_")}"
+        send(method_name, msisdn) if respond_to?(:"#{method_name}", true)
       end
     end
 
@@ -54,49 +49,33 @@ module Smess
         response = client.request "ResolveOperatorRequest", "xmlns"=>"http://www.ipx.com/api/services/consumerlookupapi09/types" do
           soap.body = body
         end
+        result = parse_operator_response(response)
       rescue Exception => e
-        result = {
-          :response_code => "-1",
-          :response  => {
-            :temporaryError =>"true",
-            :responseCode => "-1",
-            :responseText => "MM: System Communication Error"
-          }
-        }
-        # LOG error here?
+        result = result_for_error(e)
+      ensure
         @endpoint = orig_endpoint
         @credentials = orig_credentials
-        return result
       end
-      @endpoint = orig_endpoint
-      @credentials = orig_credentials
-      return parse_operator_response response
+      result
     end
 
     def parse_operator_response(response)
       if response.http_error? || response.soap_fault?
-        result = {
-          :response_code => "-1",
-          :response  => {
-            :temporaryError =>"true",
-            :responseCode => "-1",
-            :responseText => response.http_error || response.soap_fault.to_hash
-          }
-        }
-        # LOG error here?
-        return result
+        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
-
-      hash = response.to_hash[:resolve_operator_response]
+      result
     end
 
 
     def adapt_for_verizon(msisdn)
-      @sms_options["serviceMetaData"] = account[:service_meta_data_verizon]
+      soap_body["serviceMetaData"] = account[:service_meta_data_verizon]
     end
 
     def adapt_for_t_mobile_us(msisdn)
-      @sms_options["serviceMetaData"] = account[:service_meta_data_t_mobile_us]
+      soap_body["serviceMetaData"] = account[:service_meta_data_t_mobile_us]
     end
 
   end

data/lib/smess/outputs/mblox.rb

@@ -103,7 +103,7 @@ module Smess
 
     def hash_data_for(xml_params)
       rand = (SecureRandom.random_number*100000000).to_i
-      @message_id = rand # "#{Time.now.to_i}#{xml_params.to}#{rand}"
+      @message_id = rand
 
       xml_hash = {
         notification_request: {

data/lib/smess/outputs/smsglobal.rb

@@ -5,13 +5,39 @@ module Smess
   class Smsglobal
     include Smess::Logging
 
-    def deliver_sms(sms)
-      return false unless sms.kind_of? Sms
+    def deliver_sms(sms_arg)
+      return false unless sms_arg.kind_of? Sms
+      @sms = sms_arg
 
-      url = "https://www.smsglobal.com/http-api.php"
-      from = sms.originator || ENV["SMESS_SMSGLOBAL_SENDER_ID"]
+      request.url = url
+      request.body = params
+
+      begin
+        HTTPI.log_level = :debug
+        response = HTTPI.post request
+        result = normal_result(response)
+      rescue Exception => e
+        puts logger.warn response
+        # connection problem or some error
+        result = result_for_error(e)
+      end
+      result
+    end
+
+    private
 
-      params = {
+    attr_reader :sms
+
+    def url
+      "https://www.smsglobal.com/http-api.php"
+    end
+
+    def from
+      sms.originator || ENV["SMESS_SMSGLOBAL_SENDER_ID"]
+    end
+
+    def params
+      @params ||= {
         action: "sendsms",
         user: ENV["SMESS_SMSGLOBAL_USER"],
         password: ENV["SMESS_SMSGLOBAL_PASS"],
@@ -20,50 +46,45 @@ module Smess
         text: sms.message.strip_nongsm_chars,
         maxsplit: "3"
       }
+    end
 
-      request = HTTPI::Request.new
-      request.url = url
-      request.body = params
+    def request
+      @request ||= HTTPI::Request.new
+    end
 
-      begin
-        HTTPI.log_level = :debug
-        response = HTTPI.post request
+    def result_for_error(e)
+      code = e.code rescue "-1"
+      {
+        response_code: '-1',
+        response: {
+          temporaryError: 'true',
+          responseCode: e.code,
+          responseText: e.message
+        },
+        data: result_data
+      }
+    end
 
-      rescue Exception => e
-        logger.warn response
-        # connection problem or some error
-        result = {
-          response_code: '-1',
-          response: {
-            temporaryError: 'true',
-            responseCode: e.code,
-            responseText: e.message
-          },
-          data: {
-            to: sms.to,
-            text: sms.message.strip_nongsm_chars,
-            from: from
-          }
-        }
-      else
-        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
+    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
+      # Successful response
+      {
+        message_id: message_id,
+        response_code: response_code.to_s,
+        response: response.body,
+        destination_address: sms.to,
+        data: result_data
+      }
+    end
 
-        # Successful response
-        result = {
-          message_id: message_id,
-          response_code: response_code.to_s,
-          response: response.body,
-          destination_address: sms.to,
-          data: {
-            to: sms.to,
-            text: sms.message.strip_nongsm_chars,
-            from: from
-          }
-        }
-      end
-      result
+    def result_data
+      {
+        to: sms.to,
+        text: sms.message.strip_nongsm_chars,
+        from: from
+      }
     end
 
   end

data/lib/smess/utils.rb

@@ -1,46 +1,8 @@
 # encoding: UTF-8
 
 module Smess
-
   class << self
 
-    # cleans and forces the selected country prefix on the number given
-    # if international is set a lighter cleaning is done to preserve any existing country code
-    # this is not entirely problem-free for US area codes without leading 0.
-    def clean_phone(num)
-      num = num.to_s
-
-      return nil if /\{[a-z]+:.+\}/.match(num)
-
-      # make num all digits
-      num = num.gsub(/\D/,"")
-
-      if num.length > 0 && num[0..1] == "00"
-        num = num[2..-1]
-      elsif num.length > 0 && num[0] == "0"
-        # cut away leading zeros
-        num = num[1..-1] # while num[0] == "0"
-        # Add country code unless the start of the number is the correct country code
-        unless num[0..Smess.config.country_code.to_s.length-1] == Smess.config.country_code.to_s
-          num = Smess.config.country_code.to_s + num
-        end
-      elsif !Smess.config.international
-        # Add country code unless the start of the number is the correct country code
-        unless num[0..Smess.config.country_code.to_s.length-1] == Smess.config.country_code.to_s
-          num = Smess.config.country_code.to_s + num
-        end
-      end
-
-      # number must be in a valid range
-      unless (10..15) === num.length
-        return nil
-      end
-
-      num
-    end
-
-
-
     # returns an array of strings of gsm-compatible lengths
     # performance issue: utf8_safe_split also loops over the split point
     # this should be used when sending via concatenating providers

data/lib/smess/version.rb

@@ -1,3 +1,3 @@
 module Smess
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/string.rb

@@ -47,7 +47,7 @@ class String
     # Should this be a patch to String?
 
     # keeping them here in canse I need them
-    #$basic_alpha = array(
+    # basic alpha
     # '@','£','$','¥','è','é','ù','ì','ò','Ç',"\n",'Ø','ø',"\r",'Å','å',
     # 'Δ','_','Φ','Γ','Λ','Ω','Π','Ψ','Σ','Θ','Ξ','Æ','æ','ß','É',' ',
     # '!','"','#','¤','%','&','\'','(',')','*','+',',','-','.','/','0',
@@ -56,9 +56,9 @@ class String
     # 'Q','R','S','T','U','V','W','X','Y','Z','Ä','Ö','Ñ','Ü','§','¿',
     # 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p',
     # 'q','r','s','t','u','v','w','x','y','z','ä','ö','ñ','ü','à'
-    #);
-    #$extended_alpha = array('|','^','€','{','}','[',']','~','\\');
-    #$all_alpha = array_merge($basic_alpha, $extended_alpha);
+    #
+    # extended alpha
+    # '|','^','€','{','}','[',']','~','\\'
 
     allowed = '@£$¥èéùìòÇ'+"\n"+'Øø'+"\r"+'ÅåΔ_ΦΓΛΩΠΨΣΘΞÆæßÉ'+' '+Regexp.escape('!"#¤%&\'()*+,-.')+'\/'+Regexp.escape('0123456789:;<=>?¡ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÑܧ¿abcdefghijklmnopqrstuvwxyzäöñüà|^€{}[]~\\')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smess
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Martin Westin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -152,7 +152,6 @@ files:
 - lib/smess/outputs/ipx.rb
 - lib/smess/outputs/ipxus.rb
 - lib/smess/outputs/mblox.rb
-- lib/smess/outputs/mm7.rb
 - lib/smess/outputs/smsglobal.rb
 - lib/smess/outputs/test.rb
 - lib/smess/outputs/twilio.rb
@@ -166,7 +165,8 @@ files:
 - LICENSE
 - README.md
 homepage: https://github.com/eimermusic/smess
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/lib/smess/outputs/mm7.rb

@@ -1,122 +0,0 @@
-module Smess
-
-  class Mm7
-    include Smess::Logging
-
-    def initialize
-
-      # SOAP defaults
-      @endpoint = "http://example.com/mms/mm7"
-
-      # MM7 defaults
-      @mm7ns = "http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-6-MM7-1-2"
-      @mm7header = {
-        "mm7:TransactionID" => Time.now.strftime('%Y%m%d%H%M%S'),
-        :attributes! => {
-          "mm7:TransactionID" => {
-            "xmlns:mm7" => @mm7ns
-          }
-        }
-      }
-      @mm7body = {
-        "mm7:MM7Version" => "6.5.0",
-        "mm7:SenderIdentification" => {
-          "mm7:VASPID" => "",
-          "mm7:SenderAddress" => {}
-        },
-        "mm7:Recipients" => {
-          "mm7:To" => {
-            "mm7:Number" => ""
-          }
-        },
-        "mm7:ServiceCode" => "",
-        "mm7:LinkedID" => "",
-        "mm7:DeliveryReport" => "true",
-        "mm7:Subject" => "",
-        "mm7:Content/" => nil,
-        :attributes! => {"mm7:Content/" => {"href" => "cid:attachment_1"}}
-      }
-
-      @credentials = nil
-
-    end
-
-  private
-
-    def perform_operator_adaptation(msisdn)
-      # implement this method to do modify the message output
-    end
-
-    def soap_client
-      Savon.configure do |config|
-        config.log_level = :info
-        config.raise_errors = false
-      end
-
-
-      endpoint = @endpoint
-      mm7ns = @mm7ns
-      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
-
-    def get_response_hash_from(response)
-      response.to_hash[:submit_rsp]
-    end
-
-    def get_message_id_from hash
-      hash[:message_id] rescue ''
-    end
-
-    def parse_response(response)
-      logger.debug ' --- '
-      logger.debug response.http_error.to_hash
-      logger.debug ' --- '
-      # logger.debug response.success?
-      # logger.debug ' --- '
-      # logger.debug "#{response.http_error}, #{response.soap_fault }"
-      # logger.debug ' --- '
-
-      unless response.success?
-        result = {
-          :response_code => "-1",
-          :response => {
-            :responseCode => "-1",
-            :responseText => response.http_error? ? response.http_error.to_hash : response.soap_fault.to_hash
-          }
-        }
-
-        return result
-      end
-
-      hash = get_response_hash_from response
-      message_id = get_message_id_from hash
-
-      # any 1000 range code is a success, anything else is an error.
-      status_code = hash[:status][:status_code] rescue '-1'
-      if (1000..1999) === status_code.to_i
-        response_code = "0"
-      else
-        response_code = status_code
-        # LOG error here?
-      end
-
-      result = {
-        :message_id => message_id,
-        :response_code => response_code,
-        :response => hash
-      }
-
-    end
-
-  end
-end