mblox 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmIxY2E0ZmM4NmU1ZWMwZmYwNGFmMDMyZGJkNDY4ZmQ2ZjhmNTM4Mw==
+  data.tar.gz: !binary |-
+    ZTExZGY3ODg3Mzg2M2RkNmQwMTUxNzI5YzRmMGMzYzc3ZjA1NzhlZg==
+SHA512:
+  metadata.gz: !binary |-
+    MGQ2MjM0YjY0MDk0MWU1MmIzNTRlZDQwZGIyZjhiNGQ2ZDQ3YjI1ODJmMjk1
+    YmVlZWViMGIxMjNhY2U1OGI4OGY3YzNlNWM4MGRkNTNjNDdjMzI0NjcxMDZi
+    YjMwY2MxMjk2ZjU1OThkMjM5MWQ2ZTBhNjQ1NTllZjE2MjJmNDg=
+  data.tar.gz: !binary |-
+    OTI0ZGM4YTlhNzZmMGU4ZTVkNjg0MjQ5NmUzZTBiZjNlNzBkNDY2Mjg4N2Y1
+    ZDQyNDUzMjMwMzk0MjI3YTIxM2UzN2FiYWM4YzkxMTg0ZGM2ZTQ0NzE1ZWI3
+    NmIwMjRjMzk4MmY4NTRiZmIyZjMxYTY3MzE1Y2FjODA1YTY4YmQ=

data/README.md

@@ -29,7 +29,7 @@ Configuration
       config.partner_name = ...
       config.tariff = ...
       config.service_id = ...
-      
+
       # You can also configure some logging options
       # In a Rails environment, config.logger will default to Rails.logger and config.log_at will default to :debug
       # config.log_at means the level at which Mblox will log.
@@ -38,7 +38,7 @@ Configuration
       #   logging will be suppressed because it is below the log level of the logger.
       config.logger = Logger.new(STDOUT)
       config.log_at :info
-      
+
       # What to do if messages are longer than 160 characters.  Default is :raise_error
       # Other options are :truncate and :split
       config.on_message_too_long = :truncate

data/lib/mblox.rb

@@ -1,6 +1,5 @@
 require "mblox/configuration"
 require "mblox/sms"
-require "mblox/sms_error"
 require "mblox/version"
 
 module Mblox

data/lib/mblox/sms.rb

@@ -1,26 +1,33 @@
+# encoding: UTF-8
 require 'active_support/core_ext/hash'
 require 'addressable/uri'
 require 'builder'
 require "net/https"
+require 'mblox/sms_response'
 
 module Mblox
   class Sms
+    class InvalidPhoneNumberError < ::ArgumentError; end
+    class InvalidMessageError < ::ArgumentError; end
     MAX_LENGTH = 160
     MAX_SECTION_LENGTH = MAX_LENGTH - "(MSG XXX/XXX): ".size
+    ILLEGAL_CHARACTERS = /([^a-zA-Z0-9!"#$\%&'\(\)*+,-.\/:;<=>?@_£¤¥§¿i¡ÄÅÆÇÉÑÖØÜßáäåæèéìñòöøùü\n\r\tí ])/
 
     attr_reader :phone, :message
 
     ON_MESSAGE_TOO_LONG_HANDLER = {
-      :raise_error => Proc.new { raise SmsError, "Message cannot be longer than #{MAX_LENGTH} characters" },
+      :raise_error => Proc.new { raise InvalidMessageError, "Message cannot be longer than #{MAX_LENGTH} characters" },
       :truncate => Proc.new { |message| Mblox.log "Truncating message due to length.  Message was: \"#{message}\" but will now be \"#{message = message[0,MAX_LENGTH]}\""; [message] },
       :split => Proc.new { |message| split_message(message) }
     }
 
     def initialize(phone,message)
       phone = phone.to_s
-      raise SmsError, "Phone number must be ten digits" unless /\A[0-9]{10}\z/.match(phone)
-      raise SmsError, "Phone number cannot begin with 0 or 1" if ['0','1'].include?(phone[0].to_s)
-      raise SmsError, "Message cannot be blank" if message.empty?
+      raise InvalidPhoneNumberError, "Phone number must be ten digits" unless /\A[0-9]{10}\z/.match(phone)
+      raise InvalidPhoneNumberError, "Phone number cannot begin with 0 or 1" if ['0','1'].include?(phone[0].to_s)
+      raise InvalidMessageError, "Message cannot be blank" if message.empty?
+      illegal_characters = ILLEGAL_CHARACTERS.match(message).to_a
+      raise InvalidMessageError, "Message cannot contain the following special characters: #{illegal_characters.uniq.join(', ')}" unless illegal_characters.size.zero?
       Mblox.log "WARNING: Some characters may be lost because the message must be broken into at least 1000 sections" if message.size > (999 * MAX_SECTION_LENGTH)
       @message = (message.size > MAX_LENGTH) ? ON_MESSAGE_TOO_LONG_HANDLER[Mblox.config.on_message_too_long].call(message) : [message.dup]
       @phone = "1#{phone}"
@@ -31,23 +38,12 @@ module Mblox
     end
     private
       def commit(request_body)
-	Mblox.log "Sending SMS to Mblox:\n#{request_body}"
-	uri = URI.parse(Mblox.config.outbound_url)
-	http = Net::HTTP.new(uri.host, uri.port)
-	request = Net::HTTP::Post.new(uri.request_uri)
-	request.body = request_body
-	request.content_type = 'text/xml'
-	response = http.start {|http| http.request(request) }
-	response = response.body
-	Mblox.log "Mblox responds with:\n#{response}"
-	build_response(Hash.from_xml(response))
-      end
-
-      def build_response(result)
-	result = result['NotificationRequestResult']
-	result_header = result['NotificationResultHeader']
-	subscriber_result = result['NotificationResultList']['NotificationResult']['SubscriberResult']
-	"RequestResult: \"#{result_header['RequestResultCode']}:#{result_header['RequestResultText']}\" / SubscriberResult: \"#{subscriber_result['SubscriberResultCode']}:#{subscriber_result['SubscriberResultText']}\""
+        Mblox.log "Sending SMS to Mblox:\n#{request_body}"
+        request = self.class.request
+        request.body = request_body
+        response = self.class.http.start{ |http| http.request(request) }.body
+        Mblox.log "Mblox responds with:\n#{response}"
+        SmsResponse.new(response)
       end
 
       def build(message)
@@ -58,11 +54,13 @@ module Mblox
 	    nh.PartnerName(Mblox.config.partner_name)
 	    nh.PartnerPassword(Mblox.config.password)
 	  end
-	  nr.NotificationList(:BatchID => "1") do |nl|
-	    nl.Notification(:SequenceNumber => "1", :MessageType => "SMS") do |n|
-	      n.Message(message)
+	  nr.NotificationList(:BatchID => 1) do |nl|
+	    nl.Notification(:SequenceNumber => 1, :MessageType => :SMS, :Format => :UTF8) do |n|
+	      n.Message do |m|
+                m.cdata!(message)
+              end
 	      n.Profile(Mblox.config.profile_id)
-	      n.SenderID(Mblox.config.sender_id, :Type => 'Shortcode')
+	      n.SenderID(Mblox.config.sender_id, :Type => :Shortcode)
 	      n.Tariff(Mblox.config.tariff)
 	      n.Subscriber do |s|
 		s.SubscriberNumber(@phone)
@@ -90,5 +88,20 @@ module Mblox
         Mblox.log "Section ##{sections} of ##{sections} contains characters #{first_char + 1} thru #{message.size} of #{message.size}"
         split_message << "(MSG #{sections}/#{sections}): #{message[first_char..-1]}"
       end
+
+      class << self
+        def url
+          @url ||= URI.parse(URI.escape(Mblox.config.outbound_url))
+        end
+        def http
+          @http ||= Net::HTTP.new(url.host, url.port)
+        end
+        def request
+          return @request if @request
+          @request = Net::HTTP::Post.new(url.request_uri)
+          @request.content_type = 'text/xml'
+          @request
+        end
+      end
   end
 end

data/lib/mblox/sms_response.rb

@@ -0,0 +1,69 @@
+require 'active_model/serialization'
+require 'active_model/serializers/xml.rb'
+
+require 'active_model/callbacks'
+require 'active_model/validator'
+require 'active_model/naming'
+require 'active_model/translation'
+require 'active_model/validations'
+require 'active_model/errors'
+
+module Mblox
+  class SmsResponse
+    class MissingExpectedXmlContentError < StandardError; end
+    class Result
+      include ActiveModel::Validations
+      validates_presence_of :text, :code, :message => "%{attribute} cannot be blank"
+      validates_numericality_of :code, :only_integer => true, :allow_nil => true, :message => "%{attribute} must be an integer"
+
+      attr_reader :code, :text
+      def initialize(code, text)
+        @code, @text = (code.to_i.to_s == code ? code.to_i : code), text
+      end
+
+      def is_ok?
+        0 == @code
+      end
+
+      def ==(rhs)
+        code == rhs.code && text == rhs.text
+      end
+
+      UNROUTABLE_TEXT = "MsipRejectCode=29 Number unroutable:2e Do not retry:2e"
+      UNROUTABLE = new(10, UNROUTABLE_TEXT)
+    end
+
+    attr_reader :request, :result, :subscriber_result
+    def initialize(xml)
+      data = Hash.from_xml(xml)
+      data = data['NotificationRequestResult']
+      raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' node, but was #{xml}" if data.blank?
+      header = data['NotificationResultHeader']
+      raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' -> 'NotificationResultHeader' node, but was #{xml}" if header.blank?
+      @request = Result.new(header['RequestResultCode'], header['RequestResultText'])
+      @request = nil unless @request.valid?
+
+      result_list = data['NotificationResultList']
+      raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' -> 'NotificationResultList' node, but was #{xml}" if result_list.blank?
+      result_list = result_list['NotificationResult']
+      raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' -> 'NotificationResultList' => 'NotificationResult' node, but was #{xml}" if result_list.blank?
+      @result = Result.new(result_list['NotificationResultCode'], result_list['NotificationResultText'])
+      @result = nil unless @result.valid?
+
+      if @result.is_ok?
+        result_list = result_list['SubscriberResult']
+        raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' -> 'NotificationResultList' => 'NotificationResult' -> 'SubscriberResult' node, but was #{xml}" if result_list.blank?
+        @subscriber_result = Result.new(result_list['SubscriberResultCode'], result_list['SubscriberResultText'])
+        @subscriber_result = nil unless @subscriber_result.valid?
+      end
+    end
+
+    def is_ok?
+      @request.is_ok? && @result.is_ok? && @subscriber_result.is_ok?
+    end
+
+    def is_unroutable?
+      @request.is_ok? && @result.is_ok? && Result::UNROUTABLE == @subscriber_result
+    end
+  end
+end

data/lib/mblox/version.rb

@@ -1,3 +1,3 @@
 module Mblox
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/mblox.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 
+  spec.add_runtime_dependency 'activemodel'
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'addressable'
   spec.add_runtime_dependency 'builder'

data/spec/configuration_spec.rb

@@ -1,27 +1,59 @@
 require "spec_helper"
 
-describe "configuration" do
-  describe "on_message_too_long" do
-    it "should default to :raise_error" do
+describe Mblox::Configuration do
+  describe "logger" do
+    before(:each) do
       Mblox.reset_configuration
-      expect(Mblox.config.on_message_too_long).to eq(:raise_error)
     end
 
-    it "should allow the value :truncate" do
-      expect { Mblox.config.on_message_too_long = :truncate }.to_not raise_error
+    after(:all) do
+      set_configuration
+    end
+
+    [:fatal, :error, :warn, :info, :debug].each do |val|
+      it "should allow log level ':#{val}'" do
+        Mblox.config.log_at val
+        Mblox.config.logger = ::Logger.new('/dev/null')
+        expect { Mblox.log "Some info" }.to_not raise_error
+      end
+    end
+
+    it "should default to log level debug" do
+      Mblox.config.log_level.should eq(:debug)
+      expect { Mblox.log "Some debug info" }.to_not raise_error
+    end
+
+    it "should not allow log level news when the logger is created after log level is set" do
+      Mblox.config.log_at :news
+      expect { Mblox.config.logger = ::Logger.new(STDOUT)}.to raise_error(ArgumentError, "Mblox log level must be set to :fatal, :error, :warn, :info or :debug")
+      expect { Mblox.log "Some news" }.to_not raise_error
+    end
+
+    it "should not allow log level news when the logger is created before log level is set and should remain in a valid state" do
+      Mblox.config.logger = ::Logger.new("/dev/null")
+      expect { Mblox.config.log_at :news }.to raise_error(ArgumentError, "Mblox log level must be set to :fatal, :error, :warn, :info or :debug")
+      Mblox.config.log_level.should eq(:debug)
+      expect { Mblox.log "Some news" }.to_not raise_error
     end
+  end
 
-    it "should allow the value :split" do
-      expect { Mblox.config.on_message_too_long = :split }.to_not raise_error
+  describe "on_message_too_long" do
+    it "should default to :raise_error" do
+      Mblox.reset_configuration
+      Mblox.config.on_message_too_long.should eq(:raise_error)
     end
 
-    it "should allow the value :raise_error" do
-      expect { Mblox.config.on_message_too_long = :raise_error }.to_not raise_error
+    [:raise_error, :split, :truncate].each do |val|
+      it "should allow the value ':#{val}'" do
+        expect { Mblox.config.on_message_too_long = val }.to_not raise_error
+        Mblox.config.on_message_too_long.should eq(val)
+      end
     end
 
     it "should not allow other values and should remain in a valid state" do
+      original = Mblox.config.on_message_too_long
       expect { Mblox.config.on_message_too_long = :do_nothing }.to raise_error(ArgumentError, "Mblox.config.on_message_too_long must be either :truncate, :split or :raise_error")
-      expect(Mblox.config.on_message_too_long).to eq(:raise_error)
+      Mblox.config.on_message_too_long.should eq(original)
     end
   end
 end

data/spec/sms_response_result_spec.rb

@@ -0,0 +1,62 @@
+require "spec_helper"
+
+describe Mblox::SmsResponse::Result do
+  describe "code" do
+    it "cannot be blank" do
+      result = described_class.new(nil, "123")
+      result.valid?
+      result.errors[:code].should include("Code cannot be blank")
+    end
+
+    it "must be a number" do
+      result = described_class.new('abc', "123")
+      result.valid?
+      result.errors[:code].should include("Code must be an integer")
+    end
+
+    it "must be an integer" do
+      result = described_class.new(3.14159, "123")
+      result.valid?
+      result.errors[:code].should include("Code must be an integer")
+    end
+  end
+
+  describe "text" do
+    it "cannot be blank" do
+      result = described_class.new(0, '')
+      result.valid?
+      result.errors[:text].should include("Text cannot be blank")
+    end
+  end
+
+  describe "is_ok?" do
+    it "is true for code 0" do
+      described_class.new(0, "123").is_ok?.should be_true
+    end
+
+    10.times do |i|
+      it "is false for code #{i+1}" do
+        described_class.new(i+1, "123").is_ok?.should be_false
+      end
+    end
+  end
+
+  describe "==" do
+    it "should be true if code and text are the same" do
+      lhs = described_class.new(0, 'OK')
+      rhs = described_class.new(0, 'OK')
+      (lhs == rhs).should be_true
+    end
+
+    it "should be false if code does not match" do
+      lhs = described_class.new(0, 'OK')
+      rhs = described_class.new(4, 'OK')
+      (lhs == rhs).should be_false
+    end
+    it "should be false if text does not match" do
+      lhs = described_class.new(0, 'OK')
+      rhs = described_class.new(0, '__OK__')
+      (lhs == rhs).should be_false
+    end
+  end
+end

data/spec/sms_spec.rb

@@ -1,91 +1,137 @@
+# encoding: UTF-8
 require "spec_helper"
 
-describe "phone number" do
-  it "should be 10 digits" do
-    expect { Mblox::Sms.new("2"*9, the_message) }.to raise_error(Mblox::SmsError, "Phone number must be ten digits")
-    expect { Mblox::Sms.new("2"*10, the_message) }.to_not raise_error
-    expect { Mblox::Sms.new("2"*11, the_message) }.to raise_error(Mblox::SmsError, "Phone number must be ten digits")
+describe Mblox::Sms do
+  def the_message
+    "Mblox gem test sent at #{Time.now}"
   end
-
-  it "should not start with 0 or 1" do
-    expect { Mblox::Sms.new("1"+"2"*9, the_message) }.to raise_error(Mblox::SmsError, "Phone number cannot begin with 0 or 1")
-    expect { Mblox::Sms.new("0"+"2"*9, the_message) }.to raise_error(Mblox::SmsError, "Phone number cannot begin with 0 or 1")
+  before(:all) do
+    Mblox.reset_configuration
+    set_configuration
   end
+  describe "phone number" do
+    it "should be 10 digits" do
+      expect { Mblox::Sms.new("2"*9, the_message) }.to raise_error(Mblox::Sms::InvalidPhoneNumberError, "Phone number must be ten digits")
+      expect { Mblox::Sms.new("2"*10, the_message) }.to_not raise_error
+      expect { Mblox::Sms.new("2"*11, the_message) }.to raise_error(Mblox::Sms::InvalidPhoneNumberError, "Phone number must be ten digits")
+    end
 
-  it "should be safe from changing" do
-    number = TEST_NUMBER.to_s
-    mblox = Mblox::Sms.new(number,the_message)
-    number[1..3] = ''
-    expect(mblox.phone).to eq("1#{TEST_NUMBER}")
-  end
-end
+    it "should not start with 0 or 1" do
+      expect { Mblox::Sms.new("1"+"2"*9, the_message) }.to raise_error(Mblox::Sms::InvalidPhoneNumberError, "Phone number cannot begin with 0 or 1")
+      expect { Mblox::Sms.new("0"+"2"*9, the_message) }.to raise_error(Mblox::Sms::InvalidPhoneNumberError, "Phone number cannot begin with 0 or 1")
+    end
 
-describe "message" do
-  it "cannot be blank" do
-    expect { Mblox::Sms.new("2"*10, "") }.to raise_error(Mblox::SmsError, "Message cannot be blank")
+    it "should be safe from changing" do
+      number = TEST_NUMBER.to_s
+      mblox = Mblox::Sms.new(number,the_message)
+      number[1..3] = ''
+      mblox.phone.should eq("1#{TEST_NUMBER}")
+    end
   end
 
-  it "can be 160 characters long" do
-    expect { Mblox::Sms.new("2"*10, "A"*160) }.to_not raise_error
-  end
+  describe "message" do
+    it "cannot be blank" do
+      expect { Mblox::Sms.new(LANDLINE, "") }.to raise_error(Mblox::Sms::InvalidMessageError, "Message cannot be blank")
+    end
 
-  it "will be truncated when the message is longer than 160 characters if configured to do so" do
-    message = "A"+"ABCDEFGHIJ"*16
-    Mblox.config.on_message_too_long = :truncate
-    expect { @mblox = Mblox::Sms.new("2"*10, message) }.to_not raise_error
-    expect(@mblox.message).to eq([message[0,160]])
-  end
+    it "can be 160 characters long" do
+      expect { Mblox::Sms.new(LANDLINE, "A"*160) }.to_not raise_error
+    end
 
-  it "cannot be longer than 160 characters if configured to raise error" do
-    Mblox.config.on_message_too_long = :raise_error
-    expect { Mblox::Sms.new("2"*10, "A"*161) }.to raise_error(Mblox::SmsError, "Message cannot be longer than 160 characters")
-  end
+    it "will be truncated when the message is longer than 160 characters if configured to do so" do
+      message = "A"+"ABCDEFGHIJ"*16
+      Mblox.config.on_message_too_long = :truncate
+      expect { @mblox = Mblox::Sms.new(LANDLINE, message) }.to_not raise_error
+      @mblox.message.should eq([message[0,160]])
+    end
 
-  it "should be split into multiple messages when longer than 160 characters if configured to split and even split" do
-    message = "ABCDEFGHIJ"*58
-    Mblox.config.on_message_too_long = :split
-    expect { @mblox = Mblox::Sms.new("2"*10, message) }.to_not raise_error
-    expect(@mblox.message).to eq(["(MSG 1/4): #{message[0,145]}", "(MSG 2/4): #{message[145,145]}", "(MSG 3/4): #{message[290,145]}", "(MSG 4/4): #{message[435,145]}"])
-    expect(@mblox.send).to eq(Array.new(4, result_unroutable))
-  end
+    it "cannot be longer than 160 characters if configured to raise error" do
+      Mblox.config.on_message_too_long = :raise_error
+      expect { Mblox::Sms.new(LANDLINE, "A"*161) }.to raise_error(Mblox::Sms::InvalidMessageError, "Message cannot be longer than 160 characters")
+    end
 
-  it "should be split into multiple messages when longer than 160 characters if configured to split and not even split" do
-    message = "ABCDEFGHIJ"*32
-    Mblox.config.on_message_too_long = :split
-    expect { @mblox = Mblox::Sms.new("2"*10, message) }.to_not raise_error
-    expect(@mblox.message).to eq(["(MSG 1/3): #{message[0,145]}", "(MSG 2/3): #{message[145,145]}", "(MSG 3/3): #{message[290..-1]}"])
-    expect(@mblox.send).to eq(Array.new(3, result_unroutable))
-  end
+    it "should be split into multiple messages when longer than 160 characters if configured to split and even split" do
+      message = "ABCDEFGHIJ"*58
+      Mblox.config.on_message_too_long = :split
+      expect { @mblox = Mblox::Sms.new(LANDLINE, message) }.to_not raise_error
+      @mblox.message.should eq(["(MSG 1/4): #{message[0,145]}", "(MSG 2/4): #{message[145,145]}", "(MSG 3/4): #{message[290,145]}", "(MSG 4/4): #{message[435,145]}"])
+      response = @mblox.send
+      response.count.should eq(4)
+      response.each { |r| r.is_unroutable?.should be_true }
+    end
 
-  it "should be safe from changing when short" do
-    msg = the_message
-    mblox = Mblox::Sms.new(TEST_NUMBER,msg)
-    msg[1..3] = ''
-    expect(mblox.message).to eq([the_message])
-  end
+    it "should be split into multiple messages when longer than 160 characters if configured to split and not even split" do
+      message = "ABCDEFGHIJ"*32
+      Mblox.config.on_message_too_long = :split
+      expect { @mblox = Mblox::Sms.new(LANDLINE, message) }.to_not raise_error
+      @mblox.message.should eq(["(MSG 1/3): #{message[0,145]}", "(MSG 2/3): #{message[145,145]}", "(MSG 3/3): #{message[290..-1]}"])
+      response = @mblox.send
+      response.count.should eq(3)
+      response.each { |r| r.is_unroutable?.should be_true }
+    end
 
-  it "should be safe from changing when long" do
-    msg = the_message * 10
-    mblox = Mblox::Sms.new(TEST_NUMBER,msg)
-    msg[1..3] = ''
-    expect(mblox.message[0][11, 20]).to eq(the_message[0,20])
-  end
-end
+    it "should be safe from changing when short" do
+      msg = the_message
+      mblox = Mblox::Sms.new(TEST_NUMBER,msg)
+      msg[1..3] = ''
+      mblox.message.should eq([the_message])
+    end
 
-describe "SMS messages" do
-  it "should be sent when the phone number is a Fixnum" do
-    expect(Mblox::Sms.new(TEST_NUMBER.to_i,the_message).send).to eq([result_ok])
-  end
+    it "should be safe from changing when long when configured to split" do
+      Mblox.config.on_message_too_long = :split
+      msg = the_message * 10
+      mblox = Mblox::Sms.new(TEST_NUMBER,msg)
+      msg[1..3] = ''
+      mblox.message[0][11, 20].should eq(the_message[0,20])
+    end
 
-  it "should be sent when the phone number is a String" do
-    expect(Mblox::Sms.new(TEST_NUMBER.to_s,the_message).send).to eq([result_ok])
+    it "should be safe from changing when long when configured to truncate" do
+      Mblox.config.on_message_too_long = :truncate
+      msg = the_message * 10
+      mblox = Mblox::Sms.new(TEST_NUMBER,msg)
+      msg[1..3] = ''
+      mblox.message[0][0, 20].should eq(the_message[0,20])
+    end
   end
 
-  it "should allow 160-character messages" do
-    expect(Mblox::Sms.new(TEST_NUMBER,"A"*160).send).to eq([result_ok])
-  end
+  describe "SMS messages" do
+    def expect_ok_response(response)
+      response.is_ok?.should be_true
+      response.is_unroutable?.should be_false
+    end
+
+    it "should be sent when the phone number is a Fixnum" do
+      response = Mblox::Sms.new(TEST_NUMBER.to_i,the_message).send
+      response.size.should eq(1)
+      expect_ok_response(response.first)
+    end
+
+    it "should be sent when the phone number is a String" do
+      response = Mblox::Sms.new(TEST_NUMBER.to_s,the_message).send
+      response.size.should eq(1)
+      expect_ok_response(response.first)
+    end
+
+    it "should allow 160-character messages" do
+      response = Mblox::Sms.new(TEST_NUMBER,"A"*160).send
+      response.size.should eq(1)
+      expect_ok_response(response.first)
+    end
+
+    it "should be unroutable when sent to a landline" do
+      response = Mblox::Sms.new(LANDLINE,the_message).send
+      response.size.should eq(1)
+      response.first.is_unroutable?.should be_true, "#{response.first.inspect} should have been unroutable"
+      response.first.is_ok?.should be_false
+    end
 
-  it "should fail when sent to a landline" do
-    expect(Mblox::Sms.new("6176354500",the_message).send).to eq([result_unroutable])
+    "\r\n!\"#$\%&'\(\)*+,-.\/:;<=>?@_£¤¥§¿iÄÅÆÇÉÑÖØÜßáäåæèéìñòöøùü\tí¡ ".each_char do |i|
+      it "allows the special char #{i}, correctly escaping illegal XML characters where necessary" do
+        response = Mblox::Sms.new(LANDLINE,"#{the_message}#{i}#{the_message}").send
+        response.size.should eq(1)
+        response.first.is_ok?.should be_false
+        response.first.is_unroutable?.should be_true
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -15,21 +15,8 @@ def set_configuration
   end
 end
 
-set_configuration
-
 TEST_NUMBER = CONFIG['test_number']
-
-def the_message
-  "Mblox gem test sent at #{Time.now}"
-end
-
-def result_ok
-  "RequestResult: \"0:OK\" / SubscriberResult: \"0:OK\""
-end
-
-def result_unroutable
-  "RequestResult: \"0:OK\" / SubscriberResult: \"10:MsipRejectCode=29 Number unroutable:2e Do not retry:2e\""
-end
+LANDLINE = 6176354500
 
 module Mblox
   class << self
@@ -38,3 +25,7 @@ module Mblox
     end
   end
 end
+
+RSpec.configure do |config|
+  config.order = "random"
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: mblox
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Isaac Betesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,20 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  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
@@ -62,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -124,43 +125,36 @@ files:
 - lib/mblox.rb
 - lib/mblox/configuration.rb
 - lib/mblox/sms.rb
-- lib/mblox/sms_error.rb
+- lib/mblox/sms_response.rb
 - lib/mblox/version.rb
 - mblox.gemspec
 - spec/configuration_spec.rb
-- spec/log_spec.rb
+- spec/sms_response_result_spec.rb
 - spec/sms_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 965711471
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 965711471
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ! '# Mblox  This gem is for subscribers to Mblox to send SMS messages.  ##
   Installation  Add this line to your application''s Gemfile:  gem ''mblox''  And
   then execute:  $ bundle  Or install it yourself as:  $ gem install mblox  ## Usage  Configuration  Mblox.configure
@@ -186,6 +180,6 @@ summary: ! '# Mblox  This gem is for subscribers to Mblox to send SMS messages.
   5. Create new Pull Request'
 test_files:
 - spec/configuration_spec.rb
-- spec/log_spec.rb
+- spec/sms_response_result_spec.rb
 - spec/sms_spec.rb
 - spec/spec_helper.rb

data/lib/mblox/sms_error.rb

@@ -1,4 +0,0 @@
-module Mblox
-  class SmsError < ArgumentError
-  end
-end

data/spec/log_spec.rb

@@ -1,35 +0,0 @@
-require "spec_helper"
-require "logger"
-
-describe "logger" do
-  before(:each) do
-    Mblox.reset_configuration
-  end
-
-  after(:all) do
-    set_configuration
-  end
-
-  it "should allow log level info" do
-    Mblox.config.log_at :info
-    Mblox.config.logger = ::Logger.new('/dev/null')
-    expect { Mblox.log "Some info" }.to_not raise_error
-  end
-
-  it "should default to log level debug" do
-    expect(Mblox.config.log_level).to eq(:debug)
-    expect { Mblox.log "Some debug info" }.to_not raise_error
-  end
-
-  it "should not allow log level news when the logger is created after log level is set" do
-    Mblox.config.log_at :news
-    expect { Mblox.config.logger = ::Logger.new(STDOUT)}.to raise_error(ArgumentError, "Mblox log level must be set to :fatal, :error, :warn, :info or :debug")
-    expect { Mblox.log "Some news" }.to_not raise_error
-  end
-
-  it "should not allow log level news when the logger is created before log level is set and should remain in a valid state" do
-    Mblox.config.logger = ::Logger.new("/dev/null")
-    expect { Mblox.config.log_at :news }.to raise_error(ArgumentError, "Mblox log level must be set to :fatal, :error, :warn, :info or :debug")
-    expect { Mblox.log "Some news" }.to_not raise_error
-  end
-end