mblox 0.2.8 → 0.2.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2M2NzBjYjMwNDk4NDkzOWUwZDNjMWZjNTgzZjYxNzY2MGNlMDM0Yw==
+    ODgwZjU3MWFlNWUzYjI1OTAxNzBlY2MwMmI0NTNhZmE0Y2M1YjMxMw==
   data.tar.gz: !binary |-
-    YjkyYjAwZWQ0ZTE5NjVhZThmMThhZjQyOWJlZDc0YzAwMzI3ZGE1Ng==
+    OGVkNTE1ZWRmZjY1ZmRkN2JlMmJlYmU2MTQ1ZmQyMjEzODExYzdmMg==
 SHA512:
   metadata.gz: !binary |-
-    YmIyODJiOGQ4OWI0MDc3MDI1ZmFkZmFjNjVlMzAxYzllYjUzNTg3Y2M3ZmY0
-    ODEyNzYxNmU0OTg5MTM5MmZmN2NiZjE5MGI1ODdkYzFlMGYzZmRhODdmMjdh
-    NzY3MjlhZWRhNzNmYWRmYTY3MzI1NmNkNjQ3MTVhYzVmN2IxYTM=
+    OGYyYjhlNjQxNjljM2Q5M2I3NDZjZGZmZmMzNGU4Y2I0ZDdmZDQ5ZmMzN2Y3
+    YzlmODE1YjFmZTI1YWU2M2I5MmEwMWJiYTM0ZjRlNmRmMjlhMzQ0M2NmZjFk
+    MDdjMmQyMjY4OTgxMmJjOWI1MWJhNDRmOThjOTg0NmRkNjk5ZWM=
   data.tar.gz: !binary |-
-    ZDE3NTljM2NjNjkzODcyNDg5MTljZGM5ZDgzNDliY2E0YjRhY2FhNjgzMzJi
-    Y2M4MTM5OGEwMWZiNjY0ODBhNGEzN2Q0OGUxMTkyYzUzOGRlNjdjZDRiYmNj
-    ZWIyNzI2YzA0OTcxNGE1NmQ5MjQwODJmZWQ3ZDRkZTI2MzA1OWU=
+    NWUyMTNkZTVjZDYxOTg2MTVmNTdlMTdlYjZhZDNmNWY5YjgyMGQ5NDBkZDli
+    ZWNlN2I4OWYwMWUxMzY2N2IwYzhiMjI1OGZmNWY5ZDcyYzU5NTMzMWJjNjFk
+    ZGM0MDI1MTFlYTdhOGM4NmM5MjQ5YTQzY2M1MDAwMjY0YjA1YTc=

data/README.md

@@ -56,7 +56,7 @@ Copy config.yml.example to config.yml and set all the values in that file.  Run:
 
     rspec
 
-You should recieve 5 SMS messages to your phone within several seconds.
+You should recieve 6 SMS messages to your phone within several seconds.
 
 ## Contributing
 

data/lib/mblox/sms.rb

@@ -10,6 +10,7 @@ module Mblox
     class InvalidPhoneNumberError < ::ArgumentError; end
     class InvalidMessageError < ::ArgumentError; end
     class BatchIdOutOfRangeError < ::ArgumentError; end
+    class InvalidSenderIdError < ::ArgumentError; end
     MAX_LENGTH = 160
     MAX_SECTION_LENGTH = MAX_LENGTH - "(MSG XXX/XXX): ".size
     LEGAL_CHARACTERS = "~\`!\"#\$\%&'\(\)*+,-.\/:;<=>?@_£¤¥§¿i¡ÄÅÆÇÉÑÖØÜßáäåæèéìñòöøóùüú\n\r\tí "
@@ -37,6 +38,11 @@ module Mblox
       @batch_id = batch_id.to_i unless batch_id.blank?
     end
 
+    def send_from(_)
+      raise InvalidSenderIdError, "You can only send from a 5-digit shortcode" unless ((_.is_a?(Fixnum) || _.is_a?(String)) && 5 == _.to_i.to_s.size)
+      @sender_id = _.to_i.to_s
+    end
+
     def send
       @message.collect { |message| commit build(message) }
     end
@@ -64,7 +70,7 @@ module Mblox
                 m.cdata!(message)
               end
 	      n.Profile(Mblox.config.profile_id)
-	      n.SenderID(Mblox.config.sender_id, :Type => :Shortcode)
+	      n.SenderID(@sender_id || Mblox.config.sender_id, :Type => :Shortcode)
 	      n.Tariff(Mblox.config.tariff)
 	      n.Subscriber do |s|
 		s.SubscriberNumber(@phone)

data/lib/mblox/version.rb

@@ -1,3 +1,3 @@
 module Mblox
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/spec/sms_spec.rb

@@ -184,4 +184,29 @@ describe Mblox::Sms do
       expect{Mblox::Sms.new(LANDLINE,the_message, 100000000)}.to raise_error(Mblox::Sms::BatchIdOutOfRangeError, 'batch_id must be in the range 1 to 99999999.  The batch_id specified (100000000) is out of range.')
     end
   end
+
+  describe "send from" do
+    before(:each) do
+      @sms = Mblox::Sms.new(TEST_NUMBER,'This message should come from shortcode 55555')
+    end
+    def raise_invalid_sender_id_error
+      raise_error(Mblox::Sms::InvalidSenderIdError, 'You can only send from a 5-digit shortcode')
+    end
+    it "should not allow a 4-digit number" do
+      expect{@sms.send_from(1234)}.to raise_invalid_sender_id_error
+    end
+    it "should not allow a 6-digit number" do
+      expect{@sms.send_from(123456)}.to raise_invalid_sender_id_error
+    end
+    it "should not allow a blank string" do
+      expect{@sms.send_from('')}.to raise_invalid_sender_id_error
+    end
+    it "should not allow a float" do
+      expect{@sms.send_from(12345.6)}.to raise_invalid_sender_id_error
+    end
+    it "should send from the value" do
+      expect{@sms.send_from(55555)}.to_not raise_error
+      @sms.send.first.ok?.should be_true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mblox
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Isaac Betesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,7 +176,7 @@ summary: ! '# Mblox  This gem is for subscribers to Mblox to send SMS messages.
   to sending to must be a 10-digit number, including the area code.  Can be a String
   or Fixnum. phone_number = 2225555555 # or: phone_number = "2225555555" Mblox::Sms.new(phone_number,
   "your message").send  ## Testing  Copy config.yml.example to config.yml and set
-  all the values in that file.  Run:  rspec  You should recieve 5 SMS messages to
+  all the values in that file.  Run:  rspec  You should recieve 6 SMS messages to
   your phone within several seconds.  ## Contributing  1. Fork it 2. Create your feature
   branch (`git checkout -b my-new-feature`) 3. Commit your changes (`git commit -am
   ''Add some feature''`) 4. Push to the branch (`git push origin my-new-feature`)