smess 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c74dd29d5a45e1ac70089ea67c1f29148706bb4
-  data.tar.gz: fd3a185d53f641db6226a9a4a80dd2de5e8f57c3
+  metadata.gz: 7bd97cb82c4e104f4878fd93026390b7f64e557d
+  data.tar.gz: fb1c0c5c63933f965109182d2f6525359939b7e8
 SHA512:
-  metadata.gz: 818eee9d6e7328c6fee1bf647bbf30342dddf9d83dbdd97a6292e0cc70dabad8bef04b94105bd3042aaf0fe0f1076709db516ab2bfb0af8644ca71fe7386c59a
-  data.tar.gz: 5bd2f48c54d878ccdb589be344d756ea49024d296eca34bd3da11d90e22e46648b3470ebf41b2845615295257a2ebf161e208dd978d4cde8407d4892e8a9f843
+  metadata.gz: a02d6af367b2b63838c692cb1e4bf9fc5d012d286de836e07d8c42b8f7d926f0aa8878f74204baaeef48a5149f5b5b586d289e01acfc269a57b69d548fc2f917
+  data.tar.gz: 2a6bd99ef07c08ece8c04beea6ea65e0a820d422b6377e76f948ce22c76f9232fb34ef133eceead3ee62c11b5ac1286e0108fe75af9e8eb7fdd322830c5884b9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smess (1.0.2)
+    smess (1.0.3)
       activesupport (>= 3.0)
       clickatell
       httpi
@@ -41,7 +41,7 @@ GEM
     mime-types (1.25)
     mini_portile (0.5.1)
     minitest (4.7.5)
-    multi_json (1.7.9)
+    multi_json (1.8.0)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     nori (1.1.5)

data/lib/smess/outputs/twilio.rb

@@ -4,70 +4,88 @@ module Smess
   class Twilio
     include Smess::Logging
 
-    attr_reader :sms
-
     def initialize(sms)
       @sms = sms
+      @results = []
     end
 
     def deliver
-      parts = Smess.separate_sms sms.message.strip_nongsm_chars
-      return false if parts[0].empty?
+      parts.each do |part|
+        results << send_one_sms(part)
+      end
 
-      @client = ::Twilio::REST::Client.new(ENV["SMESS_TWILIO_SID"], ENV["SMESS_TWILIO_AUTH_TOKEN"])
+      # we don't actually return the status for any of additional messages which is cheating
+      results.first
+    end
 
+    private
 
-      results = []
-      while parts.length > 0
-        results << send_one_sms(sms, parts.shift)
-      end
-      results[0][:data][:text] = sms.message.strip_nongsm_chars
-      results[0]
+    attr_reader :sms
+    attr_accessor :results
+
+    def from
+      ENV["SMESS_TWILIO_FROM"]
+    end
+
+    def parts
+      @parts ||= split_parts
     end
 
-    def send_one_sms(sms, message)
+    def split_parts
+      Smess.split_sms(sms.message.strip_nongsm_chars).reject {|s| s.empty? }
+    end
+
+    def client
+      @client ||= ::Twilio::REST::Client.new(ENV["SMESS_TWILIO_SID"], ENV["SMESS_TWILIO_AUTH_TOKEN"])
+    end
+
+    def send_one_sms(message)
       begin
-        response = @client.account.sms.messages.create({
-          from: ENV["SMESS_TWILIO_FROM"],
+        response = client.account.sms.messages.create({
+          from: from,
           to: "+#{sms.to}",
           body: message,
           status_callback: ENV["SMESS_TWILIO_CALLBACK_URL"]
         })
+        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: message,
-            from: ENV["SMESS_TWILIO_FROM"]
-          }
-        }
-      else
-        response_code = response.status
-        response_code = "0" unless response.status == "failed"
-        # Successful response
-        result = {
-          message_id: response.sid,
-          response_code: response_code.to_s,
-          response: MultiJson.load(@client.last_response.body),
-          destination_address: sms.to,
-          data: {
-            to: sms.to,
-            text: message,
-            from: ENV["SMESS_TWILIO_FROM"]
-          }
-        }
+        result = result_for_error(e)
       end
       result
     end
 
+    def normal_result(response)
+      response_code = response.status
+      response_code = "0" unless response.status == "failed"
+      # Successful response
+      {
+        message_id: response.sid,
+        response_code: response_code.to_s,
+        response: MultiJson.load(client.last_response.body),
+        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
 
   end
 end

data/lib/smess/version.rb

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

data/lib/string.rb

@@ -88,36 +88,46 @@ class String
   def msisdn(*args)
     ret = self.dup
     ret.msisdn!(*args)
-    ret.empty? ? nil : ret
   end
   def msisdn!(country_code = 1, force_country_code = false)
-    self.replace("") and return self if /\{[a-z]+:.+\}/.match(self) # custom crap
-
-    # make num all digits
     self.gsub!(/\D/,"")
 
-    if length > 0 && self[0..1] == "00"
+    if begins_with_msisdn_international_prefix
       self.replace(self[2..-1])
-    elsif length > 0 && self[0] == "0"
-      # cut away leading zeros
+    elsif begins_with_msisdn_national_prefix
       self.replace(self[1..-1])
-      # Add country code unless the start of the number is the correct country code
-      unless self[0..country_code.to_s.length-1] == country_code.to_s
-        self.prepend(country_code.to_s)
-      end
+      ensure_msisdn_countrycode_prefix(country_code)
     elsif force_country_code
-      # Add country code unless the start of the number is the correct country code
-      unless self[0..country_code.to_s.length-1] == country_code.to_s
-        self.prepend(country_code.to_s)
-      end
+      ensure_msisdn_countrycode_prefix(country_code)
     end
 
-    # number must be in a valid range
-    unless (10..15) === self.length
-      self.replace("") and return self
+    validate_msisdn_length_range
+    self
+  end
+
+  private
+
+  def begins_with_msisdn_international_prefix
+    length > 0 && self[0..1] == "00"
+  end
+
+  # correct most places in the world but notably not in north america (1... countries)
+  def begins_with_msisdn_national_prefix
+    length > 0 && self[0] == "0"
+  end
+
+  # Add country code unless the start of the number is the correct country code
+  def ensure_msisdn_countrycode_prefix(country_code)
+    unless self[0..country_code.to_s.length-1] == country_code.to_s
+      self.prepend(country_code.to_s)
     end
+  end
 
-    self
+  def validate_msisdn_length_range
+    unless (10..15) === self.length
+      self.replace("")
+    end
   end
 
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smess
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Martin Westin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec