sms_broker 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0acc9a14c5a0467200ba73c2c3e1cd0f89fec0b4
-  data.tar.gz: 10f556f81b8e7cb032f572fc25457f17ac08268d
+  metadata.gz: ef32eafa4d95269c26382e2b43058a9253862ff6
+  data.tar.gz: a9f299fe0efbc007aa7718a641580d2bc074202a
 SHA512:
-  metadata.gz: '0915db6c9fd498ad8af471050428e9191bd317b642cb6586a23e8014000cc0e809f2db141af8f955ef7f79c264255e6a8708397935bfea47d1fe95b1e1bdb011'
-  data.tar.gz: b4a85f44034db87b1b6c685ee5f4221c1a8ac6ccf433c0c773d3a41ad8bc32c860275cb41854270dcdbe19375d3648cdf9a6fefe1dba77c00e0ff4b8c51caf94
+  metadata.gz: 62f1bd9c8240c787d0e0bb29011e3c3031c2c35a2d53f7b213e62c5e7794f5f6f71bbc198f6a2c29aa56e4e3561aef8e1af854ca44f3f29831ac9e165f2cb60f
+  data.tar.gz: ffc1b5f61a7a187b0df2096bb1aa67e90c444feea4ea87faeb709e43fbe9286d240a849263eaf3394ff9f108c8b2faa88c695ab90561ea91391acde0801d966d

data/lib/open_market/sms/client.rb

@@ -8,7 +8,7 @@ module OpenMarket
     class Client < OpenMarket::Client
       BASE_URL ='sms/v4'.freeze
 
-      def send_message(from:, to:, text:)
+      def send_message(from:nil, to:, text:)
         request = Requests::SendMessage.new(from, to, text)
 
         SMS::Responses::SendMessage.new(request, send_request(request))

data/lib/open_market/sms/requests/send_message.rb

@@ -46,6 +46,8 @@ module OpenMarket
         end
 
         def source
+          return {} unless @from && !@from.empty?
+
           { source: { ton: ALPHANUMERIC_TYPE_OF_NUMBER, address: @from } }
         end
 

data/lib/sms_broker/message_sender.rb

@@ -64,7 +64,7 @@ module SmsBroker
     def get_sender(from)
       if client.sender_id && from == :sender_id
         client.sender_id
-      else
+      elsif client.phone_number
         return client.phone_number if client.phone_number.start_with?('+')
 
         "+#{client.phone_number}"

data/lib/sms_broker/version.rb

@@ -1,3 +1,3 @@
 module SmsBroker
-  VERSION = '1.0.7'.freeze
+  VERSION = '1.0.8'.freeze
 end

data/spec/open_market/client_spec.rb

@@ -13,17 +13,48 @@ describe OpenMarket do
       )
     }
 
-    context 'sending a text message' do
+    context 'sending a text message without originator' do
       let(:response) {
         client.send_message(
-          from: from,
           to: to,
           text: text
         )
       }
 
       context 'with success' do
+        it 'should return success == true' do
+          VCR.use_cassette('open_market/no_sender_message_success') do
+            expect(response.success?).to eq(true)
+            expect(response.status).to eq(202)
+            expect(response.message_id).to eq('2018Z-0329K-14090-31ISC')
+          end
+        end
+      end
+
+      context 'invalid auth' do
+        it 'should return success == false' do
+          VCR.use_cassette('open_market/no_sender_message_unauthorized') do
+            expect(response.success?).to eq(false)
+            expect(response.status).to eq(401)
+
+            expect(response.error_code).to eq(420)
+            expect(response.error_message).not_to be(nil)
+          end
+        end
+
+      end
+    end
 
+    context 'sending a text message with originator' do
+      let(:response) {
+        client.send_message(
+          from: from,
+          to: to,
+          text: text
+        )
+      }
+
+      context 'with success' do
         it 'should return success == true' do
           VCR.use_cassette('open_market/message_success') do
             expect(response.success?).to eq(true)
@@ -31,7 +62,6 @@ describe OpenMarket do
             expect(response.message_id).to eq('2618Z-03021-1603K-03FDL')
           end
         end
-
       end
 
       context 'invalid auth' do

data/spec/sms_broker/open_market_spec.rb

@@ -1,54 +1,76 @@
 describe SmsBroker do
   context 'OpenMarket' do
-    context '#send_message' do
-      let(:provider) { 'open_market' }
+    let(:provider) { 'open_market' }
+    let(:account_id) { '132'}
+    let(:account_password) { '456' }
 
-      let(:account_id) { '132'}
-      let(:account_password) { '456' }
-      let(:text_message) { 'Hello World' }
-      let(:sender_id) { 'SenderID' }
-      let(:to_phone) { '44000000000' }
+    let(:service) do
+      SmsBroker.service(provider)
+    end
 
-      before(:each) do
-        SmsBroker.clear_setup
+    let(:sender_id) {}
 
-        setup
+    let(:setup) {
+      SmsBroker.setup do |config|
+        config.services [provider]
+        config.default_service provider
+        config.open_market_setup \
+          account_id: account_id,
+          account_password: account_password,
+          sender_id: sender_id
       end
+    }
 
-      let(:service) do
-        SmsBroker.service(provider)
-      end
+    before(:each) do
+      SmsBroker.clear_setup
 
-      let(:setup) {
-        SmsBroker.setup do |config|
-          config.services [provider]
-          config.default_service provider
-          config.open_market_setup \
-            account_id: account_id,
-            account_password: account_password,
-            sender_id: sender_id
-        end
-      }
+      setup
+    end
+
+    context '#send_message' do
+      let(:text_message) { 'Hello World' }
+      let(:to_phone) { '44000000000' }
 
       context 'valid' do
-        it 'should send message with success' do
-          setup
 
-          VCR.use_cassette('open_market/message_success') do
-            response = service.message(text_message).to(to_phone).deliver
+        context 'without sender_id' do
+          it 'should send message with success' do
+            setup
 
-            expect(response.service).to eq(:open_market)
-            expect(response.success?).to eq(true)
-            expect(response.message_id).not_to eq(nil)
-            expect(response.location).not_to eq(nil)
-            expect(response.request_id).not_to eq(nil)
+            VCR.use_cassette('open_market/no_sender_message_success') do
+              response = service.message(text_message).to(to_phone).deliver
 
+              expect(response.service).to eq(:open_market)
+              expect(response.success?).to eq(true)
+              expect(response.message_id).not_to eq(nil)
+              expect(response.location).not_to eq(nil)
+              expect(response.request_id).not_to eq(nil)
+            end
           end
+        end
+
+        context 'with sender_id' do
+          let(:sender_id) { 'SenderID' }
+
+          it 'should send message with success' do
+            setup
+
+            VCR.use_cassette('open_market/message_success') do
+              response = service.message(text_message).to(to_phone).deliver
 
+              expect(response.service).to eq(:open_market)
+              expect(response.success?).to eq(true)
+              expect(response.message_id).not_to eq(nil)
+              expect(response.location).not_to eq(nil)
+              expect(response.request_id).not_to eq(nil)
+            end
+          end
         end
       end
 
       context 'invalid' do
+        let(:sender_id) { 'SenderID' }
+
         it 'should return the error' do
           setup
 
@@ -65,36 +87,10 @@ describe SmsBroker do
     end
 
     context '#delivery_status' do
-      let(:provider) { 'open_market' }
-
-      let(:account_id) { '132'}
-      let(:account_password) { '456' }
-      let(:sender_id) { 'SenderID' }
-
-      let(:message_id) { '2218Z-0318E-2225A-4999C' }
-
-      before(:each) do
-        SmsBroker.clear_setup
-
-        setup
-      end
-
-      let(:service) do
-        SmsBroker.service(provider)
-      end
-
-      let(:setup) {
-        SmsBroker.setup do |config|
-          config.services [provider]
-          config.default_service provider
-          config.open_market_setup \
-            account_id: account_id,
-            account_password: account_password,
-            sender_id: sender_id
-        end
-      }
 
       context 'valid message id' do
+        let(:message_id) { '2218Z-0318E-2225A-4999C' }
+
         it 'should return the status of the message with success' do
           setup
 

data/spec/support/vcr_cassettes/open_market/no_sender_message_success.yml

@@ -0,0 +1,42 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://smsc.openmarket.com/sms/v4/mt
+    body:
+      encoding: UTF-8
+      string: '{"mobileTerminate":{"message":{"content":"Hello OpenMarket World!","type":"text"},"destination":{"address":"447736067864"}}}'
+    headers:
+      User-Agent:
+      - Faraday v0.14.0
+      Authorization:
+      - Basic BOGUS
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 202
+      message: Accepted
+    headers:
+      X-Request-Id:
+      - 001-20-CE9E4F4D-E86B-4F37-AAD2-004094B26590
+      Location:
+      - http://smsc.openmarket.com/sms/v4/mt/2018Z-0329K-14090-31ISC
+      Content-Type:
+      - application/json;charset=UTF-8
+      Content-Length:
+      - '0'
+      Date:
+      - Thu, 29 Mar 2018 14:09:31 GMT
+      Server:
+      - OpenMarket Server
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version:
+  recorded_at: Thu, 29 Mar 2018 14:09:32 GMT
+recorded_with: VCR 4.0.0

data/spec/support/vcr_cassettes/open_market/no_sender_message_unauthorized.yml

@@ -0,0 +1,43 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://smsc.openmarket.com/sms/v4/mt
+    body:
+      encoding: UTF-8
+      string: '{"mobileTerminate":{"message":{"content":"Hello OpenMarket World!","type":"text"},"destination":{"address":"918000001"}}}'
+    headers:
+      User-Agent:
+      - Faraday v0.14.0
+      Authorization:
+      - Basic BOGUS
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      X-Request-Id:
+      - 001-23-5659D2F0-44DA-4270-B662-9F276DAF6F81
+      Content-Type:
+      - application/json;charset=ISO-8859-1
+      Content-Length:
+      - '80'
+      Date:
+      - Thu, 29 Mar 2018 14:11:16 GMT
+      Server:
+      - OpenMarket Server
+    body:
+      encoding: UTF-8
+      string: '{"error":{"code":"420","description":"Invalid account ID or account
+        password"}}
+
+'
+    http_version:
+  recorded_at: Thu, 29 Mar 2018 14:11:16 GMT
+recorded_with: VCR 4.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sms_broker
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Streetbees Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nexmo
@@ -187,6 +187,8 @@ files:
 - spec/support/vcr_cassettes/open_market/message_status_unauthorized.yml
 - spec/support/vcr_cassettes/open_market/message_success.yml
 - spec/support/vcr_cassettes/open_market/message_unauthorized.yml
+- spec/support/vcr_cassettes/open_market/no_sender_message_success.yml
+- spec/support/vcr_cassettes/open_market/no_sender_message_unauthorized.yml
 - spec/support/vcr_cassettes/twilio/create_invalid_phone_error.yml
 - spec/support/vcr_cassettes/twilio/create_invalid_phone_error_21612.yml
 - spec/support/vcr_cassettes/twilio/create_success.yml
@@ -229,6 +231,8 @@ test_files:
 - spec/support/vcr_cassettes/open_market/message_status_unauthorized.yml
 - spec/support/vcr_cassettes/open_market/message_success.yml
 - spec/support/vcr_cassettes/open_market/message_unauthorized.yml
+- spec/support/vcr_cassettes/open_market/no_sender_message_success.yml
+- spec/support/vcr_cassettes/open_market/no_sender_message_unauthorized.yml
 - spec/support/vcr_cassettes/twilio/create_invalid_phone_error.yml
 - spec/support/vcr_cassettes/twilio/create_invalid_phone_error_21612.yml
 - spec/support/vcr_cassettes/twilio/create_success.yml