smess 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16c1b17c57023948c5a2d35e89fa96d52ddc5d39
-  data.tar.gz: c922d274e19515416182538305a766e637fb4ba3
+  metadata.gz: 2c74dd29d5a45e1ac70089ea67c1f29148706bb4
+  data.tar.gz: fd3a185d53f641db6226a9a4a80dd2de5e8f57c3
 SHA512:
-  metadata.gz: 2d65e955bb74948e45f3fdc80feeb2b1517a7330a7362e06c2622bb1cf29ba928f85a96af2249bbed2f339b31d2c66e2ddceb09636e1ae57cfdb9ec2ab3368e3
-  data.tar.gz: 58c24fe88631b0ddf56b48cf25ff4ae3ab25db97b8b610d50a62fb271bf12b20f7e3b46b467b43dbc96ad1a23050cc2ef86bee7e23bd46d11dd679acf3fa17f2
+  metadata.gz: 818eee9d6e7328c6fee1bf647bbf30342dddf9d83dbdd97a6292e0cc70dabad8bef04b94105bd3042aaf0fe0f1076709db516ab2bfb0af8644ca71fe7386c59a
+  data.tar.gz: 5bd2f48c54d878ccdb589be344d756ea49024d296eca34bd3da11d90e22e46648b3470ebf41b2845615295257a2ebf161e208dd978d4cde8407d4892e8a9f843

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smess (1.0.1)
+    smess (1.0.2)
       activesupport (>= 3.0)
       clickatell
       httpi

data/README.md

@@ -39,7 +39,13 @@ The aggregator outputs are a very simple plugin system so you can subclass, modi
 module Smess
   class Example
 
-    def deliver_sms(sms)
+    attr_reader :sms
+
+    def initialize(sms)
+      @sms = sms
+    end
+
+    def deliver
       # Do work and return a hash like this one
       {
       :response_code => '-1',

data/lib/smess.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# coding: UTF-8
 smess_path = File.expand_path('.', File.dirname(__FILE__))
 $:.unshift(smess_path) if File.directory?(smess_path) && !$:.include?(smess_path)
 
@@ -11,6 +11,7 @@ require 'smess/logging'
 require 'smess/country_code_registry'
 require 'smess/utils'
 require 'smess/sms'
+require 'smess/outputs/http_base'
 require 'smess/outputs/auto'
 require 'smess/outputs/ipx'
 require 'smess/outputs/ipxus'

data/lib/smess/outputs/auto.rb

@@ -1,6 +1,10 @@
 module Smess
   class Auto
 
+    def initialize(sms)
+      @sms = sms
+    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]
@@ -10,17 +14,17 @@ module Smess
 
     def output_for(msisdn)
       out_class = get_output_name_for_msisdn msisdn
-      ("Smess::#{out_class.to_s.camelize}").constantize.new
+      ("Smess::#{out_class.to_s.camelize}").constantize.new(sms)
     end
 
-    def deliver_sms(sms)
+    def deliver
       out = output_for sms.to
-      if out.respond_to? :deliver_sms
-        out.deliver_sms sms
-      else
-        nil
-      end
+      out.deliver
     end
 
+    private
+
+    attr_reader :sms
+
   end
 end

data/lib/smess/outputs/clickatell.rb

@@ -26,88 +26,89 @@ module Smess
   class Clickatell
     include Smess::Logging
 
-    def initialize
+    def initialize(sms)
+      @sms = sms
       ::Clickatell::API.debug_mode = true
       ::Clickatell::API.secure_mode = true
     end
 
-    def split_sms(text)
-      return [text] unless text.sms_length > 160
-      logger.debug "message text is long"
-
-      result = []
-      while text.sms_length > 160
-        logger.debug end_char = text.rindex(/[\n\r]/, 160)
-        part = text[0..end_char]
-        result << part
-        text = text[(end_char+1)..text.length]
+    def deliver
+      begin
+        responses = []
+        messages.each do |msg|
+          rsp = api.send_message(sms.to, msg.encode('ISO-8859-1'), {from: from, concat: 3, callback: 7})
+          responses << rsp
+        end
+        result = normal_result(responses.first)
+      rescue Exception => e
+        # connection problem or some error
+        result = result_for_error(e)
       end
-      result << text
       result
     end
 
-    def sender_not_supported(sms)
+    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"]
+    end
+
+    def messages
+      msg = sms.message.strip_nongsm_chars
+      concat_not_supported ? Smess.separate_sms(msg) : [msg]
+    end
+
+    # "feature detection"
+    # Clickatell's API requires knowledge of country-specific quirks and feature support.
+    # Supported features can and does change without notice, breaking some countries.
+    def sender_not_supported
       sms.to[0] == "1" || # USA
       sms.to[0..2] == "962" || # Jordan
       sms.to[0..2] == "971" # UAE
     end
-    def concat_not_supported(sms)
+    def concat_not_supported
       sms.to[0] == "1" # USA
     end
 
-
-
-    def deliver_sms(sms)
-      return false unless sms.kind_of? Sms
-      @sms = sms
-
-      api = ::Clickatell::API.authenticate(
+    def api
+      @api ||= ::Clickatell::API.authenticate(
         ENV["SMESS_CLICKATELL_API_ID"],
         ENV["SMESS_CLICKATELL_USER"],
         ENV["SMESS_CLICKATELL_PASS"]
       )
-      message = sms.message.strip_nongsm_chars.encode('ISO-8859-1')
-      from = ENV["SMESS_CLICKATELL_SENDER_IDS"].split(",").include?(sms.originator) ? sms.originator : ENV["SMESS_CLICKATELL_SENDER_ID"]
-
-      # Pretty pretty "feature detection"
-      if sender_not_supported sms
-        from = nil
-      end
-      if concat_not_supported sms
-        message_array = split_sms(message)
-      end
+    end
 
-      begin
-        if concat_not_supported sms
-          response = nil
-          message_array.each do |msg|
-            rsp = api.send_message(sms.to, msg, {:from => from, :concat => 3, :callback => 7})
-            response = rsp if response.nil?
-          end
-        else
-          response = api.send_message(sms.to, message, {:from => from, :concat => 3, :callback => 7})
-        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}
-        }
-        return result
-      end
+    def normal_result(response)
       # Successful response
-      result = {
-        :message_id => response['ID'],
-        :response_code => '0',
-        :response => response,
-        :destination_address => sms.to,
-        :data => {:to => sms.to, :text => sms.message.strip_nongsm_chars, :from => from}
+      {
+        message_id: response['ID'],
+        response_code: '0',
+        response: response,
+        destination_address: sms.to,
+        data: result_data
+      }
+    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
 

data/lib/smess/outputs/etisalatdemo.rb

@@ -2,7 +2,10 @@ module Smess
   class Etisalatdemo
     include Smess::Logging
 
-    def initialize
+    attr_reader :sms
+
+    def initialize(sms)
+      @sms = sms
       @smtp_settings = {
         address:              "exmail.emirates.net.ae",
         port:                 25,
@@ -14,16 +17,14 @@ module Smess
       }
     end
 
-    def deliver_sms(sms)
-      return false unless sms.kind_of? Sms
-      @sms = sms
-
+    def deliver
       local_from_var = from_address
+      local_sms = sms
       mail = Mail.new do
         from      local_from_var
-        to        "+#{sms.to}@email2sms.ae"
+        to        "+#{local_sms.to}@email2sms.ae"
         subject   "Smess Message"
-        body      sms.message.strip_nongsm_chars
+        body      local_sms.message.strip_nongsm_chars
       end
 
       mail.delivery_method :smtp, @smtp_settings

data/lib/smess/outputs/global_mouth.rb

@@ -2,18 +2,13 @@ require 'uri'
 require 'httpi'
 
 module Smess
-  class GlobalMouth
-    include Smess::Logging
-
-    def deliver_sms(sms_arg)
-      return false unless sms_arg.kind_of? Sms
-      @sms = sms_arg
+  class GlobalMouth < HttpBase
 
+    def deliver
       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
@@ -26,14 +21,14 @@ module Smess
 
     private
 
-    attr_reader :sms
-
     def username
       ENV["SMESS_GLOBAL_MOUTH_USER"].dup # paranoid safeguard
     end
+
     def password
       ENV["SMESS_GLOBAL_MOUTH_PASS"]
     end
+
     def sender_id
       ENV["SMESS_GLOBAL_MOUTH_SENDER_ID"]
     end
@@ -42,14 +37,6 @@ module Smess
       "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,
@@ -73,23 +60,6 @@ module Smess
       )
     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"
@@ -103,13 +73,5 @@ module Smess
       }
     end
 
-    def result_data
-      {
-        to: sms.to,
-        text: sms.message.strip_nongsm_chars,
-        from: from
-      }
-    end
-
   end
 end

data/lib/smess/outputs/http_base.rb

@@ -0,0 +1,54 @@
+require 'uri'
+require 'httpi'
+
+module Smess
+  class HttpBase
+    include Smess::Logging
+
+    def initialize(sms)
+      @sms = sms
+      HTTPI.log_level = :debug
+    end
+
+    private
+
+    attr_reader :sms
+
+    def sender_id
+      ENV["SMESS_SENDER_ID"]
+    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 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

data/lib/smess/outputs/ipx.rb

@@ -2,7 +2,9 @@ module Smess
   class Ipx
     include Smess::Logging
 
-    def initialize
+    def initialize(sms)
+      @sms = sms
+      @results = []
       @endpoint = account[:sms_url]
       @credentials = {
         name: account[:username],
@@ -21,25 +23,16 @@ module Smess
       }
     end
 
-    def deliver_sms(sms_arg)
-      return false unless sms_arg.kind_of? Sms
-      @sms = sms_arg
-
+    def deliver
       set_originator(sms.originator)
+      perform_operator_adaptation(sms.to)
 
-      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
+        populate_soap_body(part, i)
         results << send_one_sms
 
         # halt and use fallback on error...
-        unless results.last[:response_code].to_s == "0"
+        if last_result_was_error
           logger.info "IPX_ERROR: #{results.last}"
           return fallback_to_twilio || results.first
         end
@@ -52,6 +45,7 @@ module Smess
     private
 
     attr_reader :sms
+    attr_accessor :results
 
     def soap_body
       @soap_body ||= {
@@ -147,6 +141,13 @@ module Smess
       @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
@@ -162,6 +163,10 @@ module Smess
       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)
@@ -173,12 +178,11 @@ module Smess
     end
 
     def result_for_error(e)
-      code = e.code rescue "-1"
       {
         response_code: '-1',
         response: {
           temporaryError: 'true',
-          responseCode: code,
+          responseCode: '-1',
           responseText: e.message
         },
         data: result_data

data/lib/smess/outputs/mblox.rb

@@ -5,100 +5,24 @@ module Smess
   class Mblox
     include Smess::Logging
 
-    def deliver_sms(sms)
-      return false unless sms.kind_of? Sms
-
-      parts = Smess.split_sms(sms.message.strip_nongsm_chars)
-      return false if parts[0].empty?
+    def initialize(sms)
+      @sms = sms
+      @results = []
+    end
 
+    def deliver
       xml_params = {
         subscriber_number: sms.to,
         message: ""
       }
-      # 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 UDH
-        ref_id = Random.new.rand(255).to_s(16).rjust(2,"0")
-        num_parts = parts.length
-        xml_params[:udh] = ":05:00:03:#{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
 
-      xml_params[:message] = parts.shift
-      # send first SMS... the one we return the result from...
-      result = send_one_sms( xml_params )
-      result[:data][:text] = sms.message.strip_nongsm_chars
-
-
-      # send additional parts if we have them
-      if parts.length > 0 && result[:response_code] != "-1"
-        more_results = []
-        parts.each_with_index do |part, i|
-          xml_params[:message] = part
-          xml_params[:udh]  = ":05:00:03:#{ref_id}:#{num_parts.to_s(16).rjust(2,'0')}:#{(i+2).to_s(16).rjust(2,'0')}"
-          more_results << send_one_sms( xml_params )
-        end
-        # we don't actually return the status for any of these which is cheating
-        logger.info more_results
+      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
 
-      result
-    end
-
-
-    def send_one_sms(xml_params)
-      xml = xml_data_for(xml_params)
-      body = "XMLDATA="+URI::encode( xml.encode("ISO-8859-1") ) # escape
-
-      request = HTTPI::Request.new
-      request.url = 'https://xml4.us.mblox.com:443/send'
-      request.headers["Content-Type"] = "application/x-www-form-urlencoded"
-      request.body = body
-
-      begin
-        HTTPI.log_level = :debug
-        response = HTTPI.post request
-
-      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: xml_params[:subscriber_number],
-            text: xml_params[:message],
-            from: ENV["SMESS_MBLOX_SURE_ROUTE_SHORTCODE"]
-          }
-        }
-      else
-        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: xml_params[:subscriber_number],
-          data: {
-            to: xml_params[:subscriber_number],
-            text: xml_params[:message],
-            from: ENV["SMESS_MBLOX_SURE_ROUTE_SHORTCODE"]
-          }
-        }
-      end
-      result
-    end
-
-
-    def xml_data_for(xml_params)
-      Gyoku.convert_symbols_to :camelcase
-      '<?xml version="1.0"?>'+
-      Gyoku.xml( hash_data_for(xml_params) )
+      results.first
     end
 
     def hash_data_for(xml_params)
@@ -116,7 +40,7 @@ module Smess
               message: xml_params[:message],
               profile: ENV["SMESS_MBLOX_SURE_ROUTE_PROFILE_ID"],
               udh: xml_params.fetch(:udh,""),
-              sender_i_d: ENV["SMESS_MBLOX_SURE_ROUTE_SHORTCODE"],
+              sender_i_d: from,
               # expire_date: "",
               # operator: "",
               # tariff: "",
@@ -140,6 +64,72 @@ module Smess
       xml_hash
     end
 
+    private
+
+    attr_reader :sms
+    attr_accessor :results
+
+    def from
+      ENV["SMESS_MBLOX_SURE_ROUTE_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 Exception => 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"
@@ -151,5 +141,29 @@ module Smess
       (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

data/lib/smess/outputs/smsglobal.rb

@@ -2,22 +2,17 @@ require 'uri'
 require 'httpi'
 
 module Smess
-  class Smsglobal
-    include Smess::Logging
-
-    def deliver_sms(sms_arg)
-      return false unless sms_arg.kind_of? Sms
-      @sms = sms_arg
+  class Smsglobal < HttpBase
 
+    def deliver
       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
+        logger.warn response
         # connection problem or some error
         result = result_for_error(e)
       end
@@ -26,21 +21,25 @@ module Smess
 
     private
 
-    attr_reader :sms
+    def username
+      ENV["SMESS_SMSGLOBAL_USER"]
+    end
+    def password
+      ENV["SMESS_SMSGLOBAL_PASS"]
+    end
+    def sender_id
+      ENV["SMESS_SMSGLOBAL_SENDER_ID"]
+    end
 
     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"],
+        user: username,
+        password: password,
         from: from,
         to: sms.to,
         text: sms.message.strip_nongsm_chars,
@@ -48,23 +47,6 @@ module Smess
       }
     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)
       first_response = response.body.split(/\r\n/).first.split(";")
       response_code = first_response.first.split(':').last.to_i
@@ -79,13 +61,5 @@ module Smess
       }
     end
 
-    def result_data
-      {
-        to: sms.to,
-        text: sms.message.strip_nongsm_chars,
-        from: from
-      }
-    end
-
   end
 end

data/lib/smess/outputs/test.rb

@@ -11,9 +11,10 @@ module Smess
       }
     }
     class << self; attr_accessor :delivery_result end
-    attr_reader :sms, :mms
+    attr_reader :sms
 
-    def initialize
+    def initialize(sms)
+      @sms = sms
       @@instance = self
     end
 
@@ -21,9 +22,7 @@ module Smess
       @@instance
     end
 
-    def deliver_sms(sms)
-      return false unless sms.kind_of? Sms
-      @sms = sms
+    def deliver
       self.class.delivery_result
     end
 

data/lib/smess/outputs/twilio.rb

@@ -4,9 +4,13 @@ module Smess
   class Twilio
     include Smess::Logging
 
-    def deliver_sms(sms)
-      return false unless sms.kind_of? Sms
+    attr_reader :sms
 
+    def initialize(sms)
+      @sms = sms
+    end
+
+    def deliver
       parts = Smess.separate_sms sms.message.strip_nongsm_chars
       return false if parts[0].empty?
 

data/lib/smess/sms.rb

@@ -13,8 +13,8 @@ module Smess
 
     def deliver
       out_class = output
-      out = ("Smess::#{out_class.to_s.camelize}").constantize.new
-      results = out.deliver_sms self
+      out = ("Smess::#{out_class.to_s.camelize}").constantize.new(self)
+      results = out.deliver
     end
 
     def delivered?

data/lib/smess/utils.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# coding: UTF-8
 
 module Smess
   class << self

data/lib/smess/version.rb

@@ -1,3 +1,3 @@
 module Smess
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/string.rb

@@ -1,3 +1,4 @@
+# coding: UTF-8
 class String
   def to_underscore
     self.gsub(/::/, '/').

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smess
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Martin Westin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -148,6 +148,7 @@ files:
 - 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
 - lib/smess/outputs/ipx.rb
 - lib/smess/outputs/ipxus.rb