outbox-twilio 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c4467b6e7223984477b6df87915491435f7dc86a
-  data.tar.gz: 1d8b92b6b7d9ace5bae4615117e64c02bd7b57c7
+SHA256:
+  metadata.gz: cbd8daa2d1ffbd08eab90da3f93e4b71d3803f337f812709939838b636a4cb58
+  data.tar.gz: eb131c4481756b84eff1483da5a3199f20a4e03622a66ee0c0a67c6b61b2cfc7
 SHA512:
-  metadata.gz: 1c577e568b0d8e85fdddd445bf5fc21d67a0f89e1c74fe3e62028cba034f00478a5005f776f7342dde63c0a50c5b13020a9ac510fa15900465c1524b4b8b2e96
-  data.tar.gz: 1cc18a20f03c626ec57391d064e1c9d6b562035d5c41a320940d72870508fbd36d7cf7c40069513b91c91b9866dc75e921ff2d9391c4914d441d0d86e89b8810
+  metadata.gz: 3b5608e3b43c76c1e07c2d1bc4394c4b7345af4276ed87ab558fc079381c68faff1d9ae0d002e01a4187ec4b8316e987b8016baf89129000e197d691d5b3d783
+  data.tar.gz: 15bf9f943d2a954df373c6df3f2431200b5357d4452b286b4984cb695a334332c6cc3df48b709be01696ee1609117c3a81bda61c8f65684a44cb1a893aae3c7a

data/.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   Exclude:
-    - "vendor/**/*"
+    - 'vendor/**/*'
   DisplayCopNames: true
   DisplayStyleGuide: true
 
@@ -9,8 +9,12 @@ Style/Documentation:
 
 Metrics/BlockLength:
   Exclude:
-    - "spec/**/*"
+    - 'spec/**/*'
 
-Metrics/LineLength:
+Naming/FileName:
+  Exclude:
+    - 'lib/outbox-twilio.rb'
+
+Layout/LineLength:
   IgnoreCopDirectives: true
   Max: 100

data/.travis.yml

@@ -2,9 +2,9 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
- - 2.2.6
- - 2.3.3
- - 2.4.1
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 script:
   - bundle exec rubocop
   - bundle exec rspec

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in outbox-twilio.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/lib/outbox-twilio.rb

@@ -1,2 +1,3 @@
-# rubocop:disable Style/FileName
+# frozen_string_literal: true
+
 require 'outbox/twilio'

data/lib/outbox/twilio.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'outbox'
 
 module Outbox

data/lib/outbox/twilio/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'twilio-ruby'
 
 module Outbox
@@ -25,7 +27,7 @@ module Outbox
         @api_client = ::Twilio::REST::Client.new(
           options[:username] || options[:account_sid],
           options[:password] || options[:auth_token],
-          options[:account_sid]
+          options[:subaccount_sid] || options[:account_sid]
         )
       end
 
@@ -39,7 +41,17 @@ module Outbox
           application_sid: sms[:application_sid]
         }
         params.delete_if { |_, value| value.nil? }
-        @api_client.api.account.messages.create(params)
+        account(sms).messages.create(params)
+      end
+
+      protected
+
+      def account(sms)
+        if sms[:account_sid]
+          @api_client.api.accounts(sms[:account_sid])
+        else
+          @api_client
+        end
       end
     end
   end

data/lib/outbox/twilio/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Outbox
   module Twilio
-    VERSION = '0.3.2'.freeze
+    VERSION = '1.0.0'
   end
 end

data/outbox-twilio.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'outbox/twilio/version'
 
@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'outbox', '~> 0.2'
-  spec.add_runtime_dependency 'twilio-ruby', '~> 5.0.0.rc17'
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_runtime_dependency 'twilio-ruby', '~> 5.0'
+  spec.add_development_dependency 'bundler', '>= 1.6'
   spec.add_development_dependency 'rake', '~> 12.0.0'
   spec.add_development_dependency 'rspec', '~> 3.5.0'
-  spec.add_development_dependency 'rubocop', '~> 0.48.1'
+  spec.add_development_dependency 'rubocop', '~> 0.82.0'
 end

data/spec/outbox/twilio/client_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Outbox::Twilio::Client do
@@ -51,7 +53,7 @@ describe Outbox::Twilio::Client do
     end
 
     it 'delivers the SMS' do
-      expect(@client.api_client.api.account.messages).to receive(:create).with(
+      expect(@client.api_client.messages).to receive(:create).with(
         to: '+14155551212',
         from: 'Company Name',
         body: 'Hello world.',
@@ -61,5 +63,24 @@ describe Outbox::Twilio::Client do
       ).and_return(double(:message_context))
       @client.deliver(@sms)
     end
+
+    context 'with a subaccount' do
+      it 'delivers the SMS from the subaccount' do
+        @sms[:account_sid] = 'subaccount_sid_1'
+        account = double(:account, messages: double(:messages))
+        expect(@client.api_client.api).to(
+          receive(:accounts).with('subaccount_sid_1').and_return(account)
+        )
+        expect(account.messages).to receive(:create).with(
+          to: '+14155551212',
+          from: 'Company Name',
+          body: 'Hello world.',
+          media_url: 'http://www.example.com/hearts.png',
+          status_callback: 'http://www.example.com/callback',
+          application_sid: '1234'
+        ).and_return(double(:message_context))
+        @client.deliver(@sms)
+      end
+    end
   end
 end

data/spec/outbox/twilio_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Outbox::Twilio do

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'outbox/twilio'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: outbox-twilio
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Pete Browne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: outbox
@@ -30,26 +30,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc17
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc17
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.82.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.82.0
 description: Twilio API wrapper for Outbox, a generic interface for sending notificatons.
 email:
 - pete.browne@localmed.com
@@ -136,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Outbox SMS client for Twilio.