mblox 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTcwM2ZhN2QyZDFjZjc3NDk5NDhmN2NkYTNiNGIyZDdlNzdkMjEwYQ==
+    Nzk1MWJlNGZlNzNhZWU2YTQ3OTMxNDUzYmRiMTk1MDYyNGE5YmI2YQ==
   data.tar.gz: !binary |-
-    MDQ3Yzc3ZWRhNGM3YWJlNGE3N2JjZjY3NTcyNWQ0MDUxYTZhNzQ4NA==
+    NmVmM2U3MTdhYWE3NDdkZGMwNjgzOGE3NTkxNjE3YTM3MTE0YWZiMg==
 SHA512:
   metadata.gz: !binary |-
-    NWIyMWI2YzEwYWFiNjYyZWMzYmRiODViZmRjYzMzODlkZTUwNDVhOTA5YTFm
-    OWM3ZTk1OWYxMTE3NjEzZTkwZmNlMjQ0MzM0ZTg4NDFkYTQ3YWQwMTQ5MTE2
-    YjFhZmFmZDRlOTI5YjliYTg3MzY1YTNkMjI4NWE4YmIyZmI4MmM=
+    NDhlYjI3ODQwNTI0MGM3MmE4YzdkZjczMmQ3ZTY5YzY0YTA0NzZhMjkwMDA4
+    MmJmNGNiYzk2NTk1Nzc5NjdlYmM4NTQyMDExZTk4ZTE1YTMwMjg5ZWU2ODE4
+    OGE1YzFjZjliZjdjMDhmMjBmYjQyNDhiM2MwZDljZGViMmU2NDA=
   data.tar.gz: !binary |-
-    MWZlOWM0ZjhjY2QzYzZiY2U3YTgwZjRmNTM4OTY1NzAzM2MwOGMzZDkxMzM2
-    Zjc4M2RkODY2M2MwYzU4OTJjMWVhYTk1Yzk2YzhjMGJhNzI2ODkxODY2MjU4
-    MTNjN2U5ZjEwMDQwZWM3OWE2Y2UzM2Q4ZGI4OTc5ODE2OTFhYzg=
+    YzdiNDQ0MzI1MDA3MTYyN2NlZmNjYzdiNDQ0MDY2MGM4ODU4YTQ5MzFkYTIy
+    OTg3MDIzNmQzZTczNjJkNzg2ZDUzYzRiZjUxY2M5YWRmZDZiYmUzMmRkYmZj
+    MTYzNTA2NTBiMWJkZjAyMTQ0ZmI2ZDkzNTE4NTk1YmZkNTdlNDg=

data/lib/mblox.rb

@@ -9,5 +9,8 @@ module Mblox
     def log *args
       self.config.logger.__send__(self.config.log_level, *args) if self.config.logger
     end
+    def is_a_five_digit_number?(_)
+      ((_.is_a?(Fixnum) || _.is_a?(String)) && 5 == _.to_i.to_s.size)
+    end
   end
 end

data/lib/mblox/sms.rb

@@ -38,9 +38,13 @@ 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
+    def send_from(sender_id, service_id=nil)
+      raise InvalidSenderIdError, "You can only send from a 5-digit shortcode" unless Mblox.is_a_five_digit_number?(sender_id)
+      @sender_id = sender_id.to_i.to_s
+      unless service_id.nil?
+        raise InvalidSenderIdError, "You can only send using a 5-digit service ID.  Leave out the 2nd argument of send_from to use the globally configured '#{Mblox.config.service_id}'" unless Mblox.is_a_five_digit_number?(service_id)
+        @service_id = service_id.to_i.to_s
+      end
     end
 
     def send
@@ -75,7 +79,7 @@ module Mblox
 	      n.Subscriber do |s|
 		s.SubscriberNumber(@phone)
 	      end
-	      n.ServiceId(Mblox.config.service_id)
+	      n.ServiceId(@service_id || Mblox.config.service_id)
 	    end
 	  end
 	end

data/lib/mblox/version.rb

@@ -1,3 +1,3 @@
 module Mblox
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/mblox.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["iybetesh@gmail.com"]
   spec.description   = "Send SMS messages"
   spec.summary       = `cat README.md`
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/betesh/mblox/"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/spec/sms_spec.rb

@@ -189,24 +189,65 @@ describe Mblox::Sms 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
+
+    describe "sender_id" do
+      def raise_invalid_sender_id_error
+        raise_error(Mblox::Sms::InvalidSenderIdError, 'You can only send from a 5-digit shortcode')
+      end
+      it "cannot be a 4-digit number" do
+        expect{@sms.send_from(1234)}.to raise_invalid_sender_id_error
+      end
+      it "cannot be a 6-digit number" do
+        expect{@sms.send_from(123456)}.to raise_invalid_sender_id_error
+      end
+      it "cannot be a blank string" do
+        expect{@sms.send_from('')}.to raise_invalid_sender_id_error
+      end
+      it "cannot be a float" do
+        expect{@sms.send_from(12345.6)}.to raise_invalid_sender_id_error
+      end
+      it "cannot be nil" do
+        expect{@sms.send_from(nil)}.to raise_invalid_sender_id_error
+      end
     end
-    it "should not allow a float" do
-      expect{@sms.send_from(12345.6)}.to raise_invalid_sender_id_error
+
+    describe "service_id" do
+      def raise_invalid_service_id
+        raise_error(Mblox::Sms::InvalidSenderIdError, "You can only send using a 5-digit service ID.  Leave out the 2nd argument of send_from to use the globally configured '#{Mblox.config.service_id}'")
+      end
+      it "cannot be a 4-digit number" do
+        expect{@sms.send_from(Mblox.config.sender_id, 1234)}.to raise_invalid_service_id
+      end
+      it "cannot be a 6-digit number" do
+        expect{@sms.send_from(Mblox.config.sender_id, 123456)}.to raise_invalid_service_id
+      end
+      it "cannot be a blank string" do
+        expect{@sms.send_from(Mblox.config.sender_id, '')}.to raise_invalid_service_id
+      end
+      it "cannot be a float" do
+        expect{@sms.send_from(Mblox.config.sender_id, 12345.6)}.to raise_invalid_service_id
+      end
+      it "can be nil" do
+        expect{@sms.send_from(Mblox.config.sender_id, nil)}.to_not raise_error
+      end
     end
-    it "should send from the value" do
+
+    it "should send from the specified sender_id" do
+      @sms.instance_variable_get("@sender_id").should be_nil
       expect{@sms.send_from(55555)}.to_not raise_error
       @sms.send.first.ok?.should be_true
+      @sms.instance_variable_get("@sender_id").should == "55555"
+    end
+
+    it "should send from the specified sender_id and service_id" do
+      @sms.instance_variable_get("@service_id").should be_nil
+      expect{@sms.send_from(55555, 44444)}.to_not raise_error
+      response = @sms.send.first
+      response.should_not be_ok
+      response.request.should be_ok
+      response.result.should be_ok
+      response.subscriber_result.should == Mblox::SmsResponse::Result.new(10, "MsipRejectCode=63 Invalid ServiceId:2e Do not retry:2e")
+      @sms.instance_variable_get("@service_id").should == "44444"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mblox
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Isaac Betesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,7 @@ files:
 - spec/sms_response_spec.rb
 - spec/sms_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/betesh/mblox/
 licenses:
 - MIT
 metadata: {}